Skip to content

Commit

Permalink
fix pubkey recover
Browse files Browse the repository at this point in the history
  • Loading branch information
@beer-1
beer-1 committed Jun 26, 2024
1 parent 3b22442 commit b6902b2
Show file tree
Hide file tree
Showing 12 changed files with 104 additions and 33 deletions.
3 changes: 1 addition & 2 deletions app/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"

opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
"github.com/initia-labs/minievm/types"

evmconfig "github.com/initia-labs/minievm/x/evm/config"
)
Expand Down Expand Up @@ -64,7 +63,7 @@ func setup(db *dbm.DB, withGenesis bool) (*MinitiaApp, GenesisState) {
)

if withGenesis {
return app, NewDefaultGenesisState(encCdc.Codec, app.BasicModuleManager, types.BaseDenom)
return app, NewDefaultGenesisState(encCdc.Codec, app.BasicModuleManager, sdk.DefaultBondDenom)
}

return app, GenesisState{}
Expand Down
4 changes: 3 additions & 1 deletion cmd/minitiad/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
evmconfig "github.com/initia-labs/minievm/x/evm/config"

"github.com/initia-labs/initia/app/params"
initiakeyring "github.com/initia-labs/initia/crypto/keyring"
minitiaapp "github.com/initia-labs/minievm/app"

opchildcli "github.com/initia-labs/OPinit/x/opchild/client/cli"
Expand Down Expand Up @@ -88,7 +89,8 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
WithInput(os.Stdin).
WithAccountRetriever(types.AccountRetriever{}).
WithHomeDir(minitiaapp.DefaultNodeHome).
WithViper(minitiaapp.EnvPrefix)
WithViper(minitiaapp.EnvPrefix).
WithKeyringOptions(initiakeyring.EthSecp256k1Option())

rootCmd := &cobra.Command{
Use: basename,
Expand Down
5 changes: 3 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ require (
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/initia-labs/OPinit/api v0.3.0 // indirect
github.com/initia-labs/movevm v0.3.0 // indirect
github.com/initia-labs/movevm v0.3.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/jsternberg/zap-logfmt v1.3.0 // indirect
Expand Down Expand Up @@ -276,8 +276,9 @@ replace (
// initia custom
replace (
github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20240503082631-d98d5e638a38
github.com/cosmos/cosmos-sdk => github.com/initia-labs/cosmos-sdk v0.0.0-20240617110109-8f40e8e336e1
github.com/cosmos/iavl => github.com/initia-labs/iavl v0.0.0-20240415085037-7e81233cdd9e
github.com/cosmos/ibc-go/v8 => github.com/initia-labs/ibc-go/v8 v8.0.0-20240419124350-4275a05abe2c
github.com/ethereum/go-ethereum => github.com/initia-labs/evm v0.0.0-20240620024053-f13ebda716b7
github.com/initia-labs/initia => github.com/initia-labs/initia v0.3.1-0.20240613064038-a76fc6dc911a
github.com/initia-labs/initia => github.com/initia-labs/initia v0.3.3-0.20240626040639-e2a089177806
)
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,6 @@ github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAK
github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA=
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
github.com/cosmos/cosmos-sdk v0.50.7-0.20240517114248-b99ca2c1fded h1:NIis1/jAwIsKTvo2yoIGUf8h6DmtMsUrn4XtFWpXILg=
github.com/cosmos/cosmos-sdk v0.50.7-0.20240517114248-b99ca2c1fded/go.mod h1:84xDDJEHttRT7NDGwBaUOLVOMN0JNE9x7NbsYIxXs1s=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
Expand Down Expand Up @@ -812,14 +810,16 @@ github.com/initia-labs/OPinit/api v0.3.0 h1:OY8ijwmgZLoYwtw9LI1mSY3VC8PY+gtxJFit
github.com/initia-labs/OPinit/api v0.3.0/go.mod h1:Xy/Nt3ubXLQ4zKn0m7RuQOM1sj8TVdlNNyek21TGYR0=
github.com/initia-labs/cometbft v0.0.0-20240503082631-d98d5e638a38 h1:yNlY5QpMazwZ7C7S4vKWrNYvWoSWf2bdEuG7jOAPU/0=
github.com/initia-labs/cometbft v0.0.0-20240503082631-d98d5e638a38/go.mod h1:+W1nh53IVhT5VG86zofNq2I2Tw0RQIoYSmpTHJ9Lex8=
github.com/initia-labs/cosmos-sdk v0.0.0-20240617110109-8f40e8e336e1 h1:d8nw7Ey/ECDhL5fcUdaKAcuH3KabCLX6Y5paRvXEbXo=
github.com/initia-labs/cosmos-sdk v0.0.0-20240617110109-8f40e8e336e1/go.mod h1:lVkRY6cdMJ0fG3gp8y4hFrsKZqF4z7y0M2UXFb9Yt40=
github.com/initia-labs/evm v0.0.0-20240620024053-f13ebda716b7 h1:V7K8wvE5FVVv6WTeITI+nqWfo4b9WlZyXQH0Olz5UVI=
github.com/initia-labs/evm v0.0.0-20240620024053-f13ebda716b7/go.mod h1:x2gtBG0WHLgY08FE97lfhjtpcR5vcSAZbi34JnrsBbQ=
github.com/initia-labs/iavl v0.0.0-20240415085037-7e81233cdd9e h1:1gkMWkAgVhYFhEv7K4tX+8uJJLdiTKlQhl5+wGaxdMg=
github.com/initia-labs/iavl v0.0.0-20240415085037-7e81233cdd9e/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
github.com/initia-labs/ibc-go/v8 v8.0.0-20240419124350-4275a05abe2c h1:FDwh5zZbm9v7C37ni4FytQQ9Os5XxYp1px5U7Nqdu2Y=
github.com/initia-labs/ibc-go/v8 v8.0.0-20240419124350-4275a05abe2c/go.mod h1:wj3qx75iC/XNnsMqbPDCIGs0G6Y3E/lo3bdqCyoCy+8=
github.com/initia-labs/initia v0.3.1-0.20240613064038-a76fc6dc911a h1:3pKCqeE7iECRo7E6O67Dbw8/jwHzTkaixZsrLmZgT9Q=
github.com/initia-labs/initia v0.3.1-0.20240613064038-a76fc6dc911a/go.mod h1:wc15rmE48TiN8P6PiJRLtB36SIwjnSWwj8P5CdDKXaM=
github.com/initia-labs/initia v0.3.3-0.20240626040639-e2a089177806 h1:Svq6P9TKDWv4/4sZPSFYGOYm6HwlNoqunYXPbg01myM=
github.com/initia-labs/initia v0.3.3-0.20240626040639-e2a089177806/go.mod h1:GWkqIR8ApIGwxYBh8kNBSO5bFWdVins34X59J6t5noU=
github.com/initia-labs/kvindexer v0.1.3 h1:TLkgJjp5TiPnH+OzYfk7ZKQTKqGOfSte59Y3gasob+o=
github.com/initia-labs/kvindexer v0.1.3/go.mod h1:rvAmgCAmEs4KM8sRRPcyTqNNwi8s2JiHybiFkYfp4KE=
github.com/initia-labs/kvindexer/submodules/block v0.1.0 h1:y+EXnksd/I2F96mzIoQA64nZUZON2P+99YrSzeLCLoY=
Expand All @@ -828,8 +828,8 @@ github.com/initia-labs/kvindexer/submodules/pair v0.1.1 h1:o151gA4jIbqEl+pWTOCiz
github.com/initia-labs/kvindexer/submodules/pair v0.1.1/go.mod h1:8X1GE1ZLkH7z8TKb5MUh7UClTkcqVFIwXIIRdsqeUZY=
github.com/initia-labs/kvindexer/submodules/tx v0.1.0 h1:6kbf6wmzXPN0XCQLasiFgq1AlZHkt5K3/ZG+IWw1nNs=
github.com/initia-labs/kvindexer/submodules/tx v0.1.0/go.mod h1:i0XeLbLa6xdgTR01WF8kaAO50vMmwxbeq0fKexwpFHU=
github.com/initia-labs/movevm v0.3.0 h1:uIAFlhkMrwrISRmkSw7Ts78N9aVq2a3k9jAgeHxvoUA=
github.com/initia-labs/movevm v0.3.0/go.mod h1:6MxR4GP5zH3JUc1IMgfqAe1e483mZVS7fshPknZPJ30=
github.com/initia-labs/movevm v0.3.3 h1:xUH5VvjBSfJP4jg3axefmBlcdZ/7qfVYnUU09R4oN4g=
github.com/initia-labs/movevm v0.3.3/go.mod h1:6MxR4GP5zH3JUc1IMgfqAe1e483mZVS7fshPknZPJ30=
github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
Expand Down
2 changes: 2 additions & 0 deletions go.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ use (
.
./integration-tests
)

replace github.com/ethereum/go-ethereum => ../go-ethereum
Loading

0 comments on commit b6902b2

Please sign in to comment.