From 86a73e636e1ab8637b093ff1735be5398be0f8de Mon Sep 17 00:00:00 2001 From: maxrobot Date: Mon, 2 Dec 2024 13:07:41 +0000 Subject: [PATCH 1/6] fix and create test for address generator --- Cargo.lock | 307 +++++++----------- Cargo.toml | 3 +- packages/injective-testing/Cargo.toml | 5 +- .../src/multi_test/address_generator.rs | 63 +++- 4 files changed, 174 insertions(+), 204 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 228455be..40850110 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,7 +104,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.6", + "num-bigint", "num-traits", "paste", "rayon", @@ -128,7 +128,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-traits", "proc-macro2", "quote", @@ -157,7 +157,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint 0.4.6", + "num-bigint", ] [[package]] @@ -184,13 +184,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.3.25" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f59fe10306bb78facd90d28c2038ad23ffaaefa85bac43c8a434cde383334f" -dependencies = [ - "nodrop", - "odds", -] +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-trait" @@ -219,7 +215,7 @@ dependencies = [ "injective-std 1.13.2-auction", "prost 0.12.6", "schemars", - "serde 1.0.210", + "serde", "thiserror", ] @@ -330,6 +326,22 @@ dependencies = [ "zeroize", ] +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -399,7 +411,7 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -524,8 +536,8 @@ dependencies = [ "eyre", "k256", "rand_core 0.6.4", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "signature", "subtle-encoding", "tendermint", @@ -603,8 +615,8 @@ checksum = "93d388adfa9cb449557a92e9318121ac1a481fc4f599213b03a5b62699b403b4" dependencies = [ "cosmwasm-schema-derive 1.5.8", "schemars", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "thiserror", ] @@ -616,8 +628,8 @@ checksum = "f86b4d949b6041519c58993a73f4bbfba8083ba14f7001eae704865a09065845" dependencies = [ "cosmwasm-schema-derive 2.1.4", "schemars", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "thiserror", ] @@ -658,7 +670,7 @@ dependencies = [ "forward_ref", "hex", "schemars", - "serde 1.0.210", + "serde", "serde-json-wasm 0.5.2", "sha2 0.10.8", "static_assertions 1.1.0", @@ -681,7 +693,7 @@ dependencies = [ "hex", "rand_core 0.6.4", "schemars", - "serde 1.0.210", + "serde", "serde-json-wasm 1.0.1", "sha2 0.10.8", "static_assertions 1.1.0", @@ -695,7 +707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66de2ab9db04757bcedef2b5984fbe536903ada4a8a9766717a4a71197ef34f6" dependencies = [ "cosmwasm-std 1.5.8", - "serde 1.0.210", + "serde", ] [[package]] @@ -828,7 +840,7 @@ dependencies = [ "itertools 0.13.0", "prost 0.13.3", "schemars", - "serde 1.0.210", + "serde", "sha2 0.10.8", "thiserror", ] @@ -841,7 +853,7 @@ checksum = "f13360e9007f51998d42b1bc6b7fa0141f74feae61ed5fd1e5b0a89eec7b5de1" dependencies = [ "cosmwasm-std 2.1.4", "schemars", - "serde 1.0.210", + "serde", ] [[package]] @@ -853,7 +865,7 @@ dependencies = [ "cosmwasm-schema 2.1.4", "cosmwasm-std 2.1.4", "schemars", - "serde 1.0.210", + "serde", "thiserror", ] @@ -868,7 +880,7 @@ dependencies = [ "cw-storage-plus", "schemars", "semver", - "serde 1.0.210", + "serde", "thiserror", ] @@ -960,7 +972,7 @@ dependencies = [ "injective-cosmwasm 0.3.1", "injective-std 1.13.2-auction", "schemars", - "serde 1.0.210", + "serde", "thiserror", ] @@ -1017,7 +1029,7 @@ dependencies = [ "hashbrown 0.12.3", "hex", "rand_core 0.6.4", - "serde 1.0.210", + "serde", "sha2 0.9.9", "zeroize", ] @@ -1123,7 +1135,7 @@ dependencies = [ "ethbloom", "ethereum-types-serialize", "fixed-hash 0.3.2", - "serde 1.0.210", + "serde", "uint 0.5.0", ] @@ -1133,7 +1145,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1873d77b32bc1891a79dad925f2acbc318ee942b38b9110f9dbc5fbeffcea350" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -1282,12 +1294,6 @@ dependencies = [ "pin-utils", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "generic-array" version = "0.14.7" @@ -1418,7 +1424,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" dependencies = [ - "serde 1.0.210", + "serde", +] + +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", ] [[package]] @@ -1542,7 +1557,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -1582,7 +1597,7 @@ dependencies = [ "hex", "injective-math 0.3.0", "schemars", - "serde 1.0.210", + "serde", "serde-json-wasm 1.0.1", "serde_repr", "serde_test", @@ -1602,7 +1617,7 @@ dependencies = [ "hex", "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "schemars", - "serde 1.0.210", + "serde", "serde_repr", "subtle-encoding", "tiny-keccak", @@ -1624,7 +1639,7 @@ dependencies = [ "injective-testing", "prost 0.12.6", "schemars", - "serde 1.0.210", + "serde", "thiserror", ] @@ -1645,8 +1660,8 @@ dependencies = [ "injective-testing", "prost 0.12.6", "schemars", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "thiserror", ] @@ -1659,7 +1674,7 @@ dependencies = [ "ethereum-types", "primitive-types", "schemars", - "serde 1.0.210", + "serde", "subtle-encoding", ] @@ -1673,7 +1688,7 @@ dependencies = [ "ethereum-types", "primitive-types", "schemars", - "serde 1.0.210", + "serde", "subtle-encoding", ] @@ -1689,7 +1704,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "schemars", - "serde 1.0.210", + "serde", "serde-cw-value", ] @@ -1703,7 +1718,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "schemars", - "serde 1.0.210", + "serde", "serde-cw-value", ] @@ -1716,7 +1731,7 @@ dependencies = [ "proc-macro2", "prost 0.12.6", "quote", - "serde 1.0.210", + "serde", "syn 1.0.109", "trybuild", ] @@ -1748,15 +1763,15 @@ dependencies = [ "injective-cosmwasm 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "injective-std 1.13.0", "prost 0.12.6", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "test-tube-inj", "thiserror", ] [[package]] name = "injective-testing" -version = "1.1.1" +version = "1.1.3" dependencies = [ "anyhow", "base64 0.21.7", @@ -1768,8 +1783,9 @@ dependencies = [ "injective-test-tube", "prost 0.12.6", "rand 0.4.6", + "regex", "secp256k1", - "serde 1.0.210", + "serde", "tiny-keccak", ] @@ -1914,12 +1930,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nom" version = "7.1.3" @@ -1930,32 +1940,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint 0.1.44", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits", - "rand 0.4.6", - "rustc-serialize", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -1966,16 +1950,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits", - "rustc-serialize", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -2002,29 +1976,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-traits", - "rustc-serialize", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -2043,12 +1994,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "odds" -version = "0.2.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eae0151b9dacf24fcc170d9995e511669a082856a91f958a2fe380bfab3fb22" - [[package]] name = "once_cell" version = "1.20.2" @@ -2311,16 +2256,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - [[package]] name = "rand" version = "0.4.6" @@ -2429,9 +2364,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2482,8 +2417,8 @@ dependencies = [ "rustls", "rustls-native-certs", "rustls-pemfile", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "serde_urlencoded", "sync_wrapper", "system-configuration", @@ -2558,12 +2493,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc-serialize" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" - [[package]] name = "rustc_version" version = "0.4.1" @@ -2661,8 +2590,8 @@ checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", ] [[package]] @@ -2703,17 +2632,22 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.6.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10915a2fa4f8016ed747eb847f096b0d44b22c6b624a36d3cc76964f6af4821a" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ - "arrayvec", - "gcc", - "libc", - "rand 0.3.23", - "rustc-serialize", - "serde 0.6.15", - "serde_json 0.6.1", + "bitcoin_hashes", + "rand 0.8.5", + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", ] [[package]] @@ -2745,15 +2679,6 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -[[package]] -name = "serde" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97b18e9e53de541f11e497357d6c5eaeb39f0cb9c8734e274abe4935f6991fa" -dependencies = [ - "num", -] - [[package]] name = "serde" version = "1.0.210" @@ -2769,7 +2694,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -2778,7 +2703,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -2787,7 +2712,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -2796,7 +2721,7 @@ version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -2821,16 +2746,6 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "serde_json" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aaee47e038bf9552d30380d3973fff2593ee0a76d81ad4c581f267cdcadf36" -dependencies = [ - "num", - "serde 0.6.15", -] - [[package]] name = "serde_json" version = "1.0.128" @@ -2840,7 +2755,7 @@ dependencies = [ "itoa", "memchr", "ryu", - "serde 1.0.210", + "serde", ] [[package]] @@ -2860,7 +2775,7 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -2869,7 +2784,7 @@ version = "1.0.177" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -2881,7 +2796,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.210", + "serde", ] [[package]] @@ -3065,9 +2980,9 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "ripemd", - "serde 1.0.210", + "serde", "serde_bytes", - "serde_json 1.0.128", + "serde_json", "serde_repr", "sha2 0.10.8", "signature", @@ -3085,8 +3000,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1a02da769166e2052cd537b1a97c78017632c2d9e19266367b27e73910434fc" dependencies = [ "flex-error", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "tendermint", "toml 0.5.11", "url", @@ -3104,7 +3019,7 @@ dependencies = [ "num-traits", "prost 0.11.9", "prost-types 0.11.9", - "serde 1.0.210", + "serde", "serde_bytes", "subtle-encoding", "time", @@ -3122,7 +3037,7 @@ dependencies = [ "num-traits", "prost 0.12.6", "prost-types 0.12.6", - "serde 1.0.210", + "serde", "serde_bytes", "subtle-encoding", "time", @@ -3144,9 +3059,9 @@ dependencies = [ "rand 0.8.5", "reqwest", "semver", - "serde 1.0.210", + "serde", "serde_bytes", - "serde_json 1.0.128", + "serde_json", "subtle", "subtle-encoding", "tendermint", @@ -3180,8 +3095,8 @@ dependencies = [ "cosmrs", "cosmwasm-std 2.1.4", "prost 0.12.6", - "serde 1.0.210", - "serde_json 1.0.128", + "serde", + "serde_json", "tendermint-proto 0.32.2", "thiserror", ] @@ -3221,7 +3136,7 @@ dependencies = [ "deranged", "num-conv", "powerfmt", - "serde 1.0.210", + "serde", "time-core", "time-macros", ] @@ -3322,7 +3237,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -3331,7 +3246,7 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ - "serde 1.0.210", + "serde", "serde_spanned", "toml_datetime", "toml_edit", @@ -3343,7 +3258,7 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ - "serde 1.0.210", + "serde", ] [[package]] @@ -3353,7 +3268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.6.0", - "serde 1.0.210", + "serde", "serde_spanned", "toml_datetime", "winnow", @@ -3398,9 +3313,9 @@ checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8" dependencies = [ "dissimilar", "glob", - "serde 1.0.210", + "serde", "serde_derive", - "serde_json 1.0.128", + "serde_json", "termcolor", "toml 0.8.19", ] diff --git a/Cargo.toml b/Cargo.toml index cd8448e4..480df48b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,8 +33,9 @@ prost = { version = "0.12.6" } prost-types = { version = "0.12.6", default-features = false } quote = { version = "1.0.20" } rand = { version = "0.4.6" } +regex = { version = "1.11.1" } schemars = { version = "0.8.16" } -secp256k1 = { version = "0.6.2" } +secp256k1 = { version = "0.30.0" } serde = { version = "1.0.196", default-features = false, features = [ "derive" ] } serde-cw-value = { version = "0.7.0" } serde-json-wasm = { version = "1.0.0" } diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml index 6295550d..d909bcdc 100644 --- a/packages/injective-testing/Cargo.toml +++ b/packages/injective-testing/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "Apache-2.0" name = "injective-testing" repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-testing" -version = "1.1.1" +version = "1.1.3" [dependencies] anyhow = { workspace = true } @@ -18,6 +18,7 @@ injective-std = { path = "../injective-std" } injective-test-tube = { workspace = true } prost = { workspace = true } rand = { workspace = true } -secp256k1 = { workspace = true } +regex = { workspace = true } +secp256k1 = { workspace = true, features = [ "rand" ] } serde = { workspace = true } tiny-keccak = { workspace = true } diff --git a/packages/injective-testing/src/multi_test/address_generator.rs b/packages/injective-testing/src/multi_test/address_generator.rs index 50bebcc0..ac53cf16 100644 --- a/packages/injective-testing/src/multi_test/address_generator.rs +++ b/packages/injective-testing/src/multi_test/address_generator.rs @@ -1,8 +1,7 @@ use cosmwasm_std::{Addr, Storage}; use cw_multi_test::AddressGenerator; use injective_cosmwasm::addr_to_bech32; -use rand::OsRng; -use secp256k1::Secp256k1; +use secp256k1::{rand, PublicKey, Secp256k1, SecretKey}; use std::fmt::Write; use std::u8; @@ -72,16 +71,39 @@ impl AddressGenerator for StorageAwareInjectiveAddressGenerator { pub fn generate_inj_address() -> Addr { let secp256k1 = Secp256k1::new(); - let mut rng = OsRng::new().expect("failed to create new random number generator"); - let (_, public_key) = secp256k1.generate_keypair(&mut rng).expect("failed to generate key pair"); - let public_key_array = &public_key.serialize_vec(&secp256k1, false)[1..]; + let secret_key = SecretKey::new(&mut rand::thread_rng()); + + let public_key = PublicKey::from_secret_key(&secp256k1, &secret_key); + + // let mut rng = OsRng::new().expect("failed to create new random number generator"); + // let (_, public_key) = secp256k1.generate_keypair(&mut rng).expect("failed to generate key pair"); + + // println!("public key: {:?}", public_key); + + let public_key_array = &public_key.serialize()[1..]; + // let public_key_array = &public_key.serialize_vec(&secp256k1, true)[1..]; + + // let public_key_array = &public_key_array[1..]; + + println!("public key array: {:?}", public_key_array); + let keccak = tiny_keccak::keccak256(public_key_array); + + println!("keccak: {:?}", keccak); + let address_short = to_hex_string(&keccak[ADDRESS_BYTE_INDEX..], 40); // get rid of the constant 0x04 byte + println!("address_short: {:?}", address_short); let full_address = format!("0x{address_short}"); + + println!("full_address: {:?}", full_address); + let inj_address = addr_to_bech32(full_address); + println!("inj_address: {:?}", inj_address); + Addr::unchecked(inj_address) + // Addr::unchecked("inj123") } fn to_hex_string(slice: &[u8], expected_string_size: usize) -> String { @@ -93,3 +115,34 @@ fn to_hex_string(slice: &[u8], expected_string_size: usize) -> String { result } + +#[cfg(test)] +mod tests { + use super::*; + use regex::Regex; + + #[test] + fn test_generate_inj_address() { + // Generate an Injective address + let generated_address = generate_inj_address(); + + // Ensure the generated address is not empty + assert!(!generated_address.to_string().is_empty(), "Generated address should not be empty"); + + // Ensure the generated address starts with the Injective prefix (e.g., "inj") + assert!(generated_address.as_str().starts_with("inj"), "Generated address should start with 'inj'"); + + println!("generated address: {:?}", generated_address); + + // Ensure the address matches a valid bech32 format + let bech32_regex = Regex::new(r"^inj[0-9a-z]{39}$").unwrap(); + assert!( + bech32_regex.is_match(generated_address.as_str()), + "Generated address does not match valid bech32 format" + ); + + // Ensure each generated address is unique (you can extend this for more iterations) + let another_generated_address = generate_inj_address(); + assert_ne!(generated_address, another_generated_address, "Generated addresses should be unique"); + } +} From e90514b43494c3483bd5324a39bd96167d835b5c Mon Sep 17 00:00:00 2001 From: maxrobot Date: Mon, 2 Dec 2024 13:14:23 +0000 Subject: [PATCH 2/6] fix: test --- .../src/multi_test/address_generator.rs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/packages/injective-testing/src/multi_test/address_generator.rs b/packages/injective-testing/src/multi_test/address_generator.rs index ac53cf16..d9a0baf5 100644 --- a/packages/injective-testing/src/multi_test/address_generator.rs +++ b/packages/injective-testing/src/multi_test/address_generator.rs @@ -76,34 +76,16 @@ pub fn generate_inj_address() -> Addr { let public_key = PublicKey::from_secret_key(&secp256k1, &secret_key); - // let mut rng = OsRng::new().expect("failed to create new random number generator"); - // let (_, public_key) = secp256k1.generate_keypair(&mut rng).expect("failed to generate key pair"); - - // println!("public key: {:?}", public_key); - let public_key_array = &public_key.serialize()[1..]; - // let public_key_array = &public_key.serialize_vec(&secp256k1, true)[1..]; - - // let public_key_array = &public_key_array[1..]; - - println!("public key array: {:?}", public_key_array); let keccak = tiny_keccak::keccak256(public_key_array); - println!("keccak: {:?}", keccak); - let address_short = to_hex_string(&keccak[ADDRESS_BYTE_INDEX..], 40); // get rid of the constant 0x04 byte - println!("address_short: {:?}", address_short); let full_address = format!("0x{address_short}"); - println!("full_address: {:?}", full_address); - let inj_address = addr_to_bech32(full_address); - println!("inj_address: {:?}", inj_address); - Addr::unchecked(inj_address) - // Addr::unchecked("inj123") } fn to_hex_string(slice: &[u8], expected_string_size: usize) -> String { From 8732a650df7f1399afd09a896671d5b67fb2c66d Mon Sep 17 00:00:00 2001 From: maxrobot Date: Mon, 2 Dec 2024 13:18:25 +0000 Subject: [PATCH 3/6] feat: fix versions --- packages/injective-testing/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml index d909bcdc..df69c119 100644 --- a/packages/injective-testing/Cargo.toml +++ b/packages/injective-testing/Cargo.toml @@ -12,9 +12,9 @@ anyhow = { workspace = true } base64 = { workspace = true } cosmwasm-std = { workspace = true } cw-multi-test = { workspace = true } -injective-cosmwasm = { path = "../injective-cosmwasm" } -injective-math = { path = "../injective-math" } -injective-std = { path = "../injective-std" } +injective-cosmwasm = { workspace = true } +injective-math = { workspace = true } +injective-std = { workspace = true } injective-test-tube = { workspace = true } prost = { workspace = true } rand = { workspace = true } From 9e2e8e697505d18529fe4ed6322c3c075882254d Mon Sep 17 00:00:00 2001 From: maxrobot Date: Mon, 2 Dec 2024 13:24:26 +0000 Subject: [PATCH 4/6] fix: tidy cargo --- Cargo.toml | 4 ++-- packages/injective-testing/Cargo.toml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 480df48b..a1539682 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ ethereum-types = { version = "0.5.2" } hex = { version = "0.4.3", features = [ "serde" ] } injective-cosmwasm = { version = "0.3.0", path = "./packages/injective-cosmwasm" } injective-math = { version = "0.3.0", path = "./packages/injective-math" } -injective-std = { version = "1.13.2-auction", path = "./packages/injective-std" } +injective-std = { version = "=1.13.2-auction", path = "./packages/injective-std" } injective-std-derive = { version = "1.13.0", path = "./packages/injective-std-derive" } injective-test-tube = { version = "1.13.2" } injective-testing = { version = "1.1.0", path = "./packages/injective-testing" } @@ -35,7 +35,7 @@ quote = { version = "1.0.20" } rand = { version = "0.4.6" } regex = { version = "1.11.1" } schemars = { version = "0.8.16" } -secp256k1 = { version = "0.30.0" } +secp256k1 = { version = "0.30.0", features = [ "rand" ] } serde = { version = "1.0.196", default-features = false, features = [ "derive" ] } serde-cw-value = { version = "0.7.0" } serde-json-wasm = { version = "1.0.0" } diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml index df69c119..8321c1b7 100644 --- a/packages/injective-testing/Cargo.toml +++ b/packages/injective-testing/Cargo.toml @@ -12,13 +12,13 @@ anyhow = { workspace = true } base64 = { workspace = true } cosmwasm-std = { workspace = true } cw-multi-test = { workspace = true } -injective-cosmwasm = { workspace = true } -injective-math = { workspace = true } -injective-std = { workspace = true } +injective-cosmwasm = { workspace = true, path = "../injective-cosmwasm" } +injective-math = { workspace = true, path = "../injective-math" } +injective-std = { workspace = true, path = "../injective-std" } injective-test-tube = { workspace = true } prost = { workspace = true } rand = { workspace = true } regex = { workspace = true } -secp256k1 = { workspace = true, features = [ "rand" ] } +secp256k1 = { workspace = true } serde = { workspace = true } tiny-keccak = { workspace = true } From 5ab2ab57a48dc47d4f16ad53d0f153e4c99fd704 Mon Sep 17 00:00:00 2001 From: maxrobot Date: Mon, 2 Dec 2024 13:28:10 +0000 Subject: [PATCH 5/6] f: update injective-std version to lastest --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- packages/injective-std/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 40850110..940fcb09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -212,7 +212,7 @@ dependencies = [ "cw2", "injective-cosmwasm 0.3.1", "injective-math 0.3.0", - "injective-std 1.13.2-auction", + "injective-std 1.13.2", "prost 0.12.6", "schemars", "serde", @@ -970,7 +970,7 @@ dependencies = [ "cw-storage-plus", "cw2", "injective-cosmwasm 0.3.1", - "injective-std 1.13.2-auction", + "injective-std 1.13.2", "schemars", "serde", "thiserror", @@ -1634,7 +1634,7 @@ dependencies = [ "cw2", "injective-cosmwasm 0.3.1", "injective-math 0.3.0", - "injective-std 1.13.2-auction", + "injective-std 1.13.2", "injective-test-tube", "injective-testing", "prost 0.12.6", @@ -1655,7 +1655,7 @@ dependencies = [ "cw2", "injective-cosmwasm 0.3.1", "injective-math 0.3.0", - "injective-std 1.13.2-auction", + "injective-std 1.13.2", "injective-test-tube", "injective-testing", "prost 0.12.6", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "injective-std" -version = "1.13.2-auction" +version = "1.13.2" dependencies = [ "chrono", "cosmwasm-std 2.1.4", @@ -1779,7 +1779,7 @@ dependencies = [ "cw-multi-test", "injective-cosmwasm 0.3.1", "injective-math 0.3.0", - "injective-std 1.13.2-auction", + "injective-std 1.13.2", "injective-test-tube", "prost 0.12.6", "rand 0.4.6", diff --git a/Cargo.toml b/Cargo.toml index a1539682..3eb88add 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ ethereum-types = { version = "0.5.2" } hex = { version = "0.4.3", features = [ "serde" ] } injective-cosmwasm = { version = "0.3.0", path = "./packages/injective-cosmwasm" } injective-math = { version = "0.3.0", path = "./packages/injective-math" } -injective-std = { version = "=1.13.2-auction", path = "./packages/injective-std" } +injective-std = { version = "1.13.2", path = "./packages/injective-std" } injective-std-derive = { version = "1.13.0", path = "./packages/injective-std-derive" } injective-test-tube = { version = "1.13.2" } injective-testing = { version = "1.1.0", path = "./packages/injective-testing" } diff --git a/packages/injective-std/Cargo.toml b/packages/injective-std/Cargo.toml index 73d2aaf1..bb15f97c 100644 --- a/packages/injective-std/Cargo.toml +++ b/packages/injective-std/Cargo.toml @@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0" name = "injective-std" readme = "README.md" repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-std" -version = "1.13.2-auction" +version = "1.13.2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 3ee3ee88e764cdf479d0d08fcd7cf1f480575b39 Mon Sep 17 00:00:00 2001 From: maxrobot Date: Mon, 2 Dec 2024 14:21:31 +0000 Subject: [PATCH 6/6] feat: update test-tube-inj --- Cargo.lock | 1 + Cargo.toml | 1 + packages/injective-testing/Cargo.toml | 1 + 3 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 940fcb09..95cf4e37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1786,6 +1786,7 @@ dependencies = [ "regex", "secp256k1", "serde", + "test-tube-inj", "tiny-keccak", ] diff --git a/Cargo.toml b/Cargo.toml index 3eb88add..8cabe864 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,6 +44,7 @@ serde_repr = { version = "0.1.17" } serde_test = { version = "1.0.176" } subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] } syn = { version = "1.0.98" } +test-tube-inj = { version = "=2.0.1" } thiserror = { version = "1.0.56" } tiny-keccak = { version = "1.2.1" } trybuild = { version = "1.0.63", features = [ "diff" ] } diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml index 8321c1b7..c31ba41d 100644 --- a/packages/injective-testing/Cargo.toml +++ b/packages/injective-testing/Cargo.toml @@ -21,4 +21,5 @@ rand = { workspace = true } regex = { workspace = true } secp256k1 = { workspace = true } serde = { workspace = true } +test-tube-inj = { workspace = true } tiny-keccak = { workspace = true }