smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-24 23:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

helper da migration

Browse Source
This commit is contained in:
Solovyov1796 2024-04-26 12:39:56 +08:00
parent 2aa30b19b3
commit 438f6c84f8
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -42,3 +42,4 @@ build/linux
go.work go.work
go.work.sum go.work.sum
.build/0gchaind .build/0gchaind
.build/da

2
app/app.go
View File

@ -627,6 +627,8 @@ func NewApp(
validatorvesting.NewAppModule(app.bankKeeper), validatorvesting.NewAppModule(app.bankKeeper),
evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper, app.accountKeeper), evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper, app.accountKeeper),
mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace), mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace),
council.NewAppModule(app.CouncilKeeper, app.stakingKeeper),
das.NewAppModule(app.DasKeeper),
) )
// Warning: Some begin blockers must run before others. Ensure the dependencies are understood before modifying this list. // Warning: Some begin blockers must run before others. Ensure the dependencies are understood before modifying this list.

2
helper/da/client/client.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/0glabs/0g-evmos/helper/da/light" "github.com/0glabs/0g-chain/helper/da/light"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
helper/da/go.mod
View File

@ -1,4 +1,4 @@
module github.com/0glabs/0g-evmos/helper/da module github.com/0glabs/0g-chain/helper/da
go 1.20 go 1.20

4
helper/da/main.go
View File

@ -11,8 +11,8 @@ import (
"os/signal" "os/signal"
"time" "time"
"github.com/0glabs/0g-evmos/helper/da/service" "github.com/0glabs/0g-chain/helper/da/service"
"github.com/0glabs/0g-evmos/helper/da/types" "github.com/0glabs/0g-chain/helper/da/types"
"github.com/lesismal/nbio/nbhttp" "github.com/lesismal/nbio/nbhttp"
"github.com/lesismal/nbio/nbhttp/websocket" "github.com/lesismal/nbio/nbhttp/websocket"

14
helper/da/service/handler.go
View File

@ -8,9 +8,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/0glabs/0g-evmos/helper/da/client" "github.com/0glabs/0g-chain/helper/da/client"
"github.com/0glabs/0g-evmos/helper/da/types" "github.com/0glabs/0g-chain/helper/da/types"
"github.com/0glabs/0g-evmos/helper/da/utils/sizedw8grp" "github.com/0glabs/0g-chain/helper/da/utils/sizedw8grp"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/lesismal/nbio/nbhttp/websocket" "github.com/lesismal/nbio/nbhttp/websocket"
@ -165,20 +165,20 @@ func runEvmosdCliReportDasResult(ctx context.Context, requestId uint64, result b
strconv.FormatUint(requestId, 10), strconv.FormatUint(requestId, 10),
strconv.FormatBool(result), strconv.FormatBool(result),
"--from", account.(string), "--from", account.(string),
"--gas-prices", "767812500aevmos", // TODO: use args to set gas prices "--gas-prices", "7678500neuron", // TODO: use args to set gas prices
} }
homePath := ctx.Value(types.NODE_HOME_PATH) homePath := ctx.Value(types.NODE_HOME_PATH)
if homePath != nil { if len(homePath.(string)) > 0 {
args = append(args, "--home", homePath.(string)) args = append(args, "--home", homePath.(string))
} }
keyring := ctx.Value(types.NODE_CLI_EXEC_KEYRING) keyring := ctx.Value(types.NODE_CLI_EXEC_KEYRING)
if keyring != nil { if len(keyring.(string)) > 0 {
args = append(args, "--keyring-backend", keyring.(string)) args = append(args, "--keyring-backend", keyring.(string))
} }
cmdStr := relativePath.(string) + "evmosd" cmdStr := relativePath.(string) + "0gchaind"
cmd := exec.Command(cmdStr, append(args, "-y")...) cmd := exec.Command(cmdStr, append(args, "-y")...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr