Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmsqe
mmsqe committed Nov 22, 2023
1 parent d0467e3 commit 9949532
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 26 deletions.
3 changes: 2 additions & 1 deletion app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ import (
ethermint "github.com/evmos/ethermint/types"
"github.com/evmos/ethermint/x/evm"
evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
v0evmtypes "github.com/evmos/ethermint/x/evm/migrations/v0/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/evmos/ethermint/x/feemarket"
feemarketkeeper "github.com/evmos/ethermint/x/feemarket/keeper"
Expand Down Expand Up @@ -1153,7 +1154,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(ibcexported.ModuleName)
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
paramsKeeper.Subspace(icaauthtypes.ModuleName)
paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable()) //nolint: staticcheck
paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(v0evmtypes.ParamKeyTable()) //nolint: staticcheck
paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable())
if !skipGravity {
paramsKeeper.Subspace(gravitytypes.ModuleName)
Expand Down
3 changes: 2 additions & 1 deletion app/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
ibctmmigrations "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/migrations"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
icaauthtypes "github.com/crypto-org-chain/cronos/v2/x/icaauth/types"
v0evmtypes "github.com/evmos/ethermint/x/evm/migrations/v0/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
)
Expand Down Expand Up @@ -63,7 +64,7 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clie
case icaauthtypes.ModuleName:
keyTable = icaauthtypes.ParamKeyTable()
case evmtypes.ModuleName:
keyTable = evmtypes.ParamKeyTable() //nolint:staticcheck
keyTable = v0evmtypes.ParamKeyTable() //nolint:staticcheck
case feemarkettypes.ModuleName:
keyTable = feemarkettypes.ParamKeyTable()
case cronostypes.ModuleName:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ replace (
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
github.com/ethereum/go-ethereum => github.com/mmsqe/go-ethereum v1.10.27-0.20231116010256-4bc837707f7f
github.com/evmos/ethermint => github.com/mmsqe/ethermint v0.6.5-0.20231116043235-a7fd83b2d02c
github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231122021350-f905c2ec3570
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231122101434-6f3ad29bf943
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,10 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1
github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24=
github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467 h1:m0/aHPIJAzi2MSP3TXzzbLTFf+koRFQiaYmerRZUtK4=
github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467/go.mod h1:G384omH7cXgm90xXR7xpHvsKG7vdBaDuz4To6GpTHUU=
github.com/crypto-org-chain/ethermint v0.6.1-0.20231122101434-6f3ad29bf943 h1:3mISHcgWKssG+gnZAd6a718zeDgKckvNYLuAAka/dkM=
github.com/crypto-org-chain/ethermint v0.6.1-0.20231122101434-6f3ad29bf943/go.mod h1:y8DDupItqxfGglMpak/ow8E7qvqXM2Vb7t6kdb6s96Q=
github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231122021350-f905c2ec3570 h1:GukXF6eVCJZbK5pgTF+SHJoY9Wr0mPh95/LIOUQNMMM=
github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231122021350-f905c2ec3570/go.mod h1:DuefStAgaxoaYGLR0FueVcVbehmn5n9QUcVrMCuOvuc=
github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI=
github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e/go.mod h1:HBaDqlFjlaXJwVQtA7jHejyaA7xwjXI2o6pU/ccP3tE=
github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
Expand Down Expand Up @@ -1141,10 +1145,6 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mmsqe/ethermint v0.6.5-0.20231116043235-a7fd83b2d02c h1:SkYS9I5TYLAnAQfo7HfY/8yHB/Zi/9DPwuvUb4eW19E=
github.com/mmsqe/ethermint v0.6.5-0.20231116043235-a7fd83b2d02c/go.mod h1:0O/OkTw0d1a/1vkO4HRBlP4D15yxOJ0m1E7HH36hv30=
github.com/mmsqe/go-ethereum v1.10.27-0.20231116010256-4bc837707f7f h1:TvZf7K0r2VBCpqHZmEt3Ilqr6PTMHcVJzL6dMzqZwps=
github.com/mmsqe/go-ethereum v1.10.27-0.20231116010256-4bc837707f7f/go.mod h1:DuefStAgaxoaYGLR0FueVcVbehmn5n9QUcVrMCuOvuc=
github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
Expand Down
12 changes: 6 additions & 6 deletions gomod2nix.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,13 @@ schema = 3
version = "v1.1.0"
hash = "sha256-LFcJue98awAFkSPRc93tVvon3kWS7AvumrluxxRzt4c="
[mod."github.com/ethereum/go-ethereum"]
version = "v1.10.27-0.20231116010256-4bc837707f7f"
hash = "sha256-GI+shChkliMiljbZmbycYPfj7/Auhw0FZcd3WUS+lOI="
replaced = "github.com/mmsqe/go-ethereum"
version = "v1.10.20-0.20231122021350-f905c2ec3570"
hash = "sha256-1LRIM5dPmwjBxd57c9Y+2mZuBrbGWfMvEIlqYpdVBPA="
replaced = "github.com/crypto-org-chain/go-ethereum"
[mod."github.com/evmos/ethermint"]
version = "v0.6.5-0.20231116043235-a7fd83b2d02c"
hash = "sha256-L0lsSbzdSAYLwxlPuZUfhM41fokZOP/sVGhbGnHtDwY="
replaced = "github.com/mmsqe/ethermint"
version = "v0.6.1-0.20231122101434-6f3ad29bf943"
hash = "sha256-gt8+TkOU9Rg9YjT+ZquRrgxFyCHibLRm27rzuRirpW4="
replaced = "github.com/crypto-org-chain/ethermint"
[mod."github.com/felixge/httpsnoop"]
version = "v1.0.2"
hash = "sha256-hj6FZQ1fDAV+1wGIViAt8XaAkWZ1I5vJzgjIJa7XRBA="
Expand Down
4 changes: 0 additions & 4 deletions x/cronos/keeper/precompiles/bank.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ func (bc *BankContract) RequiredGas(input []byte) uint64 {
return baseCost
}

func (bc *BankContract) IsStateful() bool {
return true
}

func (bc *BankContract) checkBlockedAddr(addr sdk.AccAddress) error {
to, err := sdk.AccAddressFromBech32(addr.String())
if err != nil {
Expand Down
4 changes: 0 additions & 4 deletions x/cronos/keeper/precompiles/ica.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ func (ic *IcaContract) RequiredGas(input []byte) uint64 {
return baseCost
}

func (ic *IcaContract) IsStateful() bool {
return true
}

func (ic *IcaContract) Run(evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) {
// parse input
methodID := contract.Input[:4]
Expand Down
4 changes: 0 additions & 4 deletions x/cronos/keeper/precompiles/relayer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ func (bc *RelayerContract) RequiredGas(input []byte) (gas uint64) {
return total - intrinsicGas
}

func (bc *RelayerContract) IsStateful() bool {
return true
}

// prefix bytes for the relayer msg type
const (
prefixSize4Bytes = 4
Expand Down

0 comments on commit 9949532

Please sign in to comment.