Skip to content

Commit

Permalink
feat: Apply ethermint changes(remove cutsom GetSignerFunc from MsgUpd…
Browse files Browse the repository at this point in the history
…ateParams)
  • Loading branch information
dudong2 committed Apr 29, 2024
1 parent 8d49df1 commit 3ec4b10
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 1 addition & 4 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ import (

erc20v1 "github.com/Canto-Network/Canto/v7/api/canto/erc20/v1"
evmv1 "github.com/evmos/ethermint/api/ethermint/evm/v1"
feemarketv1 "github.com/evmos/ethermint/api/ethermint/feemarket/v1"
ethante "github.com/evmos/ethermint/app/ante"
enccodec "github.com/evmos/ethermint/encoding/codec"
"github.com/evmos/ethermint/ethereum/eip712"
Expand Down Expand Up @@ -322,10 +321,8 @@ func NewCanto(
},
}

// evm/MsgEthereumTx, evm/MsgUpdateParams, feemarket/MsgUpdateParams, erc20/MsgConvertERC20
// evm/MsgEthereumTx, erc20/MsgConvertERC20
signingOptions.DefineCustomGetSigners(protov2.MessageName(&evmv1.MsgEthereumTx{}), evmtypes.GetSignersFromMsgEthereumTxV2)
signingOptions.DefineCustomGetSigners(protov2.MessageName(&evmv1.MsgUpdateParams{}), evmtypes.GetSignersFromMsgUpdateParamsV2)
signingOptions.DefineCustomGetSigners(protov2.MessageName(&feemarketv1.MsgUpdateParams{}), feemarkettypes.GetSignersFromMsgUpdateParamsV2)
signingOptions.DefineCustomGetSigners(protov2.MessageName(&erc20v1.MsgConvertERC20{}), erc20types.GetSignersFromMsgConvertERC20V2)

interfaceRegistry, _ := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ require (
replace (
cosmossdk.io/core => cosmossdk.io/core v0.11.0
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
github.com/evmos/ethermint => github.com/b-harvest/ethermint v0.0.0-20240326054419-4ae15feb0e8a
github.com/evmos/ethermint => github.com/b-harvest/ethermint v0.0.0-20240426083134-b156e23dfe07
// replace broken goleveldb
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX
github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ=
github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/b-harvest/ethermint v0.0.0-20240326054419-4ae15feb0e8a h1:nhd08s7VShhOKzHfFWLwqB+e0QfebgIktk99vrEmqaM=
github.com/b-harvest/ethermint v0.0.0-20240326054419-4ae15feb0e8a/go.mod h1:RCk8XMeT47RKxOAeaz35Gct1bYt9nNwrF+Uw913WM84=
github.com/b-harvest/ethermint v0.0.0-20240426083134-b156e23dfe07 h1:malOQOeoVJivkP8rp6mB7CpErAgLv4i/HbgJtbe1z4Y=
github.com/b-harvest/ethermint v0.0.0-20240426083134-b156e23dfe07/go.mod h1:RCk8XMeT47RKxOAeaz35Gct1bYt9nNwrF+Uw913WM84=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
Expand Down

0 comments on commit 3ec4b10

Please sign in to comment.