From 81aef00c6923fabc7e79a0b556e07c4ced8869f6 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 15:51:16 +0800 Subject: [PATCH 1/9] Problem: ibc-go 7.3.0 is not used --- go.mod | 6 +++--- go.sum | 8 ++++---- gomod2nix.toml | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index fd81a8153c..f5085062b4 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/cometbft/cometbft v0.37.3-0.20230920093934-46df7b597e3c github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.2.0 + github.com/cosmos/ibc-go/v7 v7.3.0 github.com/crypto-org-chain/cronos/store v0.0.4 github.com/crypto-org-chain/cronos/versiondb v0.0.0-00010101000000-000000000000 github.com/ethereum/go-ethereum v1.10.26 @@ -233,7 +233,7 @@ replace ( // 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/evmos/go-ethereum v1.10.26-evmos-rc1 - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20230921025237-ae144329ecaf + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20230925072753-4062d0cc2a32 // 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 diff --git a/go.sum b/go.sum index 40bc958521..fe74076018 100644 --- a/go.sum +++ b/go.sum @@ -452,8 +452,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.21.0-alpha.1.0.20230904092046-df3db2d96583 h1:3Matt7/LjZiZkIBPalYazOZcw2B05Ch14dU5TJyqJEc= github.com/cosmos/iavl v0.21.0-alpha.1.0.20230904092046-df3db2d96583/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= +github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw= +github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= @@ -482,8 +482,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20230921030527-0d47d7537e32 h1:Vq github.com/crypto-org-chain/cometbft-db v0.0.0-20230921030527-0d47d7537e32/go.mod h1:V32HRAjDsAYLfAT90mk0O9UH+sE7P5apfiCmmmVLt3Q= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20230905040840-b3af5590283b h1:d2GOFR3i3BjDlPsmJkp8Gsrt9LK2nq2IVEnE/rMv1Fo= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20230905040840-b3af5590283b/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= -github.com/crypto-org-chain/ethermint v0.6.1-0.20230921025237-ae144329ecaf h1:XvwFJ6kPHOYevfNjshq4n2nazvYzoSaQ8AjSYWSfUhI= -github.com/crypto-org-chain/ethermint v0.6.1-0.20230921025237-ae144329ecaf/go.mod h1:KtjU2MHMCTcLnAoS9C3U3f+vx4f9HHNQRcOlxXiVDxY= +github.com/crypto-org-chain/ethermint v0.6.1-0.20230925072753-4062d0cc2a32 h1:A++epzNCr3EY57dnU6UTSDwbCiPD6MjvUKHKSd/PoI8= +github.com/crypto-org-chain/ethermint v0.6.1-0.20230925072753-4062d0cc2a32/go.mod h1:wnJQyK4n0vShhL+YIAUd7XCzUhgZ9fgG6yJ14n7qefo= 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= diff --git a/gomod2nix.toml b/gomod2nix.toml index 01fd3bf28d..0224dcb676 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -155,8 +155,8 @@ schema = 3 version = "v0.21.0-alpha.1.0.20230904092046-df3db2d96583" hash = "sha256-3Va8Ljq63IXty0oHlRpqfsC6WsMut6TWZ2R+/nYtfTU=" [mod."github.com/cosmos/ibc-go/v7"] - version = "v7.2.0" - hash = "sha256-fg+0AykvEMzqRGI5CmqwjQtSIwTyT6RuSDpp12wzReM=" + version = "v7.3.0" + hash = "sha256-/5r4A5VSR/WygwxQze5lUy0OPoFzMQFR5Daa+Y3pBCk=" [mod."github.com/cosmos/ics23/go"] version = "v0.10.0" hash = "sha256-KYEv727BO/ht63JO02xiKFGFAddg41Ve9l2vSSZZBq0=" @@ -213,8 +213,8 @@ schema = 3 hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE=" replaced = "github.com/evmos/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20230921025237-ae144329ecaf" - hash = "sha256-ZDzwB65qROKNIB4Yv1i+5FTJoejeuRCcUzUacyuFBFw=" + version = "v0.6.1-0.20230925072753-4062d0cc2a32" + hash = "sha256-8zwdHROHnAVfly2PIaNAfiXfb2fWsTqePaZ58EJtjH4=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" From afe7271e820891e4bef3a704779e5481df743bde Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 15:52:53 +0800 Subject: [PATCH 2/9] add change doc --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d714ca9f25..431ba32641 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - [cronos#1014](https://github.com/crypto-org-chain/cronos/pull/1014) Support stateful precompiled contract for relayer. - [cronos#1165](https://github.com/crypto-org-chain/cronos/pull/1165) Icaauth module is not adjusted correctly in ibc-go v7.2.0. - [cronos#837](https://github.com/crypto-org-chain/cronos/pull/837) Support stateful precompiled contract for bank. +- [cronos#1184](https://github.com/crypto-org-chain/cronos/pull/1184) Update ibc-go to `v7.3.0`. ### Bug Fixes From e8fd399f00b99c0505917c69e0d169306ff0d42a Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 16:13:34 +0800 Subject: [PATCH 3/9] fix build --- app/bench_test.go | 2 +- x/cronos/keeper/grpc_query.go | 4 ++-- x/cronos/rpc/api.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/bench_test.go b/app/bench_test.go index d78ad6a802..99644ef256 100644 --- a/app/bench_test.go +++ b/app/bench_test.go @@ -68,7 +68,7 @@ func benchmarkERC20Transfer(b *testing.B, db dbm.DB) { ethSigner := ethtypes.LatestSignerForChainID(chainID) signTx := func(msg *evmtypes.MsgEthereumTx) ([]byte, error) { - msg.From = address.String() + msg.From = address.Bytes() if err := msg.Sign(ethSigner, signer); err != nil { return nil, err } diff --git a/x/cronos/keeper/grpc_query.go b/x/cronos/keeper/grpc_query.go index e2a5c00d8a..ad025cf544 100644 --- a/x/cronos/keeper/grpc_query.go +++ b/x/cronos/keeper/grpc_query.go @@ -79,14 +79,14 @@ func (k Keeper) ReplayBlock(goCtx context.Context, req *types.ReplayBlockRequest } // populate the `From` field - if _, err := msg.GetSender(chainID); err != nil { + if _, err := msg.GetSenderLegacy(chainID); err != nil { return nil, err } fees, err := evmkeeper.VerifyFee(txData, evmDenom, baseFee, homestead, istanbul, ctx.IsCheckTx()) if err != nil { return nil, errorsmod.Wrapf(err, "failed to verify the fees") } - if err := k.evmKeeper.DeductTxCostsFromUserBalance(ctx, fees, common.HexToAddress(msg.From)); err != nil { + if err := k.evmKeeper.DeductTxCostsFromUserBalance(ctx, fees, common.BytesToAddress(msg.From)); err != nil { return nil, err } diff --git a/x/cronos/rpc/api.go b/x/cronos/rpc/api.go index eba64739c9..7ac7f00c3f 100644 --- a/x/cronos/rpc/api.go +++ b/x/cronos/rpc/api.go @@ -175,7 +175,7 @@ func (api *CronosAPI) GetTransactionReceiptsByBlock(blockNrOrHash rpctypes.Block status = hexutil.Uint(ethtypes.ReceiptStatusSuccessful) } - from, err := ethMsg.GetSender(api.chainIDEpoch) + from, err := ethMsg.GetSenderLegacy(api.chainIDEpoch) if err != nil { return nil, err } @@ -313,7 +313,7 @@ func (api *CronosAPI) ReplayBlock(blockNrOrHash rpctypes.BlockNumberOrHash, post status = hexutil.Uint(ethtypes.ReceiptStatusSuccessful) } - from, err := ethMsg.GetSender(api.chainIDEpoch) + from, err := ethMsg.GetSenderLegacy(api.chainIDEpoch) if err != nil { return nil, err } From e4bd03d090761e416736e1ccc74bae075c6ae4be Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 16:14:00 +0800 Subject: [PATCH 4/9] make use of CacheContext --- x/cronos/keeper/precompiles/bank.go | 6 +----- x/cronos/keeper/precompiles/interface.go | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/x/cronos/keeper/precompiles/bank.go b/x/cronos/keeper/precompiles/bank.go index f15162fa90..158f639d00 100644 --- a/x/cronos/keeper/precompiles/bank.go +++ b/x/cronos/keeper/precompiles/bank.go @@ -134,11 +134,7 @@ func (bc *BankContract) Run(evm *vm.EVM, contract *vm.Contract, readonly bool) ( token := args[0].(common.Address) addr := args[1].(common.Address) // query from storage - balance := big.NewInt(0) - err = stateDB.ExecuteNativeAction(precompileAddr, nil, func(ctx sdk.Context) error { - balance = bc.bankKeeper.GetBalance(ctx, sdk.AccAddress(addr.Bytes()), EVMDenom(token)).Amount.BigInt() - return err - }) + balance := bc.bankKeeper.GetBalance(stateDB.CacheContext(), sdk.AccAddress(addr.Bytes()), EVMDenom(token)).Amount.BigInt() return method.Outputs.Pack(balance) case "transfer": if readonly { diff --git a/x/cronos/keeper/precompiles/interface.go b/x/cronos/keeper/precompiles/interface.go index e3117589d1..cf14f2cddd 100644 --- a/x/cronos/keeper/precompiles/interface.go +++ b/x/cronos/keeper/precompiles/interface.go @@ -11,4 +11,5 @@ import ( type ExtStateDB interface { vm.StateDB ExecuteNativeAction(contract common.Address, converter statedb.EventConverter, action func(ctx sdk.Context) error) error + CacheContext() sdk.Context } From 23c2c597e79a8c960bbc87b3744152534398ffd2 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 16:37:06 +0800 Subject: [PATCH 5/9] update to latest ibc-go --- CHANGELOG.md | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 431ba32641..dbb418e4d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ - [cronos#1014](https://github.com/crypto-org-chain/cronos/pull/1014) Support stateful precompiled contract for relayer. - [cronos#1165](https://github.com/crypto-org-chain/cronos/pull/1165) Icaauth module is not adjusted correctly in ibc-go v7.2.0. - [cronos#837](https://github.com/crypto-org-chain/cronos/pull/837) Support stateful precompiled contract for bank. -- [cronos#1184](https://github.com/crypto-org-chain/cronos/pull/1184) Update ibc-go to `v7.3.0`. +- [cronos#1184](https://github.com/crypto-org-chain/cronos/pull/1184) Update ibc-go to `v7.3.1`. ### Bug Fixes diff --git a/go.mod b/go.mod index f5085062b4..f65581b887 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/cometbft/cometbft v0.37.3-0.20230920093934-46df7b597e3c github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.4 + github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.3.0 + github.com/cosmos/ibc-go/v7 v7.3.1-0.20230920070810-c3261472c815 github.com/crypto-org-chain/cronos/store v0.0.4 github.com/crypto-org-chain/cronos/versiondb v0.0.0-00010101000000-000000000000 github.com/ethereum/go-ethereum v1.10.26 diff --git a/go.sum b/go.sum index fe74076018..46b6476148 100644 --- a/go.sum +++ b/go.sum @@ -452,8 +452,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.21.0-alpha.1.0.20230904092046-df3db2d96583 h1:3Matt7/LjZiZkIBPalYazOZcw2B05Ch14dU5TJyqJEc= github.com/cosmos/iavl v0.21.0-alpha.1.0.20230904092046-df3db2d96583/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw= -github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ= +github.com/cosmos/ibc-go/v7 v7.3.1-0.20230920070810-c3261472c815 h1:raSo7w7B3IXCb7DZozHWz8ajG7HLWZw9foiyCbEgInI= +github.com/cosmos/ibc-go/v7 v7.3.1-0.20230920070810-c3261472c815/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= diff --git a/gomod2nix.toml b/gomod2nix.toml index 0224dcb676..f5bf557fb7 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -155,8 +155,8 @@ schema = 3 version = "v0.21.0-alpha.1.0.20230904092046-df3db2d96583" hash = "sha256-3Va8Ljq63IXty0oHlRpqfsC6WsMut6TWZ2R+/nYtfTU=" [mod."github.com/cosmos/ibc-go/v7"] - version = "v7.3.0" - hash = "sha256-/5r4A5VSR/WygwxQze5lUy0OPoFzMQFR5Daa+Y3pBCk=" + version = "v7.3.1-0.20230920070810-c3261472c815" + hash = "sha256-x/D64hmU+aOc5sm8RzXMB+8y+530+CCEik/Zpj3Rf9A=" [mod."github.com/cosmos/ics23/go"] version = "v0.10.0" hash = "sha256-KYEv727BO/ht63JO02xiKFGFAddg41Ve9l2vSSZZBq0=" From 72f861605d012c57e5fa3abe4526b55342a9be5b Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 25 Sep 2023 16:19:25 +0800 Subject: [PATCH 6/9] update rly --- nix/default.nix | 2 +- nix/sources.json | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 9893bbe5df..de060f0175 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -56,7 +56,7 @@ import sources.nixpkgs { name = "rly"; src = sources.relayer; subPackages = [ "." ]; - vendorSha256 = "sha256-Fd1vVVHEeVabsWpfI7yQfmC8T1z+dSDavxwmrKh9MmU="; + vendorSha256 = "sha256-IoaGLD3XKRmD61qcr/sPn3aWaa7zYAO9EbMiJFnF5BY="; doCheck = false; GOWORK = "off"; postInstall = '' diff --git a/nix/sources.json b/nix/sources.json index af1af36a00..bf51bd3309 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -96,18 +96,6 @@ "url": "https://github.com/informalsystems/ibc-rs/archive/daad02843a091bbdb3dd608e5f4ce790895c8845.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "relayer": { - "branch": "master", - "description": "An IBC relayer for ibc-go", - "homepage": "https://github.com/crypto-org-chain/relayer", - "owner": "crypto-org-chain", - "repo": "relayer", - "rev": "6be13d112138244fc9dd4f80facd81baa2dac629", - "sha256": "sha256:02pbp0jksh3fvk6g4fqyqp56l15giajf2477898vjcaliqpvzrnr", - "type": "tarball", - "url": "https://github.com/crypto-org-chain/relayer/archive/6be13d112138244fc9dd4f80facd81baa2dac629.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "niv": { "branch": "master", "description": "Easy dependency management for Nix projects", @@ -131,5 +119,17 @@ "type": "tarball", "url": "https://github.com/NixOS/nixpkgs/archive/90aa73fc8e1550b16d1ebdc436e48d9951f7989b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" + }, + "relayer": { + "branch": "main", + "description": "An IBC relayer for ibc-go", + "homepage": "https://github.com/crypto-org-chain/relayer", + "owner": "crypto-org-chain", + "repo": "relayer", + "rev": "f202a264463e9d5829398f6be50bff990421b483", + "sha256": "08x4bhwglx12rp78gs4hzgp2cywzqwr7gghk1kxasmvy9z0qxp92", + "type": "tarball", + "url": "https://github.com/crypto-org-chain/relayer/archive/f202a264463e9d5829398f6be50bff990421b483.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" } } From 9fc2d932aafe145f2715ab596ff995df8fd5aa9f Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 23:05:09 +0800 Subject: [PATCH 7/9] add encoding --- integration_tests/cosmoscli.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py index f98104f2aa..39cc1a60fb 100644 --- a/integration_tests/cosmoscli.py +++ b/integration_tests/cosmoscli.py @@ -1315,7 +1315,7 @@ def ica_query_account(self, connid, owner, **kwargs): ) ) - def ica_generate_packet_data(self, tx, memo=None, **kwargs): + def ica_generate_packet_data(self, tx, memo=None, encoding="proto3json", **kwargs): return json.loads( self.raw( "tx", @@ -1324,6 +1324,8 @@ def ica_generate_packet_data(self, tx, memo=None, **kwargs): "generate-packet-data", tx, "--memo" if memo else None, + "--encoding" if encoding else None, + encoding if encoding else None, home=self.data_dir, **kwargs, ) From f68f3d70e38ad2fc6cf8d8777392013a951aae3a Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 23:10:39 +0800 Subject: [PATCH 8/9] change default encode --- integration_tests/cosmoscli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py index 39cc1a60fb..d54bf99b6c 100644 --- a/integration_tests/cosmoscli.py +++ b/integration_tests/cosmoscli.py @@ -1315,7 +1315,7 @@ def ica_query_account(self, connid, owner, **kwargs): ) ) - def ica_generate_packet_data(self, tx, memo=None, encoding="proto3json", **kwargs): + def ica_generate_packet_data(self, tx, memo=None, encoding="proto3", **kwargs): return json.loads( self.raw( "tx", From 5f3329dc4fc2ea7db7d933a7f193284fa22a005c Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 25 Sep 2023 23:43:31 +0800 Subject: [PATCH 9/9] Apply suggestions from code review --- integration_tests/cosmoscli.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py index d54bf99b6c..7749e5a610 100644 --- a/integration_tests/cosmoscli.py +++ b/integration_tests/cosmoscli.py @@ -1323,9 +1323,8 @@ def ica_generate_packet_data(self, tx, memo=None, encoding="proto3", **kwargs): "host", "generate-packet-data", tx, - "--memo" if memo else None, - "--encoding" if encoding else None, - encoding if encoding else None, + memo=memo, + encoding=encoding, home=self.data_dir, **kwargs, )