Skip to content

Commit e1cf56b

Browse files
authored
Problem: address-by-acc-num query with id instead of account_id (#1609)
* Problem: address-by-acc-num query with id instead of account_id * update deps
1 parent 330a9cc commit e1cf56b

File tree

6 files changed

+44
-17
lines changed

6 files changed

+44
-17
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
* [#1600](https://github.com/crypto-org-chain/cronos/pull/1600) Update ethermint to avoid unnecessary block result in header related api call.
99
* [#1606](https://github.com/crypto-org-chain/cronos/pull/1606) Fix pebbledb support.
1010

11+
### Bug Fixes
12+
13+
* [#1609](https://github.com/crypto-org-chain/cronos/pull/1609) Fix query address-by-acc-num by account_id instead of id.
14+
1115
*Sep 13, 2024*
1216

1317
## v1.4.0-rc0

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ require (
255255

256256
// release/v0.50.x
257257
replace (
258-
cosmossdk.io/client/v2 => github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240916022730-3317ca17f0f1
259-
cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240916022730-3317ca17f0f1
260-
cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240916022730-3317ca17f0f1
261-
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240916022730-3317ca17f0f1
258+
cosmossdk.io/client/v2 => github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240926054726-1675d17877a6
259+
cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240926054726-1675d17877a6
260+
cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240926054726-1675d17877a6
261+
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240926054726-1675d17877a6
262262
)
263263

264264
replace (

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -420,14 +420,14 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
420420
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
421421
github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c h1:MOgfS4+FBB8cMkDE2j2VBVsbY+HCkPIu0YsJ/9bbGeQ=
422422
github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
423-
github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240916022730-3317ca17f0f1 h1:lWStPYj3ULmU5hRBFxR06QPK8Tp3v2t0qEBcEUHUjlk=
424-
github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240916022730-3317ca17f0f1/go.mod h1:Rb43DdB0i/rKcCN69Tg2X3+zA4WhJ7MC8K3a6Ezh38E=
425-
github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240916022730-3317ca17f0f1 h1:m1ayhc+L/fZ+1uregeAZt4GB7Il8oviJ/znWZyK4X94=
426-
github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240916022730-3317ca17f0f1/go.mod h1:W5sR4asmVDUhJpEmuXTUBkk/yEefKlXTjVWcNciVSR0=
427-
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240916022730-3317ca17f0f1 h1:27XoLx7tmWPV/yBV21zVLoOyQVpB2vY7fvfI9DZk0+0=
428-
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240916022730-3317ca17f0f1/go.mod h1:gjE3DZe4t/+VeIk6CmrouyqiuDbZ7QOVDDq3nLqBTpg=
429-
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240916022730-3317ca17f0f1 h1:yKiDUGCgeFiM5RLwS8IPp0BmdQANVJN7qDTCdFCPLyE=
430-
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240916022730-3317ca17f0f1/go.mod h1:RTiTs4hkXG6IvYGknvB8p79YgjYJdcbzLUOGJChsPnY=
423+
github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240926054726-1675d17877a6 h1:XQIkx8K/xNQaUc3ZpIJXkNV0YnhIdY2nN+9rzZ+jin4=
424+
github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240926054726-1675d17877a6/go.mod h1:Rb43DdB0i/rKcCN69Tg2X3+zA4WhJ7MC8K3a6Ezh38E=
425+
github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240926054726-1675d17877a6 h1:Me9XgQhWuwscdIZWx8wE11miaqIEff9P+HQAEbT6MNY=
426+
github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240926054726-1675d17877a6/go.mod h1:W5sR4asmVDUhJpEmuXTUBkk/yEefKlXTjVWcNciVSR0=
427+
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240926054726-1675d17877a6 h1:MzDuYnr9KDb+9N5ZjU5UJSpif9rGATIXI15FqQBGw/E=
428+
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240926054726-1675d17877a6/go.mod h1:gjE3DZe4t/+VeIk6CmrouyqiuDbZ7QOVDDq3nLqBTpg=
429+
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240926054726-1675d17877a6 h1:ETMIWPL33D0bC2WNotH57i3aza2r9C3UKRgMDVeLlII=
430+
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240926054726-1675d17877a6/go.mod h1:RTiTs4hkXG6IvYGknvB8p79YgjYJdcbzLUOGJChsPnY=
431431
github.com/crypto-org-chain/ethermint v0.6.1-0.20240925024103-f2a562ba9b9f h1:Moucz7HfXoyNishzeMJOVbUdeLueOMAbNwnEN5M+iS8=
432432
github.com/crypto-org-chain/ethermint v0.6.1-0.20240925024103-f2a562ba9b9f/go.mod h1:D2lnc8ARuVmgc2/2IWla2Ky1o8/pjmyrnIt+d46Clco=
433433
github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI=

gomod2nix.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ schema = 3
2323
version = "v0.7.5"
2424
hash = "sha256-Nuw697sJr56kU3EU7DV1eYNkyI76psznIVqYAV6RfbQ="
2525
[mod."cosmossdk.io/client/v2"]
26-
version = "v2.0.0-20240916022730-3317ca17f0f1"
26+
version = "v2.0.0-20240926054726-1675d17877a6"
2727
hash = "sha256-60hmufv3Ml4Pv3zNwgn8eeqlEINOR6n9MKr2QHddoxo="
2828
replaced = "github.com/crypto-org-chain/cosmos-sdk/client/v2"
2929
[mod."cosmossdk.io/collections"]
@@ -48,7 +48,7 @@ schema = 3
4848
version = "v0.0.0-20230608160436-666c345ad23d"
4949
hash = "sha256-6BMBA98BpK3jG6++ZE4LdPQwwpS+lZ0GLMRF1fO4UfM="
5050
[mod."cosmossdk.io/store"]
51-
version = "v0.0.0-20240916022730-3317ca17f0f1"
51+
version = "v0.0.0-20240926054726-1675d17877a6"
5252
hash = "sha256-Dm3sSZNJBcnBF33PULoTpK4rkNQbsZl0DfTqH1GPCQM="
5353
replaced = "github.com/crypto-org-chain/cosmos-sdk/store"
5454
[mod."cosmossdk.io/tools/confix"]
@@ -61,7 +61,7 @@ schema = 3
6161
version = "v0.1.1"
6262
hash = "sha256-aps3LfnQau1TYeccGwtqHQvy1Rudc9+O+iVAwXBKyDw="
6363
[mod."cosmossdk.io/x/tx"]
64-
version = "v0.0.0-20240916022730-3317ca17f0f1"
64+
version = "v0.0.0-20240926054726-1675d17877a6"
6565
hash = "sha256-xT5IdapEx1h46ofBpxcBQfzGF2EntmC8xZl7aym/6xE="
6666
replaced = "github.com/crypto-org-chain/cosmos-sdk/x/tx"
6767
[mod."cosmossdk.io/x/upgrade"]
@@ -174,8 +174,8 @@ schema = 3
174174
version = "v1.0.0-beta.5"
175175
hash = "sha256-Fy/PbsOsd6iq0Njy3DVWK6HqWsogI+MkE8QslHGWyVg="
176176
[mod."github.com/cosmos/cosmos-sdk"]
177-
version = "v0.50.6-0.20240916022730-3317ca17f0f1"
178-
hash = "sha256-ehNXD1RsXdC+Et+RrwuycvJBQ2yQnPNQIAb1JCUM77U="
177+
version = "v0.50.6-0.20240926054726-1675d17877a6"
178+
hash = "sha256-/5W/4n6getoWtj/MIotvel86dcJUD7jm9a4aDdDD95w="
179179
replaced = "github.com/crypto-org-chain/cosmos-sdk"
180180
[mod."github.com/cosmos/go-bip39"]
181181
version = "v1.0.0"

integration_tests/cosmoscli.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,18 @@ def account(self, addr):
306306
)
307307
)
308308

309+
def account_by_num(self, num):
310+
return json.loads(
311+
self.raw(
312+
"q",
313+
"auth",
314+
"address-by-acc-num",
315+
num,
316+
output="json",
317+
node=self.node_rpc,
318+
)
319+
)
320+
309321
def total_supply(self):
310322
return json.loads(
311323
self.raw("query", "bank", "total", output="json", node=self.node_rpc)

integration_tests/test_basic.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,3 +974,14 @@ def test_block_stm_delete(cronos):
974974
res = w3.eth.wait_for_transaction_receipt(txhash)
975975
assert res.status == 1
976976
w3_wait_for_block(w3, w3.eth.block_number + 3, timeout=30)
977+
978+
979+
def test_multi_acc(cronos):
980+
cli = cronos.cosmos_cli()
981+
cli.make_multisig("multitest1", "signer1", "signer2")
982+
multi_addr = cli.address("multitest1")
983+
signer1 = cli.address("signer1")
984+
cli.transfer(signer1, multi_addr, "1basetcro")
985+
acc = cli.account(multi_addr)
986+
res = cli.account_by_num(acc["account"]["value"]["base_account"]["account_number"])
987+
assert res["account_address"] == multi_addr

0 commit comments

Comments
 (0)