From 98ecf69cd487d7fe28dbac15ef0f4df689b3116a Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 10:41:44 +0900 Subject: [PATCH 01/53] NODE-64, deps: upgrade to bifrost-polkadot-v1.3.0 --- Cargo.lock | 1773 ++++++++++++++++++----------- Cargo.toml | 269 +++-- tests/runtime/config.local.json | 7 + tests/runtime/config.testnet.json | 7 + 4 files changed, 1263 insertions(+), 793 deletions(-) create mode 100644 tests/runtime/config.local.json create mode 100644 tests/runtime/config.testnet.json diff --git a/Cargo.lock b/Cargo.lock index 92ed5a59..52c49eed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,7 @@ version = "0.0.1" dependencies = [ "blake2-rfc", "hex", - "impl-serde 0.3.2", + "impl-serde", "libsecp256k1", "log", "parity-scale-codec", @@ -73,7 +73,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures", ] @@ -85,19 +85,10 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", - "cipher", + "cipher 0.4.4", "ctr", "ghash", - "subtle", -] - -[[package]] -name = "affix" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e7ea84d3fa2009f355f8429a0b418a96849135a4188fadf384f59127d5d4bc" -dependencies = [ - "convert_case 0.5.0", + "subtle 2.4.1", ] [[package]] @@ -226,12 +217,215 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-scale" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3", +] + [[package]] name = "array-bytes" version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" +[[package]] +name = "array-bytes" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0" + [[package]] name = "arrayref" version = "0.3.7" @@ -432,6 +626,27 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.8", + "zeroize", +] + [[package]] name = "base-x" version = "0.2.11" @@ -557,7 +772,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures 0.3.29", - "hex-literal 0.3.4", + "hex-literal", "jsonrpsee", "pallet-bfc-staking", "pallet-ethereum", @@ -617,8 +832,8 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "hex-literal 0.3.4", - "num_enum 0.5.11", + "hex-literal", + "num_enum", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -708,7 +923,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures 0.3.29", - "hex-literal 0.3.4", + "hex-literal", "jsonrpsee", "pallet-bfc-staking", "pallet-ethereum", @@ -767,8 +982,8 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "hex-literal 0.3.4", - "num_enum 0.5.11", + "hex-literal", + "num_enum", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -878,7 +1093,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures 0.3.29", - "hex-literal 0.3.4", + "hex-literal", "jsonrpsee", "pallet-bfc-staking", "pallet-ethereum", @@ -937,8 +1152,8 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "hex-literal 0.3.4", - "num_enum 0.5.11", + "hex-literal", + "num_enum", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -1049,6 +1264,18 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +dependencies = [ + "byte-tools", + "crypto-mac 0.7.0", + "digest 0.8.1", + "opaque-debug 0.2.3", +] + [[package]] name = "blake2" version = "0.10.6" @@ -1184,6 +1411,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] + [[package]] name = "bstr" version = "0.2.17" @@ -1261,6 +1497,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c2-chacha" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80" +dependencies = [ + "cipher 0.2.5", + "ppv-lite86", +] + [[package]] name = "camino" version = "1.1.6" @@ -1339,6 +1585,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862" +dependencies = [ + "byteorder", + "keystream", +] + [[package]] name = "chacha20" version = "0.9.1" @@ -1346,7 +1602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures", ] @@ -1358,7 +1614,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher", + "cipher 0.4.4", "poly1305", "zeroize", ] @@ -1379,17 +1635,26 @@ dependencies = [ [[package]] name = "cid" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash 0.16.3", + "multihash", "serde", "unsigned-varint", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "cipher" version = "0.4.4" @@ -1470,15 +1735,37 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ - "strum", - "strum_macros", + "strum 0.25.0", + "strum_macros 0.25.3", "unicode-width", ] +[[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "getrandom_or_panic", + "merlin 3.0.0", + "rand_chacha 0.3.1", +] + +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" version = "2.4.0" @@ -1506,6 +1793,26 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +[[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.11", + "once_cell", + "tiny-keccak", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1519,16 +1826,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] -name = "convert_case" -version = "0.4.0" +name = "constcat" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" [[package]] name = "convert_case" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" @@ -1752,7 +2059,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -1767,6 +2074,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +dependencies = [ + "generic-array 0.12.4", + "subtle 1.0.0", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -1774,7 +2091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -1784,7 +2101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -1793,7 +2110,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -1805,7 +2122,7 @@ dependencies = [ "byteorder", "digest 0.8.1", "rand_core 0.5.1", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -1818,7 +2135,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -1833,9 +2150,9 @@ dependencies = [ "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.2.0", + "platforms", "rustc_version", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -1953,6 +2270,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive-syn-parse" version = "0.1.5" @@ -1970,7 +2298,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case 0.4.0", + "convert_case", "proc-macro2", "quote", "rustc_version", @@ -2010,14 +2338,14 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle", + "subtle 2.4.1", ] [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] @@ -2034,13 +2362,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2065,6 +2394,50 @@ dependencies = [ "syn 2.0.40", ] +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "docify" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" +dependencies = [ + "common-path", + "derive-syn-parse", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn 2.0.40", + "termcolor", + "toml 0.8.8", + "walkdir", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -2077,12 +2450,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - [[package]] name = "dtoa" version = "1.0.9" @@ -2126,19 +2493,10 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature 2.2.0", + "signature", "spki", ] -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -2146,19 +2504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "sha2 0.9.9", - "zeroize", + "signature", ] [[package]] @@ -2168,11 +2514,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.1.1", - "ed25519 2.2.3", + "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.8", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -2214,7 +2560,7 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -2301,7 +2647,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-rlp", - "impl-serde 0.4.0", + "impl-serde", "scale-info", "tiny-keccak", ] @@ -2334,7 +2680,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-rlp", - "impl-serde 0.4.0", + "impl-serde", "primitive-types", "scale-info", "uint", @@ -2370,7 +2716,7 @@ dependencies = [ [[package]] name = "evm" version = "0.39.1" -source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" +source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" dependencies = [ "auto_impl", "environmental", @@ -2390,7 +2736,7 @@ dependencies = [ [[package]] name = "evm-core" version = "0.39.0" -source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" +source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" dependencies = [ "parity-scale-codec", "primitive-types", @@ -2401,7 +2747,7 @@ dependencies = [ [[package]] name = "evm-gasometer" version = "0.39.0" -source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" +source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" dependencies = [ "environmental", "evm-core", @@ -2412,7 +2758,7 @@ dependencies = [ [[package]] name = "evm-runtime" version = "0.39.0" -source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" +source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" dependencies = [ "auto_impl", "environmental", @@ -2424,7 +2770,7 @@ dependencies = [ [[package]] name = "evm-tracer" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "evm", @@ -2452,15 +2798,15 @@ dependencies = [ [[package]] name = "expander" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" +checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" dependencies = [ - "blake2", + "blake2 0.10.6", "fs-err", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.40", ] [[package]] @@ -2481,10 +2827,22 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fc-api" +version = "1.0.0-dev" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +dependencies = [ + "async-trait", + "fp-storage", + "parity-scale-codec", + "sp-core", + "sp-runtime", +] + [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "async-trait", "fp-consensus", @@ -2500,10 +2858,11 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "async-trait", "ethereum", + "fc-api", "fc-storage", "fp-consensus", "fp-rpc", @@ -2530,7 +2889,7 @@ dependencies = [ [[package]] name = "fc-evm-tracing" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "fp-rpc-debug", @@ -2545,7 +2904,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "fc-db", "fc-storage", @@ -2568,16 +2927,15 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", "evm", - "fc-db", + "fc-api", "fc-mapping-sync", "fc-rpc-core", "fc-storage", - "fp-ethereum", "fp-evm", "fp-rpc", "fp-storage", @@ -2586,13 +2944,13 @@ dependencies = [ "jsonrpsee", "libsecp256k1", "log", - "lru 0.8.1", "pallet-evm", "parity-scale-codec", "prometheus", "rand 0.8.5", "rlp", "sc-client-api", + "sc-consensus-aura", "sc-network", "sc-network-common", "sc-network-sync", @@ -2601,24 +2959,29 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", "sp-storage", + "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", "tokio", ] [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", @@ -2631,7 +2994,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2646,7 +3009,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2660,7 +3023,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", @@ -2673,7 +3036,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-types" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "serde", @@ -2683,10 +3046,11 @@ dependencies = [ [[package]] name = "fc-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", + "fc-api", "fc-consensus", "fc-db", "fc-evm-tracing", @@ -2697,7 +3061,7 @@ dependencies = [ "fp-rpc", "fp-rpc-debug", "futures 0.3.29", - "hex-literal 0.4.1", + "hex-literal", "jsonrpsee", "sc-client-api", "sc-utils", @@ -2713,7 +3077,7 @@ dependencies = [ [[package]] name = "fc-rpc-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", @@ -2749,7 +3113,7 @@ dependencies = [ [[package]] name = "fc-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "fc-rpc", @@ -2772,7 +3136,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", @@ -2803,7 +3167,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", +] + +[[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", ] [[package]] @@ -2923,7 +3300,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", ] @@ -2940,10 +3317,10 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "hex", - "impl-serde 0.4.0", + "impl-serde", "libsecp256k1", "log", "parity-scale-codec", @@ -2959,7 +3336,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "parity-scale-codec", @@ -2971,13 +3348,12 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", "fp-evm", "frame-support", - "num_enum 0.6.1", "parity-scale-codec", "sp-std", ] @@ -2985,10 +3361,11 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "evm", "frame-support", + "num_enum", "parity-scale-codec", "scale-info", "serde", @@ -3000,7 +3377,7 @@ dependencies = [ [[package]] name = "fp-ext" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum-types", "fp-rpc-evm-tracing-events", @@ -3013,7 +3390,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", @@ -3030,7 +3407,7 @@ dependencies = [ [[package]] name = "fp-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "environmental", "ethereum", @@ -3048,7 +3425,7 @@ dependencies = [ [[package]] name = "fp-rpc-evm-tracing-events" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "environmental", "ethereum", @@ -3063,7 +3440,7 @@ dependencies = [ [[package]] name = "fp-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "parity-scale-codec", @@ -3077,7 +3454,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "frame-support", "parity-scale-codec", @@ -3089,7 +3466,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "parity-scale-codec", "serde", @@ -3104,7 +3481,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-support-procedural", @@ -3129,10 +3506,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "Inflector", - "array-bytes", + "array-bytes 6.2.2", "chrono", "clap", "comfy-table", @@ -3163,12 +3540,13 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", + "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -3176,10 +3554,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-system", + "frame-try-runtime", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -3191,9 +3571,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", "parity-scale-codec", @@ -3204,57 +3584,66 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ + "aquamarine", "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", - "once_cell", + "macro_magic", "parity-scale-codec", "paste", "scale-info", "serde", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "expander", "frame-support-procedural-tools", "itertools 0.10.5", + "macro_magic", "proc-macro-warning", "proc-macro2", "quote", + "sp-core-hashing", "syn 2.0.40", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -3266,7 +3655,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "proc-macro2", "quote", @@ -3276,7 +3665,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "cfg-if", "frame-support", @@ -3295,7 +3684,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3310,12 +3699,24 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "sp-api", ] +[[package]] +name = "frame-try-runtime" +version = "0.10.0-dev" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" +dependencies = [ + "frame-support", + "parity-scale-codec", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "fs-err" version = "2.11.0" @@ -3335,16 +3736,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs4" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" -dependencies = [ - "rustix 0.38.28", - "windows-sys 0.48.0", -] - [[package]] name = "funty" version = "2.0.0" @@ -3547,6 +3938,15 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "getrandom_or_panic" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "ghash" version = "0.5.0" @@ -3601,7 +4001,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -3730,15 +4130,18 @@ dependencies = [ [[package]] name = "hex-literal" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] -name = "hex-literal" -version = "0.4.1" +name = "hkdf" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac 0.12.1", +] [[package]] name = "hmac" @@ -3870,21 +4273,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", -] - [[package]] name = "iana-time-zone" version = "0.1.58" @@ -3976,15 +4364,6 @@ dependencies = [ "rlp", ] -[[package]] -name = "impl-serde" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" -dependencies = [ - "serde", -] - [[package]] name = "impl-serde" version = "0.4.0" @@ -4005,6 +4384,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -4251,6 +4649,12 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keystream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" + [[package]] name = "kvdb" version = "0.13.0" @@ -4392,7 +4796,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -4434,7 +4838,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "lru 0.10.1", + "lru", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -4448,11 +4852,11 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ - "bs58", - "ed25519-dalek 2.1.0", + "bs58 0.4.0", + "ed25519-dalek", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "quick-protobuf", "rand 0.8.5", "sha2 0.10.8", @@ -4542,7 +4946,7 @@ dependencies = [ "snow", "static_assertions", "thiserror", - "x25519-dalek", + "x25519-dalek 1.1.1", "zeroize", ] @@ -4767,7 +5171,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -4855,6 +5259,18 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "lioness" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9" +dependencies = [ + "arrayref", + "blake2 0.8.1", + "chacha", + "keystream", +] + [[package]] name = "lock_api" version = "0.4.11" @@ -4871,15 +5287,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lru" version = "0.10.1" @@ -4927,6 +5334,54 @@ dependencies = [ "libc", ] +[[package]] +name = "macro_magic" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +dependencies = [ + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.40", +] + +[[package]] +name = "macro_magic_core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +dependencies = [ + "const-random", + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.40", +] + +[[package]] +name = "macro_magic_core_macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.40", +] + +[[package]] +name = "macro_magic_macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.40", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -5009,12 +5464,6 @@ dependencies = [ "hash-db 0.16.0", ] -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "merlin" version = "2.0.1" @@ -5027,6 +5476,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -5053,6 +5514,31 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mixnet" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "bitflags 1.3.2", + "blake2 0.10.6", + "c2-chacha", + "curve25519-dalek 4.1.1", + "either", + "hashlink", + "lioness", + "log", + "parking_lot 0.12.1", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_distr", + "subtle 2.4.1", + "thiserror", + "zeroize", +] + [[package]] name = "mockall" version = "0.11.4" @@ -5091,7 +5577,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash 0.17.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -5112,9 +5598,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -5127,17 +5613,6 @@ dependencies = [ "unsigned-varint", ] -[[package]] -name = "multihash" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" -dependencies = [ - "core2", - "multihash-derive", - "unsigned-varint", -] - [[package]] name = "multihash-derive" version = "0.8.1" @@ -5426,6 +5901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -5440,40 +5916,20 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.40", @@ -5571,13 +6027,20 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-system", + "log", "pallet-timestamp", "parity-scale-codec", "scale-info", @@ -5590,7 +6053,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-system", @@ -5604,7 +6067,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5619,7 +6082,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "fp-evm", "frame-support", @@ -5638,7 +6101,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "impl-serde 0.3.2", + "impl-serde", "log", "pallet-balances", "parity-scale-codec", @@ -5686,7 +6149,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "impl-serde 0.3.2", + "impl-serde", "log", "pallet-balances", "parity-scale-codec", @@ -5702,7 +6165,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5719,7 +6182,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5737,7 +6200,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "ethereum", "ethereum-types", @@ -5760,7 +6223,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "environmental", "evm", @@ -5769,7 +6232,9 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hash-db 0.16.0", + "hex", + "hex-literal", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -5784,7 +6249,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "fp-evm", ] @@ -5792,7 +6257,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "fp-evm", "sp-core", @@ -5802,7 +6267,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "fp-evm", "num", @@ -5811,7 +6276,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "fp-evm", "ripemd", @@ -5821,7 +6286,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5844,7 +6309,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5860,7 +6325,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5880,7 +6345,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5897,7 +6362,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-system", @@ -5914,7 +6379,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5953,8 +6418,9 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -5970,7 +6436,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-system", @@ -5984,6 +6450,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] @@ -5991,8 +6458,9 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -6006,8 +6474,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -6018,13 +6487,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-support", "frame-system", @@ -6040,7 +6510,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6056,7 +6526,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6068,8 +6538,9 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -6078,6 +6549,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-runtime", "sp-std", ] @@ -6085,7 +6557,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6104,7 +6576,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" dependencies = [ - "blake2", + "blake2 0.10.6", "crc32fast", "fs2", "hex", @@ -6371,12 +6843,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" - [[package]] name = "platforms" version = "3.2.0" @@ -6440,7 +6906,7 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "num_enum 0.5.11", + "num_enum", "pallet-balances", "pallet-evm", "pallet-timestamp", @@ -6464,7 +6930,7 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "num_enum 0.5.11", + "num_enum", "pallet-balances", "pallet-bfc-offences", "pallet-evm", @@ -6490,7 +6956,7 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "num_enum 0.5.11", + "num_enum", "pallet-balances", "pallet-bfc-staking", "pallet-evm", @@ -6515,8 +6981,8 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "hex-literal 0.3.4", - "num_enum 0.5.11", + "hex-literal", + "num_enum", "pallet-balances", "pallet-collective", "pallet-evm", @@ -6541,8 +7007,8 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "hex-literal 0.3.4", - "num_enum 0.5.11", + "hex-literal", + "num_enum", "pallet-balances", "pallet-democracy", "pallet-evm", @@ -6569,7 +7035,7 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "num_enum 0.5.11", + "num_enum", "pallet-balances", "pallet-evm", "pallet-relay-manager", @@ -6587,43 +7053,38 @@ dependencies = [ [[package]] name = "precompile-utils" -version = "1.0.0" +version = "0.1.0" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ - "affix", - "derive_more", "environmental", "evm", "fp-evm", "frame-support", "frame-system", "hex", - "hex-literal 0.3.4", "impl-trait-for-tuples", "log", - "num_enum 0.5.11", + "num_enum", "pallet-evm", "parity-scale-codec", - "paste", "precompile-utils-macro", - "scale-info", - "serde", - "sha3", - "similar-asserts", "sp-core", "sp-io", + "sp-runtime", "sp-std", ] [[package]] name = "precompile-utils-macro" -version = "1.0.0" +version = "0.1.0" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" dependencies = [ "case", - "num_enum 0.5.11", - "prettyplease 0.1.25", + "num_enum", + "prettyplease 0.2.15", "proc-macro2", "quote", - "sha3", + "sp-core-hashing", "syn 1.0.109", ] @@ -6686,7 +7147,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-rlp", - "impl-serde 0.4.0", + "impl-serde", "scale-info", "uint", ] @@ -6736,9 +7197,9 @@ dependencies = [ [[package]] name = "proc-macro-warning" -version = "0.3.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", @@ -6988,6 +7449,16 @@ dependencies = [ "getrandom 0.2.11", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -7166,7 +7637,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle", + "subtle 2.4.1", +] + +[[package]] +name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "blake2 0.10.6", + "common", + "fflonk", + "merlin 3.0.0", ] [[package]] @@ -7350,27 +7837,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.5", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -7415,7 +7881,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "log", "sp-core", @@ -7426,7 +7892,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "futures 0.3.29", "futures-timer", @@ -7449,7 +7915,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7464,7 +7930,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -7483,7 +7949,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -7494,9 +7960,9 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "chrono", "clap", "fdlimit", @@ -7511,8 +7977,8 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-keystore", + "sc-mixnet", "sc-network", - "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -7534,7 +8000,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "fnv", "futures 0.3.29", @@ -7550,18 +8016,18 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", - "sp-keystore", "sp-runtime", "sp-state-machine", "sp-statement-store", "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -7587,7 +8053,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "futures 0.3.29", @@ -7612,7 +8078,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "futures 0.3.29", @@ -7641,7 +8107,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "fork-tree", @@ -7656,9 +8122,8 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-keystore", "sc-telemetry", - "scale-info", + "sc-transaction-pool-api", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -7677,7 +8142,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7690,10 +8155,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ahash 0.8.6", - "array-bytes", + "array-bytes 6.2.2", "async-trait", "dyn-clone", "finality-grandpa", @@ -7712,6 +8177,7 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", "serde_json", "sp-api", @@ -7730,7 +8196,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "finality-grandpa", "futures 0.3.29", @@ -7750,7 +8216,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "assert_matches", "async-trait", @@ -7785,7 +8251,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "futures 0.3.29", @@ -7808,13 +8274,13 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmtime", + "schnellru", "sp-api", "sp-core", "sp-externalities", @@ -7830,7 +8296,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -7842,13 +8308,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "once_cell", "parking_lot 0.12.1", "rustix 0.36.17", "sc-allocator", @@ -7861,7 +8326,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ansi_term", "futures 0.3.29", @@ -7877,23 +8342,51 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" +dependencies = [ + "array-bytes 6.2.2", + "parking_lot 0.12.1", + "serde_json", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "thiserror", +] + +[[package]] +name = "sc-mixnet" +version = "0.1.0-dev" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", + "arrayvec 0.7.4", + "blake2 0.10.6", + "futures 0.3.29", + "futures-timer", + "libp2p-identity", + "log", + "mixnet", + "multiaddr", + "parity-scale-codec", "parking_lot 0.12.1", - "serde_json", - "sp-application-crypto", + "sc-client-api", + "sc-network", + "sc-transaction-pool-api", + "sp-api", + "sp-consensus", "sp-core", "sp-keystore", + "sp-mixnet", + "sp-runtime", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel", "async-trait", "asynchronous-codec", @@ -7906,37 +8399,33 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", + "partial_sort", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-client-api", - "sc-consensus", "sc-network-common", - "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec", - "snow", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", + "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-channel", "cid", @@ -7947,7 +8436,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", @@ -7957,45 +8445,33 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", "async-trait", "bitflags 1.3.2", - "bytes", "futures 0.3.29", - "futures-timer", "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", - "sc-utils", - "serde", - "smallvec", - "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ahash 0.8.6", "futures 0.3.29", "futures-timer", "libp2p", "log", - "lru 0.8.1", "sc-network", "sc-network-common", - "sc-peerset", + "schnellru", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -8004,9 +8480,9 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel", "futures 0.3.29", "libp2p-identity", @@ -8016,8 +8492,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sp-blockchain", "sp-core", "sp-runtime", @@ -8027,9 +8501,9 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel", "async-trait", "fork-tree", @@ -8037,7 +8511,6 @@ dependencies = [ "futures-timer", "libp2p", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -8046,8 +8519,8 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", + "schnellru", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -8057,79 +8530,31 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio-stream", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "futures 0.3.29", "libp2p", "log", "parity-scale-codec", - "pin-project", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", ] -[[package]] -name = "sc-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" -dependencies = [ - "array-bytes", - "bytes", - "fnv", - "futures 0.3.29", - "futures-timer", - "hyper", - "hyper-rustls", - "libp2p", - "num_cpus", - "once_cell", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "sc-client-api", - "sc-network", - "sc-network-common", - "sc-peerset", - "sc-utils", - "sp-api", - "sp-core", - "sp-offchain", - "sp-runtime", - "threadpool", - "tracing", -] - -[[package]] -name = "sc-peerset" -version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" -dependencies = [ - "futures 0.3.29", - "libp2p-identity", - "log", - "parking_lot 0.12.1", - "partial_sort", - "sc-utils", - "serde_json", - "sp-arithmetic", - "wasm-timer", -] - [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8138,7 +8563,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "futures 0.3.29", "jsonrpsee", @@ -8148,6 +8573,7 @@ dependencies = [ "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-mixnet", "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", @@ -8169,11 +8595,12 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-chain-spec", + "sc-mixnet", "sc-transaction-pool-api", "scale-info", "serde", @@ -8188,7 +8615,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "http", "jsonrpsee", @@ -8203,9 +8630,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "futures 0.3.29", "futures-util", "hex", @@ -8216,6 +8643,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-transaction-pool-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -8223,13 +8651,14 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", + "tokio", "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "directories", @@ -8256,11 +8685,9 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -8295,7 +8722,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "log", "parity-scale-codec", @@ -8303,26 +8730,10 @@ dependencies = [ "sp-core", ] -[[package]] -name = "sc-storage-monitor" -version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" -dependencies = [ - "clap", - "fs4", - "futures 0.3.29", - "log", - "sc-client-db", - "sc-utils", - "sp-core", - "thiserror", - "tokio", -] - [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "futures 0.3.29", "libc", @@ -8341,7 +8752,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "chrono", "futures 0.3.29", @@ -8360,7 +8771,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ansi_term", "atty", @@ -8368,12 +8779,10 @@ dependencies = [ "lazy_static", "libc", "log", - "once_cell", "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", - "sc-rpc-server", "sc-tracing-proc-macro", "serde", "sp-api", @@ -8391,7 +8800,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8402,14 +8811,13 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "futures 0.3.29", "futures-timer", "linked-hash-map", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", @@ -8429,13 +8837,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "futures 0.3.29", "log", + "parity-scale-codec", "serde", "sp-blockchain", + "sp-core", "sp-runtime", "thiserror", ] @@ -8443,7 +8853,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-channel", "futures 0.3.29", @@ -8511,11 +8921,11 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -8551,7 +8961,7 @@ dependencies = [ "der", "generic-array 0.14.7", "pkcs8", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -8752,12 +9162,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.2.0" @@ -8841,14 +9245,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" dependencies = [ "aes-gcm", - "blake2", + "blake2 0.10.6", "chacha20poly1305", "curve25519-dalek 4.1.1", "rand_core 0.6.4", "ring 0.17.7", "rustc_version", "sha2 0.10.8", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -8891,7 +9295,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "hash-db 0.16.0", "log", @@ -8899,6 +9303,7 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", + "sp-externalities", "sp-metadata-ir", "sp-runtime", "sp-state-machine", @@ -8911,10 +9316,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "Inflector", - "blake2", + "blake2 0.10.6", "expander", "proc-macro-crate 1.1.3", "proc-macro2", @@ -8924,8 +9329,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "23.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "scale-info", @@ -8937,8 +9342,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "16.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "integer-sqrt", "num-traits", @@ -8952,9 +9357,8 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -8964,13 +9368,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "futures 0.3.29", "log", - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", + "schnellru", "sp-api", "sp-consensus", "sp-database", @@ -8982,7 +9386,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "futures 0.3.29", @@ -8997,14 +9401,13 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-inherents", "sp-runtime", @@ -9015,7 +9418,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "parity-scale-codec", @@ -9023,11 +9426,9 @@ dependencies = [ "serde", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", @@ -9036,7 +9437,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "finality-grandpa", "log", @@ -9054,7 +9455,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9065,24 +9466,25 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "21.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", + "bandersnatch_vrfs", "bitflags 1.3.2", - "blake2", + "blake2 0.10.6", "bounded-collections", - "bs58", + "bs58 0.5.0", "dyn-clonable", "ed25519-zebra", "futures 0.3.29", "hash-db 0.16.0", "hash256-std-hasher", - "impl-serde 0.4.0", + "impl-serde", "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -9104,29 +9506,29 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", + "w3f-bls", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "9.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", "sha2 0.10.8", "sha3", - "sp-std", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "9.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "proc-macro2", "quote", "sp-core-hashing", "syn 2.0.40", @@ -9135,7 +9537,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -9143,8 +9545,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "8.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "proc-macro2", "quote", @@ -9153,8 +9555,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "0.19.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "environmental", "parity-scale-codec", @@ -9162,16 +9564,26 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "sp-genesis-builder" +version = "0.1.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" +dependencies = [ + "serde_json", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", "sp-runtime", "sp-std", "thiserror", @@ -9179,13 +9591,11 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "23.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "bytes", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", - "futures 0.3.29", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", @@ -9205,24 +9615,22 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "24.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.24.1", ] [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "0.27.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "futures 0.3.29", "parity-scale-codec", "parking_lot 0.12.1", - "serde", "sp-core", "sp-externalities", "thiserror", @@ -9231,7 +9639,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "thiserror", "zstd 0.12.4", @@ -9240,7 +9648,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -9248,10 +9656,22 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-mixnet" +version = "0.1.0-dev" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-std", +] + [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "sp-api", "sp-core", @@ -9260,8 +9680,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "8.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "backtrace", "lazy_static", @@ -9271,7 +9691,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "rustc-hash", "serde", @@ -9280,8 +9700,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "24.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "either", "hash256-std-hasher", @@ -9302,8 +9722,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "17.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -9320,8 +9740,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "11.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -9333,12 +9753,13 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-core", + "sp-keystore", "sp-runtime", "sp-staking", "sp-std", @@ -9347,8 +9768,9 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -9359,8 +9781,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "0.28.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "hash-db 0.16.0", "log", @@ -9375,16 +9797,22 @@ dependencies = [ "sp-trie", "thiserror", "tracing", + "trie-db", ] [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "log", + "aes-gcm", + "curve25519-dalek 4.1.1", + "ed25519-dalek", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", + "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", @@ -9393,19 +9821,20 @@ dependencies = [ "sp-runtime-interface", "sp-std", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "8.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "13.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "impl-serde 0.4.0", + "impl-serde", "parity-scale-codec", "ref-cast", "serde", @@ -9416,11 +9845,9 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures-timer", - "log", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -9430,8 +9857,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "10.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "sp-std", @@ -9443,7 +9870,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "sp-api", "sp-runtime", @@ -9452,10 +9879,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "log", "parity-scale-codec", "scale-info", "sp-core", @@ -9467,8 +9893,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "22.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ahash 0.8.6", "hash-db 0.16.0", @@ -9478,6 +9904,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.8.5", "scale-info", "schnellru", "sp-core", @@ -9490,10 +9917,10 @@ dependencies = [ [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "22.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "impl-serde 0.4.0", + "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", @@ -9507,8 +9934,8 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "8.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -9518,22 +9945,21 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "14.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", - "wasmi", "wasmtime", ] [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +version = "20.0.0" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9760,9 +10186,15 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", ] +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + [[package]] name = "strum_macros" version = "0.24.3" @@ -9776,6 +10208,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.40", +] + [[package]] name = "substrate-bip39" version = "0.4.5" @@ -9805,10 +10250,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" -dependencies = [ - "platforms 2.0.0", -] +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" [[package]] name = "substrate-fixed" @@ -9823,7 +10265,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.29", @@ -9842,7 +10284,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "hyper", "log", @@ -9864,20 +10306,27 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-substrate?branch=bifrost-polkadot-v0.9.43#6dd2589b254da0bb9244528db6898e3935674ea7" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "filetime", + "parity-wasm", "sp-maybe-compressed-blob", - "strum", + "strum 0.24.1", "tempfile", "toml 0.7.8", "walkdir", "wasm-opt", ] +[[package]] +name = "subtle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + [[package]] name = "subtle" version = "2.4.1" @@ -10015,15 +10464,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tikv-jemalloc-sys" version = "0.5.4+5.3.0-patched" @@ -10136,17 +10576,6 @@ dependencies = [ "syn 2.0.40", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - [[package]] name = "tokio-stream" version = "0.1.14" @@ -10195,6 +10624,18 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + [[package]] name = "toml_datetime" version = "0.6.5" @@ -10228,6 +10669,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -10358,9 +10812,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" +checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ "hash-db 0.16.0", "hashbrown 0.13.2", @@ -10534,7 +10988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -10608,6 +11062,30 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "w3f-bls" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" +dependencies = [ + "ark-bls12-377", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-serialize-derive", + "arrayref", + "constcat", + "digest 0.10.7", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "sha2 0.10.8", + "sha3", + "thiserror", + "zeroize", +] + [[package]] name = "walkdir" version = "2.4.0" @@ -10716,14 +11194,14 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.112.0" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52" dependencies = [ "anyhow", "libc", - "strum", - "strum_macros", + "strum 0.24.1", + "strum_macros 0.24.3", "tempfile", "thiserror", "wasm-opt-cxx-sys", @@ -10732,9 +11210,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e" dependencies = [ "anyhow", "cxx", @@ -10744,9 +11222,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe" dependencies = [ "anyhow", "cc", @@ -10769,39 +11247,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" -dependencies = [ - "parity-wasm", - "wasmi-validation", - "wasmi_core", -] - -[[package]] -name = "wasmi-validation" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" -dependencies = [ - "parity-wasm", -] - -[[package]] -name = "wasmi_core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" -dependencies = [ - "downcast-rs", - "libm", - "memory_units", - "num-rational", - "num-traits", -] - [[package]] name = "wasmparser" version = "0.102.0" @@ -11351,6 +11796,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +dependencies = [ + "curve25519-dalek 4.1.1", + "rand_core 0.6.4", + "serde", + "zeroize", +] + [[package]] name = "x509-parser" version = "0.14.0" diff --git a/Cargo.toml b/Cargo.toml index 102e3339..cfb401ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,28 @@ [workspace] resolver = "2" members = [ - "node/core", - "node/common", - "node/dev", - "node/testnet", - "node/mainnet", - "runtime/common", - "runtime/dev", - "runtime/testnet", - "runtime/mainnet", - "pallets/bfc-staking", - "pallets/bfc-utility", - "pallets/bfc-offences", - "pallets/relay-manager", - "precompiles/utils", - "precompiles/utils/macro", - "precompiles/bfc-staking", - "precompiles/bfc-offences", - "precompiles/relay-manager", - "precompiles/governance", - "precompiles/collective", - "precompiles/balance", - "primitives/account", - "primitives/core", - "primitives/bfc-staking", + "node/core", + "node/common", + "node/dev", + "node/testnet", + "node/mainnet", + "runtime/common", + "runtime/dev", + "runtime/testnet", + "runtime/mainnet", + "pallets/bfc-staking", + "pallets/bfc-utility", + "pallets/bfc-offences", + "pallets/relay-manager", + "precompiles/bfc-staking", + "precompiles/bfc-offences", + "precompiles/relay-manager", + "precompiles/governance", + "precompiles/collective", + "precompiles/balance", + "primitives/account", + "primitives/core", + "primitives/bfc-staking", ] [profile.release] panic = "unwind" @@ -39,47 +37,47 @@ repository = "https://github.com/bifrost-platform/bifrost-node" [workspace.dependencies] # General substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", default-features = false } -parity-scale-codec = { version = "3.2.2", default-features = false, features = [ - "derive", +parity-scale-codec = { version = "3.6.4", default-features = false, features = [ + "derive", ] } -scale-info = { version = "2.0", default-features = false, features = [ - "derive", +scale-info = { version = "2.9.0", default-features = false, features = [ + "derive", ] } evm = { git = "https://github.com/bifrost-platform/evm", default-features = false, branch = "bifrost-polkadot-v0.9.43" } environmental = { version = "1.1.2", default-features = false } clap = { version = "4.0.9", features = ["derive"] } hex = { version = "0.4.3", default-features = false } -rlp = { version = "0.5", default-features = false } +rlp = { version = "0.5.2", default-features = false } sha3 = { version = "0.10", default-features = false } -num_enum = { version = "0.5.3", default-features = false } -impl-serde = { version = "0.3.1", default-features = false } +num_enum = { version = "0.7.0", default-features = false } +impl-serde = { version = "0.4.0", default-features = false } blake2-rfc = { version = "0.2.18", default-features = false } -libsecp256k1 = { version = "0.7", default-features = false } +libsecp256k1 = { version = "0.7.1", default-features = false } serde = { version = "1.0.101", default-features = false } -jsonrpsee = { version = "0.16.2", default-features = false } +jsonrpsee = { version = "0.16.3", default-features = false } rustc-hex = { version = "2.0.1", default-features = false } -log = { version = "0.4", default-features = false } +log = { version = "0.4.20", default-features = false } impl-trait-for-tuples = "0.2.2" similar-asserts = "1.1.0" prettyplease = "0.1.18" -hex-literal = "0.3.4" +hex-literal = "0.4.1" derive_more = "0.99" proc-macro2 = "1.0" serde_json = "1.0" -futures = "0.3.1" -tokio = "1.28.2" +futures = "0.3.28" +tokio = "1.32.0" paste = "1.0.8" affix = "0.1.2" quote = "1.0" case = "1.0" syn = "1.0" -# BIFROST Primitive +# Bifrost Primitive bp-core = { default-features = false, path = "primitives/core" } bp-staking = { default-features = false, path = "primitives/bfc-staking" } account = { default-features = false, path = "primitives/account" } -# BIFROST Runtime +# Bifrost Runtime bifrost-common-constants = { default-features = false, path = "runtime/common/constants" } bifrost-dev-constants = { default-features = false, path = "runtime/dev/constants" } bifrost-testnet-constants = { default-features = false, path = "runtime/testnet/constants" } @@ -89,21 +87,19 @@ bifrost-dev-runtime = { path = "runtime/dev" } bifrost-testnet-runtime = { path = "runtime/testnet" } bifrost-mainnet-runtime = { path = "runtime/mainnet" } -# BIFROST Client +# Bifrost Client bifrost-common-node = { path = "node/common" } bifrost-dev-node = { path = "node/dev" } bifrost-testnet-node = { path = "node/testnet" } bifrost-mainnet-node = { path = "node/mainnet" } -# BIFROST Frame +# Bifrost Frame pallet-bfc-staking = { default-features = false, path = "pallets/bfc-staking" } pallet-bfc-utility = { default-features = false, path = "pallets/bfc-utility" } pallet-bfc-offences = { default-features = false, path = "pallets/bfc-offences" } pallet-relay-manager = { default-features = false, path = "pallets/relay-manager" } -# BIFROST Precompile -precompile-utils = { default-features = false, path = "precompiles/utils" } -precompile-utils-macro = { path = "precompiles/utils/macro" } +# Bifrost Precompile precompile-bfc-staking = { default-features = false, path = "precompiles/bfc-staking" } precompile-bfc-offences = { default-features = false, path = "precompiles/bfc-offences" } precompile-relay-manager = { default-features = false, path = "precompiles/relay-manager" } @@ -112,108 +108,111 @@ precompile-collective = { default-features = false, path = "precompiles/collecti precompile-balance = { default-features = false, path = "precompiles/balance" } # Substrate Client -sc-cli = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-client-api = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-rpc = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-rpc-api = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-transaction-pool = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-transaction-pool-api = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-chain-spec = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-consensus = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-consensus-aura = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-consensus-grandpa = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-consensus-grandpa-rpc = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-consensus-manual-seal = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-network = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-network-sync = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-service = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-executor = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-telemetry = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sc-basic-authorship = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -substrate-prometheus-endpoint = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } +sc-cli = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-client-api = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-rpc = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-rpc-api = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-transaction-pool = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-transaction-pool-api = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-chain-spec = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-consensus = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-consensus-aura = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-consensus-grandpa = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-consensus-grandpa-rpc = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-consensus-manual-seal = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-network = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-network-sync = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-service = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-executor = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-telemetry = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-basic-authorship = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +substrate-prometheus-endpoint = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } # Substrate Primitive -sp-io = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-api = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-block-builder = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-blockchain = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-consensus = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-consensus-aura = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-consensus-grandpa = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-core = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-inherents = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-offchain = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-runtime = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-runtime-interface = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-session = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-std = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-transaction-pool = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-version = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-staking = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-keystore = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -sp-timestamp = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } +sp-io = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-api = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-block-builder = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-blockchain = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-consensus = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-consensus-aura = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-consensus-grandpa = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-core = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-inherents = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-offchain = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-runtime = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-runtime-interface = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-session = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-std = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-transaction-pool = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-version = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-staking = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-keystore = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-timestamp = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } # Substrate FRAME -substrate-frame-rpc-system = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-system = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-support = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-executive = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-benchmarking = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-benchmarking-cli = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -frame-system-benchmarking = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-aura = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-balances = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-grandpa = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-sudo = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-timestamp = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-transaction-payment-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-scheduler = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-session = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-authorship = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-utility = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-collective = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-democracy = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-membership = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-im-online = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-offences = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-treasury = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-identity = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -pallet-preimage = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } +substrate-frame-rpc-system = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-system = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-support = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-executive = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-benchmarking = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-benchmarking-cli = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +frame-system-benchmarking = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-aura = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-balances = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-grandpa = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-sudo = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-timestamp = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-transaction-payment-rpc = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-scheduler = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-session = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-authorship = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-utility = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-collective = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-democracy = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-membership = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-im-online = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-offences = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-treasury = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-identity = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +pallet-preimage = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } # Substrate Builds -substrate-wasm-builder = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } -substrate-build-script-utils = { git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" } +substrate-wasm-builder = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +substrate-build-script-utils = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } # Frontier Client -fc-db = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fc-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fc-mapping-sync = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fc-rpc-core = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fc-rpc-debug = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fc-rpc-trace = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fc-rpc-txpool = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } +fc-db = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-mapping-sync = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-rpc-core = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-rpc-debug = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-rpc-trace = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-rpc-txpool = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } # Frontier Primitive -fp-self-contained = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-storage = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-evm = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-ext = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-rpc-debug = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-rpc-txpool = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -fp-rpc-evm-tracing-events = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } +fp-self-contained = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-storage = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-evm = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-ext = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-rpc-debug = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-rpc-txpool = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-rpc-evm-tracing-events = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } # Frontier Runtime -evm-tracer = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } +evm-tracer = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } # Frontier FRAME -pallet-evm = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -pallet-ethereum = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -pallet-base-fee = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } -pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v0.9.43" } +pallet-evm = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +pallet-ethereum = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +pallet-base-fee = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } + +# Frontier Utilities +precompile-utils = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } diff --git a/tests/runtime/config.local.json b/tests/runtime/config.local.json new file mode 100644 index 00000000..bd14392f --- /dev/null +++ b/tests/runtime/config.local.json @@ -0,0 +1,7 @@ +{ + "nodeEndpoint": "http://localhost:9944", + "testerPk": "0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b", + "tester": "0x3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0", + "tester2": "0x798d4Ba9baf0064Ec19eB4F0a1a45785ae9D6DFc", + "validator": "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac" +} diff --git a/tests/runtime/config.testnet.json b/tests/runtime/config.testnet.json new file mode 100644 index 00000000..edbfc4a6 --- /dev/null +++ b/tests/runtime/config.testnet.json @@ -0,0 +1,7 @@ +{ + "nodeEndpoint": "https://private.testnet.thebifrost.io/rpc", + "testerPk": "0x551bc2c70de4d7db6506b3599071876f99143227f48fddd19c7f9ca4db2f41eb", + "tester": "0x81143D1d29B101B84FE87BCB2f684534b20EBaAd", + "tester2": "0xEc27264491E0B8DcD6D9b7155A7951BFA13236FD", + "validator": "0x45A96ACA1Cd759306B05B05b40B082254E77699b" +} From e52dd0383f3be7bdf62762fb6e95309330473446 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 10:59:59 +0900 Subject: [PATCH 02/53] NODE-64, chore: use --- pallets/bfc-offences/src/pallet/mod.rs | 33 ++++++++++++++++++------- pallets/bfc-staking/src/pallet/mod.rs | 2 +- pallets/bfc-utility/src/pallet/mod.rs | 13 ++++++---- pallets/relay-manager/src/pallet/mod.rs | 27 ++++++++++++++------ 4 files changed, 52 insertions(+), 23 deletions(-) diff --git a/pallets/bfc-offences/src/pallet/mod.rs b/pallets/bfc-offences/src/pallet/mod.rs index 42c3a3c8..eb770230 100644 --- a/pallets/bfc-offences/src/pallet/mod.rs +++ b/pallets/bfc-offences/src/pallet/mod.rs @@ -115,23 +115,38 @@ pub mod pallet { } #[pallet::genesis_config] - pub struct GenesisConfig {} + pub struct GenesisConfig { + pub default_offence_expiration_in_sessions: SessionIndex, + pub default_full_maximum_offence_count: OffenceCount, + pub default_basic_maximum_offence_count: OffenceCount, + pub is_offence_active: bool, + pub is_slash_active: bool, + _phantom_data: PhantomData, + } #[cfg(feature = "std")] - impl Default for GenesisConfig { + impl Default for GenesisConfig { fn default() -> Self { - Self {} + Self { + default_offence_expiration_in_sessions: T::DefaultOffenceExpirationInSessions::get( + ), + default_full_maximum_offence_count: T::DefaultFullMaximumOffenceCount::get(), + default_basic_maximum_offence_count: T::DefaultBasicMaximumOffenceCount::get(), + is_offence_active: T::IsOffenceActive::get(), + is_slash_active: T::IsSlashActive::get(), + _phantom_data: PhantomData::default(), + } } } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { - OffenceExpirationInSessions::::put(T::DefaultOffenceExpirationInSessions::get()); - FullMaximumOffenceCount::::put(T::DefaultFullMaximumOffenceCount::get()); - BasicMaximumOffenceCount::::put(T::DefaultBasicMaximumOffenceCount::get()); - IsOffenceActive::::put(T::IsOffenceActive::get()); - IsSlashActive::::put(T::IsSlashActive::get()); + OffenceExpirationInSessions::::put(self.default_offence_expiration_in_sessions); + FullMaximumOffenceCount::::put(self.default_full_maximum_offence_count); + BasicMaximumOffenceCount::::put(self.default_basic_maximum_offence_count); + IsOffenceActive::::put(self.is_offence_active); + IsSlashActive::::put(self.is_slash_active); } } diff --git a/pallets/bfc-staking/src/pallet/mod.rs b/pallets/bfc-staking/src/pallet/mod.rs index 6c07841f..8e3799f7 100644 --- a/pallets/bfc-staking/src/pallet/mod.rs +++ b/pallets/bfc-staking/src/pallet/mod.rs @@ -724,7 +724,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { >::put(self.inflation_config.clone()); // Set validator commission to default config diff --git a/pallets/bfc-utility/src/pallet/mod.rs b/pallets/bfc-utility/src/pallet/mod.rs index 1c2132e9..c8a5a9ed 100644 --- a/pallets/bfc-utility/src/pallet/mod.rs +++ b/pallets/bfc-utility/src/pallet/mod.rs @@ -67,19 +67,22 @@ pub mod pallet { } #[pallet::genesis_config] - pub struct GenesisConfig {} + pub struct GenesisConfig { + pub proposal_index: PropIndex, + _phantom_data: PhantomData, + } #[cfg(feature = "std")] - impl Default for GenesisConfig { + impl Default for GenesisConfig { fn default() -> Self { - Self {} + Self { proposal_index: 0, _phantom_data: PhantomData::default() } } } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { - ProposalIndex::::put(0); + ProposalIndex::::put(self.proposal_index); } } diff --git a/pallets/relay-manager/src/pallet/mod.rs b/pallets/relay-manager/src/pallet/mod.rs index 2d2bd57d..331e251d 100644 --- a/pallets/relay-manager/src/pallet/mod.rs +++ b/pallets/relay-manager/src/pallet/mod.rs @@ -186,7 +186,8 @@ pub mod pallet { #[pallet::getter(fn cached_initial_majority)] /// The cached majority based on the active relayer set selected from the beginning of each /// previous rounds - pub type CachedInitialMajority = StorageValue<_, BTreeMap, ValueQuery>; + pub type CachedInitialMajority = + StorageValue<_, BTreeMap, ValueQuery>; #[pallet::storage] #[pallet::getter(fn received_heartbeats)] @@ -219,21 +220,31 @@ pub mod pallet { } #[pallet::genesis_config] - pub struct GenesisConfig {} + pub struct GenesisConfig { + pub storage_cache_lifetime: u32, + pub is_heartbeat_offence_active: bool, + pub heartbeat_slash_fraction: Perbill, + _phantom_data: PhantomData, + } #[cfg(feature = "std")] - impl Default for GenesisConfig { + impl Default for GenesisConfig { fn default() -> Self { - Self {} + Self { + storage_cache_lifetime: T::StorageCacheLifetimeInRounds::get(), + is_heartbeat_offence_active: T::IsHeartbeatOffenceActive::get(), + heartbeat_slash_fraction: T::DefaultHeartbeatSlashFraction::get(), + _phantom_data: PhantomData::default(), + } } } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { - StorageCacheLifetime::::put(T::StorageCacheLifetimeInRounds::get()); - IsHeartbeatOffenceActive::::put(T::IsHeartbeatOffenceActive::get()); - HeartbeatSlashFraction::::put(T::DefaultHeartbeatSlashFraction::get()); + StorageCacheLifetime::::put(self.storage_cache_lifetime); + IsHeartbeatOffenceActive::::put(self.is_heartbeat_offence_active); + HeartbeatSlashFraction::::put(self.heartbeat_slash_fraction); } } From f0ef82f84de8744238a42f93daa891830fc0d33f Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 11:00:22 +0900 Subject: [PATCH 03/53] NODE-64, chore: remove precompile utils --- precompiles/utils/Cargo.toml | 57 - precompiles/utils/macro/Cargo.toml | 21 - .../utils/macro/docs/precompile_macro.md | 199 ---- precompiles/utils/macro/src/derive_codec.rs | 104 -- .../macro/src/generate_function_selector.rs | 57 - precompiles/utils/macro/src/lib.rs | 57 - .../utils/macro/src/precompile/attr.rs | 112 -- .../utils/macro/src/precompile/expand.rs | 488 -------- precompiles/utils/macro/src/precompile/mod.rs | 116 -- .../utils/macro/src/precompile/parse.rs | 595 ---------- .../macro/src/precompile_name_from_address.rs | 114 -- precompiles/utils/src/data/bytes.rs | 176 --- precompiles/utils/src/data/mod.rs | 377 ------ precompiles/utils/src/data/native.rs | 346 ------ precompiles/utils/src/evm/costs.rs | 88 -- precompiles/utils/src/evm/handle.rs | 209 ---- precompiles/utils/src/evm/logs.rs | 78 -- precompiles/utils/src/evm/mod.rs | 3 - precompiles/utils/src/lib.rs | 57 - precompiles/utils/src/precompile_set.rs | 1036 ----------------- precompiles/utils/src/solidity/codec/bytes.rs | 177 --- precompiles/utils/src/solidity/codec/mod.rs | 326 ------ .../utils/src/solidity/codec/native.rs | 349 ------ precompiles/utils/src/solidity/mod.rs | 10 - precompiles/utils/src/solidity/modifier.rs | 36 - precompiles/utils/src/solidity/revert.rs | 363 ------ precompiles/utils/src/substrate.rs | 128 -- 27 files changed, 5679 deletions(-) delete mode 100644 precompiles/utils/Cargo.toml delete mode 100644 precompiles/utils/macro/Cargo.toml delete mode 100644 precompiles/utils/macro/docs/precompile_macro.md delete mode 100644 precompiles/utils/macro/src/derive_codec.rs delete mode 100644 precompiles/utils/macro/src/generate_function_selector.rs delete mode 100644 precompiles/utils/macro/src/lib.rs delete mode 100644 precompiles/utils/macro/src/precompile/attr.rs delete mode 100644 precompiles/utils/macro/src/precompile/expand.rs delete mode 100644 precompiles/utils/macro/src/precompile/mod.rs delete mode 100644 precompiles/utils/macro/src/precompile/parse.rs delete mode 100644 precompiles/utils/macro/src/precompile_name_from_address.rs delete mode 100644 precompiles/utils/src/data/bytes.rs delete mode 100644 precompiles/utils/src/data/mod.rs delete mode 100644 precompiles/utils/src/data/native.rs delete mode 100644 precompiles/utils/src/evm/costs.rs delete mode 100644 precompiles/utils/src/evm/handle.rs delete mode 100644 precompiles/utils/src/evm/logs.rs delete mode 100644 precompiles/utils/src/evm/mod.rs delete mode 100644 precompiles/utils/src/lib.rs delete mode 100644 precompiles/utils/src/precompile_set.rs delete mode 100644 precompiles/utils/src/solidity/codec/bytes.rs delete mode 100644 precompiles/utils/src/solidity/codec/mod.rs delete mode 100644 precompiles/utils/src/solidity/codec/native.rs delete mode 100644 precompiles/utils/src/solidity/mod.rs delete mode 100644 precompiles/utils/src/solidity/modifier.rs delete mode 100644 precompiles/utils/src/solidity/revert.rs delete mode 100644 precompiles/utils/src/substrate.rs diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml deleted file mode 100644 index 91896714..00000000 --- a/precompiles/utils/Cargo.toml +++ /dev/null @@ -1,57 +0,0 @@ -[package] -name = "precompile-utils" -version = "1.0.0" -description = "Utils to write EVM precompiles." -authors = { workspace = true } -homepage = { workspace = true} -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } - -[dependencies] -log = { workspace = true } -hex = { workspace = true } -sha3 = { workspace = true } -affix = { workspace = true } -paste = { workspace = true } -num_enum = { workspace = true } -environmental = { workspace = true } -impl-trait-for-tuples = { workspace = true } -serde = { workspace = true, optional = true } -derive_more = { workspace = true, optional = true } -hex-literal = { workspace = true, optional = true } -scale-info = { workspace = true, optional = true } -similar-asserts = { workspace = true, optional = true } - -# Substrate -parity-scale-codec = { workspace = true } -frame-support = { workspace = true } -frame-system = { workspace = true } -sp-io = { workspace = true } -sp-std = { workspace = true } -sp-core = { workspace = true } - -# Frontier -evm = { workspace = true, features = ["with-codec"] } -fp-evm = { workspace = true } -pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } - -# Local -precompile-utils-macro = { workspace = true } - -[dev-dependencies] -hex-literal = { workspace = true } - -[features] -default = ["std"] -std = [ - "environmental/std", - "parity-scale-codec/std", - "fp-evm/std", - "frame-support/std", - "frame-system/std", - "pallet-evm/std", - "sp-core/std", - "sp-io/std", - "sp-std/std", -] diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml deleted file mode 100644 index 9cbb3288..00000000 --- a/precompiles/utils/macro/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "precompile-utils-macro" -version = "1.0.0" -description = "Utility macros for precompile development" -authors = { workspace = true } -homepage = { workspace = true} -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } - -[lib] -proc-macro = true - -[dependencies] -case = { workspace = true } -num_enum = { workspace = true } -prettyplease = { workspace = true } -proc-macro2 = { workspace = true } -quote = { workspace = true } -sha3 = { workspace = true } -syn = { workspace = true, features = ["extra-traits", "fold", "full", "visit"] } diff --git a/precompiles/utils/macro/docs/precompile_macro.md b/precompiles/utils/macro/docs/precompile_macro.md deleted file mode 100644 index 0ff7ec20..00000000 --- a/precompiles/utils/macro/docs/precompile_macro.md +++ /dev/null @@ -1,199 +0,0 @@ -# `#[precompile]` procedural macro. - -This procedural macro allows to simplify the implementation of an EVM precompile or precompile set -using an `impl` block with annotations to automatically generate: - -- the implementation of the trait `Precompile` or `PrecompileSet` (exposed by the `fp_evm` crate) -- parsing of the method parameters from Solidity encoding into Rust type, based on the `EvmData` - trait (exposed by the `precompile-utils` crate) -- a test to ensure the types expressed in the Solidity signature match the Rust types in the - implementation. - -## How to use - -Define your precompile type and write an `impl` block that will contain the precompile methods -implementation. This `impl` block can have type parameters and a `where` clause, which will be -reused to generate the `Precompile`/`PrecompileSet` trait implementation and the enum representing -each public function of precompile with its parsed arguments. - -```rust,ignore -pub struct ExemplePrecompile(PhantomData<(R,I)>); - -#[precomile_utils::precompile] -impl ExemplePrecompile -where - R: pallet_evm::Config -{ - #[precompile::public("example(uint32)")] - fn example(handle: &mut impl PrecompileHandle, arg: u32) -> EvmResult { - Ok(arg * 2) - } -} -``` - -The example code above will automatically generate an enum like - -```rust,ignore -#[allow(non_camel_case_types)] -pub enum ExemplePrecompileCall -where - R: pallet_evm::Config -{ - example { - arg: u32 - }, - // + an non constrible variant with a PhantomData<(R,I)> -} -``` - -This enum have the function `parse_call_data` that can parse the calldata, recognize the Solidity -4-bytes selector and parse the appropriate enum variant. - -It will also generate automatically an implementation of `Precompile`/`PrecompileSet` that calls -this function and the content of the variant to its associated function of the `impl` block. - -## Function attributes - -`#[precompile::public("signature")]` allows to declare a function as a public method of the -precompile with the provided Solidity signature. A function can have multiple `public` attributes to -support renamed functions with backward compatibility, however the arguments must have the same -type. It is not allowed to use the exact same signature multiple times. - -The function must take a `&mut impl PrecompileHandle` as parameter, followed by all the parameters -of the Solidity function in the same order. Those parameters types must implement `EvmData`, and -their name should match the one used in the Solidity interface (.sol) while being in `snake_case`, -which will automatically be converted to `camelCase` in revert messages. The function must return an -`EvmResult`, which is an alias of `Result`. This `T` must implement the -`EvmData` trait and must match the return type in the Solidity interface. The macro will -automatically encode it to Solidity format. - -By default those functions are considered non-payable and non-view (can cause state changes). This -can be changed using either `#[precompile::payable]` or `#[precompile::view]`. Only one can be used. - -It is also possible to declare a fallback function using `#[precompile::fallback]`. This function -will be called if the selector is unknown or if the input is less than 4-bytes long (no selector). -This function cannot have any parameter outside of the `PrecompileHandle`. A function can be both -`public` and `fallback`. - -In case some check must be performed before parsing the input, such as forbidding being called from -some address, a function can be annotated with `#[precompile::pre_check]`: - -```rust,ignore -#[precompile::pre_check] -fn pre_check(handle: &mut impl PrecompileHandle) -> EvmResult { - todo!("Perform your check here") -} -``` - -This function cannot have other attributes. - -## PrecompileSet - -By default the macro considers the `impl` block to represent a precompile and this will implement -the `Precompile` trait. If you want to instead implement a precompile set, you must add the -`#[precompile::precompile_set]` to the `impl` block. - -Then, it is necessary to have a function annotated with the `#[precompile::discriminant]` attribute. -This function is called with the **code address**, the address of the precompile. It must return -`None` if this address is not part of the precompile set, or `Some` if it is. The `Some` variants -contains a value of a type of your choice that represents which member of the set this address -corresponds to. For example for our XC20 precompile sets this function returns the asset id -corresponding to this address if it exists. - -Finally, every other function annotated with a `precompile::_` attribute must now take this -discriminant as first parameter, before the `PrecompileHandle`. - -```rust,ignore -pub struct ExemplePrecompileSet(PhantomData); - -#[precompile_utils::precompile] -#[precompile::precompile_set] -impl ExamplePrecompileSet -where - R: pallet_evm::Config -{ - #[precompile::discriminant] - fn discriminant(address: H160) -> Option { - // Replace with your discriminant logic. - Some(match address { - a if a == H160::from(42) => 1 - a if a == H160::from(43) => 2, - _ => return None, - }) - } - - #[precompile::public("example(uint32)")] - fn example(discriminant: u8, handle: &mut impl PrecompileHandle, arg: u32) -> EvmResult { - // Discriminant can be used here. - Ok(arg * discriminant) - } -} -``` - -## Solidity signatures test - -The macro will automatically generate a unit test to ensure that the types expressed in a `public` -attribute matches the Rust parameters of the function, thanks to the `EvmData` trait having the -`solidity_type() -> String` function. - -If any **parsed** argument (discriminant is not concerned) depends on the type parameters of the -`impl` block, the macro will not be able to produce valid code and output an error like: - -```text -error[E0412]: cannot find type `R` in this scope - --> tests/precompile/compile-fail/test/generic-arg.rs:25:63 - | -23 | impl> Precompile { - | - help: you might be missing a type parameter: `` -24 | #[precompile::public("foo(bytes)")] -25 | fn foo(handle: &mut impl PrecompileHandle, arg: BoundedBytes) -> EvmResult { - | ^ not found in this scope -``` - -In this case you need to annotate the `impl` block with the `#[precompile::test_concrete_types(...)]` -attributes. The `...` should be replaced with concrete types for each type parameter, like a mock -runtime. Those types are only used to generate the test and only one set of types can be used. - -```rust,ignore -pub struct ExamplePrecompile(PhantomData<(R, I)>); - -pub struct GetMaxSize(PhantomData<(R, I)>); - -impl Get for GetMaxSize { - fn get() -> u32 { - >::SomeConstant::get() - } -} - -#[precompile_utils::precompile] -#[precompile::test_concrete_types(mock::Runtime, Instance1)] -impl ExamplePrecompile -where - R: pallet_evm::Config + SomeConfig -{ - #[precompile::public("example(bytes)")] - fn example( - handle: &mut impl PrecompileHandle, - data: BoundedBytes>, - ) -> EvmResult { - todo!("Method implementation") - } -} -``` - -## Enum functions - -The generated enums exposes the following public functions: - -- `parse_call_data`: take a `PrecompileHandle` and tries to parse the call data. Returns an - `EvmResult`. It **DOES NOT** execute the code of the annotated `impl` block. -- `supports_selector`: take a selector as a `u32` is returns if this selector is supported by the - precompile(set) as a `bool`. Note that the presence of a fallback function is not taken into - account. -- `selectors`: returns a static array (`&'static [u32]`) of all the supported selectors. -- For each variant/public function `foo`, there is a function `foo_selectors` which returns a static - array of all the supported selectors **for that function**. That can be used to ensure in tests - that some function have a selector that was computed by hand. -- `encode`: take `self` and encodes it in Solidity format. Additionally, `Vec` implements - `From` which simply call encodes. This is useful to write tests as you can construct the - variant you want and it will be encoded to Solidity format for you. diff --git a/precompiles/utils/macro/src/derive_codec.rs b/precompiles/utils/macro/src/derive_codec.rs deleted file mode 100644 index 7b9b66e8..00000000 --- a/precompiles/utils/macro/src/derive_codec.rs +++ /dev/null @@ -1,104 +0,0 @@ -use proc_macro::TokenStream; -use proc_macro2::Span; -use quote::{quote, quote_spanned}; -use syn::{ - parse_macro_input, punctuated::Punctuated, spanned::Spanned, DeriveInput, Ident, LitStr, Path, - PathSegment, PredicateType, TraitBound, TraitBoundModifier, -}; - -pub fn main(input: TokenStream) -> TokenStream { - let DeriveInput { ident, mut generics, data, .. } = parse_macro_input!(input as DeriveInput); - - let syn::Data::Struct (syn::DataStruct {fields: syn::Fields::Named(fields), ..}) = data else { - return quote_spanned! { ident.span() => - compile_error!("Codec can only be derived for structs with named fields"); - } - .into() - }; - let fields = fields.named; - - if fields.len() == 0 { - return quote_spanned! { ident.span() => - compile_error!("Codec can only be derived for structs with at least one field"); - } - .into(); - } - - if let Some(unamed_field) = fields.iter().find(|f| f.ident.is_none()) { - return quote_spanned! { unamed_field.ty.span() => - compile_error!("Codec can only be derived for structs with named fields"); - } - .into(); - } - - let fields_ty: Vec<_> = fields.iter().map(|f| &f.ty).collect(); - let fields_ident: Vec<_> = fields - .iter() - .map(|f| f.ident.as_ref().expect("None case checked above")) - .collect(); - let fields_name_lit: Vec<_> = - fields_ident.iter().map(|i| LitStr::new(&i.to_string(), i.span())).collect(); - - let evm_data_trait_path = { - let mut segments = Punctuated::::new(); - segments.push(Ident::new("precompile_utils", Span::call_site()).into()); - segments.push(Ident::new("solidity", Span::call_site()).into()); - segments.push(Ident::new("Codec", Span::call_site()).into()); - Path { leading_colon: Some(Default::default()), segments } - }; - let where_clause = generics.make_where_clause(); - - for ty in &fields_ty { - let mut bounds = Punctuated::new(); - bounds.push( - TraitBound { - paren_token: None, - modifier: TraitBoundModifier::None, - lifetimes: None, - path: evm_data_trait_path.clone(), - } - .into(), - ); - - where_clause.predicates.push( - PredicateType { - lifetimes: None, - bounded_ty: (*ty).clone(), - colon_token: Default::default(), - bounds, - } - .into(), - ); - } - - let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); - quote! { - impl #impl_generics ::precompile_utils::solidity::codec::Codec for #ident #ty_generics - #where_clause { - fn read( - reader: &mut ::precompile_utils::solidity::codec::Reader - ) -> ::precompile_utils::solidity::revert::MayRevert { - use ::precompile_utils::solidity::revert::BacktraceExt as _; - let (#(#fields_ident,)*): (#(#fields_ty,)*) = reader - .read() - .map_in_tuple_to_field(&[#(#fields_name_lit),*])?; - Ok(Self { - #(#fields_ident,)* - }) - } - - fn write(writer: &mut ::precompile_utils::solidity::codec::Writer, value: Self) { - ::precompile_utils::solidity::codec::Codec::write(writer, (#(value.#fields_ident,)*)); - } - - fn has_static_size() -> bool { - <(#(#fields_ty,)*)>::has_static_size() - } - - fn signature() -> String { - <(#(#fields_ty,)*)>::signature() - } - } - } - .into() -} diff --git a/precompiles/utils/macro/src/generate_function_selector.rs b/precompiles/utils/macro/src/generate_function_selector.rs deleted file mode 100644 index aaacfcd5..00000000 --- a/precompiles/utils/macro/src/generate_function_selector.rs +++ /dev/null @@ -1,57 +0,0 @@ -use super::*; - -pub fn main(_: TokenStream, input: TokenStream) -> TokenStream { - let item = parse_macro_input!(input as ItemEnum); - - let ItemEnum { attrs, vis, enum_token, ident, variants, .. } = item; - - let mut ident_expressions: Vec = vec![]; - let mut variant_expressions: Vec = vec![]; - let mut variant_attrs: Vec> = vec![]; - for variant in variants { - match variant.discriminant { - Some((_, Expr::Lit(ExprLit { lit, .. }))) => { - if let Lit::Str(lit_str) = lit { - let digest = Keccak256::digest(lit_str.value().as_bytes()); - let selector = u32::from_be_bytes([digest[0], digest[1], digest[2], digest[3]]); - ident_expressions.push(variant.ident); - variant_expressions.push(Expr::Lit(ExprLit { - lit: Lit::Verbatim(Literal::u32_suffixed(selector)), - attrs: Default::default(), - })); - variant_attrs.push(variant.attrs); - } else { - return quote_spanned! { - lit.span() => compile_error!("Expected literal string"); - } - .into(); - } - }, - Some((_eg, expr)) => { - return quote_spanned! { - expr.span() => compile_error!("Expected literal"); - } - .into() - }, - None => { - return quote_spanned! { - variant.span() => compile_error!("Each variant must have a discriminant"); - } - .into() - }, - } - } - - (quote! { - #(#attrs)* - #[derive(num_enum::TryFromPrimitive, num_enum::IntoPrimitive)] - #[repr(u32)] - #vis #enum_token #ident { - #( - #(#variant_attrs)* - #ident_expressions = #variant_expressions, - )* - } - }) - .into() -} diff --git a/precompiles/utils/macro/src/lib.rs b/precompiles/utils/macro/src/lib.rs deleted file mode 100644 index cb721319..00000000 --- a/precompiles/utils/macro/src/lib.rs +++ /dev/null @@ -1,57 +0,0 @@ -#![crate_type = "proc-macro"] -extern crate proc_macro; - -use proc_macro::TokenStream; -use quote::{quote, quote_spanned}; -use sha3::{Digest, Keccak256}; -use syn::{parse_macro_input, spanned::Spanned, Expr, Ident, ItemType, Lit, LitStr}; - -mod derive_codec; -mod precompile; -mod precompile_name_from_address; - -struct Bytes(Vec); - -impl ::std::fmt::Debug for Bytes { - #[inline] - fn fmt(&self, f: &mut std::fmt::Formatter) -> ::std::fmt::Result { - let data = &self.0; - write!(f, "[")?; - if !data.is_empty() { - write!(f, "{:#04x}u8", data[0])?; - for unit in data.iter().skip(1) { - write!(f, ", {:#04x}", unit)?; - } - } - write!(f, "]") - } -} - -#[proc_macro] -pub fn keccak256(input: TokenStream) -> TokenStream { - let lit_str = parse_macro_input!(input as LitStr); - - let hash = Keccak256::digest(lit_str.value().as_bytes()); - - let bytes = Bytes(hash.to_vec()); - let eval_str = format!("{:?}", bytes); - let eval_ts: proc_macro2::TokenStream = eval_str.parse().unwrap_or_else(|_| { - panic!("Failed to parse the string \"{}\" to TokenStream.", eval_str); - }); - quote!(#eval_ts).into() -} - -#[proc_macro_attribute] -pub fn precompile(attr: TokenStream, input: TokenStream) -> TokenStream { - precompile::main(attr, input) -} - -#[proc_macro_attribute] -pub fn precompile_name_from_address(attr: TokenStream, input: TokenStream) -> TokenStream { - precompile_name_from_address::main(attr, input) -} - -#[proc_macro_derive(Codec)] -pub fn derive_codec(input: TokenStream) -> TokenStream { - derive_codec::main(input) -} diff --git a/precompiles/utils/macro/src/precompile/attr.rs b/precompiles/utils/macro/src/precompile/attr.rs deleted file mode 100644 index a7e26bb5..00000000 --- a/precompiles/utils/macro/src/precompile/attr.rs +++ /dev/null @@ -1,112 +0,0 @@ -use proc_macro2::Span; -use quote::ToTokens; -use syn::spanned::Spanned; - -pub fn take_attributes(attributes: &mut Vec) -> syn::Result> -where - A: syn::parse::Parse, -{ - let mut output = vec![]; - let pred = |attr: &syn::Attribute| { - attr.path - .segments - .first() - .map_or(false, |segment| segment.ident == "precompile") - }; - - while let Some(index) = attributes.iter().position(pred) { - let attr = attributes.remove(index); - let attr = syn::parse2(attr.into_token_stream())?; - output.push(attr) - } - Ok(output) -} - -/// List of additional token to be used for parsing. -pub mod keyword { - syn::custom_keyword!(precompile); - syn::custom_keyword!(public); - syn::custom_keyword!(fallback); - syn::custom_keyword!(payable); - syn::custom_keyword!(view); - syn::custom_keyword!(discriminant); - syn::custom_keyword!(precompile_set); - syn::custom_keyword!(test_concrete_types); - syn::custom_keyword!(pre_check); -} - -/// Attributes for methods. -pub enum MethodAttr { - Public(Span, syn::LitStr), - Fallback(Span), - Payable(Span), - View(Span), - Discriminant(Span), - PreCheck(Span), -} - -impl syn::parse::Parse for MethodAttr { - fn parse(input: syn::parse::ParseStream) -> syn::Result { - input.parse::()?; - let content; - syn::bracketed!(content in input); - content.parse::()?; - content.parse::()?; - - let lookahead = content.lookahead1(); - - if lookahead.peek(keyword::public) { - let span = content.parse::()?.span(); - - let inner; - syn::parenthesized!(inner in content); - let signature = inner.parse::()?; - - Ok(MethodAttr::Public(span, signature)) - } else if lookahead.peek(keyword::fallback) { - Ok(MethodAttr::Fallback(content.parse::()?.span())) - } else if lookahead.peek(keyword::payable) { - Ok(MethodAttr::Payable(content.parse::()?.span())) - } else if lookahead.peek(keyword::view) { - Ok(MethodAttr::View(content.parse::()?.span())) - } else if lookahead.peek(keyword::discriminant) { - Ok(MethodAttr::Discriminant(content.parse::()?.span())) - } else if lookahead.peek(keyword::pre_check) { - Ok(MethodAttr::PreCheck(content.parse::()?.span())) - } else { - Err(lookahead.error()) - } - } -} - -/// Attributes for the main impl Block. -pub enum ImplAttr { - PrecompileSet(Span), - TestConcreteTypes(Span, Vec), -} - -impl syn::parse::Parse for ImplAttr { - fn parse(input: syn::parse::ParseStream) -> syn::Result { - input.parse::()?; - let content; - syn::bracketed!(content in input); - content.parse::()?; - content.parse::()?; - - let lookahead = content.lookahead1(); - - if lookahead.peek(keyword::precompile_set) { - Ok(ImplAttr::PrecompileSet(content.parse::()?.span())) - } else if lookahead.peek(keyword::test_concrete_types) { - let span = content.parse::()?.span(); - - let inner; - syn::parenthesized!(inner in content); - let types = inner.parse_terminated::<_, syn::Token![,]>(syn::Type::parse)?; - - Ok(ImplAttr::TestConcreteTypes(span, types.into_iter().collect())) - } else { - Err(lookahead.error()) - } - } -} diff --git a/precompiles/utils/macro/src/precompile/expand.rs b/precompiles/utils/macro/src/precompile/expand.rs deleted file mode 100644 index e58c4a9a..00000000 --- a/precompiles/utils/macro/src/precompile/expand.rs +++ /dev/null @@ -1,488 +0,0 @@ -use super::*; - -impl Precompile { - /// Main expand function, which expands everything else. - pub fn expand(&self) -> impl ToTokens { - let enum_ = self.expand_enum_decl(); - let enum_impl = self.expand_enum_impl(); - let precomp_impl = self.expand_precompile_impl(); - let test_signature = self.expand_test_solidity_signature(); - - quote! { - #enum_ - #enum_impl - #precomp_impl - #test_signature - } - } - - /// Expands the call enum declaration. - pub fn expand_enum_decl(&self) -> impl ToTokens { - let enum_ident = &self.enum_ident; - let (_impl_generics, ty_generics, where_clause) = self.generics.split_for_impl(); - - let type_parameters = self.generics.type_params().map(|p| &p.ident); - - let variants: Vec<_> = self.variants_content.keys().collect(); - let idents: Vec> = self - .variants_content - .values() - .map(|v| v.arguments.iter().map(|a| &a.ident).collect()) - .collect(); - let types: Vec> = self - .variants_content - .values() - .map(|v| v.arguments.iter().map(|a| &a.ty).collect()) - .collect(); - - quote!( - #[allow(non_camel_case_types)] - pub enum #enum_ident #ty_generics #where_clause { - #( - #variants { - #( - #idents: #types - ),* - }, - )* - - #[doc(hidden)] - __phantom( - ::core::marker::PhantomData<( #( #type_parameters ),* )>, - ::core::convert::Infallible - ), - } - ) - } - - /// Expands the parse function for each variants. - pub fn expand_variants_parse_fn(&self) -> impl ToTokens { - let span = Span::call_site(); - - let fn_parse = self.variants_content.keys().map(Self::variant_ident_to_parse_fn); - - let modifier_check = self.variants_content.values().map(|variant| { - let modifier = match variant.modifier { - Modifier::NonPayable => "NonPayable", - Modifier::Payable => "Payable", - Modifier::View => "View", - }; - - let modifier = syn::Ident::new(modifier, span); - - quote!( - use ::precompile_utils::solidity::modifier::FunctionModifier; - use ::precompile_utils::evm::handle::PrecompileHandleExt; - handle.check_function_modifier(FunctionModifier::#modifier)?; - ) - }); - - let variant_parsing = self.variants_content.iter().map(|(variant_ident, variant)| { - Self::expand_variant_parsing_from_handle(variant_ident, variant) - }); - - quote!( - #( - fn #fn_parse( - handle: &mut impl PrecompileHandle - ) -> ::precompile_utils::EvmResult { - use ::precompile_utils::solidity::revert::InjectBacktrace; - - #modifier_check - #variant_parsing - } - )* - ) - } - - /// Generates the parsing code for a variant, reading the input from the handle and - /// parsing it using Reader. - fn expand_variant_parsing_from_handle( - variant_ident: &syn::Ident, - variant: &Variant, - ) -> impl ToTokens { - if variant.arguments.is_empty() { - quote!( Ok(Self::#variant_ident {})).to_token_stream() - } else { - use case::CaseExt; - - let args_parse = variant.arguments.iter().map(|arg| { - let ident = &arg.ident; - let span = ident.span(); - let name = ident.to_string().to_camel_lowercase(); - - quote_spanned!(span=> #ident: input.read().in_field(#name)?,) - }); - let args_count = variant.arguments.len(); - - quote!( - let mut input = handle.read_after_selector()?; - input.expect_arguments(#args_count)?; - - Ok(Self::#variant_ident { - #(#args_parse)* - }) - ) - .to_token_stream() - } - } - - /// Expands the call enum impl block. - pub fn expand_enum_impl(&self) -> impl ToTokens { - let enum_ident = &self.enum_ident; - let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl(); - - let match_selectors = self.selector_to_variant.keys(); - let match_selectors2 = self.selector_to_variant.keys(); - - let variants_parsing = self.expand_variants_parse_fn(); - - let variants_ident2: Vec<_> = self.variants_content.keys().collect(); - let variants_selectors_fn: Vec<_> = self - .variants_content - .keys() - .map(|name| format_ident!("{}_selectors", name)) - .collect(); - let variants_selectors: Vec<_> = - self.variants_content.values().map(|variant| &variant.selectors).collect(); - - let variants_list: Vec> = self - .variants_content - .values() - .map(|variant| variant.arguments.iter().map(|arg| &arg.ident).collect()) - .collect(); - - let variants_encode: Vec<_> = - self.variants_content.values().map(Self::expand_variant_encoding).collect(); - - let parse_call_data_fn = self.expand_enum_parse_call_data(); - let execute_fn = self.expand_enum_execute_fn(); - - quote!( - impl #impl_generics #enum_ident #ty_generics #where_clause { - #parse_call_data_fn - - #variants_parsing - - #execute_fn - - pub fn supports_selector(selector: u32) -> bool { - match selector { - #( - #match_selectors => true, - )* - _ => false, - } - } - - pub fn selectors() -> &'static [u32] { - &[#( - #match_selectors2 - ),*] - } - - #( - pub fn #variants_selectors_fn() -> &'static [u32] { - &[#( - #variants_selectors - ),*] - } - )* - - pub fn encode(self) -> ::sp_std::vec::Vec { - use ::precompile_utils::solidity::codec::Writer; - match self { - #( - Self::#variants_ident2 { #(#variants_list),* } => { - #variants_encode - }, - )* - Self::__phantom(_, _) => panic!("__phantom variant should not be used"), - } - } - } - - impl #impl_generics From<#enum_ident #ty_generics> for ::sp_std::vec::Vec - #where_clause - { - fn from(a: #enum_ident #ty_generics) -> ::sp_std::vec::Vec { - a.encode() - } - } - ) - } - - /// Expand the execute fn of the enum. - fn expand_enum_execute_fn(&self) -> impl ToTokens { - let impl_type = &self.impl_type; - - let variants_ident: Vec<_> = self.variants_content.keys().collect(); - - let variants_arguments: Vec> = self - .variants_content - .values() - .map(|variant| variant.arguments.iter().map(|arg| &arg.ident).collect()) - .collect(); - - // If there is no precompile set there is no discriminant. - let opt_discriminant_arg = self - .precompile_set_discriminant_type - .as_ref() - .map(|ty| quote!( discriminant: #ty,)); - - let variants_call = self.variants_content.iter().map(|(variant_ident, variant)| { - let arguments = variant.arguments.iter().map(|arg| &arg.ident); - - let output_span = variant.fn_output.span(); - let opt_discriminant_arg = - self.precompile_set_discriminant_fn.as_ref().map(|_| quote!(discriminant,)); - - let write_output = quote_spanned!(output_span=> - ::precompile_utils::solidity::encode_return_value(output?) - ); - - quote!( - let output = <#impl_type>::#variant_ident( - #opt_discriminant_arg - handle, - #(#arguments),* - ); - #write_output - ) - }); - - quote!( - pub fn execute( - self, - #opt_discriminant_arg - handle: &mut impl PrecompileHandle - ) -> ::precompile_utils::EvmResult<::fp_evm::PrecompileOutput> { - use ::precompile_utils::solidity::codec::Writer; - use ::fp_evm::{PrecompileOutput, ExitSucceed}; - - let output = match self { - #( - Self::#variants_ident { #(#variants_arguments),* } => { - #variants_call - }, - )* - Self::__phantom(_, _) => panic!("__phantom variant should not be used"), - }; - - Ok(PrecompileOutput { - exit_status: ExitSucceed::Returned, - output - }) - } - ) - } - - /// Expand how a variant can be Solidity encoded. - fn expand_variant_encoding(variant: &Variant) -> impl ToTokens { - match variant.selectors.first() { - Some(selector) => { - let write_arguments = variant.arguments.iter().map(|arg| { - let ident = &arg.ident; - let span = ident.span(); - quote_spanned!(span=> .write(#ident)) - }); - - quote!( - Writer::new_with_selector(#selector) - #(#write_arguments)* - .build() - ) - .to_token_stream() - }, - None => quote!(Default::default()).to_token_stream(), - } - } - - /// Expand the main parsing function that, based on the selector in the - /// input, dispatch the decoding to one of the variants parsing function. - fn expand_enum_parse_call_data(&self) -> impl ToTokens { - let selectors = self.selector_to_variant.keys(); - let parse_fn = self.selector_to_variant.values().map(Self::variant_ident_to_parse_fn); - - let match_fallback = match &self.fallback_to_variant { - Some(variant) => { - let parse_fn = Self::variant_ident_to_parse_fn(variant); - quote!(_ => Self::#parse_fn(handle),).to_token_stream() - }, - None => quote!( - Some(_) => Err(RevertReason::UnknownSelector.into()), - None => Err(RevertReason::read_out_of_bounds("selector").into()), - ) - .to_token_stream(), - }; - - quote!( - pub fn parse_call_data( - handle: &mut impl PrecompileHandle - ) -> ::precompile_utils::EvmResult { - use ::precompile_utils::solidity::revert::RevertReason; - - let input = handle.input(); - - let selector = input.get(0..4).map(|s| { - let mut buffer = [0u8; 4]; - buffer.copy_from_slice(s); - u32::from_be_bytes(buffer) - }); - - match selector { - #( - Some(#selectors) => Self::#parse_fn(handle), - )* - #match_fallback - } - } - ) - } - - fn variant_ident_to_parse_fn(ident: &syn::Ident) -> syn::Ident { - format_ident!("_parse_{}", ident) - } - - /// Expands the impl of the Precomile(Set) trait. - pub fn expand_precompile_impl(&self) -> impl ToTokens { - let impl_type = &self.impl_type; - let enum_ident = &self.enum_ident; - let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl(); - - if let Some(discriminant_fn) = &self.precompile_set_discriminant_fn { - let opt_pre_check = self.pre_check.as_ref().map(|ident| { - let span = ident.span(); - quote_spanned!(span=> - let _: () = <#impl_type>::#ident(discriminant, handle) - .map_err(|err| Some(err))?; - ) - }); - - quote!( - impl #impl_generics ::fp_evm::PrecompileSet for #impl_type #where_clause { - fn execute( - &self, - handle: &mut impl PrecompileHandle - ) -> Option<::precompile_utils::EvmResult<::fp_evm::PrecompileOutput>> { - use ::precompile_utils::precompile_set::DiscriminantResult; - - let discriminant = <#impl_type>::#discriminant_fn( - handle.code_address(), - handle.remaining_gas() - ); - - if let DiscriminantResult::Some(_, cost) | DiscriminantResult::None(cost) = discriminant { - let result = handle.record_cost(cost); - if let Err(e) = result { - return Some(Err(e.into())); - } - } - - let discriminant = match discriminant { - DiscriminantResult::Some(d, _) => d, - DiscriminantResult::None(cost) => return None, - DiscriminantResult::OutOfGas => return Some(Err(ExitError::OutOfGas.into())) - }; - - #opt_pre_check - - Some( - <#enum_ident #ty_generics>::parse_call_data(handle) - .and_then(|call| call.execute(discriminant, handle)) - ) - } - - fn is_precompile(&self, address: H160, gas: u64) -> ::fp_evm::IsPrecompileResult { - <#impl_type>::#discriminant_fn(address, gas).into() - } - } - ) - .to_token_stream() - } else { - let opt_pre_check = self.pre_check.as_ref().map(|ident| { - let span = ident.span(); - quote_spanned!(span=>let _: () = <#impl_type>::#ident(handle)?;) - }); - - quote!( - impl #impl_generics ::fp_evm::Precompile for #impl_type #where_clause { - fn execute( - handle: &mut impl PrecompileHandle - ) -> ::precompile_utils::EvmResult<::fp_evm::PrecompileOutput> { - #opt_pre_check - - <#enum_ident #ty_generics>::parse_call_data(handle)?.execute(handle) - } - } - ) - .to_token_stream() - } - } - - /// Expands the Solidity signature test. - /// The macro expands an "inner" function in all build profiles, which is - /// then called by a test in test profile. This allows to display errors that occurs in - /// the expansion of the test without having to build in test profile, which is usually - /// related to the use of a type parameter in one of the parsed parameters of a method. - pub fn expand_test_solidity_signature(&self) -> impl ToTokens { - let variant_test: Vec<_> = self - .variants_content - .iter() - .map(|(ident, variant)| { - let span = ident.span(); - - let solidity = &variant.solidity_arguments_type; - let name = ident.to_string(); - let types: Vec<_> = variant.arguments.iter().map(|arg| &arg.ty).collect(); - - quote_spanned!(span=> - assert_eq!( - #solidity, - <(#(#types,)*) as Codec>::signature(), - "{} function signature doesn't match (left: attribute, right: computed \ - from Rust types)", - #name - ); - ) - }) - .collect(); - - let test_name = format_ident!("__{}_test_solidity_signatures", self.impl_ident); - let inner_name = format_ident!("__{}_test_solidity_signatures_inner", self.impl_ident); - - if let Some(test_types) = &self.test_concrete_types { - let (impl_generics, _ty_generics, where_clause) = self.generics.split_for_impl(); - - quote!( - #[allow(non_snake_case)] - pub(crate) fn #inner_name #impl_generics () #where_clause { - use ::precompile_utils::solidity::Codec; - #(#variant_test)* - } - - #[test] - #[allow(non_snake_case)] - fn #test_name() { - #inner_name::< #(#test_types),* >(); - } - ) - .to_token_stream() - } else { - quote!( - #[allow(non_snake_case)] - pub(crate) fn #inner_name() { - use ::precompile_utils::solidity::Codec; - #(#variant_test)* - } - - #[test] - #[allow(non_snake_case)] - fn #test_name() { - #inner_name(); - } - ) - .to_token_stream() - } - } -} diff --git a/precompiles/utils/macro/src/precompile/mod.rs b/precompiles/utils/macro/src/precompile/mod.rs deleted file mode 100644 index 16f27c67..00000000 --- a/precompiles/utils/macro/src/precompile/mod.rs +++ /dev/null @@ -1,116 +0,0 @@ -use proc_macro::TokenStream; -use proc_macro2::Span; -use quote::{format_ident, quote, quote_spanned, ToTokens}; -use sha3::{Digest, Keccak256}; -use std::collections::BTreeMap; -use syn::{parse_macro_input, spanned::Spanned}; - -pub mod attr; -pub mod expand; -pub mod parse; - -pub fn main(_attr: TokenStream, item: TokenStream) -> TokenStream { - // Macro must be used on `impl` block. - let mut impl_item = parse_macro_input!(item as syn::ItemImpl); - - // We inspect the block to collect all the data we need for the - // expansion, and make various checks. - let precompile = match Precompile::try_from(&mut impl_item) { - Ok(p) => p, - Err(e) => return e.into_compile_error().into(), - }; - - // We generate additional code based on the collected data. - let new_items = precompile.expand(); - let output = quote!( - #impl_item - #new_items - ); - - output.into() -} - -struct Precompile { - /// Impl struct type. - impl_type: syn::Type, - - /// Impl struct ident. - impl_ident: syn::Ident, - - /// New parsing enum ident. - enum_ident: syn::Ident, - - /// Generic part that needs to also be used by the input enum. - generics: syn::Generics, - - /// Which selector corresponds to which variant of the input enum. - selector_to_variant: BTreeMap, - - /// Optional fallback function if no selector matches. - fallback_to_variant: Option, - - /// Describes the content of each variant based on the precompile methods. - variants_content: BTreeMap, - - /// Since being a precompile set implies lots of changes, we must know it early - /// in the form of an attribute on the impl block itself. - tagged_as_precompile_set: bool, - - /// Ident of the function returning the PrecompileSet discriminant. - precompile_set_discriminant_fn: Option, - - /// Type of the PrecompileSet discriminant. - precompile_set_discriminant_type: Option, - - /// When generating the selector test the data types might depend on type parameters. - /// The test thus need to be written using concrete types. - test_concrete_types: Option>, - - /// Ident of a function that performs a check before the call is dispatched to the proper - /// function. - pre_check: Option, -} - -#[derive(Debug, PartialEq, Eq)] -enum Modifier { - NonPayable, - Payable, - View, -} - -#[derive(Debug)] -struct Variant { - /// Description of the arguments of this method, which will also - /// be members of a struct variant. - arguments: Vec, - - /// String extracted from the selector attribute. - /// A unit test will be generated to check that this selector matches - /// the Rust arguments. - /// - /// > solidity::Codec trait allows to generate this string at runtime only. Thus - /// > it is required to write it manually in the selector attribute, and - /// > a unit test is generated to check it matches. - solidity_arguments_type: String, - - /// Modifier of the function. They are all exclusive and defaults to - /// `NonPayable`. - modifier: Modifier, - - /// Selectors of this function to be able to encode back the data. - /// Empty if it only the fallback function. - selectors: Vec, - - /// Output of the variant fn (for better error messages). - fn_output: syn::Type, -} - -#[derive(Debug)] -struct Argument { - /// Identifier of the argument, which will be used in the struct variant. - ident: syn::Ident, - - /// Type of the argument, which will be used in the struct variant and - /// to parse the input. - ty: syn::Type, -} diff --git a/precompiles/utils/macro/src/precompile/parse.rs b/precompiles/utils/macro/src/precompile/parse.rs deleted file mode 100644 index 7189bc95..00000000 --- a/precompiles/utils/macro/src/precompile/parse.rs +++ /dev/null @@ -1,595 +0,0 @@ -use super::*; - -impl Precompile { - /// Try to extract information out of an annotated `impl` block. - pub fn try_from(impl_: &mut syn::ItemImpl) -> syn::Result { - // Extract the name of the type used in the `impl` block. - let impl_ident = Self::extract_impl_ident(impl_)?; - let enum_ident = format_ident!("{}Call", impl_ident); - - // We setup the data collection struct. - let mut precompile = Precompile { - impl_type: impl_.self_ty.as_ref().clone(), - impl_ident, - enum_ident, - generics: impl_.generics.clone(), - selector_to_variant: BTreeMap::new(), - variants_content: BTreeMap::new(), - fallback_to_variant: None, - tagged_as_precompile_set: false, - precompile_set_discriminant_fn: None, - precompile_set_discriminant_type: None, - test_concrete_types: None, - pre_check: None, - }; - - precompile.process_impl_attr(impl_)?; - for mut item in &mut impl_.items { - // We only interact with methods and leave the rest as-is. - if let syn::ImplItem::Method(ref mut method) = &mut item { - precompile.process_method(method)?; - } - } - - // Check constraint of PrecompileSet. - if precompile.tagged_as_precompile_set - && precompile.precompile_set_discriminant_fn.is_none() - { - let msg = "A PrecompileSet must have exactly one function tagged with \ - `#[precompile::discriminant]`"; - return Err(syn::Error::new(Span::call_site(), msg)); - } - - Ok(precompile) - } - - /// Process the attributes used on the `impl` block, which allows to declare - /// if it is a PrecompileSet or not, and to provide concrete types for tests if necessary. - fn process_impl_attr(&mut self, impl_: &mut syn::ItemImpl) -> syn::Result<()> { - let attrs = attr::take_attributes::(&mut impl_.attrs)?; - - for attr in attrs { - match attr { - attr::ImplAttr::PrecompileSet(_) => { - self.tagged_as_precompile_set = true; - }, - attr::ImplAttr::TestConcreteTypes(span, types) => { - if types.len() != self.generics.params.len() { - let msg = "The amount of types should match the amount of type parameters \ - of the impl block"; - return Err(syn::Error::new(span, msg)); - } - - if self.test_concrete_types.is_some() { - let msg = "Only one set of types can be provided to generate tests"; - return Err(syn::Error::new(span, msg)); - } - - self.test_concrete_types = Some(types); - }, - } - } - - Ok(()) - } - - /// Extract the ident of the type of the `impl` block. - /// This ident is used to generate new idents such as the name of the Call enum and - /// the Solidity selector test. - fn extract_impl_ident(impl_: &syn::ItemImpl) -> syn::Result { - let type_path = match impl_.self_ty.as_ref() { - syn::Type::Path(p) => p, - _ => { - let msg = "The type in the impl block must be a path, like `Precompile` or - `example::Precompile`"; - return Err(syn::Error::new(impl_.self_ty.span(), msg)); - }, - }; - - let final_path = type_path.path.segments.last().ok_or_else(|| { - let msg = "The type path must be non empty."; - syn::Error::new(impl_.self_ty.span(), msg) - })?; - - Ok(final_path.ident.clone()) - } - - /// Process a single method, looking for attributes and checking mandatory parameters. - fn process_method(&mut self, method: &mut syn::ImplItemMethod) -> syn::Result<()> { - // Take (remove) all attributes related to this macro. - let attrs = attr::take_attributes::(&mut method.attrs)?; - - // If there are no attributes it is a private function and we ignore it. - if attrs.is_empty() { - return Ok(()); - } - - // A method cannot have modifiers if it isn't a fallback and/or doesn't have a selector. - let mut used = false; - - let method_name = method.sig.ident.clone(); - let mut modifier = Modifier::NonPayable; - let mut solidity_arguments_type: Option = None; - let mut arguments = vec![]; - let mut is_fallback = false; - let mut selectors = vec![]; - let initial_arguments = if self.tagged_as_precompile_set { 2 } else { 1 }; - - // We first look for unique attributes. - if let Some(attr::MethodAttr::Discriminant(span)) = attrs.first() { - let span = *span; - - if attrs.len() != 1 { - let msg = "The discriminant attribute must be the only precompile attribute of \ - a function"; - return Err(syn::Error::new(span, msg)); - } - - return self.parse_discriminant_fn(span, method); - } - - if let Some(attr::MethodAttr::PreCheck(span)) = attrs.first() { - let span = *span; - - if attrs.len() != 1 { - let msg = "The pre_check attribute must be the only precompile attribute of \ - a function"; - return Err(syn::Error::new(span, msg)); - } - - return self.parse_pre_check_fn(span, method); - } - - // We iterate over all attributes of the method. - for attr in attrs { - match attr { - attr::MethodAttr::Discriminant(span) => { - let msg = "The discriminant attribute must be the only precompile \ - attribute of the function"; - return Err(syn::Error::new(span, msg)); - }, - attr::MethodAttr::PreCheck(span) => { - let msg = "The pre_check attribute must be the only precompile \ - attribute of the function"; - return Err(syn::Error::new(span, msg)); - }, - attr::MethodAttr::Fallback(span) => { - if self.fallback_to_variant.is_some() { - let msg = "A precompile can only have 1 fallback function"; - return Err(syn::Error::new(span, msg)); - } - - self.fallback_to_variant = Some(method_name.clone()); - used = true; - is_fallback = true; - }, - attr::MethodAttr::Payable(span) => { - if modifier != Modifier::NonPayable { - let msg = - "A precompile method can have at most one modifier (payable, view)"; - return Err(syn::Error::new(span, msg)); - } - - modifier = Modifier::Payable; - }, - attr::MethodAttr::View(span) => { - if modifier != Modifier::NonPayable { - let msg = - "A precompile method can have at most one modifier (payable, view)"; - return Err(syn::Error::new(span, msg)); - } - - modifier = Modifier::View; - }, - attr::MethodAttr::Public(_, signature_lit) => { - used = true; - - let selector = self.parse_public_attr( - signature_lit, - &method_name, - &mut solidity_arguments_type, - )?; - selectors.push(selector); - }, - } - } - - // A method cannot have attributes without being public or fallback. - if !used { - let msg = - "A precompile method cannot have modifiers without being a fallback or having\ - a `public` attribute"; - return Err(syn::Error::new(method.span(), msg)); - } - - // We forbid type parameters. - if let Some(param) = method.sig.generics.params.first() { - let msg = "Exposed precompile methods cannot have type parameters"; - return Err(syn::Error::new(param.span(), msg)); - } - - // Fallback method cannot have custom parameters. - if is_fallback { - if let Some(input) = method.sig.inputs.iter().skip(initial_arguments).next() { - let msg = if self.tagged_as_precompile_set { - "Fallback methods cannot take any parameter outside of the discriminant and \ - PrecompileHandle" - } else { - "Fallback methods cannot take any parameter outside of the PrecompileHandle" - }; - - return Err(syn::Error::new(input.span(), msg)); - } - } - - let mut method_inputs = method.sig.inputs.iter(); - - // We check the first parameters of the method. - // If this is a PrecompileSet it will look for a discriminant. - // Then for all precompile(set)s it will look for the PrecompileHandle. - // We take them from the iterator such that we are only left with the - // custom arguments. - self.check_initial_parameters(&mut method_inputs, method.sig.span())?; - - // We go through each parameter to collect each name and type that will be used to - // generate the input enum and parse the call data. - for input in method_inputs { - let input = match input { - syn::FnArg::Typed(t) => t, - _ => { - // I don't think it is possible to encounter this error since a self receiver - // seems to only be possible in the first position which is checked in - // `check_initial_parameters`. - let msg = "Exposed precompile methods cannot have a `self` parameter"; - return Err(syn::Error::new(input.span(), msg)); - }, - }; - - let msg = "Parameter must be of the form `name: Type`, optionally prefixed by `mut`"; - let ident = match input.pat.as_ref() { - syn::Pat::Ident(pat) => { - if pat.by_ref.is_some() || pat.subpat.is_some() { - return Err(syn::Error::new(pat.span(), msg)); - } - - pat.ident.clone() - }, - _ => return Err(syn::Error::new(input.pat.span(), msg)), - }; - let ty = input.ty.as_ref().clone(); - self.check_type_parameter_usage(&ty)?; - - arguments.push(Argument { ident, ty }) - } - - // Function output. - let output_type = match &method.sig.output { - syn::ReturnType::Type(_, t) => t, - _ => { - let msg = "A precompile method must have a return type of `EvmResult<_>` (exposed \ - by `precompile_utils`)"; - return Err(syn::Error::new(method.sig.span(), msg)); - }, - }; - - // We insert the collected data in self. - if let Some(_) = self.variants_content.insert( - method_name.clone(), - Variant { - arguments, - solidity_arguments_type: solidity_arguments_type.unwrap_or(String::from("()")), - modifier, - selectors, - fn_output: output_type.as_ref().clone(), - }, - ) { - let msg = "Duplicate method name"; - return Err(syn::Error::new(method_name.span(), msg)); - } - - Ok(()) - } - - /// Check the initial parameters of most methods of a Precompile(Set). - fn check_initial_parameters<'a>( - &mut self, - method_inputs: &mut impl Iterator, - method_span: Span, - ) -> syn::Result<()> { - // Discriminant input - if self.tagged_as_precompile_set { - let input = match method_inputs.next() { - Some(a) => a, - None => { - let msg = "PrecompileSet methods must have at least 2 parameters (the \ - precompile instance discriminant and the PrecompileHandle)"; - return Err(syn::Error::new(method_span, msg)); - }, - }; - - let input = match input { - syn::FnArg::Typed(a) => a, - _ => { - let msg = "self is not allowed in precompile methods"; - return Err(syn::Error::new(input.span(), msg)); - }, - }; - - let input_type = input.ty.as_ref(); - - self.try_register_discriminant_type(&input_type)?; - } - - // Precompile handle input - { - let input = match method_inputs.next() { - Some(a) => a, - None => { - let msg = if self.tagged_as_precompile_set { - "PrecompileSet methods must have at least 2 parameters (the precompile \ - instance discriminant and the PrecompileHandle)" - } else { - "Precompile methods must have at least 1 parameter (the PrecompileHandle)" - }; - - return Err(syn::Error::new(method_span, msg)); - }, - }; - - let input = match input { - syn::FnArg::Typed(a) => a, - _ => { - let msg = "self is not allowed in precompile methods"; - return Err(syn::Error::new(input.span(), msg)); - }, - }; - - let input_type = input.ty.as_ref(); - - if !is_same_type(&input_type, &syn::parse_quote! {&mut impl PrecompileHandle}) { - let msg = "This parameter must have type `&mut impl PrecompileHandle`"; - return Err(syn::Error::new(input_type.span(), msg)); - } - } - - Ok(()) - } - - /// Records the type of the discriminant and ensure they all have the same type. - fn try_register_discriminant_type(&mut self, ty: &syn::Type) -> syn::Result<()> { - if let Some(known_type) = &self.precompile_set_discriminant_type { - if !is_same_type(&known_type, &ty) { - let msg = format!( - "All discriminants must have the same type (found {} before)", - known_type.to_token_stream() - ); - return Err(syn::Error::new(ty.span(), msg)); - } - } else { - self.precompile_set_discriminant_type = Some(ty.clone()); - } - - Ok(()) - } - - /// Process the discriminant function. - fn parse_discriminant_fn( - &mut self, - span: Span, - method: &syn::ImplItemMethod, - ) -> syn::Result<()> { - if !self.tagged_as_precompile_set { - let msg = "The impl block must be tagged with `#[precompile::precompile_set]` for - the discriminant attribute to be used"; - return Err(syn::Error::new(span, msg)); - } - - if self.precompile_set_discriminant_fn.is_some() { - let msg = "A PrecompileSet can only have 1 discriminant function"; - return Err(syn::Error::new(span, msg)); - } - - let span = method.sig.span(); - - if method.sig.inputs.len() != 2 { - let msg = "The discriminant function must only take code address (H160) and \ - remaining gas (u64) as parameters."; - return Err(syn::Error::new(span, msg)); - } - - let msg = "The discriminant function must return an DiscriminantResult<_> (no type alias)"; - - let return_type = match &method.sig.output { - syn::ReturnType::Type(_, t) => t.as_ref(), - _ => return Err(syn::Error::new(span, msg)), - }; - - let return_path = match return_type { - syn::Type::Path(p) => p, - _ => return Err(syn::Error::new(span, msg)), - }; - - if return_path.qself.is_some() { - return Err(syn::Error::new(span, msg)); - } - - let return_path = &return_path.path; - - if return_path.leading_colon.is_some() || return_path.segments.len() != 1 { - return Err(syn::Error::new(span, msg)); - } - - let return_segment = &return_path.segments[0]; - - if return_segment.ident.to_string() != "DiscriminantResult" { - return Err(syn::Error::new(return_segment.ident.span(), msg)); - } - - let result_arguments = match &return_segment.arguments { - syn::PathArguments::AngleBracketed(args) => args, - _ => return Err(syn::Error::new(return_segment.ident.span(), msg)), - }; - - if result_arguments.args.len() != 1 { - let msg = "DiscriminantResult type should only have 1 type argument"; - return Err(syn::Error::new(result_arguments.args.span(), msg)); - } - - let discriminant_type: &syn::Type = match &result_arguments.args[0] { - syn::GenericArgument::Type(t) => t, - _ => return Err(syn::Error::new(result_arguments.args.span(), msg)), - }; - - self.try_register_discriminant_type(&discriminant_type)?; - - self.precompile_set_discriminant_fn = Some(method.sig.ident.clone()); - - Ok(()) - } - - /// Process the pre_check function. - fn parse_pre_check_fn(&mut self, span: Span, method: &syn::ImplItemMethod) -> syn::Result<()> { - if self.pre_check.is_some() { - let msg = "A Precompile can only have 1 pre_check function"; - return Err(syn::Error::new(span, msg)); - } - - let span = method.sig.span(); - - let mut method_inputs = method.sig.inputs.iter(); - - self.check_initial_parameters(&mut method_inputs, span)?; - - if method_inputs.next().is_some() { - let msg = if self.tagged_as_precompile_set { - "PrecompileSet pre_check method must have exactly 2 parameters (the precompile \ - instance discriminant and the PrecompileHandle)" - } else { - "Precompile pre_check method must have exactly 1 parameter (the \ - PrecompileHandle)" - }; - - return Err(syn::Error::new(span, msg)); - } - - self.pre_check = Some(method.sig.ident.clone()); - - Ok(()) - } - - /// Process a `public` attribute on a method. - fn parse_public_attr( - &mut self, - signature_lit: syn::LitStr, - method_name: &syn::Ident, - solidity_arguments_type: &mut Option, - ) -> syn::Result { - let signature = signature_lit.value(); - // Split signature to get arguments type. - let split: Vec<_> = signature.splitn(2, "(").collect(); - if split.len() != 2 { - let msg = "Selector must have form \"foo(arg1,arg2,...)\""; - return Err(syn::Error::new(signature_lit.span(), msg)); - } - - let local_args_type = format!("({}", split[1]); // add back initial parenthesis - - // If there are multiple public attributes we check that they all have - // the same type. - if let Some(ref args_type) = solidity_arguments_type { - if args_type != &local_args_type { - let msg = "Method cannot have selectors with different types."; - return Err(syn::Error::new(signature_lit.span(), msg)); - } - } else { - *solidity_arguments_type = Some(local_args_type); - } - - // Compute the 4-bytes selector. - let digest = Keccak256::digest(signature.as_bytes()); - let selector = u32::from_be_bytes([digest[0], digest[1], digest[2], digest[3]]); - - if let Some(previous) = self.selector_to_variant.insert(selector, method_name.clone()) { - let msg = format!("Selector collision with method {}", previous.to_string()); - return Err(syn::Error::new(signature_lit.span(), msg)); - } - - Ok(selector) - } - - /// Check that the provided type doesn't depend on one of the type parameters of the - /// precompile. Check is skipped if `test_concrete_types` attribute is used. - fn check_type_parameter_usage(&self, ty: &syn::Type) -> syn::Result<()> { - if self.test_concrete_types.is_some() { - return Ok(()); - } - - const ERR_MESSAGE: &'static str = - "impl type parameter is used in functions arguments. Arguments should not have a type -depending on a type parameter, unless it is a length bound for BoundedBytes, -BoundedString or alike, which doesn't affect the Solidity type. - -In that case, you must add a #[precompile::test_concrete_types(...)] attribute on the impl -block to provide concrete types that will be used to run the automatically generated tests -ensuring the Solidity function signatures are correct."; - - match ty { - syn::Type::Array(syn::TypeArray { elem, .. }) - | syn::Type::Group(syn::TypeGroup { elem, .. }) - | syn::Type::Paren(syn::TypeParen { elem, .. }) - | syn::Type::Reference(syn::TypeReference { elem, .. }) - | syn::Type::Ptr(syn::TypePtr { elem, .. }) - | syn::Type::Slice(syn::TypeSlice { elem, .. }) => self.check_type_parameter_usage(&elem)?, - - syn::Type::Path(syn::TypePath { path: syn::Path { segments, .. }, .. }) => { - let impl_params: Vec<_> = self - .generics - .params - .iter() - .filter_map(|param| match param { - syn::GenericParam::Type(syn::TypeParam { ident, .. }) => Some(ident), - _ => None, - }) - .collect(); - - for segment in segments { - if impl_params.contains(&&segment.ident) { - return Err(syn::Error::new(segment.ident.span(), ERR_MESSAGE)); - } - - if let syn::PathArguments::AngleBracketed(args) = &segment.arguments { - let types = args.args.iter().filter_map(|arg| match arg { - syn::GenericArgument::Type(ty) - | syn::GenericArgument::Binding(syn::Binding { ty, .. }) => Some(ty), - _ => None, - }); - - for ty in types { - self.check_type_parameter_usage(&ty)?; - } - } - } - }, - syn::Type::Tuple(tuple) => { - for ty in tuple.elems.iter() { - self.check_type_parameter_usage(ty)?; - } - }, - // BareFn => very unlikely this appear as parameter - // ImplTrait => will cause other errors, it must be a concrete type - // TypeInfer => it must be explicit concrete types since it ends up in enum fields - // Macro => Cannot check easily - // Never => Function will not be callable. - ty => println!("Skipping type parameter check for non supported kind of type: {ty:?}"), - } - - Ok(()) - } -} - -/// Helper to check 2 types are equal. -/// Having a function with explicit type annotation helps type inference at callsite, -/// which have trouble if `==` is used inline. -fn is_same_type(a: &syn::Type, b: &syn::Type) -> bool { - a == b -} diff --git a/precompiles/utils/macro/src/precompile_name_from_address.rs b/precompiles/utils/macro/src/precompile_name_from_address.rs deleted file mode 100644 index dc1d92a0..00000000 --- a/precompiles/utils/macro/src/precompile_name_from_address.rs +++ /dev/null @@ -1,114 +0,0 @@ -use super::*; -use syn::{GenericArgument, Type}; - -pub fn main(_: TokenStream, input: TokenStream) -> TokenStream { - let item = parse_macro_input!(input as ItemType); - - let ItemType { attrs, vis, type_token, ident, generics, eq_token, ty, semi_token } = item; - - if let Type::Tuple(ref type_tuple) = *ty { - let variants: Vec<(Ident, u64)> = - type_tuple.elems.iter().filter_map(extract_precompile_name_and_prefix).collect(); - - let ident_expressions: Vec<&Ident> = variants.iter().map(|(ident, _)| ident).collect(); - let variant_expressions: Vec<&u64> = variants.iter().map(|(_, id)| id).collect(); - - (quote! { - #(#attrs)* - #vis #type_token #ident #generics #eq_token #ty #semi_token - - #[derive(num_enum::TryFromPrimitive, num_enum::IntoPrimitive, Debug)] - #[repr(u64)] - pub enum PrecompileName { - #( - #ident_expressions = #variant_expressions, - )* - } - - impl PrecompileName { - pub fn from_address(address: sp_core::H160) -> Option { - let _u64 = address.to_low_u64_be(); - if address == sp_core::H160::from_low_u64_be(_u64) { - use num_enum::TryFromPrimitive; - Self::try_from_primitive(_u64).ok() - } else { - None - } - } - } - }) - .into() - } else { - return quote_spanned! { - ty.span() => compile_error!("Expected tuple"); - } - .into(); - } -} - -fn extract_precompile_name_and_prefix(type_: &Type) -> Option<(Ident, u64)> { - match type_ { - Type::Path(type_path) => { - if let Some(path_segment) = type_path.path.segments.last() { - match path_segment.ident.to_string().as_ref() { - "PrecompileAt" => { - extract_precompile_name_and_prefix_for_precompile_at(path_segment) - }, - _ => None, - } - } else { - None - } - }, - _ => None, - } -} - -fn extract_precompile_name_and_prefix_for_precompile_at( - path_segment: &syn::PathSegment, -) -> Option<(Ident, u64)> { - if let syn::PathArguments::AngleBracketed(generics) = &path_segment.arguments { - let mut iter = generics.args.iter(); - if let ( - Some(GenericArgument::Type(Type::Path(type_path_1))), - Some(GenericArgument::Type(Type::Path(type_path_2))), - ) = (iter.next(), iter.next()) - { - if let (Some(path_segment_1), Some(path_segment_2)) = - (type_path_1.path.segments.last(), type_path_2.path.segments.last()) - { - if let syn::PathArguments::AngleBracketed(generics_) = &path_segment_1.arguments { - if let Some(GenericArgument::Const(Expr::Lit(lit))) = generics_.args.first() { - if let Lit::Int(int) = &lit.lit { - if let Ok(precompile_id) = int.base10_parse() { - if &path_segment_2.ident.to_string() == "CollectivePrecompile" { - if let Some(instance_ident) = - precompile_instance_ident(&path_segment_2) - { - return Some((instance_ident, precompile_id)); - } - } else { - return Some((path_segment_2.ident.clone(), precompile_id)); - } - } - } - } - } - } - } - } - - None -} - -fn precompile_instance_ident(path_segment: &syn::PathSegment) -> Option { - if let syn::PathArguments::AngleBracketed(generics_) = &path_segment.arguments { - if let Some(GenericArgument::Type(Type::Path(instance_type_path))) = generics_.args.last() { - if let Some(instance_type) = instance_type_path.path.segments.last() { - return Some(instance_type.ident.clone()); - } - } - } - - None -} diff --git a/precompiles/utils/src/data/bytes.rs b/precompiles/utils/src/data/bytes.rs deleted file mode 100644 index 87fa45bb..00000000 --- a/precompiles/utils/src/data/bytes.rs +++ /dev/null @@ -1,176 +0,0 @@ -use super::*; - -type ConstU32Max = ConstU32<{ u32::MAX }>; - -pub type UnboundedBytes = BoundedBytesString; -pub type BoundedBytes = BoundedBytesString; - -pub type UnboundedString = BoundedBytesString; -pub type BoundedString = BoundedBytesString; - -trait Kind { - fn solidity_type() -> String; -} - -#[derive(Clone, Debug, Eq, PartialEq)] -pub struct BytesKind; - -impl Kind for BytesKind { - fn solidity_type() -> String { - String::from("bytes") - } -} - -#[derive(Clone, Debug, Eq, PartialEq)] -pub struct StringKind; - -impl Kind for StringKind { - fn solidity_type() -> String { - String::from("string") - } -} - -/// The `bytes/string` type of Solidity. -/// It is different from `Vec` which will be serialized with padding for each `u8` element -/// of the array, while `Bytes` is tightly packed. -#[derive(Debug)] -pub struct BoundedBytesString { - data: Vec, - _phantom: PhantomData<(K, S)>, -} - -impl> Clone for BoundedBytesString { - fn clone(&self) -> Self { - Self { data: self.data.clone(), _phantom: PhantomData } - } -} - -impl PartialEq> for BoundedBytesString { - fn eq(&self, other: &BoundedBytesString) -> bool { - self.data.eq(&other.data) - } -} - -impl Eq for BoundedBytesString {} - -impl> BoundedBytesString { - pub fn as_bytes(&self) -> &[u8] { - &self.data - } - - pub fn as_str(&self) -> Result<&str, sp_std::str::Utf8Error> { - sp_std::str::from_utf8(&self.data) - } -} - -impl> EvmData for BoundedBytesString { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let mut inner_reader = reader.read_pointer()?; - - // Read bytes/string size. - let array_size: usize = inner_reader - .read::() - .map_err(|_| RevertReason::read_out_of_bounds("length"))? - .try_into() - .map_err(|_| RevertReason::value_is_too_large("length"))?; - - if array_size > S::get() as usize { - return Err(RevertReason::value_is_too_large("length").into()); - } - - // Get valid range over the bytes data. - let range = inner_reader.move_cursor(array_size)?; - - let data = inner_reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds(K::solidity_type()))?; - - let bytes = Self { data: data.to_owned(), _phantom: PhantomData }; - - Ok(bytes) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - let value: Vec<_> = value.into(); - let length = value.len(); - - // Pad the data. - // Leave it as is if a multiple of 32, otherwise pad to next - // multiple or 32. - let chunks = length / 32; - let padded_size = match length % 32 { - 0 => chunks * 32, - _ => (chunks + 1) * 32, - }; - - let mut value = value.to_vec(); - value.resize(padded_size, 0); - - writer.write_pointer( - EvmDataWriter::new().write(U256::from(length)).write_raw_bytes(&value).build(), - ); - } - - fn has_static_size() -> bool { - false - } - - fn solidity_type() -> String { - K::solidity_type() - } -} - -// BytesString <=> Vec/&[u8] - -impl From> for Vec { - fn from(value: BoundedBytesString) -> Self { - value.data - } -} - -impl From> for BoundedBytesString { - fn from(value: Vec) -> Self { - Self { data: value, _phantom: PhantomData } - } -} - -impl From<&[u8]> for BoundedBytesString { - fn from(value: &[u8]) -> Self { - Self { data: value.to_vec(), _phantom: PhantomData } - } -} - -impl From<[u8; N]> for BoundedBytesString { - fn from(value: [u8; N]) -> Self { - Self { data: value.to_vec(), _phantom: PhantomData } - } -} - -impl From<&[u8; N]> for BoundedBytesString { - fn from(value: &[u8; N]) -> Self { - Self { data: value.to_vec(), _phantom: PhantomData } - } -} - -// BytesString <=> String/str - -impl TryFrom> for String { - type Error = alloc::string::FromUtf8Error; - - fn try_from(value: BoundedBytesString) -> Result { - alloc::string::String::from_utf8(value.data) - } -} - -impl From<&str> for BoundedBytesString { - fn from(value: &str) -> Self { - Self { data: value.as_bytes().into(), _phantom: PhantomData } - } -} - -impl From for BoundedBytesString { - fn from(value: String) -> Self { - Self { data: value.as_bytes().into(), _phantom: PhantomData } - } -} diff --git a/precompiles/utils/src/data/mod.rs b/precompiles/utils/src/data/mod.rs deleted file mode 100644 index 7b9a6655..00000000 --- a/precompiles/utils/src/data/mod.rs +++ /dev/null @@ -1,377 +0,0 @@ -pub mod bytes; -pub mod native; - -pub use affix::paste; -pub use alloc::string::String; -pub use bytes::*; -pub use native::*; - -use crate::revert::{InjectBacktrace, MayRevert, RevertReason}; -use alloc::borrow::ToOwned; -use core::{any::type_name, marker::PhantomData, ops::Range}; -use frame_support::traits::{ConstU32, Get}; -use impl_trait_for_tuples::impl_for_tuples; -use sp_core::{H160, H256, U256}; -use sp_std::{convert::TryInto, vec, vec::Vec}; - -/// Data that can be converted from and to EVM data types. -pub trait EvmData: Sized { - fn read(reader: &mut EvmDataReader) -> MayRevert; - fn write(writer: &mut EvmDataWriter, value: Self); - fn has_static_size() -> bool; - fn solidity_type() -> String; - fn is_explicit_tuple() -> bool { - false - } -} - -/// Wrapper around an EVM input slice, helping to parse it. -/// Provide functions to parse common types. -#[derive(Clone, Copy, Debug)] -pub struct EvmDataReader<'a> { - input: &'a [u8], - cursor: usize, -} - -impl<'a> EvmDataReader<'a> { - /// Create a new input parser. - pub fn new(input: &'a [u8]) -> Self { - Self { input, cursor: 0 } - } - - /// Create a new input parser from a selector-initial input. - pub fn read_selector(input: &'a [u8]) -> MayRevert - where - T: num_enum::TryFromPrimitive, - { - if input.len() < 4 { - return Err(RevertReason::read_out_of_bounds("selector").into()); - } - - let mut buffer = [0u8; 4]; - buffer.copy_from_slice(&input[0..4]); - let selector = T::try_from_primitive(u32::from_be_bytes(buffer)).map_err(|_| { - log::trace!( - target: "precompile-utils", - "Failed to match function selector for {}", - type_name::() - ); - RevertReason::UnknownSelector - })?; - - Ok(selector) - } - - /// Read selector as u32 - pub fn read_u32_selector(input: &'a [u8]) -> MayRevert { - if input.len() < 4 { - return Err(RevertReason::read_out_of_bounds("selector").into()); - } - - let mut buffer = [0u8; 4]; - buffer.copy_from_slice(&input[0..4]); - - Ok(u32::from_be_bytes(buffer)) - } - - /// Create a new input parser from a selector-initial input. - pub fn new_skip_selector(input: &'a [u8]) -> MayRevert { - if input.len() < 4 { - return Err(RevertReason::read_out_of_bounds("selector").into()); - } - - Ok(Self::new(&input[4..])) - } - - /// Check the input has at least the correct amount of arguments before the end (32 bytes - /// values). - pub fn expect_arguments(&self, args: usize) -> MayRevert<()> { - if self.input.len() >= self.cursor + args * 32 { - Ok(()) - } else { - Err(RevertReason::ExpectedAtLeastNArguments(args).into()) - } - } - - /// Read data from the input. - pub fn read(&mut self) -> MayRevert { - T::read(self) - } - - /// Read raw bytes from the input. - /// Doesn't handle any alignment checks, prefer using `read` instead of possible. - /// Returns an error if trying to parse out of bounds. - pub fn read_raw_bytes(&mut self, len: usize) -> MayRevert<&[u8]> { - let range = self.move_cursor(len)?; - - let data = self - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("raw bytes"))?; - - Ok(data) - } - - /// Reads a pointer, returning a reader targetting the pointed location. - pub fn read_pointer(&mut self) -> MayRevert { - let offset: usize = self - .read::() - .map_err(|_| RevertReason::read_out_of_bounds("pointer"))? - .try_into() - .map_err(|_| RevertReason::value_is_too_large("pointer"))?; - - if offset >= self.input.len() { - return Err(RevertReason::PointerToOutofBound.into()); - } - - Ok(Self { input: &self.input[offset..], cursor: 0 }) - } - - /// Read remaining bytes - pub fn read_till_end(&mut self) -> MayRevert<&[u8]> { - let range = self.move_cursor(self.input.len() - self.cursor)?; - - let data = self - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("raw bytes"))?; - - Ok(data) - } - - /// Move the reading cursor with provided length, and return a range from the previous cursor - /// location to the new one. - /// Checks cursor overflows. - fn move_cursor(&mut self, len: usize) -> MayRevert> { - let start = self.cursor; - let end = self.cursor.checked_add(len).ok_or_else(|| RevertReason::CursorOverflow)?; - - self.cursor = end; - - Ok(start..end) - } -} - -/// Help build an EVM input/output data. -/// -/// Functions takes `self` to allow chaining all calls like -/// `EvmDataWriter::new().write(...).write(...).build()`. -/// While it could be more ergonomic to take &mut self, this would -/// prevent to have a `build` function that don't clone the output. -#[derive(Clone, Debug)] -pub struct EvmDataWriter { - pub(crate) data: Vec, - offset_data: Vec, - selector: Option, -} - -#[derive(Clone, Debug)] -struct OffsetDatum { - // Offset location in the container data. - offset_position: usize, - // Data pointed by the offset that must be inserted at the end of container data. - data: Vec, - // Inside of arrays, the offset is not from the start of array data (length), but from the - // start of the item. This shift allow to correct this. - offset_shift: usize, -} - -impl EvmDataWriter { - /// Creates a new empty output builder (without selector). - pub fn new() -> Self { - Self { data: vec![], offset_data: vec![], selector: None } - } - - /// Creates a new empty output builder with provided selector. - /// Selector will only be appended before the data when calling - /// `build` to not mess with the offsets. - pub fn new_with_selector(selector: impl Into) -> Self { - Self { data: vec![], offset_data: vec![], selector: Some(selector.into()) } - } - - /// Return the built data. - pub fn build(mut self) -> Vec { - Self::bake_offsets(&mut self.data, self.offset_data); - - if let Some(selector) = self.selector { - let mut output = selector.to_be_bytes().to_vec(); - output.append(&mut self.data); - output - } else { - self.data - } - } - - /// Add offseted data at the end of this writer's data, updating the offsets. - fn bake_offsets(output: &mut Vec, offsets: Vec) { - for mut offset_datum in offsets { - let offset_position = offset_datum.offset_position; - let offset_position_end = offset_position + 32; - - // The offset is the distance between the start of the data and the - // start of the pointed data (start of a struct, length of an array). - // Offsets in inner data are relative to the start of their respective "container". - // However in arrays the "container" is actually the item itself instead of the whole - // array, which is corrected by `offset_shift`. - let free_space_offset = output.len() - offset_datum.offset_shift; - - // Override dummy offset to the offset it will be in the final output. - U256::from(free_space_offset) - .to_big_endian(&mut output[offset_position..offset_position_end]); - - // Append this data at the end of the current output. - output.append(&mut offset_datum.data); - } - } - - /// Write arbitrary bytes. - /// Doesn't handle any alignement checks, prefer using `write` instead if possible. - fn write_raw_bytes(mut self, value: &[u8]) -> Self { - self.data.extend_from_slice(value); - self - } - - /// Write data of requested type. - pub fn write(mut self, value: T) -> Self { - T::write(&mut self, value); - self - } - - /// Writes a pointer to given data. - /// The data will be appended when calling `build`. - /// Initially write a dummy value as offset in this writer's data, which will be replaced by - /// the correct offset once the pointed data is appended. - /// - /// Takes `&mut self` since its goal is to be used inside `EvmData` impl and not in chains. - pub fn write_pointer(&mut self, data: Vec) { - let offset_position = self.data.len(); - H256::write(self, H256::repeat_byte(0xff)); - - self.offset_data.push(OffsetDatum { offset_position, data, offset_shift: 0 }); - } -} - -impl Default for EvmDataWriter { - fn default() -> Self { - Self::new() - } -} - -/// Adapter to parse data as a first type then convert it to another one. -/// Useful for old precompiles in which Solidity arguments where set larger than -/// the needed Rust type. -#[derive(Clone, Copy, Debug)] -pub struct SolidityConvert { - inner: C, - _phantom: PhantomData

, -} - -impl From for SolidityConvert { - fn from(value: C) -> Self { - Self { inner: value, _phantom: PhantomData } - } -} - -impl SolidityConvert { - pub fn converted(self) -> C { - self.inner - } -} - -impl EvmData for SolidityConvert -where - P: EvmData + TryInto, - C: EvmData + Into

, -{ - fn read(reader: &mut EvmDataReader) -> MayRevert { - let c = P::read(reader)? - .try_into() - .map_err(|_| RevertReason::value_is_too_large(C::solidity_type()))?; - - Ok(Self { inner: c, _phantom: PhantomData }) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - P::write(writer, value.inner.into()) - } - - fn has_static_size() -> bool { - P::has_static_size() - } - - fn solidity_type() -> String { - P::solidity_type() - } -} - -/// Wrapper around values being returned by functions. -/// Handle special case with tuple encoding. -pub fn encode_as_function_return_value(value: T) -> Vec { - let output = EvmDataWriter::new().write(value).build(); - if T::is_explicit_tuple() && !T::has_static_size() { - output[32..].to_vec() - } else { - output - } -} - -/// Helper to write `EvmData` impl for Solidity structs. -/// Identifiers used should match Solidity ones. -/// Types are infered from context, which should always be -/// possible when parsing input to build a Rust struct. -/// -/// ```rust,ignore -/// impl EvmData for Currency { -/// fn read(reader: &mut EvmDataReader) -> MayRevert { -/// read_struct!(reader, (address, amount)); -/// Ok(Currency { address, amount }) -/// } -/// -/// fn write(writer: &mut EvmDataWriter, value: Self) { -/// EvmData::write(writer, (value.address, value.amount)); -/// } -/// -/// fn has_static_size() -> bool { -/// <(Address, U256)>::has_static_size() -/// } -/// } -/// ``` -#[macro_export] -macro_rules! read_struct { - ($reader:ident, {$($field:ident: $type:ty),+}) => { - use $crate::revert::BacktraceExt as _; - let ($($field),*): ($($type),*) = $reader - .read() - .map_in_tuple_to_field(&[$(stringify!($field)),*])?; - }; -} - -/// Helper to read arguments of a Solidity function. -/// Arguments are read in the provided order using the provided types. -/// Those types should match the ones in the Solidity file, -/// and identifiers used should match Solidity ones. -/// -/// Identifiers written in Rust in snake_case are converted to -/// camelCase to match Solidity conventions. -/// -/// ```rust,ignore -/// // Reading Solidity function `f(address ownner, uint256 accountIndex)`. -/// read_args!(handle, {owner: Address, account_index: U256}); -/// let owner: H160 = owner.into(); -/// ``` -#[macro_export] -macro_rules! read_args { - (@count) => (0usize); - (@count $x:ident $($xs:ident)* ) => (1usize + read_args!(@count $($xs)*)); - ($handle:ident, {$($field:ident: $type:ty),*}) => { - $crate::data::paste! { - let mut input = $handle.read_after_selector()?; - input.expect_arguments(read_args!(@count $($field)*))?; - $( - let $field: $type = input.read().in_field( - stringify!([<$field:camel>]) - )?; - )* - } - }; -} diff --git a/precompiles/utils/src/data/native.rs b/precompiles/utils/src/data/native.rs deleted file mode 100644 index 6226337b..00000000 --- a/precompiles/utils/src/data/native.rs +++ /dev/null @@ -1,346 +0,0 @@ -use super::*; - -impl EvmData for () { - fn read(_reader: &mut EvmDataReader) -> MayRevert { - Ok(()) - } - - fn write(_writer: &mut EvmDataWriter, _value: Self) {} - - fn has_static_size() -> bool { - true - } - - fn solidity_type() -> String { - String::from("()") - } -} - -#[impl_for_tuples(1, 20)] -impl EvmData for Tuple { - fn has_static_size() -> bool { - for_tuples!(#( Tuple::has_static_size() )&*) - } - - fn read(reader: &mut EvmDataReader) -> MayRevert { - if Self::has_static_size() { - let mut index = 0; - Ok(for_tuples!( ( #( { - let elem = reader.read::().in_tuple(index)?; - index +=1; - elem - } ),* ) )) - } else { - let reader = &mut reader.read_pointer()?; - let mut index = 0; - Ok(for_tuples!( ( #( { - let elem = reader.read::().in_tuple(index)?; - index +=1; - elem - } ),* ) )) - } - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - if Self::has_static_size() { - for_tuples!( #( Tuple::write(writer, value.Tuple); )* ); - } else { - let mut inner_writer = EvmDataWriter::new(); - for_tuples!( #( Tuple::write(&mut inner_writer, value.Tuple); )* ); - writer.write_pointer(inner_writer.build()); - } - } - - fn solidity_type() -> String { - let mut subtypes = Vec::new(); - for_tuples!( #( subtypes.push(Tuple::solidity_type()); )* ); - alloc::format!("({})", subtypes.join(",")) - } - - fn is_explicit_tuple() -> bool { - true - } -} - -impl EvmData for H256 { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let range = reader.move_cursor(32)?; - - let data = reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("bytes32"))?; - - Ok(H256::from_slice(data)) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - writer.data.extend_from_slice(value.as_bytes()); - } - - fn has_static_size() -> bool { - true - } - - fn solidity_type() -> String { - String::from("bytes32") - } -} - -/// The `address` type of Solidity. -/// H160 could represent 2 types of data (bytes20 and address) that are not encoded the same way. -/// To avoid issues writing H160 is thus not supported. -#[derive(Clone, Copy, Debug, Eq, PartialEq)] -pub struct Address(pub H160); - -impl From for Address { - fn from(a: H160) -> Address { - Address(a) - } -} - -impl From

for H160 { - fn from(a: Address) -> H160 { - a.0 - } -} - -impl Address { - pub fn as_u64(&self) -> Option { - let _u64 = self.0.to_low_u64_be(); - if self.0 == H160::from_low_u64_be(_u64) { - Some(_u64) - } else { - None - } - } -} - -impl EvmData for Address { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let range = reader.move_cursor(32)?; - - let data = reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("address"))?; - - Ok(H160::from_slice(&data[12..32]).into()) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - H256::write(writer, value.0.into()); - } - - fn has_static_size() -> bool { - true - } - - fn solidity_type() -> String { - String::from("address") - } -} - -impl EvmData for U256 { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let range = reader.move_cursor(32)?; - - let data = reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("uint256"))?; - - Ok(U256::from_big_endian(data)) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - let mut buffer = [0u8; 32]; - value.to_big_endian(&mut buffer); - writer.data.extend_from_slice(&buffer); - } - - fn has_static_size() -> bool { - true - } - - fn solidity_type() -> String { - String::from("uint256") - } -} - -macro_rules! impl_evmdata_for_uints { - ($($uint:ty, )*) => { - $( - impl EvmData for $uint { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let value256: U256 = reader.read() - .map_err(|_| RevertReason::read_out_of_bounds( - Self::solidity_type() - ))?; - - value256 - .try_into() - .map_err(|_| RevertReason::value_is_too_large( - Self::solidity_type() - ).into()) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - U256::write(writer, value.into()); - } - - fn has_static_size() -> bool { - true - } - - fn solidity_type() -> String { - alloc::format!("uint{}", core::mem::size_of::() * 8) - } - } - )* - }; -} - -impl_evmdata_for_uints!(u8, u16, u32, u64, u128,); - -impl EvmData for bool { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let h256 = H256::read(reader).map_err(|_| RevertReason::read_out_of_bounds("bool"))?; - - Ok(!h256.is_zero()) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - let mut buffer = [0u8; 32]; - if value { - buffer[31] = 1; - } - - writer.data.extend_from_slice(&buffer); - } - - fn has_static_size() -> bool { - true - } - - fn solidity_type() -> String { - String::from("bool") - } -} - -type ConstU32Max = ConstU32<{ u32::MAX }>; - -impl EvmData for Vec { - fn read(reader: &mut EvmDataReader) -> MayRevert { - BoundedVec::::read(reader).map(|x| x.into()) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - BoundedVec::::write( - writer, - BoundedVec { inner: value, _phantom: PhantomData }, - ) - } - - fn has_static_size() -> bool { - false - } - - fn solidity_type() -> String { - alloc::format!("{}[]", T::solidity_type()) - } -} - -/// Wrapper around a Vec that provides a max length bound on read. -#[derive(Clone, Debug, Eq, PartialEq)] -pub struct BoundedVec { - inner: Vec, - _phantom: PhantomData, -} - -impl> EvmData for BoundedVec { - fn read(reader: &mut EvmDataReader) -> MayRevert { - let mut inner_reader = reader.read_pointer()?; - - let array_size: usize = inner_reader - .read::() - .map_err(|_| RevertReason::read_out_of_bounds("length"))? - .try_into() - .map_err(|_| RevertReason::value_is_too_large("length"))?; - - if array_size > S::get() as usize { - return Err(RevertReason::value_is_too_large("length").into()); - } - - let mut array = vec![]; - - let mut item_reader = EvmDataReader { - input: inner_reader - .input - .get(32..) - .ok_or_else(|| RevertReason::read_out_of_bounds("array content"))?, - cursor: 0, - }; - - for i in 0..array_size { - array.push(item_reader.read().in_array(i)?); - } - - Ok(BoundedVec { inner: array, _phantom: PhantomData }) - } - - fn write(writer: &mut EvmDataWriter, value: Self) { - let value: Vec<_> = value.into(); - let mut inner_writer = EvmDataWriter::new().write(U256::from(value.len())); - - for inner in value { - // Any offset in items are relative to the start of the item instead of the - // start of the array. However if there is offseted data it must but appended after - // all items (offsets) are written. We thus need to rely on `compute_offsets` to do - // that, and must store a "shift" to correct the offsets. - let shift = inner_writer.data.len(); - let item_writer = EvmDataWriter::new().write(inner); - - inner_writer = inner_writer.write_raw_bytes(&item_writer.data); - for mut offset_datum in item_writer.offset_data { - offset_datum.offset_shift += 32; - offset_datum.offset_position += shift; - inner_writer.offset_data.push(offset_datum); - } - } - - writer.write_pointer(inner_writer.build()); - } - - fn has_static_size() -> bool { - false - } - - fn solidity_type() -> String { - alloc::format!("{}[]", T::solidity_type()) - } -} - -impl From> for BoundedVec { - fn from(value: Vec) -> Self { - BoundedVec { inner: value, _phantom: PhantomData } - } -} - -impl From<&[T]> for BoundedVec { - fn from(value: &[T]) -> Self { - BoundedVec { inner: value.to_vec(), _phantom: PhantomData } - } -} - -impl From<[T; N]> for BoundedVec { - fn from(value: [T; N]) -> Self { - BoundedVec { inner: value.to_vec(), _phantom: PhantomData } - } -} - -impl From> for Vec { - fn from(value: BoundedVec) -> Self { - value.inner - } -} diff --git a/precompiles/utils/src/evm/costs.rs b/precompiles/utils/src/evm/costs.rs deleted file mode 100644 index 424a13c6..00000000 --- a/precompiles/utils/src/evm/costs.rs +++ /dev/null @@ -1,88 +0,0 @@ -use crate::EvmResult; -use fp_evm::{ExitError, PrecompileFailure}; -use sp_core::U256; - -pub fn log_costs(topics: usize, data_len: usize) -> EvmResult { - // Cost calculation is copied from EVM code that is not publicly exposed by the crates. - // https://github.com/rust-blockchain/evm/blob/master/gasometer/src/costs.rs#L148 - - const G_LOG: u64 = 375; - const G_LOGDATA: u64 = 8; - const G_LOGTOPIC: u64 = 375; - - let topic_cost = G_LOGTOPIC - .checked_mul(topics as u64) - .ok_or(PrecompileFailure::Error { exit_status: ExitError::OutOfGas })?; - - let data_cost = G_LOGDATA - .checked_mul(data_len as u64) - .ok_or(PrecompileFailure::Error { exit_status: ExitError::OutOfGas })?; - - G_LOG - .checked_add(topic_cost) - .ok_or(PrecompileFailure::Error { exit_status: ExitError::OutOfGas })? - .checked_add(data_cost) - .ok_or(PrecompileFailure::Error { exit_status: ExitError::OutOfGas }) -} - -// Compute the cost of doing a subcall. -// Some parameters cannot be known in advance, so we estimate the worst possible cost. -pub fn call_cost(value: U256, config: &evm::Config) -> u64 { - // Copied from EVM code since not public. - pub const G_CALLVALUE: u64 = 9000; - pub const G_NEWACCOUNT: u64 = 25000; - - fn address_access_cost(is_cold: bool, regular_value: u64, config: &evm::Config) -> u64 { - if config.increase_state_access_gas { - if is_cold { - config.gas_account_access_cold - } else { - config.gas_storage_read_warm - } - } else { - regular_value - } - } - - fn xfer_cost(is_call_or_callcode: bool, transfers_value: bool) -> u64 { - if is_call_or_callcode && transfers_value { - G_CALLVALUE - } else { - 0 - } - } - - fn new_cost( - is_call_or_staticcall: bool, - new_account: bool, - transfers_value: bool, - config: &evm::Config, - ) -> u64 { - let eip161 = !config.empty_considered_exists; - if is_call_or_staticcall { - if eip161 { - if transfers_value && new_account { - G_NEWACCOUNT - } else { - 0 - } - } else if new_account { - G_NEWACCOUNT - } else { - 0 - } - } else { - 0 - } - } - - let transfers_value = value != U256::default(); - let is_cold = true; - let is_call_or_callcode = true; - let is_call_or_staticcall = true; - let new_account = true; - - address_access_cost(is_cold, config.gas_call, config) - + xfer_cost(is_call_or_callcode, transfers_value) - + new_cost(is_call_or_staticcall, new_account, transfers_value, config) -} diff --git a/precompiles/utils/src/evm/handle.rs b/precompiles/utils/src/evm/handle.rs deleted file mode 100644 index ef39346c..00000000 --- a/precompiles/utils/src/evm/handle.rs +++ /dev/null @@ -1,209 +0,0 @@ -use crate::{ - solidity::{ - codec::Reader, - modifier::FunctionModifier, - revert::{MayRevert, RevertReason}, - }, - EvmResult, -}; -use fp_evm::{Log, PrecompileHandle}; - -pub trait PrecompileHandleExt: PrecompileHandle { - /// Record cost of one DB read manually. - /// The max encoded lenght of the data that will be read should be provided. - #[must_use] - fn record_db_read( - &mut self, - data_max_encoded_len: usize, - ) -> Result<(), evm::ExitError>; - - /// Record cost of a log manually. - /// This can be useful to record log costs early when their content have static size. - #[must_use] - fn record_log_costs_manual(&mut self, topics: usize, data_len: usize) -> EvmResult; - - /// Record cost of logs. - #[must_use] - fn record_log_costs(&mut self, logs: &[&Log]) -> EvmResult; - - #[must_use] - /// Check that a function call is compatible with the context it is - /// called into. - fn check_function_modifier(&self, modifier: FunctionModifier) -> MayRevert; - - #[must_use] - /// Read the selector from the input data. - fn read_u32_selector(&self) -> MayRevert; - - #[must_use] - /// Returns a reader of the input, skipping the selector. - fn read_after_selector(&self) -> MayRevert; -} - -impl PrecompileHandleExt for T { - #[must_use] - fn record_db_read( - &mut self, - data_max_encoded_len: usize, - ) -> Result<(), evm::ExitError> { - self.record_cost(crate::prelude::RuntimeHelper::::db_read_gas_cost())?; - // TODO: record ref time when precompile will be benchmarked - self.record_external_cost(None, Some(data_max_encoded_len as u64)) - } - - /// Record cost of a log manualy. - /// This can be useful to record log costs early when their content have static size. - #[must_use] - fn record_log_costs_manual(&mut self, topics: usize, data_len: usize) -> EvmResult { - self.record_cost(crate::evm::costs::log_costs(topics, data_len)?)?; - - Ok(()) - } - - /// Record cost of logs. - #[must_use] - fn record_log_costs(&mut self, logs: &[&Log]) -> EvmResult { - for log in logs { - self.record_log_costs_manual(log.topics.len(), log.data.len())?; - } - - Ok(()) - } - - #[must_use] - /// Check that a function call is compatible with the context it is - /// called into. - fn check_function_modifier(&self, modifier: FunctionModifier) -> MayRevert { - crate::solidity::modifier::check_function_modifier( - self.context(), - self.is_static(), - modifier, - ) - } - - #[must_use] - /// Read the selector from the input data as u32. - fn read_u32_selector(&self) -> MayRevert { - crate::solidity::codec::selector(self.input()) - .ok_or(RevertReason::read_out_of_bounds("selector").into()) - } - - #[must_use] - /// Returns a reader of the input, skipping the selector. - fn read_after_selector(&self) -> MayRevert { - Reader::new_skip_selector(self.input()) - } -} - -environmental::environmental!(EVM_CONTEXT: trait PrecompileHandle); - -pub fn using_precompile_handle<'a, R, F: FnOnce() -> R>( - precompile_handle: &'a mut dyn PrecompileHandle, - mutator: F, -) -> R { - // # Safety - // - // unsafe rust does not mean unsafe, but "the compiler cannot guarantee the safety of the - // memory". - // - // The only risk here is that the lifetime 'a comes to its end while the global variable - // `EVM_CONTEXT` still contains the reference to the precompile handle. - // The `using` method guarantee that it can't happen because the global variable is freed right - // after the execution of the `mutator` closure (whatever the result of the execution). - unsafe { - EVM_CONTEXT::using( - core::mem::transmute::<&'a mut dyn PrecompileHandle, &'static mut dyn PrecompileHandle>( - precompile_handle, - ), - mutator, - ) - } -} - -pub fn with_precompile_handle R>(f: F) -> Option { - EVM_CONTEXT::with(|precompile_handle| f(precompile_handle)) -} - -#[cfg(test)] -mod tests { - use super::*; - - struct MockPrecompileHandle; - impl PrecompileHandle for MockPrecompileHandle { - fn call( - &mut self, - _: sp_core::H160, - _: Option, - _: Vec, - _: Option, - _: bool, - _: &evm::Context, - ) -> (evm::ExitReason, Vec) { - unimplemented!() - } - - fn record_cost(&mut self, _: u64) -> Result<(), evm::ExitError> { - unimplemented!() - } - - fn remaining_gas(&self) -> u64 { - unimplemented!() - } - - fn log( - &mut self, - _: sp_core::H160, - _: Vec, - _: Vec, - ) -> Result<(), evm::ExitError> { - unimplemented!() - } - - fn code_address(&self) -> sp_core::H160 { - unimplemented!() - } - - fn input(&self) -> &[u8] { - unimplemented!() - } - - fn context(&self) -> &evm::Context { - unimplemented!() - } - - fn is_static(&self) -> bool { - true - } - - fn gas_limit(&self) -> Option { - unimplemented!() - } - - fn record_external_cost( - &mut self, - _ref_time: Option, - _proof_size: Option, - ) -> Result<(), fp_evm::ExitError> { - Ok(()) - } - - fn refund_external_cost(&mut self, _ref_time: Option, _proof_size: Option) {} - } - - #[test] - fn with_precompile_handle_without_context() { - assert_eq!(with_precompile_handle(|_| {}), None); - } - - #[test] - fn with_precompile_handle_with_context() { - let mut precompile_handle = MockPrecompileHandle; - - assert_eq!( - using_precompile_handle(&mut precompile_handle, || with_precompile_handle(|handle| { - handle.is_static() - })), - Some(true) - ); - } -} diff --git a/precompiles/utils/src/evm/logs.rs b/precompiles/utils/src/evm/logs.rs deleted file mode 100644 index 922631fb..00000000 --- a/precompiles/utils/src/evm/logs.rs +++ /dev/null @@ -1,78 +0,0 @@ -use crate::EvmResult; -use pallet_evm::{Log, PrecompileHandle}; -use sp_core::{H160, H256}; -use sp_std::{vec, vec::Vec}; - -/// Create a 0-topic log. -#[must_use] -pub fn log0(address: impl Into, data: impl Into>) -> Log { - Log { address: address.into(), topics: vec![], data: data.into() } -} - -/// Create a 1-topic log. -#[must_use] -pub fn log1(address: impl Into, topic0: impl Into, data: impl Into>) -> Log { - Log { address: address.into(), topics: vec![topic0.into()], data: data.into() } -} - -/// Create a 2-topics log. -#[must_use] -pub fn log2( - address: impl Into, - topic0: impl Into, - topic1: impl Into, - data: impl Into>, -) -> Log { - Log { address: address.into(), topics: vec![topic0.into(), topic1.into()], data: data.into() } -} - -/// Create a 3-topics log. -#[must_use] -pub fn log3( - address: impl Into, - topic0: impl Into, - topic1: impl Into, - topic2: impl Into, - data: impl Into>, -) -> Log { - Log { - address: address.into(), - topics: vec![topic0.into(), topic1.into(), topic2.into()], - data: data.into(), - } -} - -/// Create a 4-topics log. -#[must_use] -pub fn log4( - address: impl Into, - topic0: impl Into, - topic1: impl Into, - topic2: impl Into, - topic3: impl Into, - data: impl Into>, -) -> Log { - Log { - address: address.into(), - topics: vec![topic0.into(), topic1.into(), topic2.into(), topic3.into()], - data: data.into(), - } -} - -/// Extension trait allowing to record logs into a PrecompileHandle. -pub trait LogExt { - fn record(self, handle: &mut impl PrecompileHandle) -> EvmResult; - - fn compute_cost(&self) -> EvmResult; -} - -impl LogExt for Log { - fn record(self, handle: &mut impl PrecompileHandle) -> EvmResult { - handle.log(self.address, self.topics, self.data)?; - Ok(()) - } - - fn compute_cost(&self) -> EvmResult { - crate::evm::costs::log_costs(self.topics.len(), self.data.len()) - } -} diff --git a/precompiles/utils/src/evm/mod.rs b/precompiles/utils/src/evm/mod.rs deleted file mode 100644 index 16f0cae0..00000000 --- a/precompiles/utils/src/evm/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod costs; -pub mod handle; -pub mod logs; diff --git a/precompiles/utils/src/lib.rs b/precompiles/utils/src/lib.rs deleted file mode 100644 index 69fb8c58..00000000 --- a/precompiles/utils/src/lib.rs +++ /dev/null @@ -1,57 +0,0 @@ -#![cfg_attr(not(feature = "std"), no_std)] - -extern crate alloc; - -// Allows to use inside this crate `solidity::Codec` derive macro,which depends on -// `precompile_utils` being in the list of imported crates. -extern crate self as precompile_utils; - -pub mod evm; -pub mod precompile_set; -pub mod substrate; - -pub mod solidity; - -pub use fp_evm::Precompile; -use fp_evm::PrecompileFailure; -pub use precompile_utils_macro::{keccak256, precompile, precompile_name_from_address}; - -/// Alias for Result returning an EVM precompile error. -pub type EvmResult = Result; - -pub mod prelude { - pub use { - crate::{ - evm::{ - handle::PrecompileHandleExt, - logs::{log0, log1, log2, log3, log4, LogExt}, - }, - precompile_set::DiscriminantResult, - solidity::{ - // We export solidity itself to encourage using `solidity::Codec` to avoid - // confusion with parity_scale_codec, - self, - codec::{ - Address, - BoundedBytes, - BoundedString, - BoundedVec, - // Allow usage of Codec methods while not exporting the name directly. - // Codec as _, - Convert, - UnboundedBytes, - UnboundedString, - }, - revert::{ - revert, BacktraceExt, InjectBacktrace, MayRevert, Revert, RevertExt, - RevertReason, - }, - }, - substrate::{RuntimeHelper, TryDispatchError}, - EvmResult, - }, - alloc::string::String, - pallet_evm::{PrecompileHandle, PrecompileOutput}, - precompile_utils_macro::{keccak256, precompile}, - }; -} diff --git a/precompiles/utils/src/precompile_set.rs b/precompiles/utils/src/precompile_set.rs deleted file mode 100644 index fcaab8f6..00000000 --- a/precompiles/utils/src/precompile_set.rs +++ /dev/null @@ -1,1036 +0,0 @@ -//! Provide utils to assemble precompiles and precompilesets into a -//! final precompile set with security checks. All security checks are enabled by -//! default and must be disabled explicely throught type annotations. - -use crate::{ - evm::handle::PrecompileHandleExt, - solidity::{codec::String, revert::revert}, - EvmResult, -}; -use fp_evm::{ - ExitError, IsPrecompileResult, Precompile, PrecompileFailure, PrecompileHandle, - PrecompileResult, PrecompileSet, -}; -use frame_support::pallet_prelude::Get; -use impl_trait_for_tuples::impl_for_tuples; -use pallet_evm::AddressMapping; -use sp_core::{H160, H256}; -use sp_std::{ - cell::RefCell, collections::btree_map::BTreeMap, marker::PhantomData, ops::RangeInclusive, vec, - vec::Vec, -}; - -/// Trait representing checks that can be made on a precompile call. -/// Types implementing this trait are made to be chained in a tuple. -/// -/// For that reason every method returns an Option, None meaning that -/// the implementor have no constraint and the decision is left to -/// latter elements in the chain. If None is returned by all elements of -/// the chain then sensible defaults are used. -/// -/// Both `PrecompileAt` and `PrecompileSetStartingWith` have a type parameter that must -/// implement this trait to configure the checks of the precompile(set) it represents. -pub trait PrecompileChecks { - #[inline(always)] - /// Is there a limit to the amount of recursions this precompile - /// can make using subcalls? 0 means this specific precompile will not - /// be callable as a subcall of itself, 1 will allow one level of recursion, - /// etc... - /// - /// If all checks return None, defaults to `Some(0)` (no recursion allowed). - fn recursion_limit() -> Option> { - None - } - - #[inline(always)] - /// Does this precompile supports being called with DELEGATECALL or CALLCODE? - /// - /// If all checks return None, defaults to `false`. - fn accept_delegate_call() -> Option { - None - } - - #[inline(always)] - /// Is this precompile callable by a smart contract? - /// - /// If all checks return None, defaults to `false`. - fn callable_by_smart_contract(_caller: H160, _called_selector: Option) -> Option { - None - } - - #[inline(always)] - /// Is this precompile callable by a precompile? - /// - /// If all checks return None, defaults to `false`. - fn callable_by_precompile(_caller: H160, _called_selector: Option) -> Option { - None - } - - #[inline(always)] - /// Is this precompile able to do subcalls? - /// - /// If all checks return None, defaults to `false`. - fn allow_subcalls() -> Option { - None - } - - /// Summarize the checks when being called by a smart contract. - fn callable_by_smart_contract_summary() -> Option { - None - } - - /// Summarize the checks when being called by a precompile. - fn callable_by_precompile_summary() -> Option { - None - } -} - -#[derive(Debug, Clone)] -pub enum DiscriminantResult { - Some(T, u64), - None(u64), - OutOfGas, -} - -impl Into for DiscriminantResult { - fn into(self) -> IsPrecompileResult { - match self { - Self::Some(_, extra_cost) => { - IsPrecompileResult::Answer { is_precompile: true, extra_cost } - }, - Self::None(extra_cost) => { - IsPrecompileResult::Answer { is_precompile: false, extra_cost } - }, - Self::OutOfGas => IsPrecompileResult::OutOfGas, - } - } -} - -#[derive(Debug, Clone)] -#[cfg_attr(feature = "testing", derive(serde::Serialize, serde::Deserialize))] -pub enum PrecompileKind { - Single(H160), - Prefixed(Vec), -} - -#[derive(Debug, Clone)] -#[cfg_attr(feature = "testing", derive(serde::Serialize, serde::Deserialize))] -pub struct PrecompileCheckSummary { - pub name: Option, - pub precompile_kind: PrecompileKind, - pub recursion_limit: Option, - pub accept_delegate_call: bool, - pub callable_by_smart_contract: String, - pub callable_by_precompile: String, -} - -#[impl_for_tuples(0, 20)] -impl PrecompileChecks for Tuple { - #[inline(always)] - fn recursion_limit() -> Option> { - for_tuples!(#( - if let Some(check) = Tuple::recursion_limit() { - return Some(check); - } - )*); - - None - } - - #[inline(always)] - fn accept_delegate_call() -> Option { - for_tuples!(#( - if let Some(check) = Tuple::accept_delegate_call() { - return Some(check); - } - )*); - - None - } - - #[inline(always)] - fn callable_by_smart_contract(caller: H160, called_selector: Option) -> Option { - for_tuples!(#( - if let Some(check) = Tuple::callable_by_smart_contract(caller, called_selector) { - return Some(check); - } - )*); - - None - } - - #[inline(always)] - fn callable_by_precompile(caller: H160, called_selector: Option) -> Option { - for_tuples!(#( - if let Some(check) = Tuple::callable_by_precompile(caller, called_selector) { - return Some(check); - } - )*); - - None - } - - #[inline(always)] - fn allow_subcalls() -> Option { - for_tuples!(#( - if let Some(check) = Tuple::allow_subcalls() { - return Some(check); - } - )*); - - None - } - - fn callable_by_smart_contract_summary() -> Option { - for_tuples!(#( - if let Some(check) = Tuple::callable_by_smart_contract_summary() { - return Some(check); - } - )*); - - None - } - - fn callable_by_precompile_summary() -> Option { - for_tuples!(#( - if let Some(check) = Tuple::callable_by_precompile_summary() { - return Some(check); - } - )*); - - None - } -} - -/// Precompile can be called using DELEGATECALL/CALLCODE. -pub struct AcceptDelegateCall; - -impl PrecompileChecks for AcceptDelegateCall { - #[inline(always)] - fn accept_delegate_call() -> Option { - Some(true) - } -} - -/// Precompile is able to do subcalls with provided nesting limit. -pub struct SubcallWithMaxNesting; - -impl PrecompileChecks for SubcallWithMaxNesting { - #[inline(always)] - fn recursion_limit() -> Option> { - Some(Some(R)) - } - - #[inline(always)] - fn allow_subcalls() -> Option { - Some(true) - } -} - -pub trait SelectorFilter { - fn is_allowed(_caller: H160, _selector: Option) -> bool; - - fn description() -> String; -} -pub struct ForAllSelectors; -impl SelectorFilter for ForAllSelectors { - fn is_allowed(_caller: H160, _selector: Option) -> bool { - true - } - - fn description() -> String { - "Allowed for all selectors and callers".into() - } -} - -pub struct OnlyFrom(PhantomData); -impl> SelectorFilter for OnlyFrom { - fn is_allowed(caller: H160, _selector: Option) -> bool { - caller == T::get() - } - - fn description() -> String { - alloc::format!("Allowed for all selectors only if called from {}", T::get()) - } -} - -pub struct CallableByContract(PhantomData); - -impl PrecompileChecks for CallableByContract { - #[inline(always)] - fn callable_by_smart_contract(caller: H160, called_selector: Option) -> Option { - Some(T::is_allowed(caller, called_selector)) - } - - fn callable_by_smart_contract_summary() -> Option { - Some(T::description()) - } -} - -/// Precompiles are allowed to call this precompile. -pub struct CallableByPrecompile(PhantomData); - -impl PrecompileChecks for CallableByPrecompile { - #[inline(always)] - fn callable_by_precompile(caller: H160, called_selector: Option) -> Option { - Some(T::is_allowed(caller, called_selector)) - } - - fn callable_by_precompile_summary() -> Option { - Some(T::description()) - } -} - -/// The type of EVM address. -#[derive(PartialEq)] -#[cfg_attr(feature = "std", derive(Debug))] -pub enum AddressType { - /// The code stored at the address is less than 5 bytes, but not well known. - Unknown, - /// No code is stored at the address, therefore is EOA. - EOA, - /// The 5-byte magic constant for a precompile is stored at the address. - Precompile, - /// The code is greater than 5-bytes, potentially a Smart Contract. - Contract, -} - -/// Retrieves the type of address demarcated by `AddressType`. -pub fn get_address_type( - handle: &mut impl PrecompileHandle, - address: H160, -) -> Result { - // AccountCodesMetadata: - // Blake2128(16) + H160(20) + CodeMetadata(40) - handle.record_db_read::(76)?; - let code_len = pallet_evm::Pallet::::account_code_metadata(address).size; - - // 0 => either EOA or precompile without dummy code - if code_len == 0 { - return Ok(AddressType::EOA); - } - - // dummy code is 5 bytes long, so any other len means it is a contract. - if code_len != 5 { - return Ok(AddressType::Contract); - } - - // check code matches dummy code - handle.record_db_read::(code_len as usize)?; - let code = pallet_evm::AccountCodes::::get(address); - if &code == &[0x60, 0x00, 0x60, 0x00, 0xfd] { - return Ok(AddressType::Precompile); - } - - Ok(AddressType::Unknown) -} - -fn is_address_eoa_or_precompile( - handle: &mut impl PrecompileHandle, - address: H160, -) -> Result { - match get_address_type::(handle, address)? { - AddressType::EOA | AddressType::Precompile => Ok(true), - _ => Ok(false), - } -} - -/// Common checks for precompile and precompile sets. -/// Don't contain recursion check as precompile sets have recursion check for each member. -fn common_checks( - handle: &mut impl PrecompileHandle, -) -> EvmResult<()> { - let code_address = handle.code_address(); - let caller = handle.context().caller; - - // Check DELEGATECALL config. - let accept_delegate_call = C::accept_delegate_call().unwrap_or(false); - if !accept_delegate_call && code_address != handle.context().address { - return Err(revert("Cannot be called with DELEGATECALL or CALLCODE")); - } - - // Extract which selector is called. - let selector = handle.input().get(0..4).map(|bytes| { - let mut buffer = [0u8; 4]; - buffer.copy_from_slice(bytes); - u32::from_be_bytes(buffer) - }); - - // Is this selector callable from a smart contract? - let callable_by_smart_contract = - C::callable_by_smart_contract(caller, selector).unwrap_or(false); - if !callable_by_smart_contract { - if !is_address_eoa_or_precompile::(handle, caller)? { - return Err(revert("Function not callable by smart contracts")); - } - } - - // Is this selector callable from a precompile? - let callable_by_precompile = C::callable_by_precompile(caller, selector).unwrap_or(false); - if !callable_by_precompile && is_precompile_or_fail::(caller, handle.remaining_gas())? { - return Err(revert("Function not callable by precompiles")); - } - - Ok(()) -} - -pub fn is_precompile_or_fail(address: H160, gas: u64) -> EvmResult { - match ::PrecompilesValue::get().is_precompile(address, gas) { - IsPrecompileResult::Answer { is_precompile, .. } => Ok(is_precompile), - IsPrecompileResult::OutOfGas => { - Err(PrecompileFailure::Error { exit_status: ExitError::OutOfGas }) - }, - } -} - -pub struct AddressU64; -impl Get for AddressU64 { - #[inline(always)] - fn get() -> H160 { - H160::from_low_u64_be(N) - } -} - -pub struct RestrictiveHandle<'a, H> { - handle: &'a mut H, - allow_subcalls: bool, -} - -impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> { - fn call( - &mut self, - address: H160, - transfer: Option, - input: Vec, - target_gas: Option, - is_static: bool, - context: &evm::Context, - ) -> (evm::ExitReason, Vec) { - if !self.allow_subcalls { - return ( - evm::ExitReason::Revert(evm::ExitRevert::Reverted), - crate::solidity::revert::revert_as_bytes("subcalls disabled for this precompile"), - ); - } - - self.handle.call(address, transfer, input, target_gas, is_static, context) - } - - fn record_cost(&mut self, cost: u64) -> Result<(), evm::ExitError> { - self.handle.record_cost(cost) - } - - fn remaining_gas(&self) -> u64 { - self.handle.remaining_gas() - } - - fn log( - &mut self, - address: H160, - topics: Vec, - data: Vec, - ) -> Result<(), evm::ExitError> { - self.handle.log(address, topics, data) - } - - fn code_address(&self) -> H160 { - self.handle.code_address() - } - - fn input(&self) -> &[u8] { - self.handle.input() - } - - fn context(&self) -> &evm::Context { - self.handle.context() - } - - fn is_static(&self) -> bool { - self.handle.is_static() - } - - fn gas_limit(&self) -> Option { - self.handle.gas_limit() - } - - fn record_external_cost( - &mut self, - ref_time: Option, - proof_size: Option, - ) -> Result<(), ExitError> { - self.handle.record_external_cost(ref_time, proof_size) - } - - fn refund_external_cost(&mut self, ref_time: Option, proof_size: Option) { - self.handle.refund_external_cost(ref_time, proof_size) - } -} - -/// Allows to know if a precompile is active or not. -/// This allows to detect deactivated precompile, that are still considered precompiles by -/// the EVM but that will always revert when called. -pub trait IsActivePrecompile { - /// Is the provided address an active precompile, a precompile that has - /// not be deactivated. Note that a deactivated precompile is still considered a precompile - /// for the EVM, but it will always revert when called. - fn is_active_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult; -} - -// INDIVIDUAL PRECOMPILE(SET) - -/// A fragment of a PrecompileSet. Should be implemented as is it -/// was a PrecompileSet containing only the precompile(set) it wraps. -/// They can be combined into a real PrecompileSet using `PrecompileSetBuilder`. -pub trait PrecompileSetFragment { - /// Instanciate the fragment. - fn new() -> Self; - - /// Execute the fragment. - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option; - - /// Is the provided address a precompile in this fragment? - fn is_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult; - - /// Return the list of addresses covered by this fragment. - fn used_addresses(&self) -> Vec; - - /// Summarize - fn summarize_checks(&self) -> Vec; -} - -/// Wraps a stateless precompile: a type implementing the `Precompile` trait. -/// Type parameters allow to define: -/// - A: The address of the precompile -/// - R: The recursion limit (defaults to 1) -/// - D: If DELEGATECALL is supported (default to no) -pub struct PrecompileAt { - current_recursion_level: RefCell, - _phantom: PhantomData<(A, P, C)>, -} - -impl PrecompileSetFragment for PrecompileAt -where - A: Get, - P: Precompile, - C: PrecompileChecks, -{ - #[inline(always)] - fn new() -> Self { - Self { current_recursion_level: RefCell::new(0), _phantom: PhantomData } - } - - #[inline(always)] - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option { - let code_address = handle.code_address(); - - // Check if this is the address of the precompile. - if A::get() != code_address { - return None; - } - - // Perform common checks. - if let Err(err) = common_checks::(handle) { - return Some(Err(err)); - } - - // Check and increase recursion level if needed. - let recursion_limit = C::recursion_limit().unwrap_or(Some(0)); - if let Some(max_recursion_level) = recursion_limit { - match self.current_recursion_level.try_borrow_mut() { - Ok(mut recursion_level) => { - if *recursion_level > max_recursion_level { - return Some(Err( - revert("Precompile is called with too high nesting").into() - )); - } - - *recursion_level += 1; - }, - // We don't hold the borrow and are in single-threaded code, thus we should - // not be able to fail borrowing in nested calls. - Err(_) => return Some(Err(revert("Couldn't check precompile nesting").into())), - } - } - - // Subcall protection. - let allow_subcalls = C::allow_subcalls().unwrap_or(false); - let mut handle = RestrictiveHandle { handle, allow_subcalls }; - - let res = P::execute(&mut handle); - - // Decrease recursion level if needed. - if recursion_limit.is_some() { - match self.current_recursion_level.try_borrow_mut() { - Ok(mut recursion_level) => { - *recursion_level -= 1; - }, - // We don't hold the borrow and are in single-threaded code, thus we should - // not be able to fail borrowing in nested calls. - Err(_) => return Some(Err(revert("Couldn't check precompile nesting").into())), - } - } - - Some(res) - } - - #[inline(always)] - fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { is_precompile: address == A::get(), extra_cost: 0 } - } - - #[inline(always)] - fn used_addresses(&self) -> Vec { - vec![A::get()] - } - - fn summarize_checks(&self) -> Vec { - vec![PrecompileCheckSummary { - name: None, - precompile_kind: PrecompileKind::Single(A::get()), - recursion_limit: C::recursion_limit().unwrap_or(Some(0)), - accept_delegate_call: C::accept_delegate_call().unwrap_or(false), - callable_by_smart_contract: C::callable_by_smart_contract_summary() - .unwrap_or_else(|| "Not callable".into()), - callable_by_precompile: C::callable_by_precompile_summary() - .unwrap_or_else(|| "Not callable".into()), - }] - } -} - -impl IsActivePrecompile for PrecompileAt -where - A: Get, -{ - #[inline(always)] - fn is_active_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { is_precompile: address == A::get(), extra_cost: 0 } - } -} - -/// Wraps an inner PrecompileSet with all its addresses starting with -/// a common prefix. -/// Type parameters allow to define: -/// - A: The common prefix -/// - D: If DELEGATECALL is supported (default to no) -pub struct PrecompileSetStartingWith { - precompile_set: P, - current_recursion_level: RefCell>, - _phantom: PhantomData<(A, C)>, -} - -impl PrecompileSetFragment for PrecompileSetStartingWith -where - A: Get<&'static [u8]>, - P: PrecompileSet + Default, - C: PrecompileChecks, -{ - #[inline(always)] - fn new() -> Self { - Self { - precompile_set: P::default(), - current_recursion_level: RefCell::new(BTreeMap::new()), - _phantom: PhantomData, - } - } - - #[inline(always)] - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option { - let code_address = handle.code_address(); - if !is_precompile_or_fail::(code_address, handle.remaining_gas()).ok()? { - return None; - } - // Perform common checks. - if let Err(err) = common_checks::(handle) { - return Some(Err(err)); - } - - // Check and increase recursion level if needed. - let recursion_limit = C::recursion_limit().unwrap_or(Some(0)); - if let Some(max_recursion_level) = recursion_limit { - match self.current_recursion_level.try_borrow_mut() { - Ok(mut recursion_level_map) => { - let recursion_level = recursion_level_map.entry(code_address).or_insert(0); - - if *recursion_level > max_recursion_level { - return Some(Err(revert("Precompile is called with too high nesting"))); - } - - *recursion_level += 1; - }, - // We don't hold the borrow and are in single-threaded code, thus we should - // not be able to fail borrowing in nested calls. - Err(_) => return Some(Err(revert("Couldn't check precompile nesting"))), - } - } - - // Subcall protection. - let allow_subcalls = C::allow_subcalls().unwrap_or(false); - let mut handle = RestrictiveHandle { handle, allow_subcalls }; - - let res = self.precompile_set.execute(&mut handle); - - // Decrease recursion level if needed. - if recursion_limit.is_some() { - match self.current_recursion_level.try_borrow_mut() { - Ok(mut recursion_level_map) => { - let recursion_level = match recursion_level_map.get_mut(&code_address) { - Some(recursion_level) => recursion_level, - None => return Some(Err(revert("Couldn't retreive precompile nesting"))), - }; - - *recursion_level -= 1; - }, - // We don't hold the borrow and are in single-threaded code, thus we should - // not be able to fail borrowing in nested calls. - Err(_) => return Some(Err(revert("Couldn't check precompile nesting"))), - } - } - - res - } - - #[inline(always)] - fn is_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - if address.as_bytes().starts_with(A::get()) { - return self.precompile_set.is_precompile(address, gas); - } - IsPrecompileResult::Answer { is_precompile: false, extra_cost: 0 } - } - - #[inline(always)] - fn used_addresses(&self) -> Vec { - // TODO: We currently can't get the list of used addresses. - vec![] - } - - fn summarize_checks(&self) -> Vec { - let prefix = A::get(); - - vec![PrecompileCheckSummary { - name: None, - precompile_kind: PrecompileKind::Prefixed(prefix.to_vec()), - recursion_limit: C::recursion_limit().unwrap_or(Some(0)), - accept_delegate_call: C::accept_delegate_call().unwrap_or(false), - callable_by_smart_contract: C::callable_by_smart_contract_summary() - .unwrap_or_else(|| "Not callable".into()), - callable_by_precompile: C::callable_by_precompile_summary() - .unwrap_or_else(|| "Not callable".into()), - }] - } -} - -impl IsActivePrecompile for PrecompileSetStartingWith -where - Self: PrecompileSetFragment, -{ - #[inline(always)] - fn is_active_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - self.is_precompile(address, gas) - } -} - -/// Make a precompile that always revert. -/// Can be useful when writing tests. -pub struct RevertPrecompile(PhantomData); - -impl PrecompileSetFragment for RevertPrecompile -where - A: Get, -{ - #[inline(always)] - fn new() -> Self { - Self(PhantomData) - } - - #[inline(always)] - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option { - if A::get() == handle.code_address() { - Some(Err(revert("revert"))) - } else { - None - } - } - - #[inline(always)] - fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { is_precompile: address == A::get(), extra_cost: 0 } - } - - #[inline(always)] - fn used_addresses(&self) -> Vec { - vec![A::get()] - } - - fn summarize_checks(&self) -> Vec { - vec![PrecompileCheckSummary { - name: None, - precompile_kind: PrecompileKind::Single(A::get()), - recursion_limit: Some(0), - accept_delegate_call: true, - callable_by_smart_contract: "Reverts in all cases".into(), - callable_by_precompile: "Reverts in all cases".into(), - }] - } -} - -impl IsActivePrecompile for RevertPrecompile { - #[inline(always)] - fn is_active_precompile(&self, _address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { is_precompile: true, extra_cost: 0 } - } -} - -/// A precompile that was removed from a precompile set. -/// Still considered a precompile but is inactive and always revert. -pub struct RemovedPrecompileAt(PhantomData); -impl PrecompileSetFragment for RemovedPrecompileAt -where - A: Get, -{ - #[inline(always)] - fn new() -> Self { - Self(PhantomData) - } - - #[inline(always)] - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option { - if A::get() == handle.code_address() { - Some(Err(revert("Removed precompile"))) - } else { - None - } - } - - #[inline(always)] - fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { is_precompile: address == A::get(), extra_cost: 0 } - } - - #[inline(always)] - fn used_addresses(&self) -> Vec { - vec![A::get()] - } - - fn summarize_checks(&self) -> Vec { - vec![PrecompileCheckSummary { - name: None, - precompile_kind: PrecompileKind::Single(A::get()), - recursion_limit: Some(0), - accept_delegate_call: true, - callable_by_smart_contract: "Reverts in all cases".into(), - callable_by_precompile: "Reverts in all cases".into(), - }] - } -} - -impl IsActivePrecompile for RemovedPrecompileAt { - #[inline(always)] - fn is_active_precompile(&self, _address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { is_precompile: false, extra_cost: 0 } - } -} - -// COMPOSITION OF PARTS -#[impl_for_tuples(1, 100)] -impl PrecompileSetFragment for Tuple { - #[inline(always)] - fn new() -> Self { - (for_tuples!(#( - Tuple::new() - ),*)) - } - - #[inline(always)] - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option { - for_tuples!(#( - if let Some(res) = self.Tuple.execute::(handle) { - return Some(res); - } - )*); - - None - } - - #[inline(always)] - fn is_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - for_tuples!(#( - match self.Tuple.is_precompile(address, gas) { - IsPrecompileResult::Answer { - is_precompile: true, - .. - } => return IsPrecompileResult::Answer { - is_precompile: true, - extra_cost: 0, - }, - _ => {} - }; - )*); - IsPrecompileResult::Answer { is_precompile: false, extra_cost: 0 } - } - - #[inline(always)] - fn used_addresses(&self) -> Vec { - let mut used_addresses = vec![]; - - for_tuples!(#( - let mut inner = self.Tuple.used_addresses(); - used_addresses.append(&mut inner); - )*); - - used_addresses - } - - fn summarize_checks(&self) -> Vec { - let mut checks = Vec::new(); - - for_tuples!(#( - let mut inner = self.Tuple.summarize_checks(); - checks.append(&mut inner); - )*); - - checks - } -} - -#[impl_for_tuples(1, 100)] -impl IsActivePrecompile for Tuple { - #[inline(always)] - fn is_active_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - for_tuples!(#( - match self.Tuple.is_active_precompile(address, gas) { - IsPrecompileResult::Answer { - is_precompile: true, - .. - } => return IsPrecompileResult::Answer { - is_precompile: true, - extra_cost: 0, - }, - _ => {} - }; - )*); - IsPrecompileResult::Answer { is_precompile: false, extra_cost: 0 } - } -} - -/// Wraps a precompileset fragment into a range, and will skip processing it if the address -/// is out of the range. -pub struct PrecompilesInRangeInclusive { - inner: P, - range: RangeInclusive, - _phantom: PhantomData, -} - -impl PrecompileSetFragment for PrecompilesInRangeInclusive<(S, E), P> -where - S: Get, - E: Get, - P: PrecompileSetFragment, -{ - fn new() -> Self { - Self { - inner: P::new(), - range: RangeInclusive::new(S::get(), E::get()), - _phantom: PhantomData, - } - } - - fn execute( - &self, - handle: &mut impl PrecompileHandle, - ) -> Option { - if self.range.contains(&handle.code_address()) { - self.inner.execute::(handle) - } else { - None - } - } - - fn is_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - if self.range.contains(&address) { - self.inner.is_precompile(address, gas) - } else { - IsPrecompileResult::Answer { is_precompile: false, extra_cost: 0 } - } - } - - fn used_addresses(&self) -> Vec { - self.inner.used_addresses() - } - - fn summarize_checks(&self) -> Vec { - self.inner.summarize_checks() - } -} - -impl IsActivePrecompile for PrecompilesInRangeInclusive<(S, E), P> -where - P: IsActivePrecompile, -{ - fn is_active_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - if self.range.contains(&address) { - self.inner.is_active_precompile(address, gas) - } else { - IsPrecompileResult::Answer { is_precompile: false, extra_cost: 0 } - } - } -} - -/// Wraps a tuple of `PrecompileSetFragment` to make a real `PrecompileSet`. -pub struct PrecompileSetBuilder { - inner: P, - _phantom: PhantomData, -} - -impl PrecompileSet for PrecompileSetBuilder { - fn execute(&self, handle: &mut impl PrecompileHandle) -> Option { - self.inner.execute::(handle) - } - - fn is_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - self.inner.is_precompile(address, gas) - } -} - -impl IsActivePrecompile for PrecompileSetBuilder { - fn is_active_precompile(&self, address: H160, gas: u64) -> IsPrecompileResult { - self.inner.is_active_precompile(address, gas) - } -} - -impl PrecompileSetBuilder { - /// Create a new instance of the PrecompileSet. - pub fn new() -> Self { - Self { inner: P::new(), _phantom: PhantomData } - } - - /// Return the list of addresses contained in this PrecompileSet. - pub fn used_addresses() -> impl Iterator { - Self::new() - .inner - .used_addresses() - .into_iter() - .map(|x| R::AddressMapping::into_account_id(x)) - } - - pub fn summarize_checks(&self) -> Vec { - self.inner.summarize_checks() - } -} diff --git a/precompiles/utils/src/solidity/codec/bytes.rs b/precompiles/utils/src/solidity/codec/bytes.rs deleted file mode 100644 index d92e773d..00000000 --- a/precompiles/utils/src/solidity/codec/bytes.rs +++ /dev/null @@ -1,177 +0,0 @@ -use super::*; -use alloc::borrow::ToOwned; -use sp_core::{ConstU32, Get}; - -type ConstU32Max = ConstU32<{ u32::MAX }>; - -pub type UnboundedBytes = BoundedBytesString; -pub type BoundedBytes = BoundedBytesString; - -pub type UnboundedString = BoundedBytesString; -pub type BoundedString = BoundedBytesString; - -trait Kind { - fn signature() -> String; -} - -#[derive(Clone, Debug, Eq, PartialEq)] -pub struct BytesKind; - -impl Kind for BytesKind { - fn signature() -> String { - String::from("bytes") - } -} - -#[derive(Clone, Debug, Eq, PartialEq)] -pub struct StringKind; - -impl Kind for StringKind { - fn signature() -> String { - String::from("string") - } -} - -/// The `bytes/string` type of Solidity. -/// It is different from `Vec` which will be serialized with padding for each `u8` element -/// of the array, while `Bytes` is tightly packed. -#[derive(Debug)] -pub struct BoundedBytesString { - data: Vec, - _phantom: PhantomData<(K, S)>, -} - -impl> Clone for BoundedBytesString { - fn clone(&self) -> Self { - Self { data: self.data.clone(), _phantom: PhantomData } - } -} - -impl PartialEq> for BoundedBytesString { - fn eq(&self, other: &BoundedBytesString) -> bool { - self.data.eq(&other.data) - } -} - -impl Eq for BoundedBytesString {} - -impl> BoundedBytesString { - pub fn as_bytes(&self) -> &[u8] { - &self.data - } - - pub fn as_str(&self) -> Result<&str, sp_std::str::Utf8Error> { - sp_std::str::from_utf8(&self.data) - } -} - -impl> Codec for BoundedBytesString { - fn read(reader: &mut Reader) -> MayRevert { - let mut inner_reader = reader.read_pointer()?; - - // Read bytes/string size. - let array_size: usize = inner_reader - .read::() - .map_err(|_| RevertReason::read_out_of_bounds("length"))? - .try_into() - .map_err(|_| RevertReason::value_is_too_large("length"))?; - - if array_size > S::get() as usize { - return Err(RevertReason::value_is_too_large("length").into()); - } - - // Get valid range over the bytes data. - let range = inner_reader.move_cursor(array_size)?; - - let data = inner_reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds(K::signature()))?; - - let bytes = Self { data: data.to_owned(), _phantom: PhantomData }; - - Ok(bytes) - } - - fn write(writer: &mut Writer, value: Self) { - let value: Vec<_> = value.into(); - let length = value.len(); - - // Pad the data. - // Leave it as is if a multiple of 32, otherwise pad to next - // multiple or 32. - let chunks = length / 32; - let padded_size = match length % 32 { - 0 => chunks * 32, - _ => (chunks + 1) * 32, - }; - - let mut value = value.to_vec(); - value.resize(padded_size, 0); - - writer - .write_pointer(Writer::new().write(U256::from(length)).write_raw_bytes(&value).build()); - } - - fn has_static_size() -> bool { - false - } - - fn signature() -> String { - K::signature() - } -} - -// BytesString <=> Vec/&[u8] - -impl From> for Vec { - fn from(value: BoundedBytesString) -> Self { - value.data - } -} - -impl From> for BoundedBytesString { - fn from(value: Vec) -> Self { - Self { data: value, _phantom: PhantomData } - } -} - -impl From<&[u8]> for BoundedBytesString { - fn from(value: &[u8]) -> Self { - Self { data: value.to_vec(), _phantom: PhantomData } - } -} - -impl From<[u8; N]> for BoundedBytesString { - fn from(value: [u8; N]) -> Self { - Self { data: value.to_vec(), _phantom: PhantomData } - } -} - -impl From<&[u8; N]> for BoundedBytesString { - fn from(value: &[u8; N]) -> Self { - Self { data: value.to_vec(), _phantom: PhantomData } - } -} - -// BytesString <=> String/str - -impl TryFrom> for String { - type Error = alloc::string::FromUtf8Error; - - fn try_from(value: BoundedBytesString) -> Result { - alloc::string::String::from_utf8(value.data) - } -} - -impl From<&str> for BoundedBytesString { - fn from(value: &str) -> Self { - Self { data: value.as_bytes().into(), _phantom: PhantomData } - } -} - -impl From for BoundedBytesString { - fn from(value: String) -> Self { - Self { data: value.as_bytes().into(), _phantom: PhantomData } - } -} diff --git a/precompiles/utils/src/solidity/codec/mod.rs b/precompiles/utils/src/solidity/codec/mod.rs deleted file mode 100644 index 9f493041..00000000 --- a/precompiles/utils/src/solidity/codec/mod.rs +++ /dev/null @@ -1,326 +0,0 @@ -//! Solidity encoding following the -//! [Contract ABI Specification](https://docs.soliditylang.org/en/v0.8.19/abi-spec.html#abi) - -pub mod bytes; -pub mod native; - -use crate::solidity::revert::{MayRevert, RevertReason}; -use core::{marker::PhantomData, ops::Range}; -use sp_core::{H256, U256}; -use sp_std::{convert::TryInto, vec, vec::Vec}; - -pub use alloc::string::String; -pub use bytes::{BoundedBytes, BoundedString, UnboundedBytes, UnboundedString}; -pub use native::{Address, BoundedVec}; - -// derive macro -pub use precompile_utils_macro::Codec; - -/// Data that can be encoded/encoded followiong the Solidity ABI Specification. -pub trait Codec: Sized { - fn read(reader: &mut Reader) -> MayRevert; - fn write(writer: &mut Writer, value: Self); - fn has_static_size() -> bool; - fn signature() -> String; - fn is_explicit_tuple() -> bool { - false - } -} - -/// Encode the value into its Solidity ABI format. -/// If `T` is a tuple it is encoded as a Solidity tuple with dynamic-size offset. -fn encode(value: T) -> Vec { - Writer::new().write(value).build() -} - -/// Encode the value into its Solidity ABI format. -/// If `T` is a tuple every element is encoded without a prefixed offset. -/// It matches the encoding of Solidity function arguments and return value, or event data. -pub fn encode_arguments(value: T) -> Vec { - let output = encode(value); - if T::is_explicit_tuple() && !T::has_static_size() { - output[32..].to_vec() - } else { - output - } -} - -pub use self::{encode_arguments as encode_return_value, encode_arguments as encode_event_data}; - -/// Encode the value as the arguments of a Solidity function with given selector. -/// If `T` is a tuple each member represents an argument of the function. -pub fn encode_with_selector(selector: u32, value: T) -> Vec { - Writer::new_with_selector(selector) - .write_raw_bytes(&encode_arguments(value)) - .build() -} - -/// Decode the value from its Solidity ABI format. -/// If `T` is a tuple it is decoded as a Solidity tuple with dynamic-size offset. -fn decode(input: &[u8]) -> MayRevert { - Reader::new(input).read() -} - -/// Decode the value from its Solidity ABI format. -/// If `T` is a tuple every element is decoded without a prefixed offset. -/// It matches the encoding of Solidity function arguments and return value, or event data. -pub fn decode_arguments(input: &[u8]) -> MayRevert { - if T::is_explicit_tuple() && !T::has_static_size() { - let writer = Writer::new(); - let mut writer = writer.write(U256::from(32)); - writer.write_pointer(input.to_vec()); - let input = writer.build(); - decode(&input) - } else { - decode(&input) - } -} - -pub use self::{decode_arguments as decode_return_value, decode_arguments as decode_event_data}; - -/// Extracts the selector from the start of the input, or returns `None` if the input is too short. -pub fn selector(input: &[u8]) -> Option { - input.get(0..4).map(|s| { - let mut buffer = [0u8; 4]; - buffer.copy_from_slice(s); - u32::from_be_bytes(buffer) - }) -} - -/// Wrapper around an EVM input slice. -#[derive(Clone, Copy, Debug)] -pub struct Reader<'inner> { - input: &'inner [u8], - cursor: usize, -} - -impl<'inner> Reader<'inner> { - /// Create a Reader. - pub fn new(input: &'inner [u8]) -> Self { - Self { input, cursor: 0 } - } - - /// Create a Reader while skipping an initial selector. - pub fn new_skip_selector(input: &'inner [u8]) -> MayRevert { - if input.len() < 4 { - return Err(RevertReason::read_out_of_bounds("selector").into()); - } - - Ok(Self::new(&input[4..])) - } - - /// Check the input has at least the correct amount of arguments before the end (32 bytes - /// values). - pub fn expect_arguments(&self, args: usize) -> MayRevert { - if self.input.len() >= self.cursor + args * 32 { - Ok(()) - } else { - Err(RevertReason::ExpectedAtLeastNArguments(args).into()) - } - } - - /// Read data from the input. - pub fn read(&mut self) -> MayRevert { - T::read(self) - } - - /// Read raw bytes from the input. - /// Doesn't handle any alignment checks, prefer using `read` instead of possible. - /// Returns an error if trying to parse out of bounds. - pub fn read_raw_bytes(&mut self, len: usize) -> MayRevert<&[u8]> { - let range = self.move_cursor(len)?; - - let data = self - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("raw bytes"))?; - - Ok(data) - } - - /// Reads a pointer, returning a reader targetting the pointed location. - pub fn read_pointer(&mut self) -> MayRevert { - let offset: usize = self - .read::() - .map_err(|_| RevertReason::read_out_of_bounds("pointer"))? - .try_into() - .map_err(|_| RevertReason::value_is_too_large("pointer"))?; - - if offset >= self.input.len() { - return Err(RevertReason::PointerToOutofBound.into()); - } - - Ok(Self { input: &self.input[offset..], cursor: 0 }) - } - - /// Read remaining bytes - pub fn read_till_end(&mut self) -> MayRevert<&[u8]> { - let range = self.move_cursor(self.input.len() - self.cursor)?; - - let data = self - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("raw bytes"))?; - - Ok(data) - } - - /// Move the reading cursor with provided length, and return a range from the previous cursor - /// location to the new one. - /// Checks cursor overflows. - fn move_cursor(&mut self, len: usize) -> MayRevert> { - let start = self.cursor; - let end = self.cursor.checked_add(len).ok_or_else(|| RevertReason::CursorOverflow)?; - - self.cursor = end; - - Ok(start..end) - } -} - -/// Help build an EVM input/output data. -/// -/// Functions takes `self` to allow chaining all calls like -/// `Writer::new().write(...).write(...).build()`. -/// While it could be more ergonomic to take &mut self, this would -/// prevent to have a `build` function that don't clone the output. -#[derive(Clone, Debug)] -pub struct Writer { - pub(crate) data: Vec, - offset_data: Vec, - selector: Option, -} - -#[derive(Clone, Debug)] -struct OffsetChunk { - // Offset location in the container data. - offset_position: usize, - // Data pointed by the offset that must be inserted at the end of container data. - data: Vec, - // Inside of arrays, the offset is not from the start of array data (length), but from the - // start of the item. This shift allow to correct this. - offset_shift: usize, -} - -impl Writer { - /// Creates a new empty output builder (without selector). - pub fn new() -> Self { - Self { data: vec![], offset_data: vec![], selector: None } - } - - /// Creates a new empty output builder with provided selector. - /// Selector will only be appended before the data when calling - /// `build` to not mess with the offsets. - pub fn new_with_selector(selector: impl Into) -> Self { - Self { data: vec![], offset_data: vec![], selector: Some(selector.into()) } - } - - // Return the built data. - pub fn build(mut self) -> Vec { - Self::bake_offsets(&mut self.data, self.offset_data); - - if let Some(selector) = self.selector { - let mut output = selector.to_be_bytes().to_vec(); - output.append(&mut self.data); - output - } else { - self.data - } - } - - /// Add offseted data at the end of this writer's data, updating the offsets. - fn bake_offsets(output: &mut Vec, offsets: Vec) { - for mut offset_chunk in offsets { - let offset_position = offset_chunk.offset_position; - let offset_position_end = offset_position + 32; - - // The offset is the distance between the start of the data and the - // start of the pointed data (start of a struct, length of an array). - // Offsets in inner data are relative to the start of their respective "container". - // However in arrays the "container" is actually the item itself instead of the whole - // array, which is corrected by `offset_shift`. - let free_space_offset = output.len() - offset_chunk.offset_shift; - - // Override dummy offset to the offset it will be in the final output. - U256::from(free_space_offset) - .to_big_endian(&mut output[offset_position..offset_position_end]); - - // Append this data at the end of the current output. - output.append(&mut offset_chunk.data); - } - } - - /// Write arbitrary bytes. - /// Doesn't handle any alignement checks, prefer using `write` instead if possible. - fn write_raw_bytes(mut self, value: &[u8]) -> Self { - self.data.extend_from_slice(value); - self - } - - /// Write data of requested type. - pub fn write(mut self, value: T) -> Self { - T::write(&mut self, value); - self - } - - /// Writes a pointer to given data. - /// The data will be appended when calling `build`. - /// Initially write a dummy value as offset in this writer's data, which will be replaced by - /// the correct offset once the pointed data is appended. - /// - /// Takes `&mut self` since its goal is to be used inside `solidity::Codec` impl and not in - /// chains. - pub fn write_pointer(&mut self, data: Vec) { - let offset_position = self.data.len(); - H256::write(self, H256::repeat_byte(0xff)); - - self.offset_data.push(OffsetChunk { offset_position, data, offset_shift: 0 }); - } -} - -/// Adapter to parse data as a first type then convert it to another one. -/// Useful for old precompiles in which Solidity arguments where set larger than -/// the needed Rust type. -#[derive(Clone, Copy, Debug)] -pub struct Convert { - inner: C, - _phantom: PhantomData

, -} - -impl From for Convert { - fn from(value: C) -> Self { - Self { inner: value, _phantom: PhantomData } - } -} - -impl Convert { - pub fn converted(self) -> C { - self.inner - } -} - -impl Codec for Convert -where - P: Codec + TryInto, - C: Codec + Into

, -{ - fn read(reader: &mut Reader) -> MayRevert { - let c = P::read(reader)? - .try_into() - .map_err(|_| RevertReason::value_is_too_large(C::signature()))?; - - Ok(Self { inner: c, _phantom: PhantomData }) - } - - fn write(writer: &mut Writer, value: Self) { - P::write(writer, value.inner.into()) - } - - fn has_static_size() -> bool { - P::has_static_size() - } - - fn signature() -> String { - P::signature() - } -} diff --git a/precompiles/utils/src/solidity/codec/native.rs b/precompiles/utils/src/solidity/codec/native.rs deleted file mode 100644 index c7750625..00000000 --- a/precompiles/utils/src/solidity/codec/native.rs +++ /dev/null @@ -1,349 +0,0 @@ -use super::*; -use crate::solidity::revert::InjectBacktrace; -use impl_trait_for_tuples::impl_for_tuples; -use sp_core::{ConstU32, Get, H160}; - -impl Codec for () { - fn read(_reader: &mut Reader) -> MayRevert { - Ok(()) - } - - fn write(_writer: &mut Writer, _value: Self) {} - - fn has_static_size() -> bool { - true - } - - fn signature() -> String { - String::from("()") - } -} - -#[impl_for_tuples(1, 20)] -impl Codec for Tuple { - fn has_static_size() -> bool { - for_tuples!(#( Tuple::has_static_size() )&*) - } - - fn read(reader: &mut Reader) -> MayRevert { - if Self::has_static_size() { - let mut index = 0; - Ok(for_tuples!( ( #( { - let elem = reader.read::().in_tuple(index)?; - index +=1; - elem - } ),* ) )) - } else { - let reader = &mut reader.read_pointer()?; - let mut index = 0; - Ok(for_tuples!( ( #( { - let elem = reader.read::().in_tuple(index)?; - index +=1; - elem - } ),* ) )) - } - } - - fn write(writer: &mut Writer, value: Self) { - if Self::has_static_size() { - for_tuples!( #( Tuple::write(writer, value.Tuple); )* ); - } else { - let mut inner_writer = Writer::new(); - for_tuples!( #( Tuple::write(&mut inner_writer, value.Tuple); )* ); - writer.write_pointer(inner_writer.build()); - } - } - - fn signature() -> String { - let mut subtypes = Vec::new(); - for_tuples!( #( subtypes.push(Tuple::signature()); )* ); - alloc::format!("({})", subtypes.join(",")) - } - - fn is_explicit_tuple() -> bool { - true - } -} - -impl Codec for H256 { - fn read(reader: &mut Reader) -> MayRevert { - let range = reader.move_cursor(32)?; - - let data = reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("bytes32"))?; - - Ok(H256::from_slice(data)) - } - - fn write(writer: &mut Writer, value: Self) { - writer.data.extend_from_slice(value.as_bytes()); - } - - fn has_static_size() -> bool { - true - } - - fn signature() -> String { - String::from("bytes32") - } -} - -/// The `address` type of Solidity. -/// H160 could represent 2 types of data (bytes20 and address) that are not encoded the same way. -/// To avoid issues writing H160 is thus not supported. -#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)] -pub struct Address(pub H160); - -impl From for Address { - fn from(a: H160) -> Address { - Address(a) - } -} - -impl From

for H160 { - fn from(a: Address) -> H160 { - a.0 - } -} - -impl Address { - pub fn as_u64(&self) -> Option { - let _u64 = self.0.to_low_u64_be(); - if self.0 == H160::from_low_u64_be(_u64) { - Some(_u64) - } else { - None - } - } -} - -impl Codec for Address { - fn read(reader: &mut Reader) -> MayRevert { - let range = reader.move_cursor(32)?; - - let data = reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("address"))?; - - Ok(H160::from_slice(&data[12..32]).into()) - } - - fn write(writer: &mut Writer, value: Self) { - H256::write(writer, value.0.into()); - } - - fn has_static_size() -> bool { - true - } - - fn signature() -> String { - String::from("address") - } -} - -impl Codec for U256 { - fn read(reader: &mut Reader) -> MayRevert { - let range = reader.move_cursor(32)?; - - let data = reader - .input - .get(range) - .ok_or_else(|| RevertReason::read_out_of_bounds("uint256"))?; - - Ok(U256::from_big_endian(data)) - } - - fn write(writer: &mut Writer, value: Self) { - let mut buffer = [0u8; 32]; - value.to_big_endian(&mut buffer); - writer.data.extend_from_slice(&buffer); - } - - fn has_static_size() -> bool { - true - } - - fn signature() -> String { - String::from("uint256") - } -} - -macro_rules! impl_evmdata_for_uints { - ($($uint:ty, )*) => { - $( - impl Codec for $uint { - fn read(reader: &mut Reader) -> MayRevert { - let value256: U256 = reader.read() - .map_err(|_| RevertReason::read_out_of_bounds( - Self::signature() - ))?; - - value256 - .try_into() - .map_err(|_| RevertReason::value_is_too_large( - Self::signature() - ).into()) - } - - fn write(writer: &mut Writer, value: Self) { - U256::write(writer, value.into()); - } - - fn has_static_size() -> bool { - true - } - - fn signature() -> String { - alloc::format!("uint{}", core::mem::size_of::() * 8) - } - } - )* - }; -} - -impl_evmdata_for_uints!(u8, u16, u32, u64, u128,); - -impl Codec for bool { - fn read(reader: &mut Reader) -> MayRevert { - let h256 = H256::read(reader).map_err(|_| RevertReason::read_out_of_bounds("bool"))?; - - Ok(!h256.is_zero()) - } - - fn write(writer: &mut Writer, value: Self) { - let mut buffer = [0u8; 32]; - if value { - buffer[31] = 1; - } - - writer.data.extend_from_slice(&buffer); - } - - fn has_static_size() -> bool { - true - } - - fn signature() -> String { - String::from("bool") - } -} - -type ConstU32Max = ConstU32<{ u32::MAX }>; - -impl Codec for Vec { - fn read(reader: &mut Reader) -> MayRevert { - BoundedVec::::read(reader).map(|x| x.into()) - } - - fn write(writer: &mut Writer, value: Self) { - BoundedVec::::write( - writer, - BoundedVec { inner: value, _phantom: PhantomData }, - ) - } - - fn has_static_size() -> bool { - false - } - - fn signature() -> String { - alloc::format!("{}[]", T::signature()) - } -} - -/// Wrapper around a Vec that provides a max length bound on read. -#[derive(Clone, Debug, Eq, PartialEq)] -pub struct BoundedVec { - inner: Vec, - _phantom: PhantomData, -} - -impl> Codec for BoundedVec { - fn read(reader: &mut Reader) -> MayRevert { - let mut inner_reader = reader.read_pointer()?; - - let array_size: usize = inner_reader - .read::() - .map_err(|_| RevertReason::read_out_of_bounds("length"))? - .try_into() - .map_err(|_| RevertReason::value_is_too_large("length"))?; - - if array_size > S::get() as usize { - return Err(RevertReason::value_is_too_large("length").into()); - } - - let mut array = vec![]; - - let mut item_reader = Reader { - input: inner_reader - .input - .get(32..) - .ok_or_else(|| RevertReason::read_out_of_bounds("array content"))?, - cursor: 0, - }; - - for i in 0..array_size { - array.push(item_reader.read().in_array(i)?); - } - - Ok(BoundedVec { inner: array, _phantom: PhantomData }) - } - - fn write(writer: &mut Writer, value: Self) { - let value: Vec<_> = value.into(); - let mut inner_writer = Writer::new().write(U256::from(value.len())); - - for inner in value { - // Any offset in items are relative to the start of the item instead of the - // start of the array. However if there is offseted data it must but appended after - // all items (offsets) are written. We thus need to rely on `compute_offsets` to do - // that, and must store a "shift" to correct the offsets. - let shift = inner_writer.data.len(); - let item_writer = Writer::new().write(inner); - - inner_writer = inner_writer.write_raw_bytes(&item_writer.data); - for mut offset_datum in item_writer.offset_data { - offset_datum.offset_shift += 32; - offset_datum.offset_position += shift; - inner_writer.offset_data.push(offset_datum); - } - } - - writer.write_pointer(inner_writer.build()); - } - - fn has_static_size() -> bool { - false - } - - fn signature() -> String { - alloc::format!("{}[]", T::signature()) - } -} - -impl From> for BoundedVec { - fn from(value: Vec) -> Self { - BoundedVec { inner: value, _phantom: PhantomData } - } -} - -impl From<&[T]> for BoundedVec { - fn from(value: &[T]) -> Self { - BoundedVec { inner: value.to_vec(), _phantom: PhantomData } - } -} - -impl From<[T; N]> for BoundedVec { - fn from(value: [T; N]) -> Self { - BoundedVec { inner: value.to_vec(), _phantom: PhantomData } - } -} - -impl From> for Vec { - fn from(value: BoundedVec) -> Self { - value.inner - } -} diff --git a/precompiles/utils/src/solidity/mod.rs b/precompiles/utils/src/solidity/mod.rs deleted file mode 100644 index 970a5eae..00000000 --- a/precompiles/utils/src/solidity/mod.rs +++ /dev/null @@ -1,10 +0,0 @@ -//! Provides utilities for compatibility with Solidity tooling. - -pub mod codec; -pub mod modifier; -pub mod revert; - -pub use codec::{ - decode_arguments, decode_event_data, decode_return_value, encode_arguments, encode_event_data, - encode_return_value, encode_with_selector, Codec, -}; diff --git a/precompiles/utils/src/solidity/modifier.rs b/precompiles/utils/src/solidity/modifier.rs deleted file mode 100644 index 115858ae..00000000 --- a/precompiles/utils/src/solidity/modifier.rs +++ /dev/null @@ -1,36 +0,0 @@ -//! Provide checks related to function modifiers (view/payable). - -use crate::solidity::revert::{MayRevert, RevertReason}; -use fp_evm::Context; -use sp_core::U256; - -/// Represents modifiers a Solidity function can be annotated with. -#[derive(Copy, Clone, PartialEq, Eq)] -pub enum FunctionModifier { - /// Function that doesn't modify the state. - View, - /// Function that modifies the state but refuse receiving funds. - /// Correspond to a Solidity function with no modifiers. - NonPayable, - /// Function that modifies the state and accept funds. - Payable, -} - -#[must_use] -/// Check that a function call is compatible with the context it is -/// called into. -pub fn check_function_modifier( - context: &Context, - is_static: bool, - modifier: FunctionModifier, -) -> MayRevert { - if is_static && modifier != FunctionModifier::View { - return Err(RevertReason::custom("Can't call non-static function in static context").into()); - } - - if modifier != FunctionModifier::Payable && context.apparent_value > U256::zero() { - return Err(RevertReason::custom("Function is not payable").into()); - } - - Ok(()) -} diff --git a/precompiles/utils/src/solidity/revert.rs b/precompiles/utils/src/solidity/revert.rs deleted file mode 100644 index 3840505f..00000000 --- a/precompiles/utils/src/solidity/revert.rs +++ /dev/null @@ -1,363 +0,0 @@ -//! Utilities to work with revert messages with support for backtraces and -//! consistent formatting. - -use crate::solidity::{self, codec::bytes::UnboundedBytes}; -use alloc::string::{String, ToString}; -use fp_evm::{ExitRevert, PrecompileFailure}; -use sp_std::vec::Vec; - -/// Represent the result of a computation that can revert. -pub type MayRevert = Result; - -/// Generate an encoded revert from a simple String. -/// Returns a `PrecompileFailure` that fits in an `EvmResult::Err`. -pub fn revert(msg: impl Into) -> PrecompileFailure { - RevertReason::custom(msg).into() -} - -/// Generate an encoded revert from a simple String. -/// Returns a `Vec` in case `PrecompileFailure` is too high level. -pub fn revert_as_bytes(msg: impl Into) -> Vec { - Revert::new(RevertReason::custom(msg)).to_encoded_bytes() -} - -/// Generic error to build abi-encoded revert output. -/// See: https://docs.soliditylang.org/en/latest/control-structures.html?highlight=revert#revert -pub const ERROR_SELECTOR: u32 = 0x08c379a0; - -#[derive(Clone, PartialEq, Eq)] -enum BacktracePart { - Field(String), - Tuple(usize), - Array(usize), -} - -/// Backtrace of an revert. -/// Built depth-first. -/// Implement `Display` to render the backtrace as a string. -#[derive(Default, PartialEq, Eq)] -pub struct Backtrace(Vec); - -impl Backtrace { - /// Create a new empty backtrace. - pub fn new() -> Self { - Self(Vec::new()) - } - - /// Check if the backtrace is empty. - pub fn is_empty(&self) -> bool { - self.0.is_empty() - } -} - -impl core::fmt::Display for Backtrace { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> { - for (i, part) in self.0.iter().rev().enumerate() { - match (i, part) { - (0, BacktracePart::Field(field)) => write!(f, "{field}")?, - (_, BacktracePart::Field(field)) => write!(f, ".{field}")?, - (_, BacktracePart::Tuple(index)) => write!(f, ".{index}")?, - (_, BacktracePart::Array(index)) => write!(f, "[{index}]")?, - } - } - Ok(()) - } -} - -/// Possible revert reasons. -#[non_exhaustive] -#[derive(PartialEq, Eq)] -pub enum RevertReason { - /// A custom revert reason if other variants are not appropriate. - Custom(String), - /// Tried to read data out of bounds. - ReadOutOfBounds { - /// What was being read? - what: String, - }, - /// An unknown selector has been provided. - UnknownSelector, - /// A value is too large to fit in the wanted type. - /// For security reasons integers are always parsed as `uint256` then - /// casted to the wanted type. If the value overflows this type then this - /// revert is used. - ValueIsTooLarge { - /// What was being read? - what: String, - }, - /// A pointer (used for structs and arrays) points out of bounds. - PointerToOutofBound, - /// The reading cursor overflowed. - /// This should realistically never happen as it would require an input - /// of length larger than 2^64, which would cost too much to be included - /// in a block. - CursorOverflow, - /// Used by a check that the input contains at least N static arguments. - /// Often use to return early if the input is too short. - ExpectedAtLeastNArguments(usize), -} - -impl RevertReason { - /// Create a `RevertReason::Custom` from anything that can be converted to a `String`. - /// Argument is the custom revert message. - pub fn custom(s: impl Into) -> Self { - RevertReason::Custom(s.into()) - } - - /// Create a `RevertReason::ReadOutOfBounds` from anything that can be converted to a `String`. - /// Argument names what was expected to be read. - pub fn read_out_of_bounds(what: impl Into) -> Self { - RevertReason::ReadOutOfBounds { what: what.into() } - } - - /// Create a `RevertReason::ValueIsTooLarge` from anything that can be converted to a `String`. - /// Argument names what was expected to be read. - pub fn value_is_too_large(what: impl Into) -> Self { - RevertReason::ValueIsTooLarge { what: what.into() } - } -} - -impl core::fmt::Display for RevertReason { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> { - match self { - RevertReason::Custom(s) => write!(f, "{s}"), - RevertReason::ReadOutOfBounds { what } => { - write!(f, "Tried to read {what} out of bounds") - }, - RevertReason::UnknownSelector => write!(f, "Unknown selector"), - RevertReason::ValueIsTooLarge { what } => write!(f, "Value is too large for {what}"), - RevertReason::PointerToOutofBound => write!(f, "Pointer points to out of bound"), - RevertReason::CursorOverflow => write!(f, "Reading cursor overflowed"), - RevertReason::ExpectedAtLeastNArguments(n) => { - write!(f, "Expected at least {n} arguments") - }, - } - } -} - -/// An revert returned by various functions in precompile-utils. -/// Allows to dynamically construct the backtrace (backtrace) of the revert -/// and manage it in a typed way. -/// Can be transformed into a `PrecompileFailure::Revert` and `String`, and -/// implement `Display` and `Debug`. -#[derive(PartialEq, Eq)] -pub struct Revert { - reason: RevertReason, - backtrace: Backtrace, -} - -impl Revert { - /// Create a new `Revert` with a `RevertReason` and - /// an empty backtrace. - pub fn new(reason: RevertReason) -> Self { - Self { reason, backtrace: Backtrace::new() } - } - - /// For all `RevertReason` variants that have a `what` field, change its value. - /// Otherwise do nothing. - /// It is useful when writing custom types `solidity::Codec` implementations using - /// simpler types. - pub fn change_what(mut self, what: impl Into) -> Self { - let what = what.into(); - - self.reason = match self.reason { - RevertReason::ReadOutOfBounds { .. } => RevertReason::ReadOutOfBounds { what }, - RevertReason::ValueIsTooLarge { .. } => RevertReason::ValueIsTooLarge { what }, - other => other, - }; - - self - } - - /// Transforms the revert into its bytes representation (from a String). - pub fn to_encoded_bytes(self) -> Vec { - let bytes: Vec = self.into(); - solidity::encode_with_selector(ERROR_SELECTOR, UnboundedBytes::from(bytes)) - } -} - -impl From for Revert { - fn from(a: RevertReason) -> Revert { - Revert::new(a) - } -} - -impl core::fmt::Display for Revert { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> { - if !self.backtrace.is_empty() { - write!(f, "{}: ", self.backtrace)?; - } - - write!(f, "{}", self.reason) - } -} - -impl core::fmt::Debug for Revert { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> { - write!(f, "{}", self) - } -} - -impl Into> for Revert { - fn into(self) -> Vec { - self.to_string().into() - } -} - -/// Allows to inject backtrace data. -pub trait InjectBacktrace { - /// Output type of the injection. - /// Should be a type that can hold a backtrace. - type Output; - - /// Occurs in a field. - fn in_field(self, field: impl Into) -> Self::Output; - - /// Occurs in a tuple. - fn in_tuple(self, index: usize) -> Self::Output; - - /// Occurs in an array at provided index. - fn in_array(self, index: usize) -> Self::Output; -} - -/// Additional function for everything having a Backtrace. -pub trait BacktraceExt { - /// Map last tuple entry into a field. - /// Does nothing if last entry is not a tuple. - /// As in Solidity structs are equivalent to tuples and are tricky to parse correctly, - /// it allows to parse any struct as a tuple (with the correct implementation in this crate) and - /// then map tuple indices to struct fields. - fn map_in_tuple_to_field(self, fields: &[&'static str]) -> Self; -} - -/// Additional functions for Revert and MayRevert. -pub trait RevertExt { - /// Map the reason while keeping the same backtrace. - fn map_reason(self, f: impl FnOnce(RevertReason) -> RevertReason) -> Self; -} - -impl InjectBacktrace for RevertReason { - // `RevertReason` cannot hold a backtrace, thus it wraps - // it into a `Revert`. - type Output = Revert; - - fn in_field(self, field: impl Into) -> Revert { - Revert::new(self).in_field(field) - } - - fn in_array(self, index: usize) -> Revert { - Revert::new(self).in_array(index) - } - - fn in_tuple(self, index: usize) -> Revert { - Revert::new(self).in_tuple(index) - } -} - -impl InjectBacktrace for Backtrace { - type Output = Self; - - fn in_field(mut self, field: impl Into) -> Self { - self.0.push(BacktracePart::Field(field.into())); - self - } - - fn in_array(mut self, index: usize) -> Self { - self.0.push(BacktracePart::Array(index)); - self - } - - fn in_tuple(mut self, index: usize) -> Self { - self.0.push(BacktracePart::Tuple(index)); - self - } -} - -impl BacktraceExt for Backtrace { - fn map_in_tuple_to_field(mut self, fields: &[&'static str]) -> Self { - if let Some(entry) = self.0.last_mut() { - if let BacktracePart::Tuple(index) = *entry { - if let Some(field) = fields.get(index) { - *entry = BacktracePart::Field(field.to_string()) - } - } - } - self - } -} - -impl InjectBacktrace for Revert { - type Output = Self; - - fn in_field(mut self, field: impl Into) -> Self { - self.backtrace = self.backtrace.in_field(field); - self - } - - fn in_array(mut self, index: usize) -> Self { - self.backtrace = self.backtrace.in_array(index); - self - } - - fn in_tuple(mut self, index: usize) -> Self { - self.backtrace = self.backtrace.in_tuple(index); - self - } -} - -impl RevertExt for Revert { - fn map_reason(mut self, f: impl FnOnce(RevertReason) -> RevertReason) -> Self { - self.reason = f(self.reason); - self - } -} - -impl BacktraceExt for Revert { - fn map_in_tuple_to_field(mut self, fields: &[&'static str]) -> Self { - self.backtrace = self.backtrace.map_in_tuple_to_field(fields); - self - } -} - -impl InjectBacktrace for MayRevert { - type Output = Self; - - fn in_field(self, field: impl Into) -> Self { - self.map_err(|e| e.in_field(field)) - } - - fn in_array(self, index: usize) -> Self { - self.map_err(|e| e.in_array(index)) - } - - fn in_tuple(self, index: usize) -> Self { - self.map_err(|e| e.in_tuple(index)) - } -} - -impl RevertExt for MayRevert { - fn map_reason(self, f: impl FnOnce(RevertReason) -> RevertReason) -> Self { - self.map_err(|e| e.map_reason(f)) - } -} - -impl BacktraceExt for MayRevert { - fn map_in_tuple_to_field(self, fields: &[&'static str]) -> Self { - self.map_err(|e| e.map_in_tuple_to_field(fields)) - } -} - -impl From for PrecompileFailure { - fn from(err: Revert) -> Self { - PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: err.to_encoded_bytes(), - } - } -} - -impl From for PrecompileFailure { - fn from(err: RevertReason) -> Self { - Revert::new(err).into() - } -} diff --git a/precompiles/utils/src/substrate.rs b/precompiles/utils/src/substrate.rs deleted file mode 100644 index c3ac5609..00000000 --- a/precompiles/utils/src/substrate.rs +++ /dev/null @@ -1,128 +0,0 @@ -//! Utils related to Substrate features: -//! - Substrate call dispatch. -//! - Substrate DB read and write costs - -use crate::{evm::handle::using_precompile_handle, solidity::revert::revert}; -use core::marker::PhantomData; -use fp_evm::{ExitError, PrecompileFailure, PrecompileHandle}; -use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, - pallet_prelude::*, - traits::Get, -}; -use pallet_evm::GasWeightMapping; - -#[derive(Debug)] -pub enum TryDispatchError { - Evm(ExitError), - Substrate(DispatchError), -} - -impl From for PrecompileFailure { - fn from(f: TryDispatchError) -> PrecompileFailure { - match f { - TryDispatchError::Evm(e) => PrecompileFailure::Error { exit_status: e }, - TryDispatchError::Substrate(e) => { - revert(alloc::format!("Dispatched call failed with error: {e:?}")) - }, - } - } -} - -/// Helper functions requiring a Substrate runtime. -/// This runtime must of course implement `pallet_evm::Config`. -#[derive(Clone, Copy, Debug)] -pub struct RuntimeHelper(PhantomData); - -impl RuntimeHelper -where - Runtime: pallet_evm::Config, - Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, -{ - #[inline(always)] - pub fn record_weight_v2_cost( - handle: &mut impl PrecompileHandle, - weight: Weight, - ) -> Result<(), ExitError> { - // Make sure there is enough gas. - let remaining_gas = handle.remaining_gas(); - let required_gas = Runtime::GasWeightMapping::weight_to_gas(weight); - if required_gas > remaining_gas { - return Err(ExitError::OutOfGas); - } - - // Make sure there is enough remaining weight - // TODO: record ref time when precompile will be benchmarked - handle.record_external_cost(None, Some(weight.proof_size())) - } - - #[inline(always)] - pub fn refund_weight_v2_cost( - handle: &mut impl PrecompileHandle, - weight: Weight, - maybe_actual_weight: Option, - ) -> Result { - // Refund weights and compute used weight them record used gas - // TODO: refund ref time when precompile will be benchmarked - let used_weight = if let Some(actual_weight) = maybe_actual_weight { - let refund_weight = weight.checked_sub(&actual_weight).unwrap_or_default(); - handle.refund_external_cost(None, Some(refund_weight.proof_size())); - actual_weight - } else { - weight - }; - let used_gas = Runtime::GasWeightMapping::weight_to_gas(used_weight); - handle.record_cost(used_gas)?; - Ok(used_gas) - } - - /// Try to dispatch a Substrate call. - /// Return an error if there are not enough gas, or if the call fails. - /// If successful returns the used gas using the Runtime GasWeightMapping. - pub fn try_dispatch( - handle: &mut impl PrecompileHandle, - origin: ::RuntimeOrigin, - call: Call, - ) -> Result - where - Runtime::RuntimeCall: From, - { - let call = Runtime::RuntimeCall::from(call); - let dispatch_info = call.get_dispatch_info(); - - Self::record_weight_v2_cost(handle, dispatch_info.weight) - .map_err(|e| TryDispatchError::Evm(e))?; - - // Dispatch call. - // It may be possible to not record gas cost if the call returns Pays::No. - // However while Substrate handle checking weight while not making the sender pay for it, - // the EVM doesn't. It seems this safer to always record the costs to avoid unmetered - // computations. - let post_dispatch_info = using_precompile_handle(handle, || call.dispatch(origin)) - .map_err(|e| TryDispatchError::Substrate(e.error))?; - - Self::refund_weight_v2_cost(handle, dispatch_info.weight, post_dispatch_info.actual_weight) - .map_err(|e| TryDispatchError::Evm(e))?; - - Ok(post_dispatch_info) - } -} - -impl RuntimeHelper -where - Runtime: pallet_evm::Config, -{ - /// Cost of a Substrate DB write in gas. - pub fn db_write_gas_cost() -> u64 { - ::GasWeightMapping::weight_to_gas( - ::DbWeight::get().writes(1), - ) - } - - /// Cost of a Substrate DB read in gas. - pub fn db_read_gas_cost() -> u64 { - ::GasWeightMapping::weight_to_gas( - ::DbWeight::get().reads(1), - ) - } -} From e9a4e5ad63e98a7529e5b8a6bc021c7201fbda44 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 12:32:03 +0900 Subject: [PATCH 04/53] NODE-64, chore: replace to --- Cargo.lock | 1 + Cargo.toml | 1 + node/common/Cargo.toml | 1 + node/common/src/rpc.rs | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52c49eed..b1a49f32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,6 +699,7 @@ version = "1.0.0" dependencies = [ "bp-core", "clap", + "fc-api", "fc-db", "fc-rpc", "fc-rpc-core", diff --git a/Cargo.toml b/Cargo.toml index cfb401ea..7044ea43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -191,6 +191,7 @@ fc-rpc-core = { default-features = false, git = "https://github.com/bifrost-plat fc-rpc-debug = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fc-rpc-trace = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fc-rpc-txpool = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-api = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } # Frontier Primitive fp-self-contained = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } diff --git a/node/common/Cargo.toml b/node/common/Cargo.toml index 142df691..2d808826 100644 --- a/node/common/Cargo.toml +++ b/node/common/Cargo.toml @@ -36,6 +36,7 @@ sp-block-builder = { workspace = true, features = ["std"] } # Frontier dependencies fc-db = { workspace = true } +fc-api = { workspace = true } fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] } fc-rpc-core = { workspace = true } fp-rpc-debug = { workspace = true } diff --git a/node/common/src/rpc.rs b/node/common/src/rpc.rs index 13249fa2..d456cbde 100644 --- a/node/common/src/rpc.rs +++ b/node/common/src/rpc.rs @@ -94,7 +94,7 @@ pub struct FullDevDeps { /// List of optional RPC extensions. pub ethapi_cmd: Vec, /// Frontier backend. - pub frontier_backend: Arc + Send + Sync>, + pub frontier_backend: Arc + Send + Sync>, /// Backend. pub backend: Arc, /// Maximum fee history cache size. @@ -142,7 +142,7 @@ pub struct FullDeps { /// List of optional RPC extensions. pub ethapi_cmd: Vec, /// Frontier backend. - pub frontier_backend: Arc + Send + Sync>, + pub frontier_backend: Arc + Send + Sync>, /// Backend. pub backend: Arc, /// Maximum fee history cache size. From 8dd34234bfc1a4d7838b08f55e37b0145556a2ef Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 15:23:59 +0900 Subject: [PATCH 05/53] NODE-64, chore: move to --- pallets/bfc-staking/src/pallet/impls.rs | 27 ++++++++++++++----------- pallets/bfc-staking/src/pallet/mod.rs | 14 ++++++------- runtime/dev/src/lib.rs | 14 ++++--------- runtime/mainnet/src/lib.rs | 14 ++++--------- runtime/testnet/src/lib.rs | 14 ++++--------- 5 files changed, 34 insertions(+), 49 deletions(-) diff --git a/pallets/bfc-staking/src/pallet/impls.rs b/pallets/bfc-staking/src/pallet/impls.rs index 1e316be9..cb0844bb 100644 --- a/pallets/bfc-staking/src/pallet/impls.rs +++ b/pallets/bfc-staking/src/pallet/impls.rs @@ -6,6 +6,7 @@ use crate::{ RoundIndex, TierType, TotalSnapshot, ValidatorSnapshot, ValidatorSnapshotOf, }; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_session::ShouldEndSession; use bp_staking::{ @@ -710,7 +711,7 @@ impl Pallet { if let Some(mut state) = Self::candidate_info(author) { // rounds current block increases after block authoring - state.set_last_block(current_block + T::BlockNumber::from(1u32)); + state.set_last_block(current_block + BlockNumberFor::::from(1u32)); state.increment_blocks_produced(); >::insert(author, state); } @@ -916,7 +917,7 @@ impl Pallet { /// Update to the new round. This method will refresh the candidate states and some other /// metadata, and will also apply the new top candidates selected for the new round. pub fn new_round( - now: T::BlockNumber, + now: BlockNumberFor, full_validators: Vec, basic_validators: Vec, ) { @@ -953,7 +954,7 @@ impl Pallet { } } -impl pallet_authorship::EventHandler for Pallet +impl pallet_authorship::EventHandler> for Pallet where T: Config + pallet_authorship::Config + pallet_session::Config, T: pallet_session::Config::AccountId>, @@ -1038,31 +1039,33 @@ where fn start_session(_start_index: SessionIndex) {} } -impl ShouldEndSession for Pallet { - fn should_end_session(now: T::BlockNumber) -> bool { +impl ShouldEndSession> for Pallet { + fn should_end_session(now: BlockNumberFor) -> bool { let round = Self::round(); // always update when a new round should start round.should_update(now) } } -impl EstimateNextSessionRotation for Pallet { - fn average_session_length() -> T::BlockNumber { +impl EstimateNextSessionRotation> for Pallet { + fn average_session_length() -> BlockNumberFor { let session_period = T::DefaultBlocksPerSession::get(); - T::BlockNumber::from(session_period) + BlockNumberFor::::from(session_period) } - fn estimate_current_session_progress(now: T::BlockNumber) -> (Option, Weight) { + fn estimate_current_session_progress(now: BlockNumberFor) -> (Option, Weight) { let session_period = T::DefaultBlocksPerSession::get(); - let passed_blocks = now % T::BlockNumber::from(session_period); + let passed_blocks = now % BlockNumberFor::::from(session_period); ( - Some(Permill::from_rational(passed_blocks, T::BlockNumber::from(session_period))), + Some(Permill::from_rational(passed_blocks, BlockNumberFor::::from(session_period))), // One read for the round info, blocknumber is read free T::DbWeight::get().reads(1), ) } - fn estimate_next_session_rotation(_now: T::BlockNumber) -> (Option, Weight) { + fn estimate_next_session_rotation( + _now: BlockNumberFor, + ) -> (Option>, Weight) { let round = Self::round(); ( diff --git a/pallets/bfc-staking/src/pallet/mod.rs b/pallets/bfc-staking/src/pallet/mod.rs index 8e3799f7..d0ba7843 100644 --- a/pallets/bfc-staking/src/pallet/mod.rs +++ b/pallets/bfc-staking/src/pallet/mod.rs @@ -252,7 +252,7 @@ pub mod pallet { pub enum Event { /// Started a new round. NewRound { - starting_block: T::BlockNumber, + starting_block: BlockNumberFor, round: RoundIndex, selected_validators_number: u32, total_balance: BalanceOf, @@ -412,7 +412,7 @@ pub mod pallet { /// Set blocks per round. BlocksPerRoundSet { current_round: RoundIndex, - first_block: T::BlockNumber, + first_block: BlockNumberFor, old: u32, new: u32, new_per_round_inflation_min: Perbill, @@ -449,7 +449,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn round)] /// Current round index and next round scheduled transition - pub(crate) type Round = StorageValue<_, RoundInfo, ValueQuery>; + pub(crate) type Round = StorageValue<_, RoundInfo>, ValueQuery>; #[pallet::storage] #[pallet::getter(fn storage_cache_lifetime)] @@ -684,7 +684,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_initialize(n: T::BlockNumber) -> Weight { + fn on_initialize(n: BlockNumberFor) -> Weight { let mut weight = T::WeightInfo::base_on_initialize(); >::mutate(|round| { @@ -807,7 +807,7 @@ pub mod pallet { >::put(BTreeMap::from([(1u32, initial_majority)])); T::RelayManager::refresh_majority(1u32); // Start Round 1 at Block 0 - let round: RoundInfo = RoundInfo::new( + let round: RoundInfo> = RoundInfo::new( 1u32, 0u32, 0u32, @@ -838,7 +838,7 @@ pub mod pallet { >::insert(1u32, >::get()); >::insert(1u32, TotalSnapshot::default()); >::deposit_event(Event::NewRound { - starting_block: T::BlockNumber::zero(), + starting_block: BlockNumberFor::::zero(), round: 1u32, selected_validators_number: v_count, total_balance: total_staked, @@ -1135,7 +1135,7 @@ pub mod pallet { ); ensure!(old != new, Error::::NoWritingSameValue); ensure!( - now - first < T::BlockNumber::from(new as u8), + now - first < BlockNumberFor::from(new), Error::::RoundLengthMustBeLongerThanCreatedBlocks, ); ensure!( diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 9ba5a695..937f4002 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -180,6 +180,8 @@ parameter_types! { impl frame_system::Config for Runtime { /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + /// The block type for the runtime. + type Block = Block; /// Block & extrinsics weights: base values and limits. type BlockWeights = BlockWeights; /// The maximum length of a block (in bytes). @@ -191,15 +193,11 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get the account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; + type Nonce = Nonce; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -908,11 +906,7 @@ impl pallet_base_fee::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic - { + pub struct Runtime { // System System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 7d583da1..7f68017c 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -180,6 +180,8 @@ parameter_types! { impl frame_system::Config for Runtime { /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + /// The block type for the runtime. + type Block = Block; /// Block & extrinsics weights: base values and limits. type BlockWeights = BlockWeights; /// The maximum length of a block (in bytes). @@ -191,15 +193,11 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get the account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; + type Nonce = Nonce; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -908,11 +906,7 @@ impl pallet_base_fee::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic - { + pub struct Runtime { // System System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 8560d095..5161867b 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -182,6 +182,8 @@ parameter_types! { impl frame_system::Config for Runtime { /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + /// The block type for the runtime. + type Block = Block; /// Block & extrinsics weights: base values and limits. type BlockWeights = BlockWeights; /// The maximum length of a block (in bytes). @@ -193,15 +195,11 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get the account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; + type Nonce = Nonce; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -914,11 +912,7 @@ impl pallet_base_fee::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic - { + pub struct Runtime { // System System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, From 479a4d957e89bff1a0011ad28dd6dc3998510927 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 17:06:01 +0900 Subject: [PATCH 06/53] NODE-65, chore: apply block number prelude to precompiles --- pallets/bfc-staking/src/lib.rs | 5 ++--- pallets/bfc-staking/src/pallet/mod.rs | 4 ++-- precompiles/balance/src/lib.rs | 3 ++- precompiles/bfc-staking/src/lib.rs | 12 +++++++----- precompiles/bfc-staking/src/types.rs | 15 +++++++-------- precompiles/collective/src/lib.rs | 3 ++- precompiles/governance/src/lib.rs | 21 +++++++++++++-------- precompiles/governance/src/types.rs | 9 ++++----- 8 files changed, 39 insertions(+), 33 deletions(-) diff --git a/pallets/bfc-staking/src/lib.rs b/pallets/bfc-staking/src/lib.rs index 9d206042..6c92a0b8 100644 --- a/pallets/bfc-staking/src/lib.rs +++ b/pallets/bfc-staking/src/lib.rs @@ -38,6 +38,7 @@ mod pallet; mod set; pub mod weights; +pub use frame_system::pallet_prelude::BlockNumberFor; pub use inflation::{InflationInfo, Range}; pub use pallet::pallet::*; use weights::WeightInfo; @@ -64,8 +65,6 @@ use sp_std::{ pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; -pub type BlockNumberOf = ::BlockNumber; - /// The type that indicates the point of a reward pub type RewardPoint = u32; @@ -628,7 +627,7 @@ impl< { pub fn new(stash: AccountId, bond: Balance, tier: TierType) -> Self where - BlockNumberOf: From, + BlockNumberFor: From, { let commission = match tier { TierType::Full => >::get(), diff --git a/pallets/bfc-staking/src/pallet/mod.rs b/pallets/bfc-staking/src/pallet/mod.rs index d0ba7843..208d464b 100644 --- a/pallets/bfc-staking/src/pallet/mod.rs +++ b/pallets/bfc-staking/src/pallet/mod.rs @@ -515,7 +515,7 @@ pub mod pallet { _, Twox64Concat, T::AccountId, - CandidateMetadata, BlockNumberOf>, + CandidateMetadata, BlockNumberFor>, OptionQuery, >; @@ -1135,7 +1135,7 @@ pub mod pallet { ); ensure!(old != new, Error::::NoWritingSameValue); ensure!( - now - first < BlockNumberFor::from(new), + now - first < BlockNumberFor::::from(new), Error::::RoundLengthMustBeLongerThanCreatedBlocks, ); ensure!( diff --git a/precompiles/balance/src/lib.rs b/precompiles/balance/src/lib.rs index f8f77a34..c0d6b96c 100644 --- a/precompiles/balance/src/lib.rs +++ b/precompiles/balance/src/lib.rs @@ -1,11 +1,12 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use fp_evm::PrecompileHandle; use precompile_utils::{substrate::RuntimeHelper, EvmResult}; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::marker::PhantomData; /// A precompile to wrap the functionality from pallet_balances diff --git a/precompiles/bfc-staking/src/lib.rs b/precompiles/bfc-staking/src/lib.rs index 47c50e15..1f9ae5fe 100644 --- a/precompiles/bfc-staking/src/lib.rs +++ b/precompiles/bfc-staking/src/lib.rs @@ -7,7 +7,9 @@ use frame_support::{ BoundedBTreeSet, }; -use pallet_bfc_staking::{Call as StakingCall, NominationChange, RewardDestination}; +use pallet_bfc_staking::{ + BlockNumberFor, Call as StakingCall, NominationChange, RewardDestination, +}; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; @@ -22,9 +24,9 @@ use sp_std::{ mod types; use types::{ - BalanceOf, BlockNumberOf, CandidateState, CandidateStates, EvmCandidatePoolOf, - EvmCandidateStateOf, EvmCandidateStatesOf, EvmNominatorRequestsOf, EvmNominatorStateOf, - EvmRoundInfoOf, EvmTotalOf, NominatorState, StakingOf, TotalStake, + BalanceOf, CandidateState, CandidateStates, EvmCandidatePoolOf, EvmCandidateStateOf, + EvmCandidateStatesOf, EvmNominatorRequestsOf, EvmNominatorStateOf, EvmRoundInfoOf, EvmTotalOf, + NominatorState, StakingOf, TotalStake, }; /// A precompile to wrap the functionality from pallet_bfc_staking. @@ -39,7 +41,7 @@ where ::RuntimeOrigin: From>, Runtime::RuntimeCall: From>, BalanceOf: TryFrom + Into, - BlockNumberOf: Into, + BlockNumberFor: Into, { // Role Verifiers diff --git a/precompiles/bfc-staking/src/types.rs b/precompiles/bfc-staking/src/types.rs index 091082bf..dbc4cf66 100644 --- a/precompiles/bfc-staking/src/types.rs +++ b/precompiles/bfc-staking/src/types.rs @@ -1,4 +1,5 @@ use frame_support::traits::Currency; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_bfc_staking::{ CandidateMetadata, CapacityStatus, Nominator, NominatorStatus, RewardDestination, @@ -15,8 +16,6 @@ pub type BalanceOf = <::Currency ::AccountId, >>::Balance; -pub type BlockNumberOf = ::BlockNumber; - pub type StakingOf = pallet_bfc_staking::Pallet; pub type EvmTotalOf = ( @@ -126,7 +125,7 @@ pub struct CandidateStates { /// The validator commission ratio pub commission: Vec, /// The last block number this candidate produced - pub last_block: Vec>, + pub last_block: Vec>, /// The total blocks this candidate produced in the current round pub blocks_produced: Vec, /// The block productivity for this candidate in the current round @@ -143,7 +142,7 @@ impl From> for EvmCandidateStateOf where Runtime: pallet_bfc_staking::Config, BalanceOf: Into, - BlockNumberOf: Into, + BlockNumberFor: Into, { fn from(state: CandidateStates) -> EvmCandidateStateOf { ( @@ -175,7 +174,7 @@ impl From> for EvmCandidateStatesOf where Runtime: pallet_bfc_staking::Config, BalanceOf: Into, - BlockNumberOf: Into, + BlockNumberFor: Into, { fn from(state: CandidateStates) -> EvmCandidateStatesOf { ( @@ -338,7 +337,7 @@ pub struct CandidateState { /// The validator commission ratio pub commission: u32, /// The last block number this candidate produced - pub last_block: BlockNumberOf, + pub last_block: BlockNumberFor, /// The total blocks this candidate produced in the current round pub blocks_produced: u32, /// The block productivity for this candidate in the current round @@ -355,7 +354,7 @@ impl CandidateState where Runtime: pallet_bfc_staking::Config, Runtime::AccountId: Into, - BlockNumberOf: Into, + BlockNumberFor: Into, { pub fn default() -> Self { let zero = 0u32; @@ -386,7 +385,7 @@ where pub fn set_state( &mut self, controller: Runtime::AccountId, - state: CandidateMetadata, BlockNumberOf>, + state: CandidateMetadata, BlockNumberFor>, ) { self.controller = Address(controller.into()); self.stash = Address(state.stash.into()); diff --git a/precompiles/collective/src/lib.rs b/precompiles/collective/src/lib.rs index f4975e95..dc3a5a74 100644 --- a/precompiles/collective/src/lib.rs +++ b/precompiles/collective/src/lib.rs @@ -1,7 +1,7 @@ #![cfg_attr(not(feature = "std"), no_std)] use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, weights::Weight, }; @@ -11,6 +11,7 @@ use pallet_evm::AddressMapping; use precompile_utils::prelude::*; use sp_core::{Decode, H160, H256}; +use sp_runtime::traits::Dispatchable; use sp_std::{boxed::Box, convert::TryInto, marker::PhantomData, vec::Vec}; type CollectiveOf = pallet_collective::Pallet; diff --git a/precompiles/governance/src/lib.rs b/precompiles/governance/src/lib.rs index f4cef4f3..442494ad 100644 --- a/precompiles/governance/src/lib.rs +++ b/precompiles/governance/src/lib.rs @@ -1,9 +1,10 @@ #![cfg_attr(not(feature = "std"), no_std)] use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::{Bounded, QueryPreimage}, }; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_democracy::{ AccountVote, Call as DemocracyCall, Conviction, ReferendumInfo, Vote, VoteThreshold, Voting, @@ -14,7 +15,7 @@ use pallet_preimage::Call as PreimageCall; use precompile_utils::prelude::*; use sp_core::{H160, H256, U256}; -use sp_runtime::traits::{Hash, StaticLookup}; +use sp_runtime::traits::{Dispatchable, Hash, StaticLookup}; use sp_std::{ convert::{TryFrom, TryInto}, marker::PhantomData, @@ -24,7 +25,7 @@ use sp_std::{ mod types; use types::{ - AccountVotes, BalanceOf, BlockNumberOf, DemocracyOf, EvmAccountVotes, EvmVotingOf, + AccountVotes, BalanceOf, DemocracyOf, EvmAccountVotes, EvmVotingOf, GetEncodedProposalSizeLimit, HashOf, ReferendaVotes, }; @@ -36,18 +37,17 @@ impl GovernancePrecompile where Runtime: pallet_democracy::Config + pallet_evm::Config - + frame_system::Config + + frame_system::Config + pallet_preimage::Config, Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, ::RuntimeOrigin: From>, Runtime::RuntimeCall: From>, Runtime::RuntimeCall: From>, BalanceOf: TryFrom + Into, - BlockNumberOf: Into, HashOf: Into + From, Runtime::Hash: From + Into, Runtime::AccountId: Into, - Runtime::BlockNumber: Into, + BlockNumberFor: Into, { // Storage getters @@ -254,8 +254,13 @@ where RevertReason::custom("Failure in preimage fetch").in_field("proposal_hash") })?; - let bounded = - Bounded::Lookup::> { hash: proposal_hash, len }; + let bounded = Bounded::Lookup::< + pallet_democracy::CallOf, + ::Hashing, + > { + hash: proposal_hash, + len, + }; let origin = Runtime::AddressMapping::into_account_id(handle.context().caller); let call = DemocracyCall::::propose { proposal: bounded, value }; diff --git a/precompiles/governance/src/types.rs b/precompiles/governance/src/types.rs index a419062c..c938953e 100644 --- a/precompiles/governance/src/types.rs +++ b/precompiles/governance/src/types.rs @@ -1,4 +1,5 @@ use frame_support::traits::Currency; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_democracy::Conviction; @@ -14,8 +15,6 @@ pub type BalanceOf = <::Currency a ::AccountId, >>::Balance; -pub type BlockNumberOf = ::BlockNumber; - pub type HashOf = ::Hash; pub type DemocracyOf = pallet_democracy::Pallet; @@ -91,7 +90,7 @@ pub struct AccountVotes { /// The delegated raw amount of votes received for this account (conviction not applied) pub delegated_raw_votes: BalanceOf, /// The block number that expires the locked balance - pub lock_expired_at: BlockNumberOf, + pub lock_expired_at: BlockNumberFor, /// The balance locked to the network pub lock_balance: BalanceOf, } @@ -148,7 +147,7 @@ where pub fn set_expiration( &mut self, - lock_expired_at: BlockNumberOf, + lock_expired_at: BlockNumberFor, lock_balance: BalanceOf, ) { self.lock_expired_at = lock_expired_at; @@ -160,7 +159,7 @@ impl From> for EvmAccountVotes where Runtime: pallet_democracy::Config, BalanceOf: Into, - BlockNumberOf: Into, + BlockNumberFor: Into, { fn from(votes: AccountVotes) -> Self { ( From bc9b0b0cc1dfbdfdbe9de77fb2a80edecee34581 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 17:11:09 +0900 Subject: [PATCH 07/53] NODE-65, chore: add hold/freeze reasons to --- runtime/dev/src/lib.rs | 2 ++ runtime/mainnet/src/lib.rs | 2 ++ runtime/testnet/src/lib.rs | 2 ++ 3 files changed, 6 insertions(+) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 937f4002..42ed6077 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -274,6 +274,8 @@ impl pallet_balances::Config for Runtime { type MaxFreezes = (); type HoldIdentifier = (); type MaxHolds = (); + type RuntimeHoldReason = (); + type RuntimeFreezeReason = (); } pub struct DealWithFees(sp_std::marker::PhantomData); diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 7f68017c..3954abcc 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -274,6 +274,8 @@ impl pallet_balances::Config for Runtime { type MaxFreezes = (); type HoldIdentifier = (); type MaxHolds = (); + type RuntimeHoldReason = (); + type RuntimeFreezeReason = (); } pub struct DealWithFees(sp_std::marker::PhantomData); diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 5161867b..b0f64780 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -276,6 +276,8 @@ impl pallet_balances::Config for Runtime { type MaxFreezes = (); type HoldIdentifier = (); type MaxHolds = (); + type RuntimeHoldReason = (); + type RuntimeFreezeReason = (); } pub struct DealWithFees(sp_std::marker::PhantomData); From ff6424de34a953baeb51933f51ba0d38b6a7102a Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 17:13:56 +0900 Subject: [PATCH 08/53] NODE-65, chore: remove hold identifier from --- runtime/dev/src/lib.rs | 1 - runtime/mainnet/src/lib.rs | 1 - runtime/testnet/src/lib.rs | 1 - 3 files changed, 3 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 42ed6077..233318d9 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -272,7 +272,6 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); type MaxFreezes = (); - type HoldIdentifier = (); type MaxHolds = (); type RuntimeHoldReason = (); type RuntimeFreezeReason = (); diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 3954abcc..a77ada94 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -272,7 +272,6 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); type MaxFreezes = (); - type HoldIdentifier = (); type MaxHolds = (); type RuntimeHoldReason = (); type RuntimeFreezeReason = (); diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index b0f64780..34b1d9ea 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -274,7 +274,6 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); type MaxFreezes = (); - type HoldIdentifier = (); type MaxHolds = (); type RuntimeHoldReason = (); type RuntimeFreezeReason = (); From 087352e258c12d0859982a5299dd7ba565879da0 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 17:29:03 +0900 Subject: [PATCH 09/53] NODE-65, chore: add to --- runtime/dev/src/lib.rs | 1 + runtime/mainnet/src/lib.rs | 1 + runtime/testnet/src/lib.rs | 1 + 3 files changed, 3 insertions(+) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 233318d9..03f3f459 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -244,6 +244,7 @@ impl pallet_grandpa::Config for Runtime { type EquivocationReportSystem = (); type WeightInfo = (); type MaxAuthorities = MaxAuthorities; + type MaxNominators = ConstU32<150>; type MaxSetIdSessionEntries = ConstU64<0>; } diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index a77ada94..de6fcfc9 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -244,6 +244,7 @@ impl pallet_grandpa::Config for Runtime { type EquivocationReportSystem = (); type WeightInfo = (); type MaxAuthorities = MaxAuthorities; + type MaxNominators = ConstU32<150>; type MaxSetIdSessionEntries = ConstU64<0>; } diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 34b1d9ea..8429ab14 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -246,6 +246,7 @@ impl pallet_grandpa::Config for Runtime { type EquivocationReportSystem = (); type WeightInfo = (); type MaxAuthorities = MaxAuthorities; + type MaxNominators = ConstU32<150>; type MaxSetIdSessionEntries = ConstU64<0>; } From 12d2de37efabb5cfcc46b05de76f01a3e860cc69 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 17:30:12 +0900 Subject: [PATCH 10/53] NODE-65, chore: add AllowMultipleBlocksPerSlot to pallet_aura --- runtime/dev/src/lib.rs | 1 + runtime/mainnet/src/lib.rs | 1 + runtime/testnet/src/lib.rs | 1 + 3 files changed, 3 insertions(+) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 03f3f459..8e264ea5 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -235,6 +235,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = ConstBool; } /// Provides the GRANDPA block finality gadget. diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index de6fcfc9..74db36c9 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -235,6 +235,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = ConstBool; } /// Provides the GRANDPA block finality gadget. diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 8429ab14..69872413 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -237,6 +237,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = ConstBool; } /// Provides the GRANDPA block finality gadget. From 3f24b2ef4698d46403cf46b1634194be22ee43ad Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 17:53:46 +0900 Subject: [PATCH 11/53] NODE-65, chore: add new types to pallet_treasury --- primitives/core/src/lib.rs | 2 +- runtime/dev/src/lib.rs | 13 +++++++++++-- runtime/mainnet/src/lib.rs | 13 +++++++++++-- runtime/testnet/src/lib.rs | 13 +++++++++++-- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs index 7e60cd25..875b27cf 100644 --- a/primitives/core/src/lib.rs +++ b/primitives/core/src/lib.rs @@ -31,7 +31,7 @@ pub type Hash = sp_core::H256; pub type Header = generic::Header; /// Index of a transaction in the chain. -pub type Index = u32; +pub type Nonce = u32; /// The address format for describing accounts. pub type Address = AccountId; diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 8e264ea5..d65a4053 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -7,6 +7,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Index, Signature}; +use frame_support::traits::tokens::{PayFromAccount, UnityAssetBalanceConversion}; use parity_scale_codec::{Decode, Encode}; pub use bifrost_dev_constants::{ @@ -19,7 +20,7 @@ use fp_rpc::TransactionStatus; use fp_rpc_txpool::TxPoolResponse; use sp_api::impl_runtime_apis; use sp_consensus_aura::sr25519::AuthorityId as AuraId; -use sp_core::{crypto::KeyTypeId, ConstU64, OpaqueMetadata, H160, H256, U256}; +use sp_core::{crypto::KeyTypeId, ConstBool, ConstU64, OpaqueMetadata, H160, H256, U256}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; use sp_runtime::{ @@ -60,7 +61,6 @@ use pallet_transaction_payment::CurrencyAdapter; pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, - log, pallet_prelude::Get, parameter_types, traits::{ @@ -564,6 +564,7 @@ parameter_types! { pub const SpendPeriod: BlockNumber = 1 * MINUTES; pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); pub const MaxApprovals: u32 = 100; + pub TreasuryAccount: AccountId = Treasury::account_id(); } /// A module that manages funds stored in a certain vault @@ -590,6 +591,14 @@ impl pallet_treasury::Config for Runtime { type SpendFunds = (); type MaxApprovals = MaxApprovals; type SpendOrigin = NeverEnsureOrigin; + type AssetKind = (); + type Beneficiary = AccountId; + type BeneficiaryLookup = IdentityLookup; + type Paymaster = PayFromAccount; + type BalanceConverter = UnityAssetBalanceConversion; + type PayoutPeriod = ConstU32<0>; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = BenchmarkHelper; } parameter_types! { diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 74db36c9..29b7ba7a 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -7,6 +7,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Index, Signature}; +use frame_support::traits::tokens::{PayFromAccount, UnityAssetBalanceConversion}; use parity_scale_codec::{Decode, Encode}; pub use bifrost_mainnet_constants::{ @@ -19,7 +20,7 @@ use fp_rpc::TransactionStatus; use fp_rpc_txpool::TxPoolResponse; use sp_api::impl_runtime_apis; use sp_consensus_aura::sr25519::AuthorityId as AuraId; -use sp_core::{crypto::KeyTypeId, ConstU64, OpaqueMetadata, H160, H256, U256}; +use sp_core::{crypto::KeyTypeId, ConstBool, ConstU64, OpaqueMetadata, H160, H256, U256}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; use sp_runtime::{ @@ -60,7 +61,6 @@ use pallet_transaction_payment::CurrencyAdapter; pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, - log, pallet_prelude::Get, parameter_types, traits::{ @@ -602,6 +602,7 @@ parameter_types! { pub const SpendPeriod: BlockNumber = 14 * DAYS; pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); pub const MaxApprovals: u32 = 1_000; + pub TreasuryAccount: AccountId = Treasury::account_id(); } /// A module that manages funds stored in a certain vault @@ -628,6 +629,14 @@ impl pallet_treasury::Config for Runtime { type SpendFunds = (); type MaxApprovals = MaxApprovals; type SpendOrigin = NeverEnsureOrigin; + type AssetKind = (); + type Beneficiary = AccountId; + type BeneficiaryLookup = IdentityLookup; + type Paymaster = PayFromAccount; + type BalanceConverter = UnityAssetBalanceConversion; + type PayoutPeriod = ConstU32<0>; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = BenchmarkHelper; } parameter_types! { diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 69872413..6ac15c68 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -7,6 +7,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Index, Signature}; +use frame_support::traits::tokens::{PayFromAccount, UnityAssetBalanceConversion}; use parity_scale_codec::{Decode, Encode}; pub use bifrost_testnet_constants::{ @@ -19,7 +20,7 @@ use fp_rpc::TransactionStatus; use fp_rpc_txpool::TxPoolResponse; use sp_api::impl_runtime_apis; use sp_consensus_aura::sr25519::AuthorityId as AuraId; -use sp_core::{crypto::KeyTypeId, ConstU64, OpaqueMetadata, H160, H256, U256}; +use sp_core::{crypto::KeyTypeId, ConstBool, ConstU64, OpaqueMetadata, H160, H256, U256}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; use sp_runtime::{ @@ -60,7 +61,6 @@ use pallet_transaction_payment::CurrencyAdapter; pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, - log, pallet_prelude::Get, parameter_types, traits::{ @@ -608,6 +608,7 @@ parameter_types! { pub const SpendPeriod: BlockNumber = 1 * DAYS; pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); pub const MaxApprovals: u32 = 50; + pub TreasuryAccount: AccountId = Treasury::account_id(); } /// A module that manages funds stored in a certain vault @@ -634,6 +635,14 @@ impl pallet_treasury::Config for Runtime { type SpendFunds = (); type MaxApprovals = MaxApprovals; type SpendOrigin = NeverEnsureOrigin; + type AssetKind = (); + type Beneficiary = AccountId; + type BeneficiaryLookup = IdentityLookup; + type Paymaster = PayFromAccount; + type BalanceConverter = UnityAssetBalanceConversion; + type PayoutPeriod = ConstU32<0>; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = BenchmarkHelper; } parameter_types! { From 35349ea3f560cfbf6be67f70dcf9a8e89a2088b3 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 18:06:24 +0900 Subject: [PATCH 12/53] NODE-65, chore: make pallet_preimage use Consideration --- runtime/dev/src/lib.rs | 21 +++++++++++++++------ runtime/mainnet/src/lib.rs | 21 +++++++++++++++------ runtime/testnet/src/lib.rs | 21 +++++++++++++++------ 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index d65a4053..bafe7834 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -6,8 +6,12 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Index, Signature}; -use frame_support::traits::tokens::{PayFromAccount, UnityAssetBalanceConversion}; +pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; +use frame_support::traits::{ + fungible::HoldConsideration, + tokens::{PayFromAccount, UnityAssetBalanceConversion}, + LinearStoragePrice, +}; use parity_scale_codec::{Decode, Encode}; pub use bifrost_dev_constants::{ @@ -545,8 +549,9 @@ impl pallet_democracy::Config for Runtime { } parameter_types! { - pub const BaseDeposit: Balance = 5 * SUPPLY_FACTOR * BFC; - pub const ByteDeposit: Balance = STORAGE_BYTE_FEE; + pub const PreimageBaseDeposit: Balance = 5 * SUPPLY_FACTOR * BFC; + pub const PreimageByteDeposit: Balance = STORAGE_BYTE_FEE; + pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage); } impl pallet_preimage::Config for Runtime { @@ -554,8 +559,12 @@ impl pallet_preimage::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type BaseDeposit = BaseDeposit; - type ByteDeposit = ByteDeposit; + type Consideration = HoldConsideration< + AccountId, + Balances, + PreimageHoldReason, + LinearStoragePrice, + >; } parameter_types! { diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 29b7ba7a..681b3021 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -6,8 +6,12 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Index, Signature}; -use frame_support::traits::tokens::{PayFromAccount, UnityAssetBalanceConversion}; +pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; +use frame_support::traits::{ + fungible::HoldConsideration, + tokens::{PayFromAccount, UnityAssetBalanceConversion}, + LinearStoragePrice, +}; use parity_scale_codec::{Decode, Encode}; pub use bifrost_mainnet_constants::{ @@ -583,8 +587,9 @@ impl pallet_democracy::Config for Runtime { } parameter_types! { - pub const BaseDeposit: Balance = 5 * SUPPLY_FACTOR * BFC; - pub const ByteDeposit: Balance = STORAGE_BYTE_FEE; + pub const PreimageBaseDeposit: Balance = 5 * SUPPLY_FACTOR * BFC; + pub const PreimageByteDeposit: Balance = STORAGE_BYTE_FEE; + pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage); } impl pallet_preimage::Config for Runtime { @@ -592,8 +597,12 @@ impl pallet_preimage::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type BaseDeposit = BaseDeposit; - type ByteDeposit = ByteDeposit; + type Consideration = HoldConsideration< + AccountId, + Balances, + PreimageHoldReason, + LinearStoragePrice, + >; } parameter_types! { diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 6ac15c68..c5e8e8bc 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -6,8 +6,12 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Index, Signature}; -use frame_support::traits::tokens::{PayFromAccount, UnityAssetBalanceConversion}; +pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; +use frame_support::traits::{ + fungible::HoldConsideration, + tokens::{PayFromAccount, UnityAssetBalanceConversion}, + LinearStoragePrice, +}; use parity_scale_codec::{Decode, Encode}; pub use bifrost_testnet_constants::{ @@ -589,8 +593,9 @@ impl pallet_democracy::Config for Runtime { } parameter_types! { - pub const BaseDeposit: Balance = 5 * SUPPLY_FACTOR * BFC; - pub const ByteDeposit: Balance = STORAGE_BYTE_FEE; + pub const PreimageBaseDeposit: Balance = 5 * SUPPLY_FACTOR * BFC; + pub const PreimageByteDeposit: Balance = STORAGE_BYTE_FEE; + pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage); } impl pallet_preimage::Config for Runtime { @@ -598,8 +603,12 @@ impl pallet_preimage::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type BaseDeposit = BaseDeposit; - type ByteDeposit = ByteDeposit; + type Consideration = HoldConsideration< + AccountId, + Balances, + PreimageHoldReason, + LinearStoragePrice, + >; } parameter_types! { From 89ce5745e0340c1fa860d1be445688ce5cf48a0c Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 22 Dec 2023 18:19:24 +0900 Subject: [PATCH 13/53] NODE-65, chore: add missing generic type to GenesisConfig --- pallets/bfc-offences/src/pallet/mod.rs | 5 +++-- pallets/bfc-utility/src/pallet/mod.rs | 5 +++-- pallets/relay-manager/src/pallet/mod.rs | 5 +++-- runtime/dev/src/lib.rs | 19 +++++++++---------- runtime/mainnet/src/lib.rs | 19 +++++++++---------- runtime/testnet/src/lib.rs | 19 +++++++++---------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pallets/bfc-offences/src/pallet/mod.rs b/pallets/bfc-offences/src/pallet/mod.rs index eb770230..8b1dc372 100644 --- a/pallets/bfc-offences/src/pallet/mod.rs +++ b/pallets/bfc-offences/src/pallet/mod.rs @@ -121,7 +121,8 @@ pub mod pallet { pub default_basic_maximum_offence_count: OffenceCount, pub is_offence_active: bool, pub is_slash_active: bool, - _phantom_data: PhantomData, + #[serde(skip)] + pub _config: PhantomData, } #[cfg(feature = "std")] @@ -134,7 +135,7 @@ pub mod pallet { default_basic_maximum_offence_count: T::DefaultBasicMaximumOffenceCount::get(), is_offence_active: T::IsOffenceActive::get(), is_slash_active: T::IsSlashActive::get(), - _phantom_data: PhantomData::default(), + _config: Default::default(), } } } diff --git a/pallets/bfc-utility/src/pallet/mod.rs b/pallets/bfc-utility/src/pallet/mod.rs index c8a5a9ed..04d0ac37 100644 --- a/pallets/bfc-utility/src/pallet/mod.rs +++ b/pallets/bfc-utility/src/pallet/mod.rs @@ -69,13 +69,14 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig { pub proposal_index: PropIndex, - _phantom_data: PhantomData, + #[serde(skip)] + pub _config: PhantomData, } #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { - Self { proposal_index: 0, _phantom_data: PhantomData::default() } + Self { proposal_index: 0, _config: Default::default() } } } diff --git a/pallets/relay-manager/src/pallet/mod.rs b/pallets/relay-manager/src/pallet/mod.rs index 331e251d..8b8fe4f5 100644 --- a/pallets/relay-manager/src/pallet/mod.rs +++ b/pallets/relay-manager/src/pallet/mod.rs @@ -224,7 +224,8 @@ pub mod pallet { pub storage_cache_lifetime: u32, pub is_heartbeat_offence_active: bool, pub heartbeat_slash_fraction: Perbill, - _phantom_data: PhantomData, + #[serde(skip)] + pub _config: PhantomData, } #[cfg(feature = "std")] @@ -234,7 +235,7 @@ pub mod pallet { storage_cache_lifetime: T::StorageCacheLifetimeInRounds::get(), is_heartbeat_offence_active: T::IsHeartbeatOffenceActive::get(), heartbeat_slash_fraction: T::DefaultHeartbeatSlashFraction::get(), - _phantom_data: PhantomData::default(), + _config: Default::default(), } } } diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index bafe7834..b43c5fda 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -491,7 +491,6 @@ parameter_types! { pub const MaxProposals: u32 = 100; pub const MaxDeposits: u32 = 1_000; pub const MaxBlacklisted: u32 = 1_000; - pub const PreimageByteDeposit: Balance = STORAGE_BYTE_FEE; pub const InstantAllowed: bool = true; } @@ -929,7 +928,7 @@ impl pallet_base_fee::Config for Runtime { construct_runtime!( pub struct Runtime { // System - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, // Block @@ -941,25 +940,25 @@ construct_runtime!( Historical: pallet_session_historical::{Pallet} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, ImOnline: pallet_im_online::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 8, - Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, // Monetary Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, // Staking - RelayManager: pallet_relay_manager::{Pallet, Call, Storage, Config, Event} = 20, + RelayManager: pallet_relay_manager::{Pallet, Call, Storage, Config, Event} = 20, BfcStaking: pallet_bfc_staking::{Pallet, Call, Storage, Config, Event} = 21, - BfcUtility: pallet_bfc_utility::{Pallet, Call, Storage, Config, Event} = 22, - BfcOffences: pallet_bfc_offences::{Pallet, Call, Storage, Config, Event} = 23, + BfcUtility: pallet_bfc_utility::{Pallet, Call, Storage, Config, Event} = 22, + BfcOffences: pallet_bfc_offences::{Pallet, Call, Storage, Config, Event} = 23, // Utility Utility: pallet_utility::{Pallet, Call, Event} = 30, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 31, // Ethereum - EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 40, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 41, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 40, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 41, BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config, Event} = 42, // Governance @@ -969,7 +968,7 @@ construct_runtime!( TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 53, CouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 54, TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 57, // Temporary diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 681b3021..b20de9a9 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -529,7 +529,6 @@ parameter_types! { pub const MaxProposals: u32 = 1_000; pub const MaxDeposits: u32 = 1_000; pub const MaxBlacklisted: u32 = 1_000; - pub const PreimageByteDeposit: Balance = STORAGE_BYTE_FEE; pub const InstantAllowed: bool = true; } @@ -929,7 +928,7 @@ impl pallet_base_fee::Config for Runtime { construct_runtime!( pub struct Runtime { // System - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, // Block @@ -941,25 +940,25 @@ construct_runtime!( Historical: pallet_session_historical::{Pallet} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, ImOnline: pallet_im_online::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 8, - Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, // Monetary Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, // Staking - RelayManager: pallet_relay_manager::{Pallet, Call, Storage, Config, Event} = 20, + RelayManager: pallet_relay_manager::{Pallet, Call, Storage, Config, Event} = 20, BfcStaking: pallet_bfc_staking::{Pallet, Call, Storage, Config, Event} = 21, - BfcUtility: pallet_bfc_utility::{Pallet, Call, Storage, Config, Event} = 22, - BfcOffences: pallet_bfc_offences::{Pallet, Call, Storage, Config, Event} = 23, + BfcUtility: pallet_bfc_utility::{Pallet, Call, Storage, Config, Event} = 22, + BfcOffences: pallet_bfc_offences::{Pallet, Call, Storage, Config, Event} = 23, // Utility Utility: pallet_utility::{Pallet, Call, Event} = 30, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 31, // Ethereum - EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 40, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 41, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 40, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 41, BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config, Event} = 42, // Governance @@ -969,7 +968,7 @@ construct_runtime!( TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 53, CouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 54, TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 57, // Temporary diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index c5e8e8bc..5944a9f9 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -535,7 +535,6 @@ parameter_types! { pub const MaxProposals: u32 = 50; pub const MaxDeposits: u32 = 1_000; pub const MaxBlacklisted: u32 = 1_000; - pub const PreimageByteDeposit: Balance = STORAGE_BYTE_FEE; pub const InstantAllowed: bool = true; } @@ -935,7 +934,7 @@ impl pallet_base_fee::Config for Runtime { construct_runtime!( pub struct Runtime { // System - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, // Block @@ -947,25 +946,25 @@ construct_runtime!( Historical: pallet_session_historical::{Pallet} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, ImOnline: pallet_im_online::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 8, - Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, + Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, // Monetary Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, // Staking - RelayManager: pallet_relay_manager::{Pallet, Call, Storage, Config, Event} = 20, + RelayManager: pallet_relay_manager::{Pallet, Call, Storage, Config, Event} = 20, BfcStaking: pallet_bfc_staking::{Pallet, Call, Storage, Config, Event} = 21, - BfcUtility: pallet_bfc_utility::{Pallet, Call, Storage, Config, Event} = 22, - BfcOffences: pallet_bfc_offences::{Pallet, Call, Storage, Config, Event} = 23, + BfcUtility: pallet_bfc_utility::{Pallet, Call, Storage, Config, Event} = 22, + BfcOffences: pallet_bfc_offences::{Pallet, Call, Storage, Config, Event} = 23, // Utility Utility: pallet_utility::{Pallet, Call, Event} = 30, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 31, // Ethereum - EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 40, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 41, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 40, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 41, BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config, Event} = 42, // Governance @@ -975,7 +974,7 @@ construct_runtime!( TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 53, CouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 54, TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 57, // Temporary From c63180db491840217b4d37e5245144f2329f9745 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 10:47:14 +0900 Subject: [PATCH 14/53] NODE-65, chore: update pallet_preimage --- runtime/dev/src/lib.rs | 8 ++++---- runtime/mainnet/src/lib.rs | 8 ++++---- runtime/testnet/src/lib.rs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index b43c5fda..a8bac623 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -278,9 +278,9 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); - type RuntimeHoldReason = (); - type RuntimeFreezeReason = (); + type MaxHolds = ConstU32<1>; + type RuntimeHoldReason = RuntimeHoldReason; + type RuntimeFreezeReason = RuntimeFreezeReason; } pub struct DealWithFees(sp_std::marker::PhantomData); @@ -969,7 +969,7 @@ construct_runtime!( CouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 54, TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, - Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 57, + Preimage: pallet_preimage::{Pallet, Call, Storage, Event, HoldReason} = 57, // Temporary Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event} = 99, diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index b20de9a9..1c7b900f 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -278,9 +278,9 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); - type RuntimeHoldReason = (); - type RuntimeFreezeReason = (); + type MaxHolds = ConstU32<1>; + type RuntimeHoldReason = RuntimeHoldReason; + type RuntimeFreezeReason = RuntimeFreezeReason; } pub struct DealWithFees(sp_std::marker::PhantomData); @@ -969,7 +969,7 @@ construct_runtime!( CouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 54, TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, - Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 57, + Preimage: pallet_preimage::{Pallet, Call, Storage, Event, HoldReason} = 57, // Temporary Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event} = 99, diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 5944a9f9..879d9665 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -280,9 +280,9 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); - type RuntimeHoldReason = (); - type RuntimeFreezeReason = (); + type MaxHolds = ConstU32<1>; + type RuntimeHoldReason = RuntimeHoldReason; + type RuntimeFreezeReason = RuntimeFreezeReason; } pub struct DealWithFees(sp_std::marker::PhantomData); @@ -975,7 +975,7 @@ construct_runtime!( CouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 54, TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 56, - Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 57, + Preimage: pallet_preimage::{Pallet, Call, Storage, Event, HoldReason} = 57, // Temporary Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event} = 99, From 10b26db4f0c52588bcfab7b72151d69e0434671e Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 10:54:42 +0900 Subject: [PATCH 15/53] NODE-65, chore: add IdentityInformation to pallet_identity --- runtime/dev/src/lib.rs | 2 ++ runtime/mainnet/src/lib.rs | 2 ++ runtime/testnet/src/lib.rs | 2 ++ 3 files changed, 6 insertions(+) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index a8bac623..d1f02fef 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -12,6 +12,7 @@ use frame_support::traits::{ tokens::{PayFromAccount, UnityAssetBalanceConversion}, LinearStoragePrice, }; +use pallet_identity::simple::IdentityInfo; use parity_scale_codec::{Decode, Encode}; pub use bifrost_dev_constants::{ @@ -627,6 +628,7 @@ impl pallet_identity::Config for Runtime { type SubAccountDeposit = SubAccountDeposit; type MaxSubAccounts = MaxSubAccounts; type MaxAdditionalFields = MaxAdditionalFields; + type IdentityInformation = IdentityInfo; type MaxRegistrars = MaxRegistrars; type Slashed = Treasury; type ForceOrigin = EnsureRoot; diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 1c7b900f..3b03fbb0 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -12,6 +12,7 @@ use frame_support::traits::{ tokens::{PayFromAccount, UnityAssetBalanceConversion}, LinearStoragePrice, }; +use pallet_identity::simple::IdentityInfo; use parity_scale_codec::{Decode, Encode}; pub use bifrost_mainnet_constants::{ @@ -665,6 +666,7 @@ impl pallet_identity::Config for Runtime { type SubAccountDeposit = SubAccountDeposit; type MaxSubAccounts = MaxSubAccounts; type MaxAdditionalFields = MaxAdditionalFields; + type IdentityInformation = IdentityInfo; type MaxRegistrars = MaxRegistrars; type Slashed = Treasury; type ForceOrigin = EnsureRoot; diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 879d9665..0caecd79 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -12,6 +12,7 @@ use frame_support::traits::{ tokens::{PayFromAccount, UnityAssetBalanceConversion}, LinearStoragePrice, }; +use pallet_identity::simple::IdentityInfo; use parity_scale_codec::{Decode, Encode}; pub use bifrost_testnet_constants::{ @@ -671,6 +672,7 @@ impl pallet_identity::Config for Runtime { type SubAccountDeposit = SubAccountDeposit; type MaxSubAccounts = MaxSubAccounts; type MaxAdditionalFields = MaxAdditionalFields; + type IdentityInformation = IdentityInfo; type MaxRegistrars = MaxRegistrars; type Slashed = Treasury; type ForceOrigin = EnsureRoot; From cff00137c05a339e1f9e22522f682d4caf6a8e74 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 10:57:51 +0900 Subject: [PATCH 16/53] NODE-65, chore: remove MaxPeerDataEncodingSize from pallet_im_online --- runtime/dev/src/lib.rs | 2 -- runtime/mainnet/src/lib.rs | 2 -- runtime/testnet/src/lib.rs | 2 -- 3 files changed, 6 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index d1f02fef..918f42db 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -640,7 +640,6 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); pub const MaxKeys: u32 = 10_000; pub const MaxPeerInHeartbeats: u32 = 10_000; - pub const MaxPeerDataEncodingSize: u32 = 1_000; pub const DefaultSlashFraction: Perbill = Perbill::from_parts(5_000_000); // 0.5% } @@ -663,7 +662,6 @@ impl pallet_im_online::Config for Runtime { type WeightInfo = pallet_im_online::weights::SubstrateWeight; type MaxKeys = MaxKeys; type MaxPeerInHeartbeats = MaxPeerInHeartbeats; - type MaxPeerDataEncodingSize = MaxPeerDataEncodingSize; type DefaultSlashFraction = DefaultSlashFraction; } diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 3b03fbb0..3578d6f6 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -383,7 +383,6 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); pub const MaxKeys: u32 = 10_000; pub const MaxPeerInHeartbeats: u32 = 10_000; - pub const MaxPeerDataEncodingSize: u32 = 1_000; pub const DefaultSlashFraction: Perbill = Perbill::from_parts(1000000); } @@ -406,7 +405,6 @@ impl pallet_im_online::Config for Runtime { type WeightInfo = pallet_im_online::weights::SubstrateWeight; type MaxKeys = MaxKeys; type MaxPeerInHeartbeats = MaxPeerInHeartbeats; - type MaxPeerDataEncodingSize = MaxPeerDataEncodingSize; type DefaultSlashFraction = DefaultSlashFraction; } diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 0caecd79..839bbf8d 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -385,7 +385,6 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); pub const MaxKeys: u32 = 10_000; pub const MaxPeerInHeartbeats: u32 = 10_000; - pub const MaxPeerDataEncodingSize: u32 = 1_000; pub const DefaultSlashFraction: Perbill = Perbill::from_percent(10); } @@ -408,7 +407,6 @@ impl pallet_im_online::Config for Runtime { type WeightInfo = pallet_im_online::weights::SubstrateWeight; type MaxKeys = MaxKeys; type MaxPeerInHeartbeats = MaxPeerInHeartbeats; - type MaxPeerDataEncodingSize = MaxPeerDataEncodingSize; type DefaultSlashFraction = DefaultSlashFraction; } From c8a22e4677db6206f8b85bec94ad37fd067a359d Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 11:04:10 +0900 Subject: [PATCH 17/53] NODE-65, chore: add SuicideQuickClearLimit to pallet_evm --- runtime/dev/src/lib.rs | 3 ++- runtime/mainnet/src/lib.rs | 3 ++- runtime/testnet/src/lib.rs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 918f42db..1a6f45f6 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -71,7 +71,7 @@ pub use frame_support::{ traits::{ ConstU128, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, FindAuthor, Imbalance, KeyOwnerProofSystem, LockIdentifier, NeverEnsureOrigin, OnFinalize, - OnUnbalanced, Randomness, StorageInfo, U128CurrencyToVote, + OnUnbalanced, Randomness, StorageInfo, }, weights::{ constants::{ @@ -882,6 +882,7 @@ impl pallet_evm::Config for Runtime { type PrecompilesValue = PrecompilesValue; type OnCreate = (); type GasLimitPovSizeRatio = GasLimitPovSizeRatio; + type SuicideQuickClearLimit = ConstU32<0>; type Timestamp = Timestamp; type WeightInfo = pallet_evm::weights::SubstrateWeight; } diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 3578d6f6..996ed655 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -71,7 +71,7 @@ pub use frame_support::{ traits::{ ConstU128, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, FindAuthor, Imbalance, KeyOwnerProofSystem, LockIdentifier, NeverEnsureOrigin, OnFinalize, - OnUnbalanced, Randomness, StorageInfo, U128CurrencyToVote, + OnUnbalanced, Randomness, StorageInfo, }, weights::{ constants::{ @@ -882,6 +882,7 @@ impl pallet_evm::Config for Runtime { type PrecompilesValue = PrecompilesValue; type OnCreate = (); type GasLimitPovSizeRatio = GasLimitPovSizeRatio; + type SuicideQuickClearLimit = ConstU32<0>; type Timestamp = Timestamp; type WeightInfo = pallet_evm::weights::SubstrateWeight; } diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 839bbf8d..308ebc0a 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -71,7 +71,7 @@ pub use frame_support::{ traits::{ ConstU128, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, FindAuthor, Imbalance, KeyOwnerProofSystem, LockIdentifier, NeverEnsureOrigin, OnFinalize, - OnUnbalanced, Randomness, StorageInfo, U128CurrencyToVote, + OnUnbalanced, Randomness, StorageInfo, }, weights::{ constants::{ @@ -888,6 +888,7 @@ impl pallet_evm::Config for Runtime { type PrecompilesValue = PrecompilesValue; type OnCreate = (); type GasLimitPovSizeRatio = GasLimitPovSizeRatio; + type SuicideQuickClearLimit = ConstU32<0>; type Timestamp = Timestamp; type WeightInfo = pallet_evm::weights::SubstrateWeight; } From 680d5a394de8e09ba7606c77f1a8452878670022 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 11:22:46 +0900 Subject: [PATCH 18/53] NODE-65, feat: implement GenesisBuilder runtime api --- Cargo.lock | 3 +++ Cargo.toml | 1 + runtime/common/src/apis.rs | 13 +++++++++++-- runtime/dev/Cargo.toml | 3 ++- runtime/dev/src/lib.rs | 1 + runtime/mainnet/Cargo.toml | 3 ++- runtime/mainnet/src/lib.rs | 1 + runtime/testnet/Cargo.toml | 3 ++- runtime/testnet/src/lib.rs | 1 + 9 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1a49f32..acf9e2fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -880,6 +880,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -1030,6 +1031,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -1200,6 +1202,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", diff --git a/Cargo.toml b/Cargo.toml index 7044ea43..964832e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -148,6 +148,7 @@ sp-version = { default-features = false, git = "https://github.com/bifrost-platf sp-staking = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } sp-keystore = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } sp-timestamp = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sp-genesis-builder = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } # Substrate FRAME substrate-frame-rpc-system = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } diff --git a/runtime/common/src/apis.rs b/runtime/common/src/apis.rs index 7e9f1245..5b6ddbfb 100644 --- a/runtime/common/src/apis.rs +++ b/runtime/common/src/apis.rs @@ -423,8 +423,8 @@ macro_rules! impl_common_runtime_apis { None } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Index { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Nonce { System::account_nonce(account) } } @@ -489,6 +489,15 @@ macro_rules! impl_common_runtime_apis { Ok(batches) } } + impl sp_genesis_builder::GenesisBuilder for Runtime { + fn create_default_config() -> Vec { + create_default_config::() + } + + fn build_config(config: Vec) -> sp_genesis_builder::Result { + build_config::(config) + } + } } }; } diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 1c1f55f3..6fe04f02 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-dev-runtime" version = "1.0.0" description = "The substrate runtime for Bifrost Node development" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -68,6 +68,7 @@ sp-session = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +sp-genesis-builder = { workspace = true } # Frontier pallet-evm = { workspace = true } diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 1a6f45f6..65b2a14d 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -66,6 +66,7 @@ use pallet_transaction_payment::CurrencyAdapter; pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, + genesis_builder_helper::{build_config, create_default_config}, pallet_prelude::Get, parameter_types, traits::{ diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml index 2d31bc43..712e01a2 100644 --- a/runtime/mainnet/Cargo.toml +++ b/runtime/mainnet/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-mainnet-runtime" version = "1.0.0" description = "The substrate runtime for Bifrost Node mainnet" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -68,6 +68,7 @@ sp-session = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +sp-genesis-builder = { workspace = true } # Frontier pallet-evm = { workspace = true } diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 996ed655..746406d3 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -66,6 +66,7 @@ use pallet_transaction_payment::CurrencyAdapter; pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, + genesis_builder_helper::{build_config, create_default_config}, pallet_prelude::Get, parameter_types, traits::{ diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index ff48027e..5f722fa7 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-testnet-runtime" version = "1.0.0" description = "The substrate runtime for Bifrost Node testnet" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -68,6 +68,7 @@ sp-session = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +sp-genesis-builder = { workspace = true } # Frontier pallet-evm = { workspace = true } diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 308ebc0a..1b164859 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -66,6 +66,7 @@ use pallet_transaction_payment::CurrencyAdapter; pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, + genesis_builder_helper::{build_config, create_default_config}, pallet_prelude::Get, parameter_types, traits::{ From ab2ef53c5f06be6fae0fc568c169d906f60e2197 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 12:16:01 +0900 Subject: [PATCH 19/53] NODE-65, chore: rename Index to Nonce --- node/dev/src/rpc.rs | 4 ++-- node/mainnet/src/rpc.rs | 4 ++-- node/testnet/src/rpc.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/node/dev/src/rpc.rs b/node/dev/src/rpc.rs index a3207816..9ea39021 100644 --- a/node/dev/src/rpc.rs +++ b/node/dev/src/rpc.rs @@ -9,7 +9,7 @@ use jsonrpsee::RpcModule; use std::sync::Arc; use bifrost_common_node::{cli_opt::EthApi as EthApiCmd, rpc::TracingConfig}; -use bifrost_dev_runtime::{opaque::Block, AccountId, Balance, Index}; +use bifrost_dev_runtime::{opaque::Block, AccountId, Balance, Nonce}; use sp_api::{CallApiAt, ProvideRuntimeApi}; use sp_block_builder::BlockBuilder; @@ -49,7 +49,7 @@ where C: AuxStore, C: StorageProvider, C: Send + Sync + 'static, - C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BlockBuilder, C::Api: fp_rpc::EthereumRuntimeRPCApi, diff --git a/node/mainnet/src/rpc.rs b/node/mainnet/src/rpc.rs index 5889b741..4f607da5 100644 --- a/node/mainnet/src/rpc.rs +++ b/node/mainnet/src/rpc.rs @@ -9,7 +9,7 @@ use jsonrpsee::RpcModule; use std::sync::Arc; use bifrost_common_node::{cli_opt::EthApi as EthApiCmd, rpc::TracingConfig}; -use bifrost_mainnet_runtime::{opaque::Block, AccountId, Balance, Index}; +use bifrost_mainnet_runtime::{opaque::Block, AccountId, Balance, Nonce}; use sp_api::{CallApiAt, ProvideRuntimeApi}; use sp_block_builder::BlockBuilder; @@ -48,7 +48,7 @@ where C: AuxStore, C: StorageProvider, C: Send + Sync + 'static, - C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BlockBuilder, C::Api: fp_rpc::EthereumRuntimeRPCApi, diff --git a/node/testnet/src/rpc.rs b/node/testnet/src/rpc.rs index 50fbfdb0..1ba08f35 100644 --- a/node/testnet/src/rpc.rs +++ b/node/testnet/src/rpc.rs @@ -9,7 +9,7 @@ use jsonrpsee::RpcModule; use std::sync::Arc; use bifrost_common_node::{cli_opt::EthApi as EthApiCmd, rpc::TracingConfig}; -use bifrost_testnet_runtime::{opaque::Block, AccountId, Balance, Index}; +use bifrost_testnet_runtime::{opaque::Block, AccountId, Balance, Nonce}; use sp_api::{CallApiAt, ProvideRuntimeApi}; use sp_block_builder::BlockBuilder; @@ -48,7 +48,7 @@ where C: AuxStore, C: StorageProvider, C: Send + Sync + 'static, - C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BlockBuilder, C::Api: fp_rpc::EthereumRuntimeRPCApi, From 3a975b704f666dc79368a3bfef4fabda2f408627 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 12:25:42 +0900 Subject: [PATCH 20/53] NODE-65, chore: specify txpool feature to fc_rpc --- Cargo.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 964832e4..04509a5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -186,7 +186,9 @@ substrate-build-script-utils = { git = "https://github.com/bifrost-platform/polk # Frontier Client fc-db = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } -fc-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fc-rpc = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0", features = [ + "txpool", +] } fc-mapping-sync = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fc-rpc-core = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fc-rpc-debug = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } From bbfcaeded606eb8d2b2f6384f167d7f124039115 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 13:20:52 +0900 Subject: [PATCH 21/53] NODE-65, fix: pending runtime api for pending state --- Cargo.lock | 3 +++ node/common/src/rpc.rs | 8 ++++++-- node/dev/Cargo.toml | 7 +++---- node/dev/src/rpc.rs | 10 ++++++++-- node/dev/src/service.rs | 14 ++++++++++++++ node/mainnet/Cargo.toml | 12 +++++++----- node/mainnet/src/rpc.rs | 10 ++++++++-- node/mainnet/src/service.rs | 14 ++++++++++++++ node/testnet/Cargo.toml | 12 +++++++----- node/testnet/src/rpc.rs | 10 ++++++++-- node/testnet/src/service.rs | 14 ++++++++++++++ 11 files changed, 92 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index acf9e2fb..47f9fe85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -805,6 +805,7 @@ dependencies = [ "sp-consensus-aura", "sp-consensus-grandpa", "sp-core", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-timestamp", @@ -956,6 +957,7 @@ dependencies = [ "sp-consensus-aura", "sp-consensus-grandpa", "sp-core", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-timestamp", @@ -1127,6 +1129,7 @@ dependencies = [ "sp-consensus-aura", "sp-consensus-grandpa", "sp-core", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-timestamp", diff --git a/node/common/src/rpc.rs b/node/common/src/rpc.rs index d456cbde..d729c1cc 100644 --- a/node/common/src/rpc.rs +++ b/node/common/src/rpc.rs @@ -70,7 +70,7 @@ pub struct GrandpaDeps { } /// Full client dependencies. -pub struct FullDevDeps { +pub struct FullDevDeps { /// The client instance to use. pub client: Arc, /// Transaction pool instance. @@ -115,10 +115,12 @@ pub struct FullDevDeps { pub forced_parent_hashes: Option>, /// Chain syncing service pub sync_service: Arc>, + /// Something that can create the inherent data providers for pending state + pub pending_create_inherent_data_providers: CIDP, } /// Mainnet/Testnet client dependencies. -pub struct FullDeps { +pub struct FullDeps { /// The client instance to use. pub client: Arc, /// Transaction pool instance. @@ -161,6 +163,8 @@ pub struct FullDeps { pub forced_parent_hashes: Option>, /// Chain syncing service pub sync_service: Arc>, + /// Something that can create the inherent data providers for pending state + pub pending_create_inherent_data_providers: CIDP, } pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { diff --git a/node/dev/Cargo.toml b/node/dev/Cargo.toml index 5a0688d3..5a5239f0 100644 --- a/node/dev/Cargo.toml +++ b/node/dev/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-dev-node" version = "1.0.0" description = "The node specification for Bifrost Node development" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -46,6 +46,7 @@ sp-block-builder = { workspace = true, features = ["std"] } sp-timestamp = { workspace = true, features = ["std"] } sp-blockchain = { workspace = true } sp-consensus = { workspace = true } +sp-inherents = { workspace = true } # FRAME dependencies pallet-bfc-staking = { workspace = true } @@ -82,6 +83,4 @@ bifrost-common-node = { workspace = true } [features] default = [] -runtime-benchmarks = [ - "bifrost-dev-runtime/runtime-benchmarks", -] +runtime-benchmarks = ["bifrost-dev-runtime/runtime-benchmarks"] diff --git a/node/dev/src/rpc.rs b/node/dev/src/rpc.rs index 9ea39021..d90bc102 100644 --- a/node/dev/src/rpc.rs +++ b/node/dev/src/rpc.rs @@ -5,6 +5,7 @@ #![warn(missing_docs)] +use fc_rpc::pending::AuraConsensusDataProvider; use jsonrpsee::RpcModule; use std::sync::Arc; @@ -17,6 +18,7 @@ use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; use sp_consensus::SelectChain; +use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::BlakeTwo256; use bifrost_common_node::rpc::{FullDevDeps, GrandpaDeps}; @@ -28,8 +30,8 @@ use sc_transaction_pool::ChainApi; use sc_transaction_pool_api::TransactionPool; /// Instantiate all full RPC extensions. -pub fn create_full( - deps: FullDevDeps, +pub fn create_full( + deps: FullDevDeps, maybe_tracing_config: Option, pubsub_notification_sinks: Arc< fc_mapping_sync::EthereumBlockNotificationSinks< @@ -58,6 +60,7 @@ where P: TransactionPool + 'static, A: ChainApi + 'static, SC: SelectChain + 'static, + CIDP: CreateInherentDataProviders + Send + 'static, { use fc_rpc::{ Eth, EthApiServer, EthFilter, EthFilterApiServer, EthPubSub, EthPubSubApiServer, Net, @@ -94,6 +97,7 @@ where logs_request_timeout, forced_parent_hashes, sync_service, + pending_create_inherent_data_providers, } = deps; let GrandpaDeps { @@ -195,6 +199,8 @@ where fee_history_limit, 10, forced_parent_hashes, + pending_create_inherent_data_providers, + Some(Box::new(AuraConsensusDataProvider::new(client.clone()))), ) .into_rpc(), ) diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index 44a12aa3..4e101ca8 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -625,6 +625,19 @@ pub fn build_rpc_extensions_builder( prometheus_registry.clone(), )); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let pending_create_inherent_data_providers = move |_, ()| async move { + let current = sp_timestamp::InherentDataProvider::from_system_time(); + let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); + let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into()); + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + Ok((slot, timestamp)) + }; + // Sinks for pubsub notifications. // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. // The MappingSyncWorker sends through the channel on block import and the subscription emits a @@ -759,6 +772,7 @@ pub fn build_rpc_extensions_builder( logs_request_timeout: rpc_config.logs_request_timeout, forced_parent_hashes: None, sync_service: sync_service.clone(), + pending_create_inherent_data_providers, }; if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { diff --git a/node/mainnet/Cargo.toml b/node/mainnet/Cargo.toml index 979fda20..47807118 100644 --- a/node/mainnet/Cargo.toml +++ b/node/mainnet/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-mainnet-node" version = "1.0.0" description = "The node specification for Bifrost Node mainnet" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -45,6 +45,7 @@ sp-block-builder = { workspace = true, features = ["std"] } sp-timestamp = { workspace = true, features = ["std"] } sp-blockchain = { workspace = true } sp-consensus = { workspace = true } +sp-inherents = { workspace = true } # FRAME dependencies pallet-bfc-staking = { workspace = true } @@ -75,12 +76,13 @@ frame-benchmarking = { workspace = true, features = ["std"] } # Local Dependencies bp-core = { workspace = true } -bifrost-mainnet-runtime = { workspace = true, features = ["std", "evm-tracing"] } +bifrost-mainnet-runtime = { workspace = true, features = [ + "std", + "evm-tracing", +] } bifrost-mainnet-constants = { workspace = true } bifrost-common-node = { workspace = true } [features] default = [] -runtime-benchmarks = [ - "bifrost-mainnet-runtime/runtime-benchmarks", -] +runtime-benchmarks = ["bifrost-mainnet-runtime/runtime-benchmarks"] diff --git a/node/mainnet/src/rpc.rs b/node/mainnet/src/rpc.rs index 4f607da5..d929c593 100644 --- a/node/mainnet/src/rpc.rs +++ b/node/mainnet/src/rpc.rs @@ -5,6 +5,7 @@ #![warn(missing_docs)] +use fc_rpc::pending::AuraConsensusDataProvider; use jsonrpsee::RpcModule; use std::sync::Arc; @@ -17,6 +18,7 @@ use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; use sp_consensus::SelectChain; +use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::BlakeTwo256; use bifrost_common_node::rpc::{FullDeps, GrandpaDeps}; @@ -27,8 +29,8 @@ use sc_transaction_pool::ChainApi; use sc_transaction_pool_api::TransactionPool; /// Instantiate all full RPC extensions. -pub fn create_full( - deps: FullDeps, +pub fn create_full( + deps: FullDeps, maybe_tracing_config: Option, pubsub_notification_sinks: Arc< fc_mapping_sync::EthereumBlockNotificationSinks< @@ -57,6 +59,7 @@ where P: TransactionPool + 'static, A: ChainApi + 'static, SC: SelectChain + 'static, + CIDP: CreateInherentDataProviders + Send + 'static, { use fc_rpc::{ Eth, EthApiServer, EthFilter, EthFilterApiServer, EthPubSub, EthPubSubApiServer, Net, @@ -92,6 +95,7 @@ where logs_request_timeout, forced_parent_hashes, sync_service, + pending_create_inherent_data_providers, } = deps; let GrandpaDeps { @@ -193,6 +197,8 @@ where fee_history_limit, 10, forced_parent_hashes, + pending_create_inherent_data_providers, + Some(Box::new(AuraConsensusDataProvider::new(client.clone()))), ) .into_rpc(), ) diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index f300b8e1..5208a9c7 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -436,6 +436,19 @@ pub fn build_rpc_extensions_builder( prometheus_registry.clone(), )); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let pending_create_inherent_data_providers = move |_, ()| async move { + let current = sp_timestamp::InherentDataProvider::from_system_time(); + let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); + let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into()); + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + Ok((slot, timestamp)) + }; + // Sinks for pubsub notifications. // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. // The MappingSyncWorker sends through the channel on block import and the subscription emits a @@ -569,6 +582,7 @@ pub fn build_rpc_extensions_builder( logs_request_timeout: rpc_config.logs_request_timeout, forced_parent_hashes: None, sync_service: sync_service.clone(), + pending_create_inherent_data_providers, }; if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { diff --git a/node/testnet/Cargo.toml b/node/testnet/Cargo.toml index 203c84b9..16cab158 100644 --- a/node/testnet/Cargo.toml +++ b/node/testnet/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-testnet-node" version = "1.0.0" description = "The node specification for Bifrost Node testnet" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -45,6 +45,7 @@ sp-block-builder = { workspace = true, features = ["std"] } sp-timestamp = { workspace = true, features = ["std"] } sp-blockchain = { workspace = true } sp-consensus = { workspace = true } +sp-inherents = { workspace = true } # FRAME dependencies pallet-bfc-staking = { workspace = true } @@ -75,12 +76,13 @@ frame-benchmarking = { workspace = true, features = ["std"] } # Local Dependencies bp-core = { workspace = true } -bifrost-testnet-runtime = { workspace = true, features = ["std", "evm-tracing"] } +bifrost-testnet-runtime = { workspace = true, features = [ + "std", + "evm-tracing", +] } bifrost-testnet-constants = { workspace = true } bifrost-common-node = { workspace = true } [features] default = [] -runtime-benchmarks = [ - "bifrost-testnet-runtime/runtime-benchmarks", -] +runtime-benchmarks = ["bifrost-testnet-runtime/runtime-benchmarks"] diff --git a/node/testnet/src/rpc.rs b/node/testnet/src/rpc.rs index 1ba08f35..5d19006a 100644 --- a/node/testnet/src/rpc.rs +++ b/node/testnet/src/rpc.rs @@ -5,6 +5,7 @@ #![warn(missing_docs)] +use fc_rpc::pending::AuraConsensusDataProvider; use jsonrpsee::RpcModule; use std::sync::Arc; @@ -17,6 +18,7 @@ use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; use sp_consensus::SelectChain; +use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::BlakeTwo256; use bifrost_common_node::rpc::{FullDeps, GrandpaDeps}; @@ -27,8 +29,8 @@ use sc_transaction_pool::ChainApi; use sc_transaction_pool_api::TransactionPool; /// Instantiate all full RPC extensions. -pub fn create_full( - deps: FullDeps, +pub fn create_full( + deps: FullDeps, maybe_tracing_config: Option, pubsub_notification_sinks: Arc< fc_mapping_sync::EthereumBlockNotificationSinks< @@ -57,6 +59,7 @@ where P: TransactionPool + 'static, A: ChainApi + 'static, SC: SelectChain + 'static, + CIDP: CreateInherentDataProviders + Send + 'static, { use fc_rpc::{ Eth, EthApiServer, EthFilter, EthFilterApiServer, EthPubSub, EthPubSubApiServer, Net, @@ -92,6 +95,7 @@ where logs_request_timeout, forced_parent_hashes, sync_service, + pending_create_inherent_data_providers, } = deps; let GrandpaDeps { @@ -193,6 +197,8 @@ where fee_history_limit, 10, forced_parent_hashes, + pending_create_inherent_data_providers, + Some(Box::new(AuraConsensusDataProvider::new(client.clone()))), ) .into_rpc(), ) diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index 7f51267c..ceb992b4 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -436,6 +436,19 @@ pub fn build_rpc_extensions_builder( prometheus_registry.clone(), )); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let pending_create_inherent_data_providers = move |_, ()| async move { + let current = sp_timestamp::InherentDataProvider::from_system_time(); + let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); + let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into()); + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + Ok((slot, timestamp)) + }; + // Sinks for pubsub notifications. // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. // The MappingSyncWorker sends through the channel on block import and the subscription emits a @@ -569,6 +582,7 @@ pub fn build_rpc_extensions_builder( logs_request_timeout: rpc_config.logs_request_timeout, forced_parent_hashes: None, sync_service: sync_service.clone(), + pending_create_inherent_data_providers, }; if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { From e0bc42377f57da5ca75d37f6db59731ac75d3009 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 14:27:35 +0900 Subject: [PATCH 22/53] NODE-65, chore: Removal of execution strategies --- Cargo.lock | 123 ++++++++++++++++++++++++++++++++++-- Cargo.toml | 1 + node/dev/Cargo.toml | 1 + node/dev/src/service.rs | 56 ++++++++++++---- node/mainnet/Cargo.toml | 1 + node/mainnet/src/service.rs | 31 +++++++-- node/testnet/Cargo.toml | 1 + node/testnet/src/service.rs | 31 +++++++-- 8 files changed, 217 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47f9fe85..612444ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -791,6 +791,7 @@ dependencies = [ "sc-executor", "sc-network", "sc-network-sync", + "sc-offchain", "sc-rpc", "sc-rpc-api", "sc-service", @@ -943,6 +944,7 @@ dependencies = [ "sc-executor", "sc-network", "sc-network-sync", + "sc-offchain", "sc-rpc", "sc-rpc-api", "sc-service", @@ -1115,6 +1117,7 @@ dependencies = [ "sc-executor", "sc-network", "sc-network-sync", + "sc-offchain", "sc-rpc", "sc-rpc-api", "sc-service", @@ -3843,7 +3846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls", + "rustls 0.20.9", "webpki", ] @@ -4280,6 +4283,22 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls 0.21.10", + "rustls-native-certs", + "tokio", + "tokio-rustls", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -4991,7 +5010,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls", + "rustls 0.20.9", "thiserror", "tokio", ] @@ -5072,7 +5091,7 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.16.20", - "rustls", + "rustls 0.20.9", "thiserror", "webpki", "x509-parser", @@ -7371,7 +7390,7 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "rustc-hash", - "rustls", + "rustls 0.20.9", "slab", "thiserror", "tinyvec", @@ -7844,6 +7863,49 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.7", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -8558,6 +8620,40 @@ dependencies = [ "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-offchain" +version = "4.0.0-dev" +source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" +dependencies = [ + "array-bytes 6.2.2", + "bytes", + "fnv", + "futures 0.3.29", + "futures-timer", + "hyper", + "hyper-rustls", + "libp2p", + "log", + "num_cpus", + "once_cell", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "sc-client-api", + "sc-network", + "sc-network-common", + "sc-transaction-pool-api", + "sc-utils", + "sp-api", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-offchain", + "sp-runtime", + "threadpool", + "tracing", +] + [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" @@ -10471,6 +10567,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "tikv-jemalloc-sys" version = "0.5.4+5.3.0-patched" @@ -10583,6 +10688,16 @@ dependencies = [ "syn 2.0.40", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.10", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" diff --git a/Cargo.toml b/Cargo.toml index 04509a5e..c7d84146 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -127,6 +127,7 @@ sc-executor = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch sc-telemetry = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } sc-basic-authorship = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } substrate-prometheus-endpoint = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } +sc-offchain = { git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } # Substrate Primitive sp-io = { default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.3.0" } diff --git a/node/dev/Cargo.toml b/node/dev/Cargo.toml index 5a5239f0..87d3fd92 100644 --- a/node/dev/Cargo.toml +++ b/node/dev/Cargo.toml @@ -34,6 +34,7 @@ sc-rpc = { workspace = true } sc-rpc-api = { workspace = true } sc-chain-spec = { workspace = true } sc-basic-authorship = { workspace = true } +sc-offchain = { workspace = true } # substrate primitives dependencies sp-core = { workspace = true, features = ["std"] } diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index 4e101ca8..5e514f24 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -5,6 +5,7 @@ use fc_db::Backend; use futures::StreamExt; use jsonrpsee::RpcModule; use sc_network_sync::SyncingService; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use bifrost_common_node::{ @@ -36,6 +37,10 @@ use sp_api::NumberFor; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_runtime::traits::Block as BlockT; +/// The minimum period of blocks on which justifications will be +/// imported and generated. +const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; + /// Development runtime executor pub mod dev { pub use bifrost_dev_runtime::RuntimeApi; @@ -183,6 +188,7 @@ pub fn new_partial( let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import( client.clone(), + GRANDPA_JUSTIFICATION_PERIOD, &(client.clone() as Arc<_>), select_chain.clone(), telemetry.as_ref().map(|x| x.handle()), @@ -272,11 +278,23 @@ pub fn new_full_base( })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-worker", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + is_validator: config.role.is_authority(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + enable_http_requests: true, + custom_extensions: |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -374,7 +392,7 @@ pub fn new_full_base( let grandpa_config = sc_consensus_grandpa::Config { gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -393,6 +411,7 @@ pub fn new_full_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), }; task_manager.spawn_essential_handle().spawn_blocking( @@ -458,11 +477,23 @@ pub fn new_manual_base( })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-worker", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + is_validator: config.role.is_authority(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + enable_http_requests: true, + custom_extensions: |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -553,7 +584,7 @@ pub fn new_manual_base( let grandpa_config = sc_consensus_grandpa::Config { gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -572,6 +603,7 @@ pub fn new_manual_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), }; task_manager.spawn_essential_handle().spawn_blocking( diff --git a/node/mainnet/Cargo.toml b/node/mainnet/Cargo.toml index 47807118..c7b90258 100644 --- a/node/mainnet/Cargo.toml +++ b/node/mainnet/Cargo.toml @@ -33,6 +33,7 @@ sc-rpc = { workspace = true } sc-rpc-api = { workspace = true } sc-chain-spec = { workspace = true } sc-basic-authorship = { workspace = true } +sc-offchain = { workspace = true } # substrate primitives dependencies sp-core = { workspace = true, features = ["std"] } diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index 5208a9c7..8bc4ee94 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -5,6 +5,7 @@ use fc_db::Backend; use futures::StreamExt; use jsonrpsee::RpcModule; use sc_network_sync::SyncingService; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use bifrost_common_node::{ @@ -35,6 +36,10 @@ use sp_api::NumberFor; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_runtime::traits::Block as BlockT; +/// The minimum period of blocks on which justifications will be +/// imported and generated. +const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; + /// Mainnet runtime executor pub mod mainnet { pub use bifrost_mainnet_runtime::RuntimeApi; @@ -175,6 +180,7 @@ pub fn new_partial( let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import( client.clone(), + GRANDPA_JUSTIFICATION_PERIOD, &(client.clone() as Arc<_>), select_chain.clone(), telemetry.as_ref().map(|x| x.handle()), @@ -264,11 +270,23 @@ pub fn new_full_base( })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-worker", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + is_validator: config.role.is_authority(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + enable_http_requests: true, + custom_extensions: |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -365,7 +383,7 @@ pub fn new_full_base( let grandpa_config = sc_consensus_grandpa::Config { gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -384,6 +402,7 @@ pub fn new_full_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), }; task_manager.spawn_essential_handle().spawn_blocking( diff --git a/node/testnet/Cargo.toml b/node/testnet/Cargo.toml index 16cab158..8b4ac14d 100644 --- a/node/testnet/Cargo.toml +++ b/node/testnet/Cargo.toml @@ -33,6 +33,7 @@ sc-rpc = { workspace = true } sc-rpc-api = { workspace = true } sc-chain-spec = { workspace = true } sc-basic-authorship = { workspace = true } +sc-offchain = { workspace = true } # substrate primitives dependencies sp-core = { workspace = true, features = ["std"] } diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index ceb992b4..9cd68134 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -5,6 +5,7 @@ use fc_db::Backend; use futures::StreamExt; use jsonrpsee::RpcModule; use sc_network_sync::SyncingService; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use bifrost_common_node::{ @@ -35,6 +36,10 @@ use sp_api::NumberFor; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_runtime::traits::Block as BlockT; +/// The minimum period of blocks on which justifications will be +/// imported and generated. +const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; + /// Testnet runtime executor pub mod testnet { pub use bifrost_testnet_runtime::RuntimeApi; @@ -175,6 +180,7 @@ pub fn new_partial( let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import( client.clone(), + GRANDPA_JUSTIFICATION_PERIOD, &(client.clone() as Arc<_>), select_chain.clone(), telemetry.as_ref().map(|x| x.handle()), @@ -264,11 +270,23 @@ pub fn new_full_base( })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-worker", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + is_validator: config.role.is_authority(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + enable_http_requests: true, + custom_extensions: |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -365,7 +383,7 @@ pub fn new_full_base( let grandpa_config = sc_consensus_grandpa::Config { gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -384,6 +402,7 @@ pub fn new_full_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), }; task_manager.spawn_essential_handle().spawn_blocking( From f3d922bbc5967120167b3b283f63ab7e801830ef Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 14:36:05 +0900 Subject: [PATCH 23/53] NODE-65, chore: Set StateBackend::Transaction to PrefixedMemoryDB --- node/dev/src/service.rs | 2 +- node/mainnet/src/service.rs | 2 +- node/testnet/src/service.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index 5e514f24..8f01f5f2 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -132,7 +132,7 @@ pub fn new_partial( FullClient, FullBackend, FullSelectChain, - sc_consensus::DefaultImportQueue, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( sc_consensus_grandpa::GrandpaBlockImport< diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index 8bc4ee94..35a79248 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -124,7 +124,7 @@ pub fn new_partial( FullClient, FullBackend, FullSelectChain, - sc_consensus::DefaultImportQueue, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( sc_consensus_grandpa::GrandpaBlockImport< diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index 9cd68134..26517805 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -124,7 +124,7 @@ pub fn new_partial( FullClient, FullBackend, FullSelectChain, - sc_consensus::DefaultImportQueue, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( sc_consensus_grandpa::GrandpaBlockImport< From 4da002b717c16da8ed274a959635b5124f172529 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 14:39:52 +0900 Subject: [PATCH 24/53] NODE-65, chore: Modular block request handler --- node/dev/src/service.rs | 1 + node/mainnet/src/service.rs | 1 + node/testnet/src/service.rs | 1 + 3 files changed, 3 insertions(+) diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index 8f01f5f2..536ac588 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -275,6 +275,7 @@ pub fn new_full_base( import_queue, block_announce_validator_builder: None, warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + block_relay: None, })?; if config.offchain_worker.enabled { diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index 35a79248..de9f0529 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -267,6 +267,7 @@ pub fn new_full_base( import_queue, block_announce_validator_builder: None, warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + block_relay: None, })?; if config.offchain_worker.enabled { diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index 26517805..ccb1ba59 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -267,6 +267,7 @@ pub fn new_full_base( import_queue, block_announce_validator_builder: None, warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + block_relay: None, })?; if config.offchain_worker.enabled { From 0da80740960e8b0a7b93f7fe9cfc1b9736ce5484 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 15:37:29 +0900 Subject: [PATCH 25/53] NODE-65, chore: implement eth_call state override --- node/common/src/rpc.rs | 12 ++++++++++++ node/dev/src/rpc.rs | 25 ++++++++++++++++--------- node/mainnet/src/rpc.rs | 25 ++++++++++++++++--------- node/testnet/src/rpc.rs | 25 ++++++++++++++++--------- 4 files changed, 60 insertions(+), 27 deletions(-) diff --git a/node/common/src/rpc.rs b/node/common/src/rpc.rs index d729c1cc..f183f871 100644 --- a/node/common/src/rpc.rs +++ b/node/common/src/rpc.rs @@ -26,6 +26,18 @@ use std::{collections::BTreeMap, sync::Arc}; pub type Block = generic::Block; +pub struct DefaultEthConfig(std::marker::PhantomData<(C, BE)>); + +impl fc_rpc::EthConfig for DefaultEthConfig +where + C: StorageProvider + Sync + Send + 'static, + BE: Backend + 'static, +{ + type EstimateGasAdapter = (); + type RuntimeStorageOverride = + fc_rpc::frontier_backend_client::SystemAccountId20StorageOverride; +} + /// Override storage pub fn overrides_handle(client: Arc) -> Arc> where diff --git a/node/dev/src/rpc.rs b/node/dev/src/rpc.rs index d90bc102..d956b109 100644 --- a/node/dev/src/rpc.rs +++ b/node/dev/src/rpc.rs @@ -5,11 +5,13 @@ #![warn(missing_docs)] -use fc_rpc::pending::AuraConsensusDataProvider; use jsonrpsee::RpcModule; use std::sync::Arc; -use bifrost_common_node::{cli_opt::EthApi as EthApiCmd, rpc::TracingConfig}; +use bifrost_common_node::{ + cli_opt::EthApi as EthApiCmd, + rpc::{DefaultEthConfig, FullDevDeps, GrandpaDeps, TracingConfig}, +}; use bifrost_dev_runtime::{opaque::Block, AccountId, Balance, Nonce}; use sp_api::{CallApiAt, ProvideRuntimeApi}; @@ -18,11 +20,15 @@ use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; use sp_consensus::SelectChain; +use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi}; use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::BlakeTwo256; -use bifrost_common_node::rpc::{FullDevDeps, GrandpaDeps}; -use sc_client_api::backend::{Backend, StateBackend, StorageProvider}; +use fc_rpc::pending::AuraConsensusDataProvider; +use sc_client_api::{ + backend::{Backend, StateBackend, StorageProvider}, + UsageProvider, +}; pub use sc_client_api::{AuxStore, BlockOf, BlockchainEvents}; use sc_consensus_manual_seal::rpc::{ManualSeal, ManualSealApiServer}; pub use sc_rpc_api::DenyUnsafe; @@ -44,12 +50,11 @@ where BE::State: StateBackend, BE::Blockchain: BlockchainBackend, C: ProvideRuntimeApi, - C: BlockchainEvents, + C: BlockchainEvents + UsageProvider, C: StorageProvider, C: HeaderBackend + HeaderMetadata + 'static, C: CallApiAt, C: AuxStore, - C: StorageProvider, C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, @@ -57,6 +62,7 @@ where C::Api: fp_rpc::EthereumRuntimeRPCApi, C::Api: fp_rpc::ConvertTransactionRuntimeApi, C::Api: fp_rpc_txpool::TxPoolRuntimeApi, + C::Api: AuraApi, P: TransactionPool + 'static, A: ChainApi + 'static, SC: SelectChain + 'static, @@ -128,7 +134,7 @@ where EthFilter::new( client.clone(), frontier_backend.clone(), - fc_rpc::TxPool::new(client.clone(), graph.clone()), + graph.clone(), filter_pool, 500_usize, // max stored filters max_past_logs, @@ -184,7 +190,7 @@ where let convert_transaction: Option = None; io.merge( - Eth::new( + Eth::<_, _, _, _, _, _, _, DefaultEthConfig>::new( Arc::clone(&client), Arc::clone(&pool), graph.clone(), @@ -192,7 +198,7 @@ where Arc::clone(&sync_service), signers, Arc::clone(&overrides), - Arc::clone(&frontier_backend), + frontier_backend.clone(), is_authority, Arc::clone(&block_data_cache), fee_history_cache, @@ -202,6 +208,7 @@ where pending_create_inherent_data_providers, Some(Box::new(AuraConsensusDataProvider::new(client.clone()))), ) + .replace_config::>() .into_rpc(), ) .ok(); diff --git a/node/mainnet/src/rpc.rs b/node/mainnet/src/rpc.rs index d929c593..03a0ace4 100644 --- a/node/mainnet/src/rpc.rs +++ b/node/mainnet/src/rpc.rs @@ -5,11 +5,13 @@ #![warn(missing_docs)] -use fc_rpc::pending::AuraConsensusDataProvider; use jsonrpsee::RpcModule; use std::sync::Arc; -use bifrost_common_node::{cli_opt::EthApi as EthApiCmd, rpc::TracingConfig}; +use bifrost_common_node::{ + cli_opt::EthApi as EthApiCmd, + rpc::{DefaultEthConfig, FullDeps, GrandpaDeps, TracingConfig}, +}; use bifrost_mainnet_runtime::{opaque::Block, AccountId, Balance, Nonce}; use sp_api::{CallApiAt, ProvideRuntimeApi}; @@ -18,11 +20,15 @@ use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; use sp_consensus::SelectChain; +use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi}; use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::BlakeTwo256; -use bifrost_common_node::rpc::{FullDeps, GrandpaDeps}; -use sc_client_api::backend::{Backend, StateBackend, StorageProvider}; +use fc_rpc::pending::AuraConsensusDataProvider; +use sc_client_api::{ + backend::{Backend, StateBackend, StorageProvider}, + UsageProvider, +}; pub use sc_client_api::{AuxStore, BlockOf, BlockchainEvents}; pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool::ChainApi; @@ -43,12 +49,11 @@ where BE::State: StateBackend, BE::Blockchain: BlockchainBackend, C: ProvideRuntimeApi, - C: BlockchainEvents, + C: BlockchainEvents + UsageProvider, C: StorageProvider, C: HeaderBackend + HeaderMetadata + 'static, C: CallApiAt, C: AuxStore, - C: StorageProvider, C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, @@ -56,6 +61,7 @@ where C::Api: fp_rpc::EthereumRuntimeRPCApi, C::Api: fp_rpc::ConvertTransactionRuntimeApi, C::Api: fp_rpc_txpool::TxPoolRuntimeApi, + C::Api: AuraApi, P: TransactionPool + 'static, A: ChainApi + 'static, SC: SelectChain + 'static, @@ -126,7 +132,7 @@ where EthFilter::new( client.clone(), frontier_backend.clone(), - fc_rpc::TxPool::new(client.clone(), graph.clone()), + graph.clone(), filter_pool, 500_usize, // max stored filters max_past_logs, @@ -182,7 +188,7 @@ where let convert_transaction: Option = None; io.merge( - Eth::new( + Eth::<_, _, _, _, _, _, _, DefaultEthConfig>::new( Arc::clone(&client), Arc::clone(&pool), graph.clone(), @@ -190,7 +196,7 @@ where Arc::clone(&sync_service), signers, Arc::clone(&overrides), - Arc::clone(&frontier_backend), + frontier_backend.clone(), is_authority, Arc::clone(&block_data_cache), fee_history_cache, @@ -200,6 +206,7 @@ where pending_create_inherent_data_providers, Some(Box::new(AuraConsensusDataProvider::new(client.clone()))), ) + .replace_config::>() .into_rpc(), ) .ok(); diff --git a/node/testnet/src/rpc.rs b/node/testnet/src/rpc.rs index 5d19006a..a51d6d19 100644 --- a/node/testnet/src/rpc.rs +++ b/node/testnet/src/rpc.rs @@ -5,11 +5,13 @@ #![warn(missing_docs)] -use fc_rpc::pending::AuraConsensusDataProvider; use jsonrpsee::RpcModule; use std::sync::Arc; -use bifrost_common_node::{cli_opt::EthApi as EthApiCmd, rpc::TracingConfig}; +use bifrost_common_node::{ + cli_opt::EthApi as EthApiCmd, + rpc::{DefaultEthConfig, FullDeps, GrandpaDeps, TracingConfig}, +}; use bifrost_testnet_runtime::{opaque::Block, AccountId, Balance, Nonce}; use sp_api::{CallApiAt, ProvideRuntimeApi}; @@ -18,11 +20,15 @@ use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; use sp_consensus::SelectChain; +use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi}; use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::BlakeTwo256; -use bifrost_common_node::rpc::{FullDeps, GrandpaDeps}; -use sc_client_api::backend::{Backend, StateBackend, StorageProvider}; +use fc_rpc::pending::AuraConsensusDataProvider; +use sc_client_api::{ + backend::{Backend, StateBackend, StorageProvider}, + UsageProvider, +}; pub use sc_client_api::{AuxStore, BlockOf, BlockchainEvents}; pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool::ChainApi; @@ -43,12 +49,11 @@ where BE::State: StateBackend, BE::Blockchain: BlockchainBackend, C: ProvideRuntimeApi, - C: BlockchainEvents, + C: BlockchainEvents + UsageProvider, C: StorageProvider, C: HeaderBackend + HeaderMetadata + 'static, C: CallApiAt, C: AuxStore, - C: StorageProvider, C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, @@ -56,6 +61,7 @@ where C::Api: fp_rpc::EthereumRuntimeRPCApi, C::Api: fp_rpc::ConvertTransactionRuntimeApi, C::Api: fp_rpc_txpool::TxPoolRuntimeApi, + C::Api: AuraApi, P: TransactionPool + 'static, A: ChainApi + 'static, SC: SelectChain + 'static, @@ -126,7 +132,7 @@ where EthFilter::new( client.clone(), frontier_backend.clone(), - fc_rpc::TxPool::new(client.clone(), graph.clone()), + graph.clone(), filter_pool, 500_usize, // max stored filters max_past_logs, @@ -182,7 +188,7 @@ where let convert_transaction: Option = None; io.merge( - Eth::new( + Eth::<_, _, _, _, _, _, _, DefaultEthConfig>::new( Arc::clone(&client), Arc::clone(&pool), graph.clone(), @@ -190,7 +196,7 @@ where Arc::clone(&sync_service), signers, Arc::clone(&overrides), - Arc::clone(&frontier_backend), + frontier_backend.clone(), is_authority, Arc::clone(&block_data_cache), fee_history_cache, @@ -200,6 +206,7 @@ where pending_create_inherent_data_providers, Some(Box::new(AuraConsensusDataProvider::new(client.clone()))), ) + .replace_config::>() .into_rpc(), ) .ok(); From 98a8a17fba5f7f6e370d3306694c32a633ca8181 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 15:54:24 +0900 Subject: [PATCH 26/53] NODE-65, fix: resolve service.rs compile errors --- node/dev/src/service.rs | 22 +++++++++++----------- node/mainnet/src/service.rs | 21 ++++++++++----------- node/testnet/src/service.rs | 21 ++++++++++----------- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index 536ac588..70fd2152 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -1,11 +1,9 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. -use bp_core::*; -use fc_db::Backend; -use futures::StreamExt; +use crate::rpc::create_full; + +use futures::{FutureExt, StreamExt}; use jsonrpsee::RpcModule; -use sc_network_sync::SyncingService; -use sc_transaction_pool_api::OffchainTransactionPoolFactory; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use bifrost_common_node::{ @@ -15,24 +13,25 @@ use bifrost_common_node::{ tracing::{spawn_tracing_tasks, RpcRequesters}, }; -use crate::rpc::create_full; - use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy}; use fc_rpc::EthTask; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; -use sc_client_api::{BlockBackend, BlockchainEvents}; +use sc_client_api::{Backend, BlockBackend, BlockchainEvents}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; use sc_consensus_manual_seal::EngineCommand; pub use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; +use sc_network_sync::SyncingService; use sc_rpc_api::DenyUnsafe; use sc_service::{ error::Error as ServiceError, Configuration, RpcHandlers, SpawnTaskHandle, TaskManager, WarpSyncParams, }; use sc_telemetry::{Telemetry, TelemetryWorker}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; +use bp_core::*; use sp_api::NumberFor; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_runtime::traits::Block as BlockT; @@ -475,6 +474,7 @@ pub fn new_manual_base( import_queue, block_announce_validator_builder: None, warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + block_relay: None, })?; if config.offchain_worker.enabled { @@ -658,7 +658,7 @@ pub fn build_rpc_extensions_builder( prometheus_registry.clone(), )); - let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let slot_duration = sc_consensus_aura::slot_duration(&*client).expect("Slot duration exists"); let pending_create_inherent_data_providers = move |_, ()| async move { let current = sp_timestamp::InherentDataProvider::from_system_time(); let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); @@ -708,7 +708,7 @@ pub fn build_rpc_extensions_builder( ); match frontier_backend.clone() { - Backend::KeyValue(b) => { + fc_db::Backend::KeyValue(b) => { // Frontier offchain DB task. Essential. // Maps emulated ethereum data to substrate native data. builder.task_manager.spawn_essential_handle().spawn( @@ -730,7 +730,7 @@ pub fn build_rpc_extensions_builder( .for_each(|()| futures::future::ready(())), ); }, - Backend::Sql(b) => { + fc_db::Backend::Sql(b) => { builder.task_manager.spawn_essential_handle().spawn_blocking( "frontier-mapping-sync-worker", Some("frontier"), diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index de9f0529..0511383e 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -1,11 +1,9 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. -use bp_core::*; -use fc_db::Backend; -use futures::StreamExt; +use crate::rpc::create_full; + +use futures::{FutureExt, StreamExt}; use jsonrpsee::RpcModule; -use sc_network_sync::SyncingService; -use sc_transaction_pool_api::OffchainTransactionPoolFactory; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use bifrost_common_node::{ @@ -15,23 +13,24 @@ use bifrost_common_node::{ tracing::{spawn_tracing_tasks, RpcRequesters}, }; -use crate::rpc::create_full; - use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy}; use fc_rpc::EthTask; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; -use sc_client_api::{BlockBackend, BlockchainEvents}; +use sc_client_api::{Backend, BlockBackend, BlockchainEvents}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; pub use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; +use sc_network_sync::SyncingService; use sc_rpc_api::DenyUnsafe; use sc_service::{ error::Error as ServiceError, Configuration, RpcHandlers, SpawnTaskHandle, TaskManager, WarpSyncParams, }; use sc_telemetry::{Telemetry, TelemetryWorker}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; +use bp_core::*; use sp_api::NumberFor; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_runtime::traits::Block as BlockT; @@ -456,7 +455,7 @@ pub fn build_rpc_extensions_builder( prometheus_registry.clone(), )); - let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let slot_duration = sc_consensus_aura::slot_duration(&*client).expect("Slot duration exists"); let pending_create_inherent_data_providers = move |_, ()| async move { let current = sp_timestamp::InherentDataProvider::from_system_time(); let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); @@ -506,7 +505,7 @@ pub fn build_rpc_extensions_builder( ); match frontier_backend.clone() { - Backend::KeyValue(b) => { + fc_db::Backend::KeyValue(b) => { // Frontier offchain DB task. Essential. // Maps emulated ethereum data to substrate native data. builder.task_manager.spawn_essential_handle().spawn( @@ -528,7 +527,7 @@ pub fn build_rpc_extensions_builder( .for_each(|()| futures::future::ready(())), ); }, - Backend::Sql(b) => { + fc_db::Backend::Sql(b) => { builder.task_manager.spawn_essential_handle().spawn_blocking( "frontier-mapping-sync-worker", Some("frontier"), diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index ccb1ba59..84509714 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -1,11 +1,9 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. -use bp_core::*; -use fc_db::Backend; -use futures::StreamExt; +use crate::rpc::create_full; + +use futures::{FutureExt, StreamExt}; use jsonrpsee::RpcModule; -use sc_network_sync::SyncingService; -use sc_transaction_pool_api::OffchainTransactionPoolFactory; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use bifrost_common_node::{ @@ -15,23 +13,24 @@ use bifrost_common_node::{ tracing::{spawn_tracing_tasks, RpcRequesters}, }; -use crate::rpc::create_full; - use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy}; use fc_rpc::EthTask; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; -use sc_client_api::{BlockBackend, BlockchainEvents}; +use sc_client_api::{Backend, BlockBackend, BlockchainEvents}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; pub use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; +use sc_network_sync::SyncingService; use sc_rpc_api::DenyUnsafe; use sc_service::{ error::Error as ServiceError, Configuration, RpcHandlers, SpawnTaskHandle, TaskManager, WarpSyncParams, }; use sc_telemetry::{Telemetry, TelemetryWorker}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; +use bp_core::*; use sp_api::NumberFor; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_runtime::traits::Block as BlockT; @@ -456,7 +455,7 @@ pub fn build_rpc_extensions_builder( prometheus_registry.clone(), )); - let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let slot_duration = sc_consensus_aura::slot_duration(&*client).expect("Slot duration exists"); let pending_create_inherent_data_providers = move |_, ()| async move { let current = sp_timestamp::InherentDataProvider::from_system_time(); let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); @@ -506,7 +505,7 @@ pub fn build_rpc_extensions_builder( ); match frontier_backend.clone() { - Backend::KeyValue(b) => { + fc_db::Backend::KeyValue(b) => { // Frontier offchain DB task. Essential. // Maps emulated ethereum data to substrate native data. builder.task_manager.spawn_essential_handle().spawn( @@ -528,7 +527,7 @@ pub fn build_rpc_extensions_builder( .for_each(|()| futures::future::ready(())), ); }, - Backend::Sql(b) => { + fc_db::Backend::Sql(b) => { builder.task_manager.spawn_essential_handle().spawn_blocking( "frontier-mapping-sync-worker", Some("frontier"), From fc0d6095b71d06bc80fefd3a24db6596fd1fd8e8 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 15:57:36 +0900 Subject: [PATCH 27/53] NODE-65, fix: replace to RuntimeGenesisConfig in chain_spec --- node/dev/src/chain_spec.rs | 7 ++++--- node/mainnet/src/chain_spec.rs | 7 ++++--- node/testnet/src/chain_spec.rs | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/node/dev/src/chain_spec.rs b/node/dev/src/chain_spec.rs index bb858968..9125633f 100644 --- a/node/dev/src/chain_spec.rs +++ b/node/dev/src/chain_spec.rs @@ -16,7 +16,7 @@ use sp_runtime::{BoundedVec, Perbill}; use hex_literal::hex; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a crypto pair from seed. pub fn get_from_seed(seed: &str) -> ::Public { @@ -171,16 +171,17 @@ fn development_genesis( root_key: AccountId, endowed_accounts: Vec, _enable_println: bool, -) -> devnet::GenesisConfig { +) -> devnet::RuntimeGenesisConfig { // This is the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - devnet::GenesisConfig { + devnet::RuntimeGenesisConfig { system: devnet::SystemConfig { // Add Wasm runtime to storage. code: wasm_binary.to_vec(), + ..Default::default() }, balances: devnet::BalancesConfig { balances: endowed_accounts diff --git a/node/mainnet/src/chain_spec.rs b/node/mainnet/src/chain_spec.rs index a807467b..8e5fcf9d 100644 --- a/node/mainnet/src/chain_spec.rs +++ b/node/mainnet/src/chain_spec.rs @@ -15,7 +15,7 @@ use sp_runtime::{BoundedVec, Perbill}; use hex_literal::hex; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a crypto pair from key. pub fn inspect_key(key: &str) -> ::Public { @@ -150,16 +150,17 @@ fn mainnet_genesis( root_key: AccountId, endowed_accounts: Vec, _enable_println: bool, -) -> mainnet::GenesisConfig { +) -> mainnet::RuntimeGenesisConfig { // This is the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - mainnet::GenesisConfig { + mainnet::RuntimeGenesisConfig { system: mainnet::SystemConfig { // Add Wasm runtime to storage. code: wasm_binary.to_vec(), + ..Default::default() }, balances: mainnet::BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 10_000_000 * BFC)).collect(), diff --git a/node/testnet/src/chain_spec.rs b/node/testnet/src/chain_spec.rs index 5c256e13..8d4153cc 100644 --- a/node/testnet/src/chain_spec.rs +++ b/node/testnet/src/chain_spec.rs @@ -15,7 +15,7 @@ use sp_runtime::{BoundedVec, Perbill}; use hex_literal::hex; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a crypto pair from key. pub fn inspect_key(key: &str) -> ::Public { @@ -150,16 +150,17 @@ fn testnet_genesis( root_key: AccountId, endowed_accounts: Vec, _enable_println: bool, -) -> testnet::GenesisConfig { +) -> testnet::RuntimeGenesisConfig { // This is the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - testnet::GenesisConfig { + testnet::RuntimeGenesisConfig { system: testnet::SystemConfig { // Add Wasm runtime to storage. code: wasm_binary.to_vec(), + ..Default::default() }, balances: testnet::BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 200_000 * BFC)).collect(), From 5a16af4432d916ae9f5e90468210661c42fcf38d Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 15:59:28 +0900 Subject: [PATCH 28/53] NODE-65, chore: add missing clone() --- node/dev/src/service.rs | 4 ++-- node/mainnet/src/service.rs | 2 +- node/testnet/src/service.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index 70fd2152..c7abc0df 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -411,7 +411,7 @@ pub fn new_full_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), - offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), }; task_manager.spawn_essential_handle().spawn_blocking( @@ -604,7 +604,7 @@ pub fn new_manual_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), - offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), }; task_manager.spawn_essential_handle().spawn_blocking( diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index 0511383e..9a71e666 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -402,7 +402,7 @@ pub fn new_full_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), - offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), }; task_manager.spawn_essential_handle().spawn_blocking( diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index 84509714..b3d7c066 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -402,7 +402,7 @@ pub fn new_full_base( prometheus_registry, shared_voter_state, sync: sync_service.clone(), - offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), }; task_manager.spawn_essential_handle().spawn_blocking( From c90b0e3c9641d10255e650b8e6be8f387d976816 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 27 Dec 2023 16:16:40 +0900 Subject: [PATCH 29/53] NODE-65, chore: remove native runtime version api --- Cargo.lock | 2 ++ node/common/Cargo.toml | 4 ++++ node/common/src/rpc.rs | 11 +++++++---- node/common/src/service.rs | 11 ++++++++--- node/core/src/command.rs | 19 +++++-------------- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 612444ad..2612a340 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -705,9 +705,11 @@ dependencies = [ "fc-rpc-core", "fc-rpc-debug", "fc-rpc-trace", + "fp-ext", "fp-rpc", "fp-rpc-debug", "fp-storage", + "frame-benchmarking", "futures 0.3.29", "sc-chain-spec", "sc-client-api", diff --git a/node/common/Cargo.toml b/node/common/Cargo.toml index 2d808826..481678d5 100644 --- a/node/common/Cargo.toml +++ b/node/common/Cargo.toml @@ -27,6 +27,9 @@ sc-network-sync = { workspace = true } sc-service = { workspace = true } substrate-prometheus-endpoint = { workspace = true } +# benchmarking dependencies +frame-benchmarking = { workspace = true, features = ["std"] } + # substrate primitives dependencies sp-core = { workspace = true, features = ["std"] } sp-runtime = { workspace = true, features = ["std"] } @@ -44,6 +47,7 @@ fp-storage = { workspace = true } fp-rpc = { workspace = true } fc-rpc-debug = { workspace = true } fc-rpc-trace = { workspace = true } +fp-ext = { workspace = true, features = ["std"] } # Local Dependencies bp-core = { workspace = true } diff --git a/node/common/src/rpc.rs b/node/common/src/rpc.rs index f183f871..1215292a 100644 --- a/node/common/src/rpc.rs +++ b/node/common/src/rpc.rs @@ -1,12 +1,12 @@ use crate::cli_opt::EthApi as EthApiCmd; -use bp_core::{BlockNumber, Hash, Header}; + +use std::{collections::BTreeMap, sync::Arc}; + use fc_rpc::{ EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override, SchemaV2Override, SchemaV3Override, StorageOverride, }; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; -use fp_rpc::{self, EthereumRuntimeRPCApi}; -use fp_storage::EthereumStorageSchema; use sc_client_api::{backend::Backend, StorageProvider}; use sc_consensus_grandpa::{ FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState, @@ -18,11 +18,14 @@ use sc_rpc::SubscriptionTaskExecutor; use sc_rpc_api::DenyUnsafe; use sc_service::TaskManager; use sc_transaction_pool::{ChainApi, Pool}; + +use bp_core::{BlockNumber, Hash, Header}; +use fp_rpc::{self, EthereumRuntimeRPCApi}; +use fp_storage::EthereumStorageSchema; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; use sp_core::H256; use sp_runtime::{generic, traits::Block as BlockT, OpaqueExtrinsic as UncheckedExtrinsic}; -use std::{collections::BTreeMap, sync::Arc}; pub type Block = generic::Block; diff --git a/node/common/src/service.rs b/node/common/src/service.rs index 5e44a3f1..21a9010b 100644 --- a/node/common/src/service.rs +++ b/node/common/src/service.rs @@ -1,16 +1,21 @@ -use bp_core::Block; +use crate::cli_opt::{BackendTypeConfig, RpcConfig}; + +use std::{path::Path, sync::Arc}; + use fc_db::DatabaseSource; use sc_client_api::{ backend::{Backend, StateBackend}, AuxStore, StorageProvider, }; use sc_service::Configuration; + +use bp_core::Block; use sp_api::ProvideRuntimeApi; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_runtime::traits::BlakeTwo256; -use std::{path::Path, sync::Arc}; -use crate::cli_opt::{BackendTypeConfig, RpcConfig}; +pub type HostFunctions = + (frame_benchmarking::benchmarking::HostFunctions, fp_ext::bifrost_ext::HostFunctions); /// Configure frontier database. pub fn frontier_database_dir(config: &Configuration, path: &str) -> std::path::PathBuf { diff --git a/node/core/src/command.rs b/node/core/src/command.rs index a7cc28e7..a13b9bd8 100644 --- a/node/core/src/command.rs +++ b/node/core/src/command.rs @@ -3,7 +3,8 @@ use crate::cli::{Cli, Subcommand}; use bifrost_common_node::cli_opt::{BackendType, BackendTypeConfig, RpcConfig}; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; -use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli}; + +use sc_cli::SubstrateCli; use sc_service::PartialComponents; trait IdentifyChain { @@ -77,18 +78,6 @@ impl SubstrateCli for Cli { )?), }) } - - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - if chain_spec.is_dev() { - &bifrost_dev_runtime::VERSION - } else if chain_spec.is_testnet() { - &bifrost_testnet_runtime::VERSION - } else if chain_spec.is_mainnet() { - &bifrost_mainnet_runtime::VERSION - } else { - &bifrost_dev_runtime::VERSION - } - } } /// Parse and run command line arguments @@ -288,6 +277,8 @@ pub fn run() -> sc_cli::Result<()> { } }, Some(Subcommand::Benchmark(cmd)) => { + use bifrost_common_node::rpc::Block; + let runner = cli.create_runner(cmd)?; runner.sync_run(|config| { @@ -303,7 +294,7 @@ pub fn run() -> sc_cli::Result<()> { ); } - cmd.run::(config) + cmd.run::(config) }, BenchmarkCmd::Block(cmd) => { let PartialComponents { client, .. } = From 705d7ca1f754553132fd1dd2001ecad80b254374 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 28 Dec 2023 12:38:24 +0900 Subject: [PATCH 30/53] NODE-65, fix: replace to fp-account --- Cargo.lock | 65 ++------------ Cargo.toml | 3 +- primitives/account/Cargo.toml | 54 ------------ primitives/account/src/lib.rs | 156 ---------------------------------- primitives/core/Cargo.toml | 9 +- primitives/core/src/lib.rs | 2 +- runtime/dev/Cargo.toml | 4 +- runtime/mainnet/Cargo.toml | 4 +- runtime/testnet/Cargo.toml | 4 +- 9 files changed, 19 insertions(+), 282 deletions(-) delete mode 100644 primitives/account/Cargo.toml delete mode 100644 primitives/account/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 2612a340..f647aede 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,26 +12,6 @@ dependencies = [ "regex", ] -[[package]] -name = "account" -version = "0.0.1" -dependencies = [ - "blake2-rfc", - "hex", - "impl-serde", - "libsecp256k1", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sha3", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", -] - [[package]] name = "addr2line" version = "0.19.0" @@ -432,15 +412,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - [[package]] name = "arrayvec" version = "0.5.2" @@ -820,11 +791,11 @@ dependencies = [ name = "bifrost-dev-runtime" version = "1.0.0" dependencies = [ - "account", "bifrost-common-runtime", "bifrost-dev-constants", "bp-core", "evm-tracer", + "fp-account", "fp-evm", "fp-rpc", "fp-rpc-debug", @@ -973,11 +944,11 @@ dependencies = [ name = "bifrost-mainnet-runtime" version = "1.0.0" dependencies = [ - "account", "bifrost-common-runtime", "bifrost-mainnet-constants", "bp-core", "evm-tracer", + "fp-account", "fp-evm", "fp-rpc", "fp-rpc-debug", @@ -1146,11 +1117,11 @@ dependencies = [ name = "bifrost-testnet-runtime" version = "1.0.0" dependencies = [ - "account", "bifrost-common-runtime", "bifrost-testnet-constants", "bp-core", "evm-tracer", + "fp-account", "fp-evm", "fp-rpc", "fp-rpc-debug", @@ -1297,16 +1268,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake2b_simd" version = "1.0.2" @@ -1315,7 +1276,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -1326,7 +1287,7 @@ checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -1339,7 +1300,7 @@ dependencies = [ "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -1397,7 +1358,7 @@ dependencies = [ name = "bp-core" version = "0.0.1" dependencies = [ - "account", + "fp-account", "fp-self-contained", "sp-core", "sp-runtime", @@ -1825,12 +1786,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -5817,12 +5772,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nohash-hasher" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index c7d84146..d9c04e91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ members = [ "precompiles/governance", "precompiles/collective", "precompiles/balance", - "primitives/account", "primitives/core", "primitives/bfc-staking", ] @@ -75,7 +74,6 @@ syn = "1.0" # Bifrost Primitive bp-core = { default-features = false, path = "primitives/core" } bp-staking = { default-features = false, path = "primitives/bfc-staking" } -account = { default-features = false, path = "primitives/account" } # Bifrost Runtime bifrost-common-constants = { default-features = false, path = "runtime/common/constants" } @@ -199,6 +197,7 @@ fc-api = { default-features = false, git = "https://github.com/bifrost-platform/ # Frontier Primitive fp-self-contained = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } +fp-account = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fp-storage = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fp-evm = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } fp-ext = { default-features = false, git = "https://github.com/bifrost-platform/bifrost-frontier", branch = "bifrost-polkadot-v1.3.0" } diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml deleted file mode 100644 index 4c77c42f..00000000 --- a/primitives/account/Cargo.toml +++ /dev/null @@ -1,54 +0,0 @@ -[package] -name = "account" -version = "0.0.1" -description = "Util module for Ethereum account support" -authors = { workspace = true } -homepage = { workspace = true} -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } - -[package.metadata.docs.rs] -targets = [ "x86_64-unknown-linux-gnu" ] - -[dependencies] -log = { workspace = true } -hex = { workspace = true } -sha3 = { workspace = true } -impl-serde = { workspace = true } -blake2-rfc = { workspace = true, optional = true } -libsecp256k1 = { workspace = true, features = ["hmac"] } -serde = { workspace = true, optional = true, features = ["derive"] } - -# Substrate -scale-info = { workspace = true } -parity-scale-codec = { workspace = true } -sp-io = { workspace = true } -sp-std = { workspace = true } -sp-core = { workspace = true } -sp-runtime = { workspace = true } -sp-runtime-interface = { workspace = true } - -[dev-dependencies] -hex = { workspace = true } - -[features] -default = [ "std" ] -std = [ - "full_crypto", - "hex/std", - "impl-serde/std", - "libsecp256k1/std", - "parity-scale-codec/std", - "serde/std", - "sha3/std", - "sp-core/std", - "sp-io/std", - "sp-runtime/std", - "sp-std/std", -] - -full_crypto = [ - "blake2-rfc", - "sp-runtime-interface/disable_target_static_assertions", -] diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs deleted file mode 100644 index 5d14a043..00000000 --- a/primitives/account/src/lib.rs +++ /dev/null @@ -1,156 +0,0 @@ -//! The Ethereum Signature implementation. -//! It includes the Verify and IdentifyAccount traits for the AccountId20 - -#![cfg_attr(not(feature = "std"), no_std)] - -use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; -use scale_info::TypeInfo; -use sha3::{Digest, Keccak256}; -use sp_core::{ecdsa, H160, H256}; - -#[cfg(feature = "std")] -pub use serde::{de::DeserializeOwned, Deserialize, Serialize}; - -/// The account type to be used in BIFROST. It is a wrapper for 20 fixed bytes. We prefer to use -/// a dedicated type to prevent using arbitrary 20 byte arrays were AccountIds are expected. With -/// the introduction of the `scale-info` crate this benefit extends even to non-Rust tools like -/// Polkadot JS. -#[derive( - Eq, PartialEq, Copy, Clone, Encode, Decode, TypeInfo, MaxEncodedLen, Default, PartialOrd, Ord, -)] -pub struct AccountId20(pub [u8; 20]); - -#[cfg(feature = "std")] -impl_serde::impl_fixed_hash_serde!(AccountId20, 20); - -#[cfg(feature = "std")] -impl std::fmt::Display for AccountId20 { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } -} - -impl core::fmt::Debug for AccountId20 { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - write!(f, "{:?}", H160(self.0)) - } -} - -impl From<[u8; 20]> for AccountId20 { - fn from(bytes: [u8; 20]) -> Self { - Self(bytes) - } -} - -impl Into<[u8; 20]> for AccountId20 { - fn into(self) -> [u8; 20] { - self.0 - } -} - -impl From for AccountId20 { - fn from(h160: H160) -> Self { - Self(h160.0) - } -} - -impl Into for AccountId20 { - fn into(self) -> H160 { - H160(self.0) - } -} - -#[cfg(feature = "std")] -impl std::str::FromStr for AccountId20 { - type Err = &'static str; - fn from_str(input: &str) -> Result { - H160::from_str(input).map(Into::into).map_err(|_| "invalid hex address.") - } -} - -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] -#[derive(Eq, PartialEq, Clone, Encode, Decode, sp_core::RuntimeDebug, TypeInfo)] -pub struct EthereumSignature(ecdsa::Signature); - -impl From for EthereumSignature { - fn from(x: ecdsa::Signature) -> Self { - EthereumSignature(x) - } -} - -impl sp_runtime::traits::Verify for EthereumSignature { - type Signer = EthereumSigner; - fn verify>(&self, mut msg: L, signer: &AccountId20) -> bool { - let mut m = [0u8; 32]; - m.copy_from_slice(Keccak256::digest(msg.get()).as_slice()); - match sp_io::crypto::secp256k1_ecdsa_recover(self.0.as_ref(), &m) { - Ok(pubkey) => { - AccountId20(H160::from(H256::from_slice(Keccak256::digest(&pubkey).as_slice())).0) - == *signer - }, - Err(sp_io::EcdsaVerifyError::BadRS) => { - log::error!(target: "evm", "Error recovering: Incorrect value of R or S"); - false - }, - Err(sp_io::EcdsaVerifyError::BadV) => { - log::error!(target: "evm", "Error recovering: Incorrect value of V"); - false - }, - Err(sp_io::EcdsaVerifyError::BadSignature) => { - log::error!(target: "evm", "Error recovering: Invalid signature"); - false - }, - } - } -} - -/// Public key for an Ethereum / BIFROST compatible account -#[derive( - Eq, PartialEq, Ord, PartialOrd, Clone, Encode, Decode, sp_core::RuntimeDebug, TypeInfo, -)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] -pub struct EthereumSigner([u8; 20]); - -impl sp_runtime::traits::IdentifyAccount for EthereumSigner { - type AccountId = AccountId20; - fn into_account(self) -> AccountId20 { - AccountId20(self.0) - } -} - -impl From<[u8; 20]> for EthereumSigner { - fn from(x: [u8; 20]) -> Self { - EthereumSigner(x) - } -} - -impl From for EthereumSigner { - fn from(x: ecdsa::Public) -> Self { - let decompressed = libsecp256k1::PublicKey::parse_slice( - &x.0, - Some(libsecp256k1::PublicKeyFormat::Compressed), - ) - .expect("Wrong compressed public key provided") - .serialize(); - let mut m = [0u8; 64]; - m.copy_from_slice(&decompressed[1..65]); - let account = H160::from(H256::from_slice(Keccak256::digest(&m).as_slice())); - EthereumSigner(account.into()) - } -} - -impl From for EthereumSigner { - fn from(x: libsecp256k1::PublicKey) -> Self { - let mut m = [0u8; 64]; - m.copy_from_slice(&x.serialize()[1..65]); - let account = H160::from(H256::from_slice(Keccak256::digest(&m).as_slice())); - EthereumSigner(account.into()) - } -} - -#[cfg(feature = "std")] -impl std::fmt::Display for EthereumSigner { - fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(fmt, "ethereum signature: {:?}", H160::from_slice(&self.0)) - } -} diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index 729ecc0e..5274d095 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -3,22 +3,21 @@ name = "bp-core" version = "0.0.1" description = "Core primitives for Bifrost runtime" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } [dependencies] -account = { workspace = true } - +fp-account = { workspace = true } fp-self-contained = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ - "account/std", + "fp-account/std", "fp-self-contained/std", "sp-core/std", "sp-runtime/std", diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs index 875b27cf..735e7635 100644 --- a/primitives/core/src/lib.rs +++ b/primitives/core/src/lib.rs @@ -1,6 +1,6 @@ #![cfg_attr(not(feature = "std"), no_std)] -use account::EthereumSignature; +use fp_account::EthereumSignature; pub use sp_runtime::OpaqueExtrinsic; use sp_runtime::{ diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 6fe04f02..1ec8c2d4 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -25,7 +25,6 @@ num_enum = { workspace = true } bifrost-common-runtime = { workspace = true } bifrost-dev-constants = { workspace = true } bp-core = { workspace = true } -account = { workspace = true } precompile-utils = { workspace = true } # FRAME dependencies @@ -80,6 +79,7 @@ fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } fp-rpc-evm-tracing-events = { workspace = true, optional = true } +fp-account = { workspace = true, features = ["serde"]} evm-tracer = { workspace = true, optional = true } # Custom Pallets @@ -159,8 +159,8 @@ std = [ "fp-rpc-debug/std", "fp-rpc-txpool/std", "fp-rpc-evm-tracing-events/std", + "fp-account/std", "evm-tracer/std", - "account/std", "precompile-utils/std", ] evm-tracing = [ diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml index 712e01a2..a0c309d5 100644 --- a/runtime/mainnet/Cargo.toml +++ b/runtime/mainnet/Cargo.toml @@ -25,7 +25,6 @@ num_enum = { workspace = true } bifrost-common-runtime = { workspace = true } bifrost-mainnet-constants = { workspace = true } bp-core = { workspace = true } -account = { workspace = true } precompile-utils = { workspace = true } # FRAME dependencies @@ -80,6 +79,7 @@ fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } fp-rpc-evm-tracing-events = { workspace = true, optional = true } +fp-account = { workspace = true, features = ["serde"] } evm-tracer = { workspace = true, optional = true } # Custom Pallets @@ -159,8 +159,8 @@ std = [ "fp-rpc-debug/std", "fp-rpc-txpool/std", "fp-rpc-evm-tracing-events/std", + "fp-account/std", "evm-tracer/std", - "account/std", "precompile-utils/std", ] evm-tracing = [ diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index 5f722fa7..55e12c98 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -25,7 +25,6 @@ num_enum = { workspace = true } bifrost-common-runtime = { workspace = true } bifrost-testnet-constants = { workspace = true } bp-core = { workspace = true } -account = { workspace = true } precompile-utils = { workspace = true } # FRAME dependencies @@ -80,6 +79,7 @@ fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } fp-rpc-evm-tracing-events = { workspace = true, optional = true } +fp-account = { workspace = true, features = ["serde"] } evm-tracer = { workspace = true, optional = true } # Custom Pallets @@ -159,8 +159,8 @@ std = [ "fp-rpc-debug/std", "fp-rpc-txpool/std", "fp-rpc-evm-tracing-events/std", + "fp-account/std", "evm-tracer/std", - "account/std", "precompile-utils/std", ] evm-tracing = [ From 1d888e2ece1f6f8217227a56132e263f6b87b061 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 28 Dec 2023 13:53:55 +0900 Subject: [PATCH 31/53] NODE-65, fix: remove RuntimeFreezeReason and sort imports --- runtime/dev/src/lib.rs | 22 +++++++++------------- runtime/mainnet/src/lib.rs | 22 +++++++++------------- runtime/testnet/src/lib.rs | 22 +++++++++------------- 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 65b2a14d..c588e0a0 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -6,21 +6,13 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; -use frame_support::traits::{ - fungible::HoldConsideration, - tokens::{PayFromAccount, UnityAssetBalanceConversion}, - LinearStoragePrice, -}; -use pallet_identity::simple::IdentityInfo; -use parity_scale_codec::{Decode, Encode}; - pub use bifrost_dev_constants::{ currency::{GWEI, UNITS as BFC, *}, fee::*, time::*, }; +pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; use fp_rpc::TransactionStatus; use fp_rpc_txpool::TxPoolResponse; use sp_api::impl_runtime_apis; @@ -41,11 +33,12 @@ use sp_runtime::{ }; pub use sp_runtime::{Perbill, Percent, Permill}; use sp_std::prelude::*; - #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; +use parity_scale_codec::{Decode, Encode}; + pub use pallet_balances::{Call as BalancesCall, NegativeImbalance}; pub use pallet_bfc_staking::{InflationInfo, Range}; use pallet_ethereum::{ @@ -58,6 +51,7 @@ use pallet_evm::{ use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; +use pallet_identity::simple::IdentityInfo; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_session::historical::{self as pallet_session_historical}; pub use pallet_timestamp::Call as TimestampCall; @@ -70,9 +64,11 @@ pub use frame_support::{ pallet_prelude::Get, parameter_types, traits::{ + fungible::HoldConsideration, + tokens::{PayFromAccount, UnityAssetBalanceConversion}, ConstU128, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, - FindAuthor, Imbalance, KeyOwnerProofSystem, LockIdentifier, NeverEnsureOrigin, OnFinalize, - OnUnbalanced, Randomness, StorageInfo, + FindAuthor, Imbalance, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, + NeverEnsureOrigin, OnFinalize, OnUnbalanced, Randomness, StorageInfo, }, weights::{ constants::{ @@ -282,7 +278,7 @@ impl pallet_balances::Config for Runtime { type MaxFreezes = (); type MaxHolds = ConstU32<1>; type RuntimeHoldReason = RuntimeHoldReason; - type RuntimeFreezeReason = RuntimeFreezeReason; + type RuntimeFreezeReason = (); } pub struct DealWithFees(sp_std::marker::PhantomData); diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 746406d3..c6cf4cda 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -6,21 +6,13 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; -use frame_support::traits::{ - fungible::HoldConsideration, - tokens::{PayFromAccount, UnityAssetBalanceConversion}, - LinearStoragePrice, -}; -use pallet_identity::simple::IdentityInfo; -use parity_scale_codec::{Decode, Encode}; - pub use bifrost_mainnet_constants::{ currency::{GWEI, UNITS as BFC, *}, fee::*, time::*, }; +pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; use fp_rpc::TransactionStatus; use fp_rpc_txpool::TxPoolResponse; use sp_api::impl_runtime_apis; @@ -41,7 +33,6 @@ use sp_runtime::{ }; pub use sp_runtime::{Perbill, Percent, Permill}; use sp_std::prelude::*; - #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; @@ -58,11 +49,14 @@ use pallet_evm::{ use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; +use pallet_identity::simple::IdentityInfo; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_session::historical::{self as pallet_session_historical}; pub use pallet_timestamp::Call as TimestampCall; use pallet_transaction_payment::CurrencyAdapter; +use parity_scale_codec::{Decode, Encode}; + pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, @@ -70,9 +64,11 @@ pub use frame_support::{ pallet_prelude::Get, parameter_types, traits::{ + fungible::HoldConsideration, + tokens::{PayFromAccount, UnityAssetBalanceConversion}, ConstU128, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, - FindAuthor, Imbalance, KeyOwnerProofSystem, LockIdentifier, NeverEnsureOrigin, OnFinalize, - OnUnbalanced, Randomness, StorageInfo, + FindAuthor, Imbalance, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, + NeverEnsureOrigin, OnFinalize, OnUnbalanced, Randomness, StorageInfo, }, weights::{ constants::{ @@ -282,7 +278,7 @@ impl pallet_balances::Config for Runtime { type MaxFreezes = (); type MaxHolds = ConstU32<1>; type RuntimeHoldReason = RuntimeHoldReason; - type RuntimeFreezeReason = RuntimeFreezeReason; + type RuntimeFreezeReason = (); } pub struct DealWithFees(sp_std::marker::PhantomData); diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 1b164859..cdb27515 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -6,21 +6,13 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; -use frame_support::traits::{ - fungible::HoldConsideration, - tokens::{PayFromAccount, UnityAssetBalanceConversion}, - LinearStoragePrice, -}; -use pallet_identity::simple::IdentityInfo; -use parity_scale_codec::{Decode, Encode}; - pub use bifrost_testnet_constants::{ currency::{GWEI, UNITS as BFC, *}, fee::*, time::*, }; +pub use bp_core::{AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature}; use fp_rpc::TransactionStatus; use fp_rpc_txpool::TxPoolResponse; use sp_api::impl_runtime_apis; @@ -41,7 +33,6 @@ use sp_runtime::{ }; pub use sp_runtime::{Perbill, Percent, Permill}; use sp_std::prelude::*; - #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; @@ -58,11 +49,14 @@ use pallet_evm::{ use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; +use pallet_identity::simple::IdentityInfo; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_session::historical::{self as pallet_session_historical}; pub use pallet_timestamp::Call as TimestampCall; use pallet_transaction_payment::CurrencyAdapter; +use parity_scale_codec::{Decode, Encode}; + pub use frame_support::{ construct_runtime, dispatch::{DispatchClass, GetDispatchInfo}, @@ -70,9 +64,11 @@ pub use frame_support::{ pallet_prelude::Get, parameter_types, traits::{ + fungible::HoldConsideration, + tokens::{PayFromAccount, UnityAssetBalanceConversion}, ConstU128, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, - FindAuthor, Imbalance, KeyOwnerProofSystem, LockIdentifier, NeverEnsureOrigin, OnFinalize, - OnUnbalanced, Randomness, StorageInfo, + FindAuthor, Imbalance, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, + NeverEnsureOrigin, OnFinalize, OnUnbalanced, Randomness, StorageInfo, }, weights::{ constants::{ @@ -284,7 +280,7 @@ impl pallet_balances::Config for Runtime { type MaxFreezes = (); type MaxHolds = ConstU32<1>; type RuntimeHoldReason = RuntimeHoldReason; - type RuntimeFreezeReason = RuntimeFreezeReason; + type RuntimeFreezeReason = (); } pub struct DealWithFees(sp_std::marker::PhantomData); From 68328cb7c1fae2b594d9e397b563f83781b0b34d Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 28 Dec 2023 14:59:16 +0900 Subject: [PATCH 32/53] NODE-65, chore: remove unneccessary self imports --- runtime/dev/src/lib.rs | 3 +-- runtime/mainnet/src/lib.rs | 3 +-- runtime/testnet/src/lib.rs | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index c588e0a0..9f18e0d9 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -53,7 +53,6 @@ use pallet_grandpa::{ }; use pallet_identity::simple::IdentityInfo; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; -use pallet_session::historical::{self as pallet_session_historical}; pub use pallet_timestamp::Call as TimestampCall; use pallet_transaction_payment::CurrencyAdapter; @@ -935,7 +934,7 @@ construct_runtime!( // Consensus Authorship: pallet_authorship::{Pallet, Storage} = 4, Session: pallet_session::{Pallet, Call, Storage, Config, Event} = 5, - Historical: pallet_session_historical::{Pallet} = 6, + Historical: pallet_session::historical::{Pallet} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, ImOnline: pallet_im_online::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 8, Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index c6cf4cda..0c1cd30a 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -51,7 +51,6 @@ use pallet_grandpa::{ }; use pallet_identity::simple::IdentityInfo; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; -use pallet_session::historical::{self as pallet_session_historical}; pub use pallet_timestamp::Call as TimestampCall; use pallet_transaction_payment::CurrencyAdapter; @@ -935,7 +934,7 @@ construct_runtime!( // Consensus Authorship: pallet_authorship::{Pallet, Storage} = 4, Session: pallet_session::{Pallet, Call, Storage, Config, Event} = 5, - Historical: pallet_session_historical::{Pallet} = 6, + Historical: pallet_session::historical::{Pallet} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, ImOnline: pallet_im_online::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 8, Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index cdb27515..d0b46250 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -51,7 +51,6 @@ use pallet_grandpa::{ }; use pallet_identity::simple::IdentityInfo; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; -use pallet_session::historical::{self as pallet_session_historical}; pub use pallet_timestamp::Call as TimestampCall; use pallet_transaction_payment::CurrencyAdapter; @@ -941,7 +940,7 @@ construct_runtime!( // Consensus Authorship: pallet_authorship::{Pallet, Storage} = 4, Session: pallet_session::{Pallet, Call, Storage, Config, Event} = 5, - Historical: pallet_session_historical::{Pallet} = 6, + Historical: pallet_session::historical::{Pallet} = 6, Offences: pallet_offences::{Pallet, Storage, Event} = 7, ImOnline: pallet_im_online::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 8, Grandpa: pallet_grandpa::{Pallet, Call, Storage, ValidateUnsigned, Config, Event} = 9, From cc2b2f53bf8047dc5c3a13c724d5d08dd1a5cc43 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 28 Dec 2023 15:20:49 +0900 Subject: [PATCH 33/53] NODE-65, fix: rollback cherry-picked EthereumRuntimeRPCApi changes --- runtime/common/src/apis.rs | 116 +++++++++++-------------------------- runtime/dev/src/lib.rs | 3 +- runtime/mainnet/src/lib.rs | 3 +- runtime/testnet/src/lib.rs | 3 +- 4 files changed, 39 insertions(+), 86 deletions(-) diff --git a/runtime/common/src/apis.rs b/runtime/common/src/apis.rs index 5b6ddbfb..13b1a4b8 100644 --- a/runtime/common/src/apis.rs +++ b/runtime/common/src/apis.rs @@ -195,43 +195,20 @@ macro_rules! impl_common_runtime_apis { None }; - let is_transactional = false; - let validate = true; - let evm_config = config.as_ref().unwrap_or(::config()); - - let mut estimated_transaction_len = data.len() + - 20 + // to - 20 + // from - 32 + // value - 32 + // gas_limit - 32 + // nonce - 1 + // TransactionAction - 8 + // chain id - 65; // signature - - if max_fee_per_gas.is_some() { - estimated_transaction_len += 32; - } - if max_priority_fee_per_gas.is_some() { - estimated_transaction_len += 32; - } - if access_list.is_some() { - estimated_transaction_len += access_list.encoded_size(); - } - - let gas_limit = gas_limit.min(u64::MAX.into()).low_u64(); - let without_base_extrinsic_weight = true; - - let (weight_limit, proof_size_base_cost) = - match ::GasWeightMapping::gas_to_weight( - gas_limit, - without_base_extrinsic_weight - ) { - weight_limit if weight_limit.proof_size() > 0 => { - (Some(weight_limit), Some(estimated_transaction_len as u64)) - } - _ => (None, None), - }; + let gas_limit = gas_limit.min(u64::MAX.into()); + let transaction_data = TransactionData::new( + TransactionAction::Call(to), + data.clone(), + nonce.unwrap_or_default(), + gas_limit, + None, + max_fee_per_gas, + max_priority_fee_per_gas, + value, + Some(::ChainId::get()), + access_list.clone().unwrap_or_default(), + ); + let (weight_limit, proof_size_base_cost) = pallet_ethereum::Pallet::::transaction_weight(&transaction_data); ::Runner::call( from, @@ -243,11 +220,11 @@ macro_rules! impl_common_runtime_apis { max_priority_fee_per_gas, nonce, access_list.unwrap_or_default(), - is_transactional, - validate, + false, + true, weight_limit, proof_size_base_cost, - evm_config, + config.as_ref().unwrap_or(::config()), ).map_err(|err| err.error.into()) } fn create( @@ -269,46 +246,19 @@ macro_rules! impl_common_runtime_apis { None }; - let is_transactional = false; - let validate = true; - let evm_config = config.as_ref().unwrap_or(::config()); - - let mut estimated_transaction_len = data.len() + - 20 + // from - 32 + // value - 32 + // gas_limit - 32 + // nonce - 1 + // TransactionAction - 8 + // chain id - 65; // signature - - if max_fee_per_gas.is_some() { - estimated_transaction_len += 32; - } - if max_priority_fee_per_gas.is_some() { - estimated_transaction_len += 32; - } - if access_list.is_some() { - estimated_transaction_len += access_list.encoded_size(); - } - - let gas_limit = if gas_limit > U256::from(u64::MAX) { - u64::MAX - } else { - gas_limit.low_u64() - }; - let without_base_extrinsic_weight = true; - - let (weight_limit, proof_size_base_cost) = - match ::GasWeightMapping::gas_to_weight( - gas_limit, - without_base_extrinsic_weight - ) { - weight_limit if weight_limit.proof_size() > 0 => { - (Some(weight_limit), Some(estimated_transaction_len as u64)) - } - _ => (None, None), - }; + let transaction_data = TransactionData::new( + TransactionAction::Create, + data.clone(), + nonce.unwrap_or_default(), + gas_limit, + None, + max_fee_per_gas, + max_priority_fee_per_gas, + value, + Some(::ChainId::get()), + access_list.clone().unwrap_or_default(), + ); + let (weight_limit, proof_size_base_cost) = pallet_ethereum::Pallet::::transaction_weight(&transaction_data); ::Runner::create( from, @@ -319,11 +269,11 @@ macro_rules! impl_common_runtime_apis { max_priority_fee_per_gas, nonce, access_list.unwrap_or_default(), - is_transactional, - validate, + false, + true, weight_limit, proof_size_base_cost, - evm_config, + config.as_ref().unwrap_or(::config()), ).map_err(|err| err.error.into()) } fn current_transaction_statuses() -> Option> { diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 9f18e0d9..2e8d6452 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -43,10 +43,11 @@ pub use pallet_balances::{Call as BalancesCall, NegativeImbalance}; pub use pallet_bfc_staking::{InflationInfo, Range}; use pallet_ethereum::{ Call::transact, EthereumBlockHashMapping, PostLogContent, Transaction as EthereumTransaction, + TransactionAction, TransactionData, }; use pallet_evm::{ Account as EVMAccount, EVMCurrencyAdapter, EnsureAddressNever, EnsureAddressRoot, - FeeCalculator, GasWeightMapping, IdentityAddressMapping, Runner, + FeeCalculator, IdentityAddressMapping, Runner, }; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index 0c1cd30a..6a0640da 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -41,10 +41,11 @@ pub use pallet_balances::{Call as BalancesCall, NegativeImbalance}; pub use pallet_bfc_staking::{InflationInfo, Range}; use pallet_ethereum::{ Call::transact, EthereumBlockHashMapping, PostLogContent, Transaction as EthereumTransaction, + TransactionAction, TransactionData, }; use pallet_evm::{ Account as EVMAccount, EVMCurrencyAdapter, EnsureAddressNever, EnsureAddressRoot, - FeeCalculator, GasWeightMapping, IdentityAddressMapping, Runner, + FeeCalculator, IdentityAddressMapping, Runner, }; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index d0b46250..6ad20853 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -41,10 +41,11 @@ pub use pallet_balances::{Call as BalancesCall, NegativeImbalance}; pub use pallet_bfc_staking::{InflationInfo, Range}; use pallet_ethereum::{ Call::transact, EthereumBlockHashMapping, PostLogContent, Transaction as EthereumTransaction, + TransactionAction, TransactionData, }; use pallet_evm::{ Account as EVMAccount, EVMCurrencyAdapter, EnsureAddressNever, EnsureAddressRoot, - FeeCalculator, GasWeightMapping, IdentityAddressMapping, Runner, + FeeCalculator, IdentityAddressMapping, Runner, }; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, From 75d3d5caf9ba1ea5e68da08346ddd2fc43a6b81b Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Tue, 2 Jan 2024 14:45:24 +0900 Subject: [PATCH 34/53] NODE-65, fix: add missing evm features --- Cargo.lock | 3 --- node/dev/Cargo.toml | 7 ++++--- node/mainnet/Cargo.toml | 7 ++++--- node/testnet/Cargo.toml | 7 ++++--- precompiles/balance/Cargo.toml | 4 ++-- precompiles/bfc-offences/Cargo.toml | 2 +- precompiles/collective/Cargo.toml | 2 +- precompiles/governance/Cargo.toml | 2 +- precompiles/relay-manager/Cargo.toml | 2 +- primitives/bfc-staking/Cargo.toml | 2 +- runtime/common/Cargo.toml | 13 +++---------- runtime/common/constants/Cargo.toml | 2 +- runtime/dev/Cargo.toml | 8 ++++---- runtime/dev/constants/Cargo.toml | 10 +++------- runtime/mainnet/Cargo.toml | 6 +++--- runtime/mainnet/constants/Cargo.toml | 10 +++------- runtime/testnet/Cargo.toml | 6 +++--- runtime/testnet/constants/Cargo.toml | 10 +++------- 18 files changed, 42 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f647aede..ce7e4244 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -750,7 +750,6 @@ dependencies = [ "jsonrpsee", "pallet-bfc-staking", "pallet-ethereum", - "pallet-evm", "pallet-im-online", "pallet-transaction-payment-rpc", "sc-basic-authorship", @@ -904,7 +903,6 @@ dependencies = [ "jsonrpsee", "pallet-bfc-staking", "pallet-ethereum", - "pallet-evm", "pallet-im-online", "pallet-transaction-payment-rpc", "sc-basic-authorship", @@ -1077,7 +1075,6 @@ dependencies = [ "jsonrpsee", "pallet-bfc-staking", "pallet-ethereum", - "pallet-evm", "pallet-im-online", "pallet-transaction-payment-rpc", "sc-basic-authorship", diff --git a/node/dev/Cargo.toml b/node/dev/Cargo.toml index 87d3fd92..7766ae3f 100644 --- a/node/dev/Cargo.toml +++ b/node/dev/Cargo.toml @@ -68,9 +68,10 @@ fp-storage = { workspace = true } fp-ext = { workspace = true, features = ["std"] } fp-rpc = { workspace = true, features = ["std"] } fp-rpc-txpool = { workspace = true, features = ["std"] } -pallet-evm = { workspace = true, features = ["std"] } - -pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } +pallet-ethereum = { workspace = true, features = [ + "std", + "forbid-evm-reentrancy", +] } # benchmarking dependencies frame-benchmarking-cli = { workspace = true } diff --git a/node/mainnet/Cargo.toml b/node/mainnet/Cargo.toml index c7b90258..e989e541 100644 --- a/node/mainnet/Cargo.toml +++ b/node/mainnet/Cargo.toml @@ -67,9 +67,10 @@ fp-storage = { workspace = true } fp-ext = { workspace = true, features = ["std"] } fp-rpc = { workspace = true, features = ["std"] } fp-rpc-txpool = { workspace = true, features = ["std"] } -pallet-evm = { workspace = true, features = ["std"] } - -pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } +pallet-ethereum = { workspace = true, features = [ + "std", + "forbid-evm-reentrancy", +] } # benchmarking dependencies frame-benchmarking-cli = { workspace = true } diff --git a/node/testnet/Cargo.toml b/node/testnet/Cargo.toml index 8b4ac14d..b6e3d180 100644 --- a/node/testnet/Cargo.toml +++ b/node/testnet/Cargo.toml @@ -67,9 +67,10 @@ fp-storage = { workspace = true } fp-ext = { workspace = true, features = ["std"] } fp-rpc = { workspace = true, features = ["std"] } fp-rpc-txpool = { workspace = true, features = ["std"] } -pallet-evm = { workspace = true, features = ["std"] } - -pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } +pallet-ethereum = { workspace = true, features = [ + "std", + "forbid-evm-reentrancy", +] } # benchmarking dependencies frame-benchmarking-cli = { workspace = true } diff --git a/precompiles/balance/Cargo.toml b/precompiles/balance/Cargo.toml index a98c0901..dc5d3b37 100644 --- a/precompiles/balance/Cargo.toml +++ b/precompiles/balance/Cargo.toml @@ -3,7 +3,7 @@ name = "precompile-balance" version = "1.0.0" description = "A precompile that creates pallet balance accessible to pallet-evm" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -26,7 +26,7 @@ pallet-balances = { workspace = true, features = ["insecure_zero_ed"] } # Frontier fp-evm = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [dev-dependencies] derive_more = { workspace = true } diff --git a/precompiles/bfc-offences/Cargo.toml b/precompiles/bfc-offences/Cargo.toml index bb70cb95..a78e32cc 100644 --- a/precompiles/bfc-offences/Cargo.toml +++ b/precompiles/bfc-offences/Cargo.toml @@ -28,7 +28,7 @@ sp-staking = { workspace = true } # Frontier fp-evm = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [dev-dependencies] derive_more = { workspace = true } diff --git a/precompiles/collective/Cargo.toml b/precompiles/collective/Cargo.toml index 500f90ac..731eb0b9 100644 --- a/precompiles/collective/Cargo.toml +++ b/precompiles/collective/Cargo.toml @@ -27,7 +27,7 @@ pallet-collective = { workspace = true } # Frontier fp-evm = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [dev-dependencies] hex-literal = { workspace = true } diff --git a/precompiles/governance/Cargo.toml b/precompiles/governance/Cargo.toml index 239c88e6..0e94c583 100644 --- a/precompiles/governance/Cargo.toml +++ b/precompiles/governance/Cargo.toml @@ -28,7 +28,7 @@ pallet-preimage = { workspace = true } # Frontier fp-evm = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [dev-dependencies] hex-literal = { workspace = true } diff --git a/precompiles/relay-manager/Cargo.toml b/precompiles/relay-manager/Cargo.toml index 2221ea94..8cdb4b5a 100644 --- a/precompiles/relay-manager/Cargo.toml +++ b/precompiles/relay-manager/Cargo.toml @@ -27,7 +27,7 @@ sp-runtime = { workspace = true } # Frontier fp-evm = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [dev-dependencies] derive_more = { workspace = true } diff --git a/primitives/bfc-staking/Cargo.toml b/primitives/bfc-staking/Cargo.toml index 6f8b8646..fb4fb4cc 100644 --- a/primitives/bfc-staking/Cargo.toml +++ b/primitives/bfc-staking/Cargo.toml @@ -20,7 +20,7 @@ sp-runtime = { workspace = true } sp-staking = { workspace = true } [features] -default = [ "std" ] +default = ["std"] std = [ "scale-info/std", "parity-scale-codec/std", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 5e5abbfa..3fc71738 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-common-runtime" version = "1.0.0" description = "The common code shared between substrate runtimes for Bifrost Node" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -19,12 +19,5 @@ sp-runtime = { workspace = true } sp-std = { workspace = true } [features] -std = [ - "frame-support/std", - "sp-core/std", - "sp-runtime/std", - "sp-std/std", -] -try-runtime = [ - "frame-support/try-runtime", -] +std = ["frame-support/std", "sp-core/std", "sp-runtime/std", "sp-std/std"] +try-runtime = ["frame-support/try-runtime"] diff --git a/runtime/common/constants/Cargo.toml b/runtime/common/constants/Cargo.toml index a554d5c9..5c34e898 100644 --- a/runtime/common/constants/Cargo.toml +++ b/runtime/common/constants/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-common-constants" version = "1.0.0" description = "The substrate runtime constants for Bifrost Node development" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 1ec8c2d4..7d7ae3c2 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -70,16 +70,16 @@ sp-version = { workspace = true } sp-genesis-builder = { workspace = true } # Frontier -pallet-evm = { workspace = true } -pallet-ethereum = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } +pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-base-fee = { workspace = true } -fp-self-contained = { workspace = true } +fp-self-contained = { workspace = true, features = ["serde"] } fp-evm = { workspace = true } fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } fp-rpc-evm-tracing-events = { workspace = true, optional = true } -fp-account = { workspace = true, features = ["serde"]} +fp-account = { workspace = true, features = ["serde"] } evm-tracer = { workspace = true, optional = true } # Custom Pallets diff --git a/runtime/dev/constants/Cargo.toml b/runtime/dev/constants/Cargo.toml index d53212d7..af835c62 100644 --- a/runtime/dev/constants/Cargo.toml +++ b/runtime/dev/constants/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-dev-constants" version = "1.0.0" description = "The substrate runtime constants for Bifrost Node development" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -16,12 +16,8 @@ bp-core = { workspace = true } # Substrate sp-core = { workspace = true } frame-support = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [features] default = ["std"] -std = [ - "pallet-evm/std", - "sp-core/std", - "frame-support/std" -] +std = ["pallet-evm/std", "sp-core/std", "frame-support/std"] diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml index a0c309d5..c227fc08 100644 --- a/runtime/mainnet/Cargo.toml +++ b/runtime/mainnet/Cargo.toml @@ -70,10 +70,10 @@ sp-version = { workspace = true } sp-genesis-builder = { workspace = true } # Frontier -pallet-evm = { workspace = true } -pallet-ethereum = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } +pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-base-fee = { workspace = true } -fp-self-contained = { workspace = true } +fp-self-contained = { workspace = true, features = ["serde"] } fp-evm = { workspace = true } fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } diff --git a/runtime/mainnet/constants/Cargo.toml b/runtime/mainnet/constants/Cargo.toml index 93dd8a21..269b02fe 100644 --- a/runtime/mainnet/constants/Cargo.toml +++ b/runtime/mainnet/constants/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-mainnet-constants" version = "1.0.0" description = "The substrate runtime constants for Bifrost Node development" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -16,12 +16,8 @@ bp-core = { workspace = true } # Substrate sp-core = { workspace = true } frame-support = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [features] default = ["std"] -std = [ - "pallet-evm/std", - "sp-core/std", - "frame-support/std" -] +std = ["pallet-evm/std", "sp-core/std", "frame-support/std"] diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index 55e12c98..a4a629aa 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -70,10 +70,10 @@ sp-version = { workspace = true } sp-genesis-builder = { workspace = true } # Frontier -pallet-evm = { workspace = true } -pallet-ethereum = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } +pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-base-fee = { workspace = true } -fp-self-contained = { workspace = true } +fp-self-contained = { workspace = true, features = ["serde"] } fp-evm = { workspace = true } fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } diff --git a/runtime/testnet/constants/Cargo.toml b/runtime/testnet/constants/Cargo.toml index 086428a8..a1133cc5 100644 --- a/runtime/testnet/constants/Cargo.toml +++ b/runtime/testnet/constants/Cargo.toml @@ -3,7 +3,7 @@ name = "bifrost-testnet-constants" version = "1.0.0" description = "The substrate runtime constants for Bifrost Node development" authors = { workspace = true } -homepage = { workspace = true} +homepage = { workspace = true } edition = { workspace = true } license = { workspace = true } repository = { workspace = true } @@ -16,12 +16,8 @@ bp-core = { workspace = true } # Substrate sp-core = { workspace = true } frame-support = { workspace = true } -pallet-evm = { workspace = true } +pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } [features] default = ["std"] -std = [ - "pallet-evm/std", - "sp-core/std", - "frame-support/std" -] +std = ["pallet-evm/std", "sp-core/std", "frame-support/std"] From 2617a8087448e05261366d86acfdf80578706919 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Tue, 2 Jan 2024 15:50:11 +0900 Subject: [PATCH 35/53] NODE-65, deps: release v1.3.0 --- Cargo.lock | 2 +- node/common/Cargo.toml | 2 +- node/core/Cargo.toml | 4 ++-- node/dev/Cargo.toml | 2 +- node/mainnet/Cargo.toml | 2 +- node/testnet/Cargo.toml | 2 +- runtime/common/Cargo.toml | 2 +- runtime/common/constants/Cargo.toml | 2 +- runtime/dev/Cargo.toml | 2 +- runtime/dev/constants/Cargo.toml | 2 +- runtime/mainnet/Cargo.toml | 2 +- runtime/mainnet/constants/Cargo.toml | 2 +- runtime/testnet/Cargo.toml | 2 +- runtime/testnet/constants/Cargo.toml | 2 +- tests/package-lock.json | 18 +++++++++--------- tests/package.json | 4 ++-- tools/package-lock.json | 18 +++++++++--------- tools/package.json | 4 ++-- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce7e4244..8ae63445 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1020,7 +1020,7 @@ dependencies = [ [[package]] name = "bifrost-node" -version = "1.2.5" +version = "1.3.0" dependencies = [ "bifrost-common-node", "bifrost-dev-node", diff --git a/node/common/Cargo.toml b/node/common/Cargo.toml index 481678d5..6b5c382b 100644 --- a/node/common/Cargo.toml +++ b/node/common/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-common-node" version = "1.0.0" -description = "The common code shared between node specifications for Bifrost Node" +description = "The common code shared between client implementations for Bifrost" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/node/core/Cargo.toml b/node/core/Cargo.toml index 43dce1d9..096315a5 100644 --- a/node/core/Cargo.toml +++ b/node/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-node" -version = "1.2.5" -description = "The node specification for Bifrost Node" +version = "1.3.0" +description = "The node client implementation for Bifrost" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/node/dev/Cargo.toml b/node/dev/Cargo.toml index 7766ae3f..f9b11ed1 100644 --- a/node/dev/Cargo.toml +++ b/node/dev/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-dev-node" version = "1.0.0" -description = "The node specification for Bifrost Node development" +description = "The node client implementation for Bifrost dev chain" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/node/mainnet/Cargo.toml b/node/mainnet/Cargo.toml index e989e541..20ecb713 100644 --- a/node/mainnet/Cargo.toml +++ b/node/mainnet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-mainnet-node" version = "1.0.0" -description = "The node specification for Bifrost Node mainnet" +description = "The node client implementation for Bifrost mainnet" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/node/testnet/Cargo.toml b/node/testnet/Cargo.toml index b6e3d180..5c547797 100644 --- a/node/testnet/Cargo.toml +++ b/node/testnet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-testnet-node" version = "1.0.0" -description = "The node specification for Bifrost Node testnet" +description = "The node client implementation for Bifrost testnet" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 3fc71738..3d65708d 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-common-runtime" version = "1.0.0" -description = "The common code shared between substrate runtimes for Bifrost Node" +description = "The common runtime apis for Bifrost" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/common/constants/Cargo.toml b/runtime/common/constants/Cargo.toml index 5c34e898..82c8c0f4 100644 --- a/runtime/common/constants/Cargo.toml +++ b/runtime/common/constants/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-common-constants" version = "1.0.0" -description = "The substrate runtime constants for Bifrost Node development" +description = "The common runtime constants for Bifrost" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 7d7ae3c2..0bbf8544 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-dev-runtime" version = "1.0.0" -description = "The substrate runtime for Bifrost Node development" +description = "The runtime for Bifrost dev chain" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/dev/constants/Cargo.toml b/runtime/dev/constants/Cargo.toml index af835c62..c1af6a20 100644 --- a/runtime/dev/constants/Cargo.toml +++ b/runtime/dev/constants/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-dev-constants" version = "1.0.0" -description = "The substrate runtime constants for Bifrost Node development" +description = "The runtime constants for Bifrost dev chain" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml index c227fc08..63352803 100644 --- a/runtime/mainnet/Cargo.toml +++ b/runtime/mainnet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-mainnet-runtime" version = "1.0.0" -description = "The substrate runtime for Bifrost Node mainnet" +description = "The runtime for Bifrost mainnet" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/mainnet/constants/Cargo.toml b/runtime/mainnet/constants/Cargo.toml index 269b02fe..8cb0b623 100644 --- a/runtime/mainnet/constants/Cargo.toml +++ b/runtime/mainnet/constants/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-mainnet-constants" version = "1.0.0" -description = "The substrate runtime constants for Bifrost Node development" +description = "The runtime constants for Bifrost mainnet" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index a4a629aa..d1f4098c 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-testnet-runtime" version = "1.0.0" -description = "The substrate runtime for Bifrost Node testnet" +description = "The runtime for Bifrost testnet" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/runtime/testnet/constants/Cargo.toml b/runtime/testnet/constants/Cargo.toml index a1133cc5..11f31ddd 100644 --- a/runtime/testnet/constants/Cargo.toml +++ b/runtime/testnet/constants/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-testnet-constants" version = "1.0.0" -description = "The substrate runtime constants for Bifrost Node development" +description = "The runtime constants for Bifrost testnet" authors = { workspace = true } homepage = { workspace = true } edition = { workspace = true } diff --git a/tests/package-lock.json b/tests/package-lock.json index 639e90e5..e9326f49 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -1,15 +1,15 @@ { "name": "@bifrost-platform/bifrost-node", - "version": "1.2.5", + "version": "1.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@bifrost-platform/bifrost-node", - "version": "1.2.5", + "version": "1.3.0", "dependencies": { "@polkadot/api": "10.9.1", - "axios": "1.5.0", + "axios": "1.6.3", "bignumber.js": "9.1.2", "ethers": "5.7.2", "shelljs": "0.8.5", @@ -1571,9 +1571,9 @@ } }, "node_modules/axios": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz", - "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", + "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -4875,9 +4875,9 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, "axios": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz", - "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", + "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/tests/package.json b/tests/package.json index e0de0754..825e162c 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,6 +1,6 @@ { "name": "@bifrost-platform/bifrost-node", - "version": "1.2.5", + "version": "1.3.0", "author": "bifrost-platform", "scripts": { "test": "mocha -r ts-node/register tests/**/**/*.ts --exit", @@ -19,7 +19,7 @@ }, "dependencies": { "@polkadot/api": "10.9.1", - "axios": "1.5.0", + "axios": "1.6.3", "bignumber.js": "9.1.2", "ethers": "5.7.2", "shelljs": "0.8.5", diff --git a/tools/package-lock.json b/tools/package-lock.json index f6826673..9d92f065 100644 --- a/tools/package-lock.json +++ b/tools/package-lock.json @@ -1,15 +1,15 @@ { "name": "@bifrost-platform/bifrost-node", - "version": "1.2.5", + "version": "1.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@bifrost-platform/bifrost-node", - "version": "1.2.5", + "version": "1.3.0", "dependencies": { "@polkadot/api": "10.9.1", - "axios": "1.5.0", + "axios": "1.6.3", "bignumber.js": "9.1.2", "gauge": "5.0.1", "shelljs": "0.8.5", @@ -1156,9 +1156,9 @@ } }, "node_modules/axios": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz", - "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", + "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -3318,9 +3318,9 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, "axios": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz", - "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", + "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/tools/package.json b/tools/package.json index e30fefbd..3478c685 100644 --- a/tools/package.json +++ b/tools/package.json @@ -1,6 +1,6 @@ { "name": "@bifrost-platform/bifrost-node", - "version": "1.2.5", + "version": "1.3.0", "author": "bifrost-platform", "scripts": { "set_session_keys": "ts-node src/set_session_keys.ts", @@ -17,7 +17,7 @@ }, "dependencies": { "@polkadot/api": "10.9.1", - "axios": "1.5.0", + "axios": "1.6.3", "bignumber.js": "9.1.2", "gauge": "5.0.1", "shelljs": "0.8.5", From f888264baea99161ac0f7c4c40e54823864a6d97 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Tue, 2 Jan 2024 16:31:08 +0900 Subject: [PATCH 36/53] NODE-65, fix: remove unused params --- node/dev/src/chain_spec.rs | 7 ------- node/mainnet/src/chain_spec.rs | 7 ------- node/testnet/src/chain_spec.rs | 7 ------- 3 files changed, 21 deletions(-) diff --git a/node/dev/src/chain_spec.rs b/node/dev/src/chain_spec.rs index 9125633f..c2288461 100644 --- a/node/dev/src/chain_spec.rs +++ b/node/dev/src/chain_spec.rs @@ -132,7 +132,6 @@ pub fn development_config() -> Result { AccountId::from(hex!("f4fc2d9Be3D6e19cCAfd575dE7CB290A585A1a22")), AccountId::from(hex!("962dBf2aecF6545f552373487127976fD5B55105")), ], - true, ) }, // Bootnodes @@ -170,13 +169,7 @@ fn development_genesis( initial_tech_committee_members: Vec, root_key: AccountId, endowed_accounts: Vec, - _enable_println: bool, ) -> devnet::RuntimeGenesisConfig { - // This is the simplest bytecode to revert without returning any data. - // We will pre-deploy it under all of our precompiles to ensure they can be called from - // within contracts. - // (PUSH1 0x00 PUSH1 0x00 REVERT) - let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; devnet::RuntimeGenesisConfig { system: devnet::SystemConfig { // Add Wasm runtime to storage. diff --git a/node/mainnet/src/chain_spec.rs b/node/mainnet/src/chain_spec.rs index 8e5fcf9d..8085afee 100644 --- a/node/mainnet/src/chain_spec.rs +++ b/node/mainnet/src/chain_spec.rs @@ -111,7 +111,6 @@ pub fn mainnet_config() -> Result { // Relayer accounts AccountId::from(hex!("d6D3f3a35Fab64F69b7885D6162e81B62e44bF58")), ], - true, ) }, // Bootnodes @@ -149,13 +148,7 @@ fn mainnet_genesis( initial_tech_committee_members: Vec, root_key: AccountId, endowed_accounts: Vec, - _enable_println: bool, ) -> mainnet::RuntimeGenesisConfig { - // This is the simplest bytecode to revert without returning any data. - // We will pre-deploy it under all of our precompiles to ensure they can be called from - // within contracts. - // (PUSH1 0x00 PUSH1 0x00 REVERT) - let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; mainnet::RuntimeGenesisConfig { system: mainnet::SystemConfig { // Add Wasm runtime to storage. diff --git a/node/testnet/src/chain_spec.rs b/node/testnet/src/chain_spec.rs index 8d4153cc..c61ac8db 100644 --- a/node/testnet/src/chain_spec.rs +++ b/node/testnet/src/chain_spec.rs @@ -111,7 +111,6 @@ pub fn testnet_config() -> Result { // Relayer accounts AccountId::from(hex!("d6D3f3a35Fab64F69b7885D6162e81B62e44bF58")), ], - true, ) }, // Bootnodes @@ -149,13 +148,7 @@ fn testnet_genesis( initial_tech_committee_members: Vec, root_key: AccountId, endowed_accounts: Vec, - _enable_println: bool, ) -> testnet::RuntimeGenesisConfig { - // This is the simplest bytecode to revert without returning any data. - // We will pre-deploy it under all of our precompiles to ensure they can be called from - // within contracts. - // (PUSH1 0x00 PUSH1 0x00 REVERT) - let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; testnet::RuntimeGenesisConfig { system: testnet::SystemConfig { // Add Wasm runtime to storage. From 31a505bb8a749e7b5e0eff81c0474374565c14ef Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 3 Jan 2024 14:18:33 +0900 Subject: [PATCH 37/53] NODE-65, fix: use correct crate features --- pallets/bfc-staking/Cargo.toml | 3 +-- pallets/bfc-staking/src/inflation.rs | 30 +++++++++++++++++++++++----- precompiles/bfc-staking/Cargo.toml | 1 + runtime/dev/Cargo.toml | 2 +- runtime/mainnet/Cargo.toml | 2 +- runtime/testnet/Cargo.toml | 2 +- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/pallets/bfc-staking/Cargo.toml b/pallets/bfc-staking/Cargo.toml index 3d2fbcbf..6b5bdf18 100644 --- a/pallets/bfc-staking/Cargo.toml +++ b/pallets/bfc-staking/Cargo.toml @@ -10,7 +10,7 @@ repository = { workspace = true } [dependencies] log = { workspace = true } -serde = { workspace = true, optional = true } +serde = { workspace = true, features = ["std"] } substrate-fixed = { workspace = true } # Substrate @@ -51,7 +51,6 @@ std = [ "pallet-im-online/std", "pallet-relay-manager/std", "pallet-bfc-offences/std", - "serde", "sp-runtime/std", "sp-std/std", "sp-staking/std", diff --git a/pallets/bfc-staking/src/inflation.rs b/pallets/bfc-staking/src/inflation.rs index c48f4999..988683b0 100644 --- a/pallets/bfc-staking/src/inflation.rs +++ b/pallets/bfc-staking/src/inflation.rs @@ -5,7 +5,6 @@ use crate::{ BalanceOf, }; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; @@ -29,9 +28,19 @@ pub fn rounds_per_year() -> u32 { BLOCKS_PER_YEAR / blocks_per_round } -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive( - Eq, PartialEq, Clone, Copy, Encode, Decode, Default, RuntimeDebug, MaxEncodedLen, TypeInfo, + Eq, + PartialEq, + Clone, + Copy, + Encode, + Decode, + Default, + RuntimeDebug, + MaxEncodedLen, + TypeInfo, + Serialize, + Deserialize, )] /// A data structure that represents a certain range in three possible values pub struct Range { @@ -97,8 +106,19 @@ pub fn round_issuance_range(round_inflation: Range) -> Range } } -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[derive( + Eq, + PartialEq, + Clone, + Encode, + Decode, + Default, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, + Serialize, + Deserialize, +)] /// The information about the staking inflation for this network pub struct InflationInfo { /// Staking expectations diff --git a/precompiles/bfc-staking/Cargo.toml b/precompiles/bfc-staking/Cargo.toml index 1c242e98..b261f67a 100644 --- a/precompiles/bfc-staking/Cargo.toml +++ b/precompiles/bfc-staking/Cargo.toml @@ -49,6 +49,7 @@ std = [ "frame-support/std", "frame-system/std", "pallet-bfc-staking/std", + "pallet-evm/std", "bp-staking/std", "precompile-utils/std", "sp-core/std", diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 0bbf8544..55d1bcbc 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -74,7 +74,7 @@ pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-base-fee = { workspace = true } fp-self-contained = { workspace = true, features = ["serde"] } -fp-evm = { workspace = true } +fp-evm = { workspace = true, features = ["serde"] } fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml index 63352803..2da0896c 100644 --- a/runtime/mainnet/Cargo.toml +++ b/runtime/mainnet/Cargo.toml @@ -74,7 +74,7 @@ pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-base-fee = { workspace = true } fp-self-contained = { workspace = true, features = ["serde"] } -fp-evm = { workspace = true } +fp-evm = { workspace = true, features = ["serde"] } fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index d1f4098c..b7cb8042 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -74,7 +74,7 @@ pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] } pallet-base-fee = { workspace = true } fp-self-contained = { workspace = true, features = ["serde"] } -fp-evm = { workspace = true } +fp-evm = { workspace = true, features = ["serde"] } fp-rpc = { workspace = true } fp-rpc-debug = { workspace = true } fp-rpc-txpool = { workspace = true } From 0f44c0ee1412f20a45462de3bf892e810a607bb8 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 3 Jan 2024 14:59:52 +0900 Subject: [PATCH 38/53] NODE-65, fix: remove std feature on pallet GenesisConfig Default impl --- pallets/bfc-offences/src/pallet/mod.rs | 1 - pallets/bfc-staking/src/pallet/mod.rs | 1 - pallets/bfc-utility/src/pallet/mod.rs | 1 - pallets/relay-manager/src/pallet/mod.rs | 1 - 4 files changed, 4 deletions(-) diff --git a/pallets/bfc-offences/src/pallet/mod.rs b/pallets/bfc-offences/src/pallet/mod.rs index 8b1dc372..498db59b 100644 --- a/pallets/bfc-offences/src/pallet/mod.rs +++ b/pallets/bfc-offences/src/pallet/mod.rs @@ -125,7 +125,6 @@ pub mod pallet { pub _config: PhantomData, } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { diff --git a/pallets/bfc-staking/src/pallet/mod.rs b/pallets/bfc-staking/src/pallet/mod.rs index 208d464b..0bc60938 100644 --- a/pallets/bfc-staking/src/pallet/mod.rs +++ b/pallets/bfc-staking/src/pallet/mod.rs @@ -716,7 +716,6 @@ pub mod pallet { pub inflation_config: InflationInfo>, } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { candidates: vec![], nominations: vec![], inflation_config: Default::default() } diff --git a/pallets/bfc-utility/src/pallet/mod.rs b/pallets/bfc-utility/src/pallet/mod.rs index 04d0ac37..74636446 100644 --- a/pallets/bfc-utility/src/pallet/mod.rs +++ b/pallets/bfc-utility/src/pallet/mod.rs @@ -73,7 +73,6 @@ pub mod pallet { pub _config: PhantomData, } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { proposal_index: 0, _config: Default::default() } diff --git a/pallets/relay-manager/src/pallet/mod.rs b/pallets/relay-manager/src/pallet/mod.rs index 8b8fe4f5..95fd02b6 100644 --- a/pallets/relay-manager/src/pallet/mod.rs +++ b/pallets/relay-manager/src/pallet/mod.rs @@ -228,7 +228,6 @@ pub mod pallet { pub _config: PhantomData, } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { From 6c4e5448a42d609bc913dacdde05b5df05606310 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 3 Jan 2024 15:51:46 +0900 Subject: [PATCH 39/53] NODE-65, test: replace deprecated storage --- tests/tests/pallets/test_democracy.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tests/pallets/test_democracy.ts b/tests/tests/pallets/test_democracy.ts index ee847926..47e287f1 100644 --- a/tests/tests/pallets/test_democracy.ts +++ b/tests/tests/pallets/test_democracy.ts @@ -36,12 +36,12 @@ describeDevNode('pallet_democracy - note preimage', (context) => { const preimage = rawPreimage.unwrap().toJSON(); expect(preimage).to.not.be.null; - const rawStatusFor: any = await context.polkadotApi.query.preimage.statusFor(encodedHash); + const rawStatusFor: any = await context.polkadotApi.query.preimage.requestStatusFor(encodedHash); const statusFor = rawStatusFor.unwrap().toJSON(); expect(statusFor).has.key('unrequested'); - expect(statusFor.unrequested.deposit[0]).equal(alith.address); - expect(new BigNumber(statusFor.unrequested.deposit[1]).toFixed()).equal(storageFee.toFixed()); + expect(statusFor.unrequested.ticket[0]).equal(alith.address); + expect(new BigNumber(statusFor.unrequested.ticket[1]).toFixed()).equal(storageFee.toFixed()); expect(statusFor.unrequested.len).equal(xt.length - 1); }); From 47ba1334e68f6668cae5b8489f6d440a96a6132e Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 4 Jan 2024 14:07:16 +0900 Subject: [PATCH 40/53] NODE-65, test: estimated gas should be correct --- tests/runtime/test_runtime_upgrade.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/runtime/test_runtime_upgrade.ts b/tests/runtime/test_runtime_upgrade.ts index 3c0955d7..6be6956c 100644 --- a/tests/runtime/test_runtime_upgrade.ts +++ b/tests/runtime/test_runtime_upgrade.ts @@ -117,7 +117,10 @@ describe('runtime_upgrade - evm interactions', function () { data: contract.methods.store(1).encodeABI() }, alithPk)).rawTransaction; - await sendTransaction(signedTx_2); + const txHash = await sendTransaction(signedTx_2); + + const receipt_2 = await web3.eth.getTransactionReceipt(txHash); + expect(Number(receipt_2.gasUsed)).lessThanOrEqual(Number(gas)); // call contract methods const response = await contract.methods.retrieve().call(); @@ -147,7 +150,10 @@ describe('runtime_upgrade - evm interactions', function () { data: staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).encodeABI() }, baltatharPk)).rawTransaction; - await sendTransaction(signedTx); + const txHash = await sendTransaction(signedTx); + + const receipt_2 = await web3.eth.getTransactionReceipt(txHash); + expect(Number(receipt_2.gasUsed)).lessThanOrEqual(Number(gas)); }); }); From 13798e67183d42175ecea28a8e5e6f971867d002 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 4 Jan 2024 17:16:36 +0900 Subject: [PATCH 41/53] NODE-65, test: split runtime tests --- tests/.gitignore | 3 ++ tests/package.json | 4 +- ...client_upgrade.ts => test_live_runtime.ts} | 39 +++++++++++++++---- ...ntime_upgrade.ts => test_local_runtime.ts} | 33 +++++++++++++--- 4 files changed, 64 insertions(+), 15 deletions(-) rename tests/runtime/{test_client_upgrade.ts => test_live_runtime.ts} (86%) rename tests/runtime/{test_runtime_upgrade.ts => test_local_runtime.ts} (88%) diff --git a/tests/.gitignore b/tests/.gitignore index 2dba6caf..57d02457 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -194,3 +194,6 @@ $RECYCLE.BIN/ *.lnk config.json +config.local.json +config.testnet.json +config.mainnet.json diff --git a/tests/package.json b/tests/package.json index 825e162c..cf992fbe 100644 --- a/tests/package.json +++ b/tests/package.json @@ -4,8 +4,8 @@ "author": "bifrost-platform", "scripts": { "test": "mocha -r ts-node/register tests/**/**/*.ts --exit", - "test_runtime": "mocha -r ts-node/register runtime/**/**/*runtime*.ts --exit", - "test_client": "mocha -r ts-node/register runtime/**/**/*client*.ts --exit", + "test_local_runtime": "mocha -r ts-node/register runtime/**/**/*local_runtime*.ts --exit", + "test_live_runtime": "mocha -r ts-node/register runtime/**/**/*live_runtime*.ts --exit", "run_node": "ts-node commands/run_node.ts", "set_node": "ts-node commands/set_node.ts", "rewind_node": "ts-node commands/rewind_node.ts", diff --git a/tests/runtime/test_client_upgrade.ts b/tests/runtime/test_live_runtime.ts similarity index 86% rename from tests/runtime/test_client_upgrade.ts rename to tests/runtime/test_live_runtime.ts index 6a10c085..e90cb07a 100644 --- a/tests/runtime/test_client_upgrade.ts +++ b/tests/runtime/test_live_runtime.ts @@ -1,9 +1,11 @@ +import BigNumber from 'bignumber.js'; import { expect } from 'chai'; import { describe } from 'mocha'; import Web3, { TransactionReceiptAPI } from 'web3'; -import { ApiPromise, HttpProvider } from '@polkadot/api'; +import { ApiPromise, HttpProvider, Keyring } from '@polkadot/api'; +import { MIN_NOMINATOR_STAKING_AMOUNT } from '../constants/currency'; import { DEMO_ABI, DEMO_BYTE_CODE } from '../constants/demo_contract'; import { ERC20_ABI, ERC20_BYTE_CODE } from '../constants/ERC20'; import { STAKING_ABI, STAKING_ADDRESS } from '../constants/staking_contract'; @@ -11,7 +13,6 @@ import { sleep } from '../tests/utils'; import config from './config.json'; const node_endpoint = config.nodeEndpoint; - const web3 = new Web3(new Web3.providers.HttpProvider(node_endpoint)); const testerPk = config.testerPk; @@ -69,7 +70,7 @@ const createErc20Transfer = async (): Promise => { }, testerPk)).rawTransaction; }; -describe('runtime_upgrade - evm interactions', function () { +describe('test_runtime - evm interactions', function () { this.timeout(20000); it('should successfully send transaction - legacy', async function () { @@ -119,7 +120,10 @@ describe('runtime_upgrade - evm interactions', function () { data: contract.methods.store(1).encodeABI() }, testerPk)).rawTransaction; - await sendTransaction(signedTx_2); + const txHash = await sendTransaction(signedTx_2); + + const receipt_2 = await web3.eth.getTransactionReceipt(txHash); + expect(Number(receipt_2.gasUsed)).lessThanOrEqual(Number(gas)); // call contract methods const response = await contract.methods.retrieve().call(); @@ -148,11 +152,14 @@ describe('runtime_upgrade - evm interactions', function () { data: staking.methods.nominator_bond_more(validator, web3.utils.toWei(0.01, 'ether')).encodeABI() }, testerPk)).rawTransaction; - await sendTransaction(signedTx); + const txHash = await sendTransaction(signedTx); + + const receipt_2 = await web3.eth.getTransactionReceipt(txHash); + expect(Number(receipt_2.gasUsed)).lessThanOrEqual(Number(gas)); }); }); -describe('runtime_upgrade - ethapi', function () { +describe('test_runtime - ethapi', function () { this.timeout(20000); it('should successfully request eth namespace methods', async function () { @@ -235,10 +242,11 @@ describe('runtime_upgrade - ethapi', function () { }); }); -describe('runtime_upgrade - pallet interactions', function () { +describe('test_runtime - pallet interactions', function () { this.timeout(20000); let api: ApiPromise; + const keyring = new Keyring({ type: 'ethereum' }); before('should initialize api', async function () { api = await ApiPromise.create({ provider: new HttpProvider(node_endpoint), noInitWarn: true }); @@ -269,4 +277,21 @@ describe('runtime_upgrade - pallet interactions', function () { expect(relayerState).is.ok; expect(relayerState.controller).equal(validator); }); + + it('should successfully send pallet extrinsics', async function () { + const stake = new BigNumber(MIN_NOMINATOR_STAKING_AMOUNT); + const testerSub = keyring.addFromUri(testerPk); + + await api.tx.bfcStaking + .nominatorBondMore(validator, stake.toFixed()) + .signAndSend(testerSub); + + await sleep(4000); + + const rawNominatorState: any = await api.query.bfcStaking.nominatorState(testerSub.address); + const nominatorState = rawNominatorState.unwrap(); + + expect(nominatorState.nominations[0].owner.toString().toLowerCase()).equal(validator.toLowerCase()); + expect(new BigNumber(nominatorState.nominations[0].amount.toString()).isGreaterThan(stake)).is.true; + }); }); diff --git a/tests/runtime/test_runtime_upgrade.ts b/tests/runtime/test_local_runtime.ts similarity index 88% rename from tests/runtime/test_runtime_upgrade.ts rename to tests/runtime/test_local_runtime.ts index 6be6956c..56b8c1dc 100644 --- a/tests/runtime/test_runtime_upgrade.ts +++ b/tests/runtime/test_local_runtime.ts @@ -1,16 +1,19 @@ +import BigNumber from 'bignumber.js'; import { expect } from 'chai'; import { describe } from 'mocha'; import Web3, { TransactionReceiptAPI } from 'web3'; -import { ApiPromise, HttpProvider } from '@polkadot/api'; +import { ApiPromise, HttpProvider, Keyring } from '@polkadot/api'; +import { MIN_NOMINATOR_STAKING_AMOUNT } from '../constants/currency'; import { DEMO_ABI, DEMO_BYTE_CODE } from '../constants/demo_contract'; import { ERC20_ABI, ERC20_BYTE_CODE } from '../constants/ERC20'; import { TEST_CONTROLLERS } from '../constants/keys'; import { STAKING_ABI, STAKING_ADDRESS } from '../constants/staking_contract'; import { sleep } from '../tests/utils'; -const web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:9944')); +const node_endpoint = 'http://localhost:9944'; +const web3 = new Web3(new Web3.providers.HttpProvider(node_endpoint)); const alithPk = TEST_CONTROLLERS[0].private; const alith = web3.eth.accounts.wallet.add(alithPk)[0].address; @@ -67,7 +70,7 @@ const createErc20Transfer = async (): Promise => { }, alithPk)).rawTransaction; }; -describe('runtime_upgrade - evm interactions', function () { +describe('test_runtime - evm interactions', function () { this.timeout(20000); it('should successfully send transaction - legacy', async function () { @@ -157,7 +160,7 @@ describe('runtime_upgrade - evm interactions', function () { }); }); -describe('runtime_upgrade - ethapi', function () { +describe('test_runtime - ethapi', function () { this.timeout(20000); it('should successfully request eth namespace methods', async function () { @@ -240,13 +243,14 @@ describe('runtime_upgrade - ethapi', function () { }); }); -describe('runtime_upgrade - pallet interactions', function () { +describe('test_runtime - pallet interactions', function () { this.timeout(20000); let api: ApiPromise; + const keyring = new Keyring({ type: 'ethereum' }); before('should initialize api', async function () { - api = await ApiPromise.create({ provider: new HttpProvider('http://localhost:9944'), noInitWarn: true }); + api = await ApiPromise.create({ provider: new HttpProvider(node_endpoint), noInitWarn: true }); }); it('should have correct validator information', async function () { @@ -274,4 +278,21 @@ describe('runtime_upgrade - pallet interactions', function () { expect(relayerState).is.ok; expect(relayerState.controller).equal(alith); }); + + it('should successfully send pallet extrinsics', async function () { + const stake = new BigNumber(MIN_NOMINATOR_STAKING_AMOUNT); + const charleth = keyring.addFromUri(TEST_CONTROLLERS[2].private); + + await api.tx.bfcStaking + .nominate(alith, stake.toFixed(), 10, 10) + .signAndSend(charleth); + + await sleep(4000); + + const rawNominatorState: any = await api.query.bfcStaking.nominatorState(charleth.address); + const nominatorState = rawNominatorState.unwrap(); + + expect(nominatorState.nominations[0].owner.toString().toLowerCase()).equal(alith.toLowerCase()); + expect(nominatorState.nominations[0].amount.toString()).equal(stake.toFixed()); + }); }); From dd89d018a54bb06d92a2ffa7a3191ed36bb56870 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 5 Jan 2024 10:47:19 +0900 Subject: [PATCH 42/53] NODE-65, test: check balance consistancy --- tests/runtime/test_local_runtime.ts | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/runtime/test_local_runtime.ts b/tests/runtime/test_local_runtime.ts index 56b8c1dc..fd67214b 100644 --- a/tests/runtime/test_local_runtime.ts +++ b/tests/runtime/test_local_runtime.ts @@ -12,6 +12,8 @@ import { TEST_CONTROLLERS } from '../constants/keys'; import { STAKING_ABI, STAKING_ADDRESS } from '../constants/staking_contract'; import { sleep } from '../tests/utils'; +import type { SubmittableExtrinsic } from '@polkadot/api/promise/types'; + const node_endpoint = 'http://localhost:9944'; const web3 = new Web3(new Web3.providers.HttpProvider(node_endpoint)); @@ -73,6 +75,13 @@ const createErc20Transfer = async (): Promise => { describe('test_runtime - evm interactions', function () { this.timeout(20000); + let api: ApiPromise; + const keyring = new Keyring({ type: 'ethereum' }); + + before('should initialize api', async function () { + api = await ApiPromise.create({ provider: new HttpProvider(node_endpoint), noInitWarn: true }); + }); + it('should successfully send transaction - legacy', async function () { const signedTx = (await web3.eth.accounts.signTransaction({ from: alith, @@ -158,6 +167,26 @@ describe('test_runtime - evm interactions', function () { const receipt_2 = await web3.eth.getTransactionReceipt(txHash); expect(Number(receipt_2.gasUsed)).lessThanOrEqual(Number(gas)); }); + + it('should consistently maintain substrate and evm balances', async function () { + const baltatharS = keyring.addFromUri(TEST_CONTROLLERS[1].private); + + // now note a preimage + const xt = api.tx.bfcStaking.setMaxFullSelected(20); + const encodedProposal = (xt as SubmittableExtrinsic)?.method.toHex() || ''; + + await api.tx.preimage + .notePreimage(encodedProposal) + .signAndSend(baltatharS); + + await sleep(4000); + + const rawBalanceS: any = await api.query.system.account(baltatharS.address); + const balanceS = new BigNumber(rawBalanceS.toJSON().data.free); + const balanceE = new BigNumber((await web3.eth.getBalance(baltathar)).toString()); + + expect(balanceS.toFixed()).equal(balanceE.toFixed()); + }); }); describe('test_runtime - ethapi', function () { From fa722b479e7351e3b76184ba54a943c6fe7c0820 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 5 Jan 2024 14:06:54 +0900 Subject: [PATCH 43/53] NODE-65, test: check balance consistancy (2) --- tests/runtime/test_local_runtime.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/runtime/test_local_runtime.ts b/tests/runtime/test_local_runtime.ts index fd67214b..f8bf0ce0 100644 --- a/tests/runtime/test_local_runtime.ts +++ b/tests/runtime/test_local_runtime.ts @@ -5,7 +5,9 @@ import Web3, { TransactionReceiptAPI } from 'web3'; import { ApiPromise, HttpProvider, Keyring } from '@polkadot/api'; -import { MIN_NOMINATOR_STAKING_AMOUNT } from '../constants/currency'; +import { + AMOUNT_FACTOR, MIN_NOMINATOR_STAKING_AMOUNT +} from '../constants/currency'; import { DEMO_ABI, DEMO_BYTE_CODE } from '../constants/demo_contract'; import { ERC20_ABI, ERC20_BYTE_CODE } from '../constants/ERC20'; import { TEST_CONTROLLERS } from '../constants/keys'; @@ -181,8 +183,12 @@ describe('test_runtime - evm interactions', function () { await sleep(4000); + await api.tx.democracy.delegate(alith, 1, AMOUNT_FACTOR).signAndSend(baltatharS); + + await sleep(4000); + const rawBalanceS: any = await api.query.system.account(baltatharS.address); - const balanceS = new BigNumber(rawBalanceS.toJSON().data.free); + const balanceS = new BigNumber(rawBalanceS.toJSON().data.free).minus(rawBalanceS.toJSON().data.frozen); const balanceE = new BigNumber((await web3.eth.getBalance(baltathar)).toString()); expect(balanceS.toFixed()).equal(balanceE.toFixed()); From 109355d7510d7e501b1f240034343db139aee137 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 5 Jan 2024 18:57:53 +0900 Subject: [PATCH 44/53] NODE-65, feat: Only use substrate-wasm-builder when std feature is enabled --- runtime/dev/Cargo.toml | 3 ++- runtime/dev/build.rs | 15 ++++++++------- runtime/dev/src/lib.rs | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 55d1bcbc..e0b9c585 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -102,7 +102,7 @@ precompile-collective = { workspace = true } precompile-balance = { workspace = true } [build-dependencies] -substrate-wasm-builder = { workspace = true } +substrate-wasm-builder = { workspace = true, optional = true } [features] default = ["std"] @@ -162,6 +162,7 @@ std = [ "fp-account/std", "evm-tracer/std", "precompile-utils/std", + "substrate-wasm-builder", ] evm-tracing = [ "rlp", diff --git a/runtime/dev/build.rs b/runtime/dev/build.rs index 9b53d245..c03d6185 100644 --- a/runtime/dev/build.rs +++ b/runtime/dev/build.rs @@ -1,9 +1,10 @@ -use substrate_wasm_builder::WasmBuilder; - fn main() { - WasmBuilder::new() - .with_current_project() - .export_heap_base() - .import_memory() - .build() + #[cfg(feature = "std")] + { + substrate_wasm_builder::WasmBuilder::new() + .with_current_project() + .export_heap_base() + .import_memory() + .build(); + } } diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 2e8d6452..ba6943bf 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -142,7 +142,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // The version of the authorship interface. authoring_version: 1, // The version of the runtime spec. - spec_version: 306, + spec_version: 330, // The version of the implementation of the spec. impl_version: 1, // A list of supported runtime APIs along with their versions. From b24d9a9e677f0735d70c47f86a9eae606ea1dcf0 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 5 Jan 2024 18:58:10 +0900 Subject: [PATCH 45/53] NODE-65, deps: update Cargo.lock --- Cargo.lock | 720 ++++++++++++++++++++++++++--------------------------- 1 file changed, 351 insertions(+), 369 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ae63445..92ff07e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,7 +68,7 @@ dependencies = [ "cipher 0.4.4", "ctr", "ghash", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -77,19 +77,19 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "approx" @@ -501,24 +501,24 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite 0.2.13", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -593,7 +593,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object 0.32.2", "rustc-demangle", ] @@ -638,9 +638,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] name = "base64ct" @@ -681,7 +681,7 @@ dependencies = [ "fp-rpc-debug", "fp-storage", "frame-benchmarking", - "futures 0.3.29", + "futures 0.3.30", "sc-chain-spec", "sc-client-api", "sc-consensus-grandpa", @@ -745,7 +745,7 @@ dependencies = [ "fp-storage", "frame-benchmarking", "frame-benchmarking-cli", - "futures 0.3.29", + "futures 0.3.30", "hex-literal", "jsonrpsee", "pallet-bfc-staking", @@ -898,7 +898,7 @@ dependencies = [ "fp-storage", "frame-benchmarking", "frame-benchmarking-cli", - "futures 0.3.29", + "futures 0.3.30", "hex-literal", "jsonrpsee", "pallet-bfc-staking", @@ -1070,7 +1070,7 @@ dependencies = [ "fp-storage", "frame-benchmarking", "frame-benchmarking-cli", - "futures 0.3.29", + "futures 0.3.30", "hex-literal", "jsonrpsee", "pallet-bfc-staking", @@ -1211,13 +1211,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.15", + "prettyplease 0.2.16", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -1403,9 +1403,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "serde", @@ -1488,9 +1488,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] @@ -1503,7 +1503,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.21", "serde", "serde_json", "thiserror", @@ -1536,9 +1536,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ "smallvec", ] @@ -1638,9 +1638,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -1649,9 +1649,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" dependencies = [ "clap_builder", "clap_derive", @@ -1659,9 +1659,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" dependencies = [ "anstream", "anstyle", @@ -1678,7 +1678,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -1747,21 +1747,21 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" @@ -1778,7 +1778,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "tiny-keccak", ] @@ -1837,9 +1837,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1968,46 +1968,37 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -2023,7 +2014,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -2055,17 +2046,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.7", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -2086,7 +2077,7 @@ dependencies = [ "byteorder", "digest 0.8.1", "rand_core 0.5.1", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -2099,7 +2090,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -2116,7 +2107,7 @@ dependencies = [ "fiat-crypto", "platforms", "rustc_version", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -2128,14 +2119,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] name = "cxx" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" dependencies = [ "cc", "cxxbridge-flags", @@ -2145,9 +2136,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" dependencies = [ "cc", "codespan-reporting", @@ -2155,24 +2146,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] name = "cxxbridge-flags" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" +checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" [[package]] name = "cxxbridge-macro" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -2227,9 +2218,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -2302,7 +2293,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -2355,7 +2346,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -2396,9 +2387,9 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.40", + "syn 2.0.48", "termcolor", - "toml 0.8.8", + "toml 0.8.2", "walkdir", ] @@ -2482,7 +2473,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "sha2 0.10.8", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -2524,7 +2515,7 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -2563,7 +2554,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -2658,9 +2649,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -2673,7 +2664,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", "pin-project-lite 0.2.13", ] @@ -2757,7 +2748,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", ] [[package]] @@ -2770,7 +2761,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -2831,7 +2822,7 @@ dependencies = [ "fp-consensus", "fp-rpc", "fp-storage", - "futures 0.3.29", + "futures 0.3.30", "kvdb-rocksdb", "log", "parity-db", @@ -2874,7 +2865,7 @@ dependencies = [ "fc-storage", "fp-consensus", "fp-rpc", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "log", "parking_lot 0.12.1", @@ -2903,7 +2894,7 @@ dependencies = [ "fp-evm", "fp-rpc", "fp-storage", - "futures 0.3.29", + "futures 0.3.30", "hex", "jsonrpsee", "libsecp256k1", @@ -2963,7 +2954,7 @@ dependencies = [ "ethereum-types", "fc-evm-tracing", "fc-rpc-core-types", - "futures 0.3.29", + "futures 0.3.30", "jsonrpsee", "serde", "serde_json", @@ -2978,7 +2969,7 @@ dependencies = [ "ethereum-types", "fc-evm-tracing", "fc-rpc-core-types", - "futures 0.3.29", + "futures 0.3.30", "jsonrpsee", "serde", "serde_json", @@ -3024,7 +3015,7 @@ dependencies = [ "fc-storage", "fp-rpc", "fp-rpc-debug", - "futures 0.3.29", + "futures 0.3.30", "hex-literal", "jsonrpsee", "sc-client-api", @@ -3054,7 +3045,7 @@ dependencies = [ "fc-storage", "fp-rpc", "fp-rpc-debug", - "futures 0.3.29", + "futures 0.3.30", "jsonrpsee", "log", "sc-client-api", @@ -3131,7 +3122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -3182,7 +3173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "log", "num-traits", @@ -3601,7 +3592,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -3613,7 +3604,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -3623,7 +3614,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -3714,9 +3705,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -3729,9 +3720,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -3739,15 +3730,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -3768,15 +3759,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "futures-core", "pin-project-lite 0.2.13", @@ -3784,13 +3775,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -3806,15 +3797,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -3824,9 +3815,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures 0.1.31", "futures-channel", @@ -3893,9 +3884,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -3951,7 +3942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", - "bstr 1.8.0", + "bstr 1.9.0", "log", "regex-automata 0.4.3", "regex-syntax 0.8.2", @@ -3965,7 +3956,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -4037,7 +4028,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", ] [[package]] @@ -4046,7 +4037,7 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "allocator-api2", ] @@ -4123,7 +4114,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", "digest 0.9.0", ] @@ -4149,11 +4140,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4215,9 +4206,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -4230,7 +4221,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.13", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -4255,16 +4246,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -4316,7 +4307,7 @@ dependencies = [ "async-io", "core-foundation", "fnv", - "futures 0.3.29", + "futures 0.3.30", "if-addrs", "ipnet", "log", @@ -4468,13 +4459,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi 0.3.3", "rustix 0.38.28", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4609,9 +4600,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -4685,18 +4676,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -4712,9 +4703,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f35eae38201a993ece6bdc823292d6abd1bffed1c4d0f4a3517d2bd8e1d917fe" dependencies = [ "bytes", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", - "getrandom 0.2.11", + "getrandom 0.2.12", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -4770,7 +4761,7 @@ checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" dependencies = [ "either", "fnv", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "instant", "libp2p-identity", @@ -4796,7 +4787,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "libp2p-core", "log", "parking_lot 0.12.1", @@ -4812,7 +4803,7 @@ checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" dependencies = [ "asynchronous-codec", "either", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "libp2p-core", "libp2p-identity", @@ -4855,7 +4846,7 @@ dependencies = [ "bytes", "either", "fnv", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "instant", "libp2p-core", @@ -4879,7 +4870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b" dependencies = [ "data-encoding", - "futures 0.3.29", + "futures 0.3.30", "if-watch", "libp2p-core", "libp2p-identity", @@ -4915,7 +4906,7 @@ checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.29", + "futures 0.3.30", "libp2p-core", "libp2p-identity", "log", @@ -4937,7 +4928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202" dependencies = [ "either", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "instant", "libp2p-core", @@ -4954,7 +4945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735" dependencies = [ "bytes", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "if-watch", "libp2p-core", @@ -4976,7 +4967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "instant", "libp2p-core", "libp2p-identity", @@ -4993,7 +4984,7 @@ checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" dependencies = [ "either", "fnv", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "instant", "libp2p-core", @@ -5023,7 +5014,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "if-watch", "libc", @@ -5039,7 +5030,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "futures-rustls", "libp2p-core", "libp2p-identity", @@ -5058,7 +5049,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -5073,7 +5064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" dependencies = [ "either", - "futures 0.3.29", + "futures 0.3.30", "futures-rustls", "libp2p-core", "log", @@ -5091,7 +5082,7 @@ version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "libp2p-core", "log", "thiserror", @@ -5151,7 +5142,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -5185,9 +5176,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" dependencies = [ "cc", "pkg-config", @@ -5323,7 +5314,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -5337,7 +5328,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -5348,7 +5339,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -5359,7 +5350,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -5395,9 +5386,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memfd" @@ -5426,15 +5417,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "memory-db" version = "0.32.0" @@ -5514,7 +5496,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_distr", - "subtle 2.4.1", + "subtle 2.5.0", "thiserror", "zeroize", ] @@ -5620,7 +5602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", - "futures 0.3.29", + "futures 0.3.30", "log", "pin-project", "smallvec", @@ -5726,7 +5708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", - "futures 0.3.29", + "futures 0.3.30", "log", "netlink-packet-core", "netlink-sys", @@ -5741,7 +5723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", - "futures 0.3.29", + "futures 0.3.30", "libc", "log", "tokio", @@ -5903,10 +5885,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -5923,9 +5905,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -5959,9 +5941,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -5980,7 +5962,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -5991,9 +5973,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -6546,9 +6528,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" +checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" dependencies = [ "blake2 0.10.6", "crc32fast", @@ -6562,6 +6544,7 @@ dependencies = [ "rand 0.8.5", "siphasher", "snap", + "winapi", ] [[package]] @@ -6585,7 +6568,7 @@ version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 1.0.109", @@ -6675,7 +6658,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", ] [[package]] @@ -6710,9 +6693,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" dependencies = [ "memchr", "thiserror", @@ -6721,9 +6704,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde" dependencies = [ "pest", "pest_generator", @@ -6731,22 +6714,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d" dependencies = [ "once_cell", "pest", @@ -6780,7 +6763,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -6813,15 +6796,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polling" @@ -7055,7 +7038,7 @@ source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifros dependencies = [ "case", "num_enum", - "prettyplease 0.2.15", + "prettyplease 0.2.16", "proc-macro2", "quote", "sp-core-hashing", @@ -7104,12 +7087,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -7138,11 +7121,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" dependencies = [ - "toml_edit 0.20.7", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -7177,14 +7161,14 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -7223,7 +7207,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -7348,9 +7332,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -7420,7 +7404,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -7513,29 +7497,29 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -7611,7 +7595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -7652,7 +7636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -7717,7 +7701,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "log", "netlink-packet-route", "netlink-proto", @@ -7760,7 +7744,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.21", ] [[package]] @@ -7841,7 +7825,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.6", ] [[package]] @@ -7866,7 +7850,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "pin-project", "static_assertions", ] @@ -7911,7 +7895,7 @@ name = "sc-basic-authorship" version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "log", "parity-scale-codec", @@ -7971,7 +7955,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -7983,7 +7967,7 @@ dependencies = [ "chrono", "clap", "fdlimit", - "futures 0.3.29", + "futures 0.3.30", "libp2p-identity", "log", "names", @@ -8020,7 +8004,7 @@ version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "fnv", - "futures 0.3.29", + "futures 0.3.30", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -8073,7 +8057,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "libp2p-identity", "log", @@ -8098,7 +8082,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "log", "parity-scale-codec", "sc-block-builder", @@ -8128,7 +8112,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "async-trait", "fork-tree", - "futures 0.3.29", + "futures 0.3.30", "log", "num-bigint", "num-rational", @@ -8174,13 +8158,13 @@ name = "sc-consensus-grandpa" version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "array-bytes 6.2.2", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "log", "parity-scale-codec", @@ -8216,7 +8200,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "finality-grandpa", - "futures 0.3.29", + "futures 0.3.30", "jsonrpsee", "log", "parity-scale-codec", @@ -8237,7 +8221,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "assert_matches", "async-trait", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "jsonrpsee", "log", @@ -8271,7 +8255,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "log", "parity-scale-codec", @@ -8346,7 +8330,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "ansi_term", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "log", "sc-client-api", @@ -8378,7 +8362,7 @@ dependencies = [ "array-bytes 4.2.0", "arrayvec 0.7.4", "blake2 0.10.6", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "libp2p-identity", "log", @@ -8410,7 +8394,7 @@ dependencies = [ "bytes", "either", "fnv", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "ip_network", "libp2p", @@ -8446,7 +8430,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "async-channel", "cid", - "futures 0.3.29", + "futures 0.3.30", "libp2p-identity", "log", "prost", @@ -8466,7 +8450,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "async-trait", "bitflags 1.3.2", - "futures 0.3.29", + "futures 0.3.30", "libp2p-identity", "parity-scale-codec", "prost-build", @@ -8481,8 +8465,8 @@ name = "sc-network-gossip" version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "ahash 0.8.6", - "futures 0.3.29", + "ahash 0.8.7", + "futures 0.3.30", "futures-timer", "libp2p", "log", @@ -8501,7 +8485,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "array-bytes 6.2.2", "async-channel", - "futures 0.3.29", + "futures 0.3.30", "libp2p-identity", "log", "parity-scale-codec", @@ -8524,7 +8508,7 @@ dependencies = [ "async-channel", "async-trait", "fork-tree", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "libp2p", "log", @@ -8556,7 +8540,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "array-bytes 6.2.2", - "futures 0.3.29", + "futures 0.3.30", "libp2p", "log", "parity-scale-codec", @@ -8576,7 +8560,7 @@ dependencies = [ "array-bytes 6.2.2", "bytes", "fnv", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "hyper", "hyper-rustls", @@ -8616,7 +8600,7 @@ name = "sc-rpc" version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "jsonrpsee", "log", "parity-scale-codec", @@ -8684,7 +8668,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "array-bytes 6.2.2", - "futures 0.3.29", + "futures 0.3.30", "futures-util", "hex", "jsonrpsee", @@ -8714,7 +8698,7 @@ dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "jsonrpsee", "log", @@ -8786,7 +8770,7 @@ name = "sc-sysinfo" version = "6.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "libc", "log", "rand 0.8.5", @@ -8806,7 +8790,7 @@ version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "chrono", - "futures 0.3.29", + "futures 0.3.30", "libp2p", "log", "parking_lot 0.12.1", @@ -8856,7 +8840,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -8865,7 +8849,7 @@ version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "linked-hash-map", "log", @@ -8891,7 +8875,7 @@ version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "log", "parity-scale-codec", "serde", @@ -8907,7 +8891,7 @@ version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-channel", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "lazy_static", "log", @@ -8944,11 +8928,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -8957,7 +8941,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "cfg-if", "hashbrown 0.13.2", ] @@ -8976,7 +8960,7 @@ dependencies = [ "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -9012,7 +8996,7 @@ dependencies = [ "der", "generic-array 0.14.7", "pkcs8", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -9077,9 +9061,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -9092,29 +9076,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -9123,9 +9107,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -9238,9 +9222,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" dependencies = [ "bstr 0.2.17", "unicode-segmentation", @@ -9303,7 +9287,7 @@ dependencies = [ "ring 0.17.7", "rustc_version", "sha2 0.10.8", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -9335,7 +9319,7 @@ dependencies = [ "base64 0.13.1", "bytes", "flate2", - "futures 0.3.29", + "futures 0.3.30", "http", "httparse", "log", @@ -9375,7 +9359,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -9421,7 +9405,7 @@ name = "sp-blockchain" version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9440,7 +9424,7 @@ version = "0.10.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "async-trait", - "futures 0.3.29", + "futures 0.3.30", "log", "sp-core", "sp-inherents", @@ -9528,7 +9512,7 @@ dependencies = [ "bs58 0.5.0", "dyn-clonable", "ed25519-zebra", - "futures 0.3.29", + "futures 0.3.30", "hash-db 0.16.0", "hash256-std-hasher", "impl-serde", @@ -9582,7 +9566,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -9601,7 +9585,7 @@ source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-po dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -9798,7 +9782,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -9947,7 +9931,7 @@ name = "sp-trie" version = "22.0.0" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "hash-db 0.16.0", "hashbrown 0.13.2", "lazy_static", @@ -9991,7 +9975,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -10075,7 +10059,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "atoi", "byteorder", "bytes", @@ -10172,9 +10156,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.44.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1" +checksum = "3c0c74081753a8ce1c8eb10b9f262ab6f7017e5ad3317c17a54c7ab65fcb3c6e" dependencies = [ "Inflector", "num-format", @@ -10269,7 +10253,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -10319,7 +10303,7 @@ version = "4.0.0-dev" source = "git+https://github.com/bifrost-platform/polkadot-sdk?branch=bifrost-polkadot-v1.3.0#617cb3adbb3fbc69b2ebc62bb6ddefb0ab7e58f6" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.29", + "futures 0.3.30", "jsonrpsee", "log", "parity-scale-codec", @@ -10380,9 +10364,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -10397,9 +10381,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.40" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -10447,21 +10431,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.4.1", "rustix 0.38.28", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -10481,22 +10465,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -10536,9 +10520,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -10556,9 +10540,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -10608,9 +10592,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -10633,7 +10617,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -10696,21 +10680,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -10730,20 +10714,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.1.0", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.1.0", "serde", @@ -10813,7 +10786,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -11058,7 +11031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -11208,7 +11181,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -11242,7 +11215,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11308,7 +11281,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -11371,7 +11344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.6", "bincode", "directories-next", "file-per-thread-logger", @@ -11500,7 +11473,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.8.0", + "memoffset", "paste", "rand 0.8.5", "rustix 0.36.17", @@ -11616,7 +11589,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] @@ -11629,6 +11602,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -11829,9 +11811,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" dependencies = [ "memchr", ] @@ -11902,7 +11884,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -11921,22 +11903,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.30" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.30" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] @@ -11956,7 +11938,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.48", ] [[package]] From d8890a601a0e6938bb603597cea8fd5aeb595f04 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Wed, 10 Jan 2024 17:45:34 +0900 Subject: [PATCH 46/53] NODE-65, fix: resolve imports --- pallets/bfc-offences/src/migrations.rs | 4 +++- pallets/bfc-staking/src/pallet/mod.rs | 2 +- precompiles/bfc-staking/src/lib.rs | 4 ++-- precompiles/relay-manager/src/lib.rs | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pallets/bfc-offences/src/migrations.rs b/pallets/bfc-offences/src/migrations.rs index cd1d16c0..06b42357 100644 --- a/pallets/bfc-offences/src/migrations.rs +++ b/pallets/bfc-offences/src/migrations.rs @@ -1,11 +1,13 @@ use super::*; -use frame_support::{dispatch::Weight, pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade}; +use frame_support::{pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade}; #[storage_alias] pub type StorageVersion = StorageValue, Releases, ValueQuery>; pub mod v3 { use super::*; + use frame_support::pallet_prelude::Weight; + #[cfg(feature = "try-runtime")] use sp_runtime::TryRuntimeError; diff --git a/pallets/bfc-staking/src/pallet/mod.rs b/pallets/bfc-staking/src/pallet/mod.rs index 0bc60938..f4e15443 100644 --- a/pallets/bfc-staking/src/pallet/mod.rs +++ b/pallets/bfc-staking/src/pallet/mod.rs @@ -1,7 +1,7 @@ mod impls; use crate::{ - migrations, BalanceOf, BlockNumberOf, Bond, CandidateMetadata, DelayedCommissionSet, + migrations, BalanceOf, BlockNumberFor, Bond, CandidateMetadata, DelayedCommissionSet, DelayedControllerSet, DelayedPayout, InflationInfo, NominationRequest, Nominations, Nominator, NominatorAdded, Range, RewardDestination, RewardPoint, RoundIndex, RoundInfo, TierType, TotalSnapshot, ValidatorSnapshot, WeightInfo, diff --git a/precompiles/bfc-staking/src/lib.rs b/precompiles/bfc-staking/src/lib.rs index 1f9ae5fe..2383aa13 100644 --- a/precompiles/bfc-staking/src/lib.rs +++ b/precompiles/bfc-staking/src/lib.rs @@ -1,7 +1,7 @@ #![cfg_attr(not(feature = "std"), no_std)] use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, pallet_prelude::ConstU32, traits::Get, BoundedBTreeSet, @@ -17,7 +17,7 @@ use precompile_utils::prelude::*; use bp_staking::{RoundIndex, TierType, MAX_AUTHORITIES}; use fp_evm::PrecompileHandle; use sp_core::{H160, U256}; -use sp_runtime::Perbill; +use sp_runtime::{traits::Dispatchable, Perbill}; use sp_std::{ collections::btree_set::BTreeSet, convert::TryInto, marker::PhantomData, vec, vec::Vec, }; diff --git a/precompiles/relay-manager/src/lib.rs b/precompiles/relay-manager/src/lib.rs index 40c1f963..04e593ed 100644 --- a/precompiles/relay-manager/src/lib.rs +++ b/precompiles/relay-manager/src/lib.rs @@ -1,6 +1,6 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::pallet_prelude::ConstU32; use frame_support::BoundedBTreeSet; @@ -11,6 +11,7 @@ use precompile_utils::prelude::*; use bp_staking::{RoundIndex, MAX_AUTHORITIES}; use sp_core::{H160, H256, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{collections::btree_set::BTreeSet, marker::PhantomData, vec, vec::Vec}; mod types; From 901587aa6ccafe6c345576b38b5aa8f168194311 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 11 Jan 2024 12:46:21 +0900 Subject: [PATCH 47/53] NODE-65, fix: update runtime tests --- tests/runtime/test_local_runtime.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/runtime/test_local_runtime.ts b/tests/runtime/test_local_runtime.ts index f8bf0ce0..45283eb5 100644 --- a/tests/runtime/test_local_runtime.ts +++ b/tests/runtime/test_local_runtime.ts @@ -21,8 +21,8 @@ const web3 = new Web3(new Web3.providers.HttpProvider(node_endpoint)); const alithPk = TEST_CONTROLLERS[0].private; const alith = web3.eth.accounts.wallet.add(alithPk)[0].address; -const baltatharPk = TEST_CONTROLLERS[1].private; -const baltathar = web3.eth.accounts.wallet.add(baltatharPk)[1].address; +const charlethPk = TEST_CONTROLLERS[2].private; +const charleth = web3.eth.accounts.wallet.add(charlethPk)[1].address; let erc20Address: string | undefined; @@ -62,7 +62,7 @@ const sendTransaction = async (signedTx: string): Promise => { const createErc20Transfer = async (): Promise => { const erc20: any = new web3.eth.Contract(ERC20_ABI, erc20Address); - const gas = await erc20.methods.transfer(baltathar, web3.utils.toWei(1, 'ether')).estimateGas({ from: alith }); + const gas = await erc20.methods.transfer(charleth, web3.utils.toWei(1, 'ether')).estimateGas({ from: alith }); expect(gas).is.ok; return (await web3.eth.accounts.signTransaction({ @@ -70,7 +70,7 @@ const createErc20Transfer = async (): Promise => { to: erc20Address, gas, gasPrice: web3.utils.toWei(1000, 'gwei'), - data: erc20.methods.transfer(baltathar, web3.utils.toWei(1, 'ether')).encodeABI() + data: erc20.methods.transfer(charleth, web3.utils.toWei(1, 'ether')).encodeABI() }, alithPk)).rawTransaction; }; @@ -153,16 +153,16 @@ describe('test_runtime - evm interactions', function () { expect(candidateState.candidate).equal(alith); expect(Number(candidateState.bond)).greaterThanOrEqual(Number(web3.utils.toWei(1000, 'ether'))); - const gas = await staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).estimateGas({ from: baltathar }); + const gas = await staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).estimateGas({ from: charleth }); expect(gas).is.ok; const signedTx = (await web3.eth.accounts.signTransaction({ - from: baltathar, + from: charleth, to: STAKING_ADDRESS, gas, gasPrice: web3.utils.toWei(1000, 'gwei'), data: staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).encodeABI() - }, baltatharPk)).rawTransaction; + }, charlethPk)).rawTransaction; const txHash = await sendTransaction(signedTx); @@ -189,7 +189,7 @@ describe('test_runtime - evm interactions', function () { const rawBalanceS: any = await api.query.system.account(baltatharS.address); const balanceS = new BigNumber(rawBalanceS.toJSON().data.free).minus(rawBalanceS.toJSON().data.frozen); - const balanceE = new BigNumber((await web3.eth.getBalance(baltathar)).toString()); + const balanceE = new BigNumber((await web3.eth.getBalance(charleth)).toString()); expect(balanceS.toFixed()).equal(balanceE.toFixed()); }); @@ -325,9 +325,9 @@ describe('test_runtime - pallet interactions', function () { await sleep(4000); const rawNominatorState: any = await api.query.bfcStaking.nominatorState(charleth.address); - const nominatorState = rawNominatorState.unwrap(); + const nominatorState = rawNominatorState.unwrap().toJSON(); - expect(nominatorState.nominations[0].owner.toString().toLowerCase()).equal(alith.toLowerCase()); - expect(nominatorState.nominations[0].amount.toString()).equal(stake.toFixed()); + expect(nominatorState.nominations).has.key(alith); + expect(parseInt(nominatorState.nominations[alith].toString(), 16).toString()).equal(stake.toFixed()); }); }); From 35cdedf4d7d774f0a3faebde8776fbbc59f49f32 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 11 Jan 2024 14:26:44 +0900 Subject: [PATCH 48/53] NODE-65, fix: handle runtime test failures --- tests/runtime/test_local_runtime.ts | 43 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/tests/runtime/test_local_runtime.ts b/tests/runtime/test_local_runtime.ts index 45283eb5..4963ad6d 100644 --- a/tests/runtime/test_local_runtime.ts +++ b/tests/runtime/test_local_runtime.ts @@ -21,8 +21,8 @@ const web3 = new Web3(new Web3.providers.HttpProvider(node_endpoint)); const alithPk = TEST_CONTROLLERS[0].private; const alith = web3.eth.accounts.wallet.add(alithPk)[0].address; -const charlethPk = TEST_CONTROLLERS[2].private; -const charleth = web3.eth.accounts.wallet.add(charlethPk)[1].address; +const baltatharPk = TEST_CONTROLLERS[1].private; +const baltathar = web3.eth.accounts.wallet.add(baltatharPk)[1].address; let erc20Address: string | undefined; @@ -38,7 +38,7 @@ const deployDemo = async (deployTx: any): Promise => { expect(txHash).is.ok; // get transaction receipt - await sleep(3500); + await sleep(6000); const receipt = await web3.requestManager.send({ method: 'eth_getTransactionReceipt', params: [txHash] }); expect(receipt).is.ok; expect(receipt!.status).equal('0x1'); @@ -62,7 +62,7 @@ const sendTransaction = async (signedTx: string): Promise => { const createErc20Transfer = async (): Promise => { const erc20: any = new web3.eth.Contract(ERC20_ABI, erc20Address); - const gas = await erc20.methods.transfer(charleth, web3.utils.toWei(1, 'ether')).estimateGas({ from: alith }); + const gas = await erc20.methods.transfer(baltathar, web3.utils.toWei(1, 'ether')).estimateGas({ from: alith }); expect(gas).is.ok; return (await web3.eth.accounts.signTransaction({ @@ -70,7 +70,7 @@ const createErc20Transfer = async (): Promise => { to: erc20Address, gas, gasPrice: web3.utils.toWei(1000, 'gwei'), - data: erc20.methods.transfer(charleth, web3.utils.toWei(1, 'ether')).encodeABI() + data: erc20.methods.transfer(baltathar, web3.utils.toWei(1, 'ether')).encodeABI() }, alithPk)).rawTransaction; }; @@ -153,16 +153,16 @@ describe('test_runtime - evm interactions', function () { expect(candidateState.candidate).equal(alith); expect(Number(candidateState.bond)).greaterThanOrEqual(Number(web3.utils.toWei(1000, 'ether'))); - const gas = await staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).estimateGas({ from: charleth }); + const gas = await staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).estimateGas({ from: baltathar }); expect(gas).is.ok; const signedTx = (await web3.eth.accounts.signTransaction({ - from: charleth, + from: baltathar, to: STAKING_ADDRESS, gas, gasPrice: web3.utils.toWei(1000, 'gwei'), data: staking.methods.nominate(alith, web3.utils.toWei(1000, 'ether'), 1000, 1000).encodeABI() - }, charlethPk)).rawTransaction; + }, baltatharPk)).rawTransaction; const txHash = await sendTransaction(signedTx); @@ -171,7 +171,7 @@ describe('test_runtime - evm interactions', function () { }); it('should consistently maintain substrate and evm balances', async function () { - const baltatharS = keyring.addFromUri(TEST_CONTROLLERS[1].private); + const baltatharSubKey = keyring.addFromUri(TEST_CONTROLLERS[1].private); // now note a preimage const xt = api.tx.bfcStaking.setMaxFullSelected(20); @@ -179,19 +179,24 @@ describe('test_runtime - evm interactions', function () { await api.tx.preimage .notePreimage(encodedProposal) - .signAndSend(baltatharS); + .signAndSend(baltatharSubKey, { nonce: -1 }); - await sleep(4000); + await sleep(6000); - await api.tx.democracy.delegate(alith, 1, AMOUNT_FACTOR).signAndSend(baltatharS); + await api.tx.democracy.delegate(alith, 1, AMOUNT_FACTOR).signAndSend(baltatharSubKey, { nonce: -1 }); - await sleep(4000); + await sleep(6000); - const rawBalanceS: any = await api.query.system.account(baltatharS.address); - const balanceS = new BigNumber(rawBalanceS.toJSON().data.free).minus(rawBalanceS.toJSON().data.frozen); - const balanceE = new BigNumber((await web3.eth.getBalance(charleth)).toString()); + const rawBalanceSub: any = (await api.query.system.account(baltatharSubKey.address)).toJSON().data; - expect(balanceS.toFixed()).equal(balanceE.toFixed()); + expect(rawBalanceSub.free).exist; + expect(rawBalanceSub.frozen).exist; + expect(rawBalanceSub.reserved).exist; + + const balanceSub = new BigNumber(rawBalanceSub.free).minus(rawBalanceSub.frozen); + const balanceEvm = new BigNumber((await web3.eth.getBalance(baltathar)).toString()); + + expect(balanceSub.toFixed()).equal(balanceEvm.toFixed()); }); }); @@ -322,7 +327,7 @@ describe('test_runtime - pallet interactions', function () { .nominate(alith, stake.toFixed(), 10, 10) .signAndSend(charleth); - await sleep(4000); + await sleep(6000); const rawNominatorState: any = await api.query.bfcStaking.nominatorState(charleth.address); const nominatorState = rawNominatorState.unwrap().toJSON(); From 5be907f4b916d476a73dbb8fa76b41d771e6d2c0 Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Thu, 11 Jan 2024 14:50:04 +0900 Subject: [PATCH 49/53] NODE-65, deps: update node packages --- tests/package-lock.json | 2218 +++++++++++++++--------------- tests/package.json | 24 +- tools/package-lock.json | 2821 ++++++++++++++++----------------------- tools/package.json | 16 +- 4 files changed, 2336 insertions(+), 2743 deletions(-) diff --git a/tests/package-lock.json b/tests/package-lock.json index e9326f49..2767e647 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -8,33 +8,33 @@ "name": "@bifrost-platform/bifrost-node", "version": "1.3.0", "dependencies": { - "@polkadot/api": "10.9.1", - "axios": "1.6.3", - "bignumber.js": "9.1.2", - "ethers": "5.7.2", - "shelljs": "0.8.5", - "tcp-port-used": "1.0.2", - "web3": "4.1.1" + "@polkadot/api": "^10.11.2", + "axios": "^1.6.5", + "bignumber.js": "^9.1.2", + "ethers": "^5.7.2", + "shelljs": "^0.8.5", + "tcp-port-used": "^1.0.2", + "web3": "^4.3.0" }, "devDependencies": { - "@types/chai": "4.3.6", - "@types/mocha": "10.0.1", - "@types/node": "20.5.9", - "@types/shelljs": "0.8.12", - "@types/tcp-port-used": "1.0.1", - "@types/yargs": "17.0.24", - "chai": "4.3.8", - "char": "1.0.2", - "mocha": "10.2.0", - "ts-node": "10.9.1", - "ts-node-register": "1.0.0", - "typescript": "5.2.2" + "@types/chai": "^4.3.11", + "@types/mocha": "^10.0.6", + "@types/node": "^20.10.8", + "@types/shelljs": "^0.8.15", + "@types/tcp-port-used": "^1.0.4", + "@types/yargs": "^17.0.32", + "chai": "^4.4.0", + "char": "^1.0.2", + "mocha": "^10.2.0", + "ts-node": "^10.9.2", + "ts-node-register": "^1.0.0", + "typescript": "^5.3.3" } }, "node_modules/@adraffy/ens-normalize": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz", - "integrity": "sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==" + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz", + "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==" }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", @@ -802,306 +802,328 @@ } }, "node_modules/@polkadot/api": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.9.1.tgz", - "integrity": "sha512-ND/2UqZBWvtt4PfV03OStTKg0mxmPk4UpMAgJKutdgsz/wP9CYJ1KbjwFgPNekL9JnzbKQsWyQNPVrcw7kQk8A==", - "dependencies": { - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/api-derive": "10.9.1", - "@polkadot/keyring": "^12.3.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/types-known": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.11.2.tgz", + "integrity": "sha512-AorCZxCWCoTtdbl4DPUZh+ACe/pbLIS1BkdQY0AFJuZllm0x/yWzjgampcPd5jQAA/O3iKShRBkZqj6Mk9yG/A==", + "dependencies": { + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/api-derive": "10.11.2", + "@polkadot/keyring": "^12.6.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/types-known": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "eventemitter3": "^5.0.1", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/api-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.9.1.tgz", - "integrity": "sha512-kRZZvCFVcN4hAH4dJ+Qzfdy27/4EEq3oLDf3ihj0LTVrAezSWcKPGE3EVFy+Mn6Lo4SUc7RVyoKvIUhSk2l4Dg==", - "dependencies": { - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.11.2.tgz", + "integrity": "sha512-PTpnqpezc75qBqUtgrc0GYB8h9UHjfbHSRZamAbecIVAJ2/zc6CqtnldeaBlIu1IKTgBzi3FFtTyYu+ZGbNT2Q==", + "dependencies": { + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/api-base": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.9.1.tgz", - "integrity": "sha512-Q3m2KzlceMK2kX8bhnUZWk3RT6emmijeeFZZQgCePpEcrSeNjnqG4qjuTPgkveaOkUT8MAoDc5Avuzcc2jlW9g==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.11.2.tgz", + "integrity": "sha512-4LIjaUfO9nOzilxo7XqzYKCNMtmUypdk8oHPdrRnSjKEsnK7vDsNi+979z2KXNXd2KFSCFHENmI523fYnMnReg==", "dependencies": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/api-derive": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.9.1.tgz", - "integrity": "sha512-mRud1UZCFIc4Z63qAoGSIHh/foyUYADfy1RQYCmPpeFKfIdCIrHpd7xFdJXTOMYOS0BwlM6u4qli/ZT4XigezQ==", - "dependencies": { - "@polkadot/api": "10.9.1", - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.11.2.tgz", + "integrity": "sha512-m3BQbPionkd1iSlknddxnL2hDtolPIsT+aRyrtn4zgMRPoLjHFmTmovvg8RaUyYofJtZeYrnjMw0mdxiSXx7eA==", + "dependencies": { + "@polkadot/api": "10.11.2", + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/keyring": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.4.2.tgz", - "integrity": "sha512-VH91feSL6GiVVLcJ6V8h6jIAuq62bfvhM75AMcjTFol6MDqFl25jdjkHfZ2bQhig330LIhLw89nKdYr2/OfwjA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.6.2.tgz", + "integrity": "sha512-O3Q7GVmRYm8q7HuB3S0+Yf/q/EB2egKRRU3fv9b3B7V+A52tKzA+vIwEmNVaD1g5FKW9oB97rmpggs0zaKFqHw==", "dependencies": { - "@polkadot/util": "12.4.2", - "@polkadot/util-crypto": "12.4.2", + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "12.4.2", - "@polkadot/util-crypto": "12.4.2" + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2" } }, "node_modules/@polkadot/networks": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.4.2.tgz", - "integrity": "sha512-dd7vss+86kpOyy/C+DuCWChGfhwHBHtrzJ9ArbbpY75qc8SqdP90lj/c13ZCHr5I1l+coy31gyyMj5i6ja1Dpg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.6.2.tgz", + "integrity": "sha512-1oWtZm1IvPWqvMrldVH6NI2gBoCndl5GEwx7lAuQWGr7eNL+6Bdc5K3Z9T0MzFvDGoi2/CBqjX9dRKo39pDC/w==", "dependencies": { - "@polkadot/util": "12.4.2", - "@substrate/ss58-registry": "^1.43.0", + "@polkadot/util": "12.6.2", + "@substrate/ss58-registry": "^1.44.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/rpc-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.9.1.tgz", - "integrity": "sha512-MaLHkNlyqN20ZRYr6uNd1BZr1OsrnX9qLAmsl0mcrri1vPGRH6VHjfFH1RBLkikpWD82v17g0l2hLwdV1ZHMcw==", - "dependencies": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.11.2.tgz", + "integrity": "sha512-9AhT0WW81/8jYbRcAC6PRmuxXqNhJje8OYiulBQHbG1DTCcjAfz+6VQBke9BwTStzPq7d526+yyBKD17O3zlAA==", + "dependencies": { + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/rpc-core": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.9.1.tgz", - "integrity": "sha512-ZtA8B8SfXSAwVkBlCcKRHw0eSM7ec/sbiNOM5GasXPeRujUgT7lOwSH2GbUZSqe9RfRDMp6DvO9c2JoGc3LLWw==", - "dependencies": { - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.11.2.tgz", + "integrity": "sha512-Ot0CFLWx8sZhLZog20WDuniPA01Bk2StNDsdAQgcFKPwZw6ShPaZQCHuKLQK6I6DodOrem9FXX7c1hvoKJP5Ww==", + "dependencies": { + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/rpc-provider": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.9.1.tgz", - "integrity": "sha512-4QzT2QzD+320+eT6b79sGAA85Tt3Bb8fQvse4r5Mom2iiBd2SO81vOhxSAOaIe4GUsw25VzFJmsbe7+OObItdg==", - "dependencies": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-support": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", - "@polkadot/x-fetch": "^12.3.1", - "@polkadot/x-global": "^12.3.1", - "@polkadot/x-ws": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.11.2.tgz", + "integrity": "sha512-he5jWMpDJp7e+vUzTZDzpkB7ps3H8psRally+/ZvZZScPvFEjfczT7I1WWY9h58s8+ImeVP/lkXjL9h/gUOt3Q==", + "dependencies": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-support": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "@polkadot/x-fetch": "^12.6.2", + "@polkadot/x-global": "^12.6.2", + "@polkadot/x-ws": "^12.6.2", "eventemitter3": "^5.0.1", - "mock-socket": "^9.2.1", - "nock": "^13.3.1", - "tslib": "^2.5.3" + "mock-socket": "^9.3.1", + "nock": "^13.4.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "optionalDependencies": { - "@substrate/connect": "0.7.26" + "@substrate/connect": "0.7.35" } }, "node_modules/@polkadot/types": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.9.1.tgz", - "integrity": "sha512-AG33i2ZGGfq7u+5rkAdGrXAQHHl844/Yv+junH5ZzX69xiCoWO1bH/yzDUNBdpki2GlACWvF9nLYh3F2tVF93w==", - "dependencies": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.11.2.tgz", + "integrity": "sha512-d52j3xXni+C8GdYZVTSfu8ROAnzXFMlyRvXtor0PudUc8UQHOaC4+mYAkTBGA2gKdmL8MHSfRSbhcxHhsikY6Q==", + "dependencies": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.9.1.tgz", - "integrity": "sha512-OY9/jTMFRFqYdkUnfcGwqMLC64A0Q25bjvCuVQCVjsPFKE3wl0Kt5rNT01eV2UmLXrR6fY0xWbR2w80bLA7CIQ==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.11.2.tgz", + "integrity": "sha512-8eB8ew04wZiE5GnmFvEFW1euJWmF62SGxb1O+8wL3zoUtB9Xgo1vB6w6xbTrd+HLV6jNSeXXnbbF1BEUvi9cNg==", "dependencies": { - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-codec": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.9.1.tgz", - "integrity": "sha512-mJ5OegKGraY1FLvEa8FopRCr3pQrhDkcn5RNOjmgJQozENVeRaxhk0NwxYz7IojFvSDnKnc6lNQfKaaSe5pLHg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.11.2.tgz", + "integrity": "sha512-3xjOQL+LOOMzYqlgP9ROL0FQnzU8lGflgYewzau7AsDlFziSEtb49a9BpYo6zil4koC+QB8zQ9OHGFumG08T8w==", "dependencies": { - "@polkadot/util": "^12.3.1", - "@polkadot/x-bigint": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "@polkadot/x-bigint": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-create": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.9.1.tgz", - "integrity": "sha512-OVz50MGTTuiuVnRP/zAx4CTuLioc0hsiwNwqN2lNhmIJGtnQ4Vy/7mQRsIWehiYz6g0Vzzm5B3qWkTXO1NSN5w==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.11.2.tgz", + "integrity": "sha512-SJt23NxYvefRxVZZm6mT9ed1pR6FDoIGQ3xUpbjhTLfU2wuhpKjekMVorYQ6z/gK2JLMu2kV92Ardsz+6GX5XQ==", "dependencies": { - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-known": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.9.1.tgz", - "integrity": "sha512-zCMVWc4pJtkbMFPu72bD4IhvV/gkHXPX3C5uu92WdmCfnn0vEIEsMKWlVXVVvQQZKAqvs/awpqIfrUtEViOGEA==", - "dependencies": { - "@polkadot/networks": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.11.2.tgz", + "integrity": "sha512-kbEIX7NUQFxpDB0FFGNyXX/odY7jbp56RGD+Z4A731fW2xh/DgAQrI994xTzuh0c0EqPE26oQm3kATSpseqo9w==", + "dependencies": { + "@polkadot/networks": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-support": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.9.1.tgz", - "integrity": "sha512-XsieuLDsszvMZQlleacQBfx07i/JkwQV/UxH9q8Hz7Okmaz9pEVEW1h3ka2/cPuC7a4l32JhaORBUYshBZNdJg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.11.2.tgz", + "integrity": "sha512-X11hoykFYv/3efg4coZy2hUOUc97JhjQMJLzDhHniFwGLlYU8MeLnPdCVGkXx0xDDjTo4/ptS1XpZ5HYcg+gRw==", "dependencies": { - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/util": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.4.2.tgz", - "integrity": "sha512-NcTCbnIzMb/3TvJNEbaiu/9EvYIBuzDwZfqQ4hzL0GAptkF8aDkKMDCfQ/j3FI38rR+VTPQHNky9fvWglGKGRw==", - "dependencies": { - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-global": "12.4.2", - "@polkadot/x-textdecoder": "12.4.2", - "@polkadot/x-textencoder": "12.4.2", - "@types/bn.js": "^5.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.6.2.tgz", + "integrity": "sha512-l8TubR7CLEY47240uki0TQzFvtnxFIO7uI/0GoWzpYD/O62EIAMRsuY01N4DuwgKq2ZWD59WhzsLYmA5K6ksdw==", + "dependencies": { + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-global": "12.6.2", + "@polkadot/x-textdecoder": "12.6.2", + "@polkadot/x-textencoder": "12.6.2", + "@types/bn.js": "^5.1.5", "bn.js": "^5.2.1", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/util-crypto": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.4.2.tgz", - "integrity": "sha512-JP7OrEKYx35P3wWc2Iu9F6BfYMIkywXik908zQqPxwoQhr8uDLP1Qoyu9Sws+hE97Yz1O4jBVvryS2le0yusog==", - "dependencies": { - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.1", - "@polkadot/networks": "12.4.2", - "@polkadot/util": "12.4.2", - "@polkadot/wasm-crypto": "^7.2.2", - "@polkadot/wasm-util": "^7.2.2", - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-randomvalues": "12.4.2", - "@scure/base": "1.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.6.2.tgz", + "integrity": "sha512-FEWI/dJ7wDMNN1WOzZAjQoIcCP/3vz3wvAp5QQm+lOrzOLj0iDmaIGIcBkz8HVm3ErfSe/uKP0KS4jgV/ib+Mg==", + "dependencies": { + "@noble/curves": "^1.3.0", + "@noble/hashes": "^1.3.3", + "@polkadot/networks": "12.6.2", + "@polkadot/util": "12.6.2", + "@polkadot/wasm-crypto": "^7.3.2", + "@polkadot/wasm-util": "^7.3.2", + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-randomvalues": "12.6.2", + "@scure/base": "^1.1.5", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "12.4.2" + "@polkadot/util": "12.6.2" + } + }, + "node_modules/@polkadot/util-crypto/node_modules/@noble/curves": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz", + "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==", + "dependencies": { + "@noble/hashes": "1.3.3" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@polkadot/util-crypto/node_modules/@noble/hashes": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", + "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/@polkadot/wasm-bridge": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.2.2.tgz", - "integrity": "sha512-CgNENd65DVYtackOVXXRA0D1RPoCv5+77IdBCf7kNqu6LeAnR4nfTI6qjaApUdN1xRweUsQjSH7tu7VjkMOA0A==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.3.2.tgz", + "integrity": "sha512-AJEXChcf/nKXd5Q/YLEV5dXQMle3UNT7jcXYmIffZAo/KI394a+/24PaISyQjoNC0fkzS1Q8T5pnGGHmXiVz2g==", "dependencies": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", @@ -1109,19 +1131,19 @@ } }, "node_modules/@polkadot/wasm-crypto": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.2.2.tgz", - "integrity": "sha512-1ZY1rxUTawYm0m1zylvBMFovNIHYgG2v/XoASNp/EMG5c8FQIxCbhJRaTBA983GVq4lN/IAKREKEp9ZbLLqssA==", - "dependencies": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-init": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.3.2.tgz", + "integrity": "sha512-+neIDLSJ6jjVXsjyZ5oLSv16oIpwp+PxFqTUaZdZDoA2EyFRQB8pP7+qLsMNk+WJuhuJ4qXil/7XiOnZYZ+wxw==", + "dependencies": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-init": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", @@ -1129,32 +1151,32 @@ } }, "node_modules/@polkadot/wasm-crypto-asmjs": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.2.2.tgz", - "integrity": "sha512-wKg+cpsWQCTSVhjlHuNeB/184rxKqY3vaklacbLOMbUXieIfuDBav5PJdzS3yeiVE60TpYaHW4iX/5OYHS82gg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.3.2.tgz", + "integrity": "sha512-QP5eiUqUFur/2UoF2KKKYJcesc71fXhQFLT3D4ZjG28Mfk2ZPI0QNRUfpcxVQmIUpV5USHg4geCBNuCYsMm20Q==", "dependencies": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/wasm-crypto-init": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.2.2.tgz", - "integrity": "sha512-vD4iPIp9x+SssUIWUenxWLPw4BVIwhXHNMpsV81egK990tvpyIxL205/EF5QRb1mKn8WfWcNFm5tYwwh9NdnnA==", - "dependencies": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.3.2.tgz", + "integrity": "sha512-FPq73zGmvZtnuJaFV44brze3Lkrki3b4PebxCy9Fplw8nTmisKo9Xxtfew08r0njyYh+uiJRAxPCXadkC9sc8g==", + "dependencies": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", @@ -1162,133 +1184,130 @@ } }, "node_modules/@polkadot/wasm-crypto-wasm": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.2.2.tgz", - "integrity": "sha512-3efoIB6jA3Hhv6k0YIBwCtlC8gCSWCk+R296yIXRLLr3cGN415KM/PO/d1JIXYI64lbrRzWRmZRhllw3jf6Atg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.3.2.tgz", + "integrity": "sha512-15wd0EMv9IXs5Abp1ZKpKKAVyZPhATIAHfKsyoWCEFDLSOA0/K0QGOxzrAlsrdUkiKZOq7uzSIgIDgW8okx2Mw==", "dependencies": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/wasm-util": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.2.2.tgz", - "integrity": "sha512-N/25960ifCc56sBlJZ2h5UBpEPvxBmMLgwYsl7CUuT+ea2LuJW9Xh8VHDN/guYXwmm92/KvuendYkEUykpm/JQ==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.3.2.tgz", + "integrity": "sha512-bmD+Dxo1lTZyZNxbyPE380wd82QsX+43mgCm40boyKrRppXEyQmWT98v/Poc7chLuskYb6X8IQ6lvvK2bGR4Tg==", "dependencies": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/x-bigint": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.4.2.tgz", - "integrity": "sha512-VRbkhdIf7CyWiUSyHemYi2fFWjBetUGyqpzsIHEclmzvqhKPfs7Kd2ZRdoXKU5QM56eD0sV2pyJxL34dv36/rw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.6.2.tgz", + "integrity": "sha512-HSIk60uFPX4GOFZSnIF7VYJz7WZA7tpFJsne7SzxOooRwMTWEtw3fUpFy5cYYOeLh17/kHH1Y7SVcuxzVLc74Q==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-fetch": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.4.2.tgz", - "integrity": "sha512-QEtYIUO6q6LupYkOl+vRwAkbBSSNHbALG8Y3+L/tFDubeXQl79vCkJFmsjhLewpsDIwTFTPNOwzA0ZEyb+0HZw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.6.2.tgz", + "integrity": "sha512-8wM/Z9JJPWN1pzSpU7XxTI1ldj/AfC8hKioBlUahZ8gUiJaOF7K9XEFCrCDLis/A1BoOu7Ne6WMx/vsJJIbDWw==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "node-fetch": "^3.3.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-global": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.4.2.tgz", - "integrity": "sha512-CwbjSt1Grmn56xAj+hGC8ZB0uZxMl92K+VkBH0KxjgcbAX/D24ZD/0ds8pAnUYrO4aYHYq2j2MAGVSMdHcMBAQ==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.6.2.tgz", + "integrity": "sha512-a8d6m+PW98jmsYDtAWp88qS4dl8DyqUBsd0S+WgyfSMtpEXu6v9nXDgPZgwF5xdDvXhm+P0ZfVkVTnIGrScb5g==", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-randomvalues": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.4.2.tgz", - "integrity": "sha512-HVlXRWY9RfN54RgfDroDy2itWmtTUtr119DfPl3wjnBf9i4wl/M+848OYlmCZCTpViTJrvWVSEJH9zVgchlNnw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.6.2.tgz", + "integrity": "sha512-Vr8uG7rH2IcNJwtyf5ebdODMcr0XjoCpUbI91Zv6AlKVYOGKZlKLYJHIwpTaKKB+7KPWyQrk4Mlym/rS7v9feg==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "12.4.2", + "@polkadot/util": "12.6.2", "@polkadot/wasm-util": "*" } }, "node_modules/@polkadot/x-textdecoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.4.2.tgz", - "integrity": "sha512-cyUoKwdSIiBXAaWnGdMYqnaNHc5NV9skQh/fITis3ufKKi3pMwxJ5IwhhfDZpuKDl/3fDXF40Z3fqtTeUnoRXA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.6.2.tgz", + "integrity": "sha512-M1Bir7tYvNappfpFWXOJcnxUhBUFWkUFIdJSyH0zs5LmFtFdbKAeiDXxSp2Swp5ddOZdZgPac294/o2TnQKN1w==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-textencoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.4.2.tgz", - "integrity": "sha512-xrcwx55B2K7j9CnVucGLFl0qd5sb7W5Ei6dOsWgDnZNjZPBqsx9jTBQSBv9HmyHE4GEnF4z0rpO0msy3S7Sj9Q==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.6.2.tgz", + "integrity": "sha512-4N+3UVCpI489tUJ6cv3uf0PjOHvgGp9Dl+SZRLgFGt9mvxnvpW/7+XBADRMtlG4xi5gaRK7bgl5bmY6OMDsNdw==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-ws": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.4.2.tgz", - "integrity": "sha512-dYUtpbPa/JNd94tPAM9iHMzhR8MZ4wtOPh8gvueQRRYC8ZYQ9NPwjbBImY2FRfx7wCG1tFLAR6OEw4ToLLJNsA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.6.2.tgz", + "integrity": "sha512-cGZWo7K5eRRQCRl2LrcyCYsrc3lRbTlixZh3AzgU8uX4wASVGRlNWi/Hf4TtHNe1ExCDmxabJzdIsABIfrr7xw==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2", - "ws": "^8.13.0" + "ws": "^8.15.1" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@scure/base": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz", - "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", + "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==", + "funding": { + "url": "https://paulmillr.com/funding/" + } }, "node_modules/@scure/bip32": { "version": "1.3.1", @@ -1316,14 +1335,14 @@ } }, "node_modules/@substrate/connect": { - "version": "0.7.26", - "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.26.tgz", - "integrity": "sha512-uuGSiroGuKWj1+38n1kY5HReer5iL9bRwPCzuoLtqAOmI1fGI0hsSI2LlNQMAbfRgr7VRHXOk5MTuQf5ulsFRw==", + "version": "0.7.35", + "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.35.tgz", + "integrity": "sha512-Io8vkalbwaye+7yXfG1Nj52tOOoJln2bMlc7Q9Yy3vEWqZEVkgKmcPVzbwV0CWL3QD+KMPDA2Dnw/X7EdwgoLw==", + "hasInstallScript": true, "optional": true, "dependencies": { "@substrate/connect-extension-protocol": "^1.0.1", - "eventemitter3": "^4.0.7", - "smoldot": "1.0.4" + "smoldot": "2.0.7" } }, "node_modules/@substrate/connect-extension-protocol": { @@ -1332,16 +1351,10 @@ "integrity": "sha512-161JhCC1csjH3GE5mPLEd7HbWtwNSPJBg3p1Ksz9SFlTzj/bgEwudiRN2y5i0MoLGCIJRYKyKGMxVnd29PzNjg==", "optional": true }, - "node_modules/@substrate/connect/node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "optional": true - }, "node_modules/@substrate/ss58-registry": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz", - "integrity": "sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==" + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.45.0.tgz", + "integrity": "sha512-NHmOkILimbLRPKvpnR+JGVckc1q4AJjxz9FnzZ3dKAVBL17AKknDy2FxXcwlJbmOXl9u7W3FS3bLDHgfKi4tQw==" }, "node_modules/@tsconfig/node10": { "version": "1.0.8", @@ -1372,17 +1385,17 @@ "license": "MIT" }, "node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz", + "integrity": "sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==", "dependencies": { "@types/node": "*" } }, "node_modules/@types/chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==", + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", + "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", "dev": true }, "node_modules/@types/glob": { @@ -1402,20 +1415,23 @@ "dev": true }, "node_modules/@types/mocha": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz", - "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", + "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, "node_modules/@types/node": { - "version": "20.5.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", - "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==" + "version": "20.10.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz", + "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/shelljs": { - "version": "0.8.12", - "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.12.tgz", - "integrity": "sha512-ZA8U81/gldY+rR5zl/7HSHrG2KDfEb3lzG6uCUDhW1DTQE9yC/VBQ45fXnXq8f3CgInfhZmjtdu/WOUlrXRQUg==", + "version": "0.8.15", + "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.15.tgz", + "integrity": "sha512-vzmnCHl6hViPu9GNLQJ+DZFd6BQI2DBTUeOvYHqkWQLMfKAAQYMb/xAmZkTogZI/vqXHCWkqDRymDI5p0QTi5Q==", "dev": true, "dependencies": { "@types/glob": "~7.2.0", @@ -1423,9 +1439,9 @@ } }, "node_modules/@types/tcp-port-used": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/tcp-port-used/-/tcp-port-used-1.0.1.tgz", - "integrity": "sha512-6pwWTx8oUtWvsiZUCrhrK/53MzKVLnuNSSaZILPy3uMes9QnTrLMar9BDlJArbMOjDcjb3QXFk6Rz8qmmuySZw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/tcp-port-used/-/tcp-port-used-1.0.4.tgz", + "integrity": "sha512-0vQ4fz9TTM4bCdllYWEJ2JHBUXR9xqPtc70dJ7BMRDVfvZyYdrgey3nP5RRcVj+qAgnHJM8r9fvgrfnPMxdnhA==", "dev": true }, "node_modules/@types/ws": { @@ -1437,9 +1453,9 @@ } }, "node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -1451,6 +1467,20 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, + "node_modules/abitype": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.7.1.tgz", + "integrity": "sha512-VBkRHTDZf9Myaek/dO3yMmOzB/y2s3Zo6nVU7yaw1G+TvCHAjwaJzNGN9yo4K5D8bU/VZXKP1EJpRhFr862PlQ==", + "peerDependencies": { + "typescript": ">=4.9.4", + "zod": "^3 >=3.19.1" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, "node_modules/acorn": { "version": "8.7.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", @@ -1571,11 +1601,11 @@ } }, "node_modules/axios": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", - "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -1664,12 +1694,13 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1689,18 +1720,18 @@ } }, "node_modules/chai": { - "version": "4.3.8", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz", - "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.0.tgz", + "integrity": "sha512-x9cHNq1uvkCdU+5xTkNh5WtgD4e4yDFCsp9jVc7N7qVeKeftv3gO/ZrviX5d+3ZfxdYnZXZYujjRInu1RogU6A==", "dev": true, "dependencies": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" }, "engines": { "node": ">=4" @@ -1743,11 +1774,13 @@ "dev": true }, "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, - "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.2" + }, "engines": { "node": "*" } @@ -1849,9 +1882,9 @@ "license": "MIT" }, "node_modules/cross-fetch": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", - "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "dependencies": { "node-fetch": "^2.6.12" } @@ -1930,6 +1963,19 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "license": "MIT" }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2124,16 +2170,15 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -2197,10 +2242,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "license": "MIT" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/get-caller-file": { "version": "2.0.5", @@ -2222,14 +2269,14 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2302,6 +2349,17 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", @@ -2347,6 +2405,17 @@ "minimalistic-assert": "^1.0.1" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -2613,11 +2682,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -2636,13 +2700,12 @@ } }, "node_modules/loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, - "license": "MIT", "dependencies": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "node_modules/make-error": { @@ -2766,9 +2829,9 @@ "license": "MIT" }, "node_modules/mock-socket": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.0.tgz", - "integrity": "sha512-TFaQaIxXbzNke3z9nhSnMJFQn8l7QPmF+Luhh8MPHqkmr6B4fPquOTSILCjGUyxDBPv9AFxuaTGmRINDHDmkdQ==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.1.tgz", + "integrity": "sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw==", "engines": { "node": ">= 8" } @@ -2793,13 +2856,12 @@ } }, "node_modules/nock": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz", - "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "dependencies": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" }, "engines": { @@ -2904,12 +2966,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/pako": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==", - "optional": true - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3076,6 +3132,20 @@ "randombytes": "^2.1.0" } }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -3118,12 +3188,11 @@ } }, "node_modules/smoldot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-1.0.4.tgz", - "integrity": "sha512-N3TazI1C4GGrseFH/piWyZCCCRJTRx2QhDfrUKRT4SzILlW5m8ayZ3QTKICcz1C/536T9cbHHJyP7afxI6Mi1A==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-2.0.7.tgz", + "integrity": "sha512-VAOBqEen6vises36/zgrmAT1GWk2qE3X8AGnO7lmQFdskbKx8EovnwS22rtPAG+Y1Rk23/S22kDJUdPANyPkBA==", "optional": true, "dependencies": { - "pako": "^2.0.4", "ws": "^8.8.1" } }, @@ -3241,9 +3310,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -3317,10 +3386,9 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "dev": true, + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -3329,6 +3397,11 @@ "node": ">=14.17" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "node_modules/utf-8-validate": { "version": "5.0.10", "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", @@ -3363,34 +3436,34 @@ "license": "MIT" }, "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz", + "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==", "engines": { "node": ">= 8" } }, "node_modules/web3": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-4.1.1.tgz", - "integrity": "sha512-vnPll2G+ZNktSu7oJVjAW0QYuY0kPHLs8LQMifml4kTR+hqhiTmzMIzO8FqkcsESLEu6H9R7Acj6EgyeU1hruQ==", - "dependencies": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-eth-contract": "^4.0.5", - "web3-eth-ens": "^4.0.5", - "web3-eth-iban": "^4.0.5", - "web3-eth-personal": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-4.3.0.tgz", + "integrity": "sha512-YiLCsb5wmgJlSxRLzt7Z7H+CmlVVIKD8VaUQaZ+xKVG3Q7CpsO5Z6jmeKnlr6M9c6fDDsDnRM6G8g+nchZehbA==", + "dependencies": { + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-contract": "^4.1.4", + "web3-eth-ens": "^4.0.8", + "web3-eth-iban": "^4.0.7", + "web3-eth-personal": "^4.0.8", + "web3-net": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14.0.0", @@ -3398,32 +3471,33 @@ } }, "node_modules/web3-core": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.1.1.tgz", - "integrity": "sha512-wzS01bC+ihf5DJ6mz2fz4d5yxnPEM5AYQIRihO8kUt3dil+X4V07CHks23wLbb9yk8U9+3a1Iod207WGF872rA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.3.2.tgz", + "integrity": "sha512-uIMVd/j4BgOnwfpY8ZT+QKubOyM4xohEhFZXz9xB8wimXWMMlYVlIK/TbfHqFolS9uOerdSGhsMbcK9lETae8g==", "dependencies": { - "web3-errors": "^1.1.1", - "web3-eth-iban": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-iban": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ws": "^4.0.7", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", "npm": ">=6.12.0" }, "optionalDependencies": { - "web3-providers-ipc": "^4.0.5" + "web3-providers-ipc": "^4.0.7" } }, "node_modules/web3-errors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.1.tgz", - "integrity": "sha512-9IEhcympCJEK3Nmkz2oE/daKnOh+3CxHceuVWWRkHWKUfuIiJQgXAv9wRkPGk63JJTP/R9jtGmP+IbkScKoTBA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.4.tgz", + "integrity": "sha512-WahtszSqILez+83AxGecVroyZsMuuRT+KmQp4Si5P4Rnqbczno1k748PCrZTS1J4UCPmXMG2/Vt+0Bz2zwXkwQ==", "dependencies": { - "web3-types": "^1.1.1" + "web3-types": "^1.3.1" }, "engines": { "node": ">=14", @@ -3431,21 +3505,21 @@ } }, "node_modules/web3-eth": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.1.1.tgz", - "integrity": "sha512-0lftXINbeEOiYhHCWIKgeAOPnjoeHR8DTWLOjURDoz5CKbTj2wfcRQvuL6tUfvvVmrGWHEfIOncM30jhjlTxYQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.3.1.tgz", + "integrity": "sha512-zJir3GOXooHQT85JB8SrufE+Voo5TtXdjhf1D8IGXmxM8MrhI8AT+Pgt4siBTupJcu5hF17iGmTP/Nj2XnaibQ==", "dependencies": { "setimmediate": "^1.0.5", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-net": "^4.0.7", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3453,15 +3527,15 @@ } }, "node_modules/web3-eth-abi": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.1.tgz", - "integrity": "sha512-dOLwJ7Ua98WMXuxk7anYfSIqkuCdUvrvU/Um/OWPb6Gw10QciKUWXMIiRobNpWkpS8R77nDtecmQQ1OnTnLaNA==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.4.tgz", + "integrity": "sha512-YLOBVVxxxLYKXjaiwZjEWYEnkMmmrm0nswZsvzSsINy/UgbWbzfoiZU+zn4YNWIEhORhx1p37iS3u/dP6VyC2w==", "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "abitype": "0.7.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3469,17 +3543,17 @@ } }, "node_modules/web3-eth-accounts": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.0.5.tgz", - "integrity": "sha512-cmaAH20zFe/7Xjga7EuRXL0UV4O894i6ElEXB9Cqd9fP/CBnhQYK/TYuU37xydHhs5WY+B0hKeaoTqxLaPWAYg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.1.0.tgz", + "integrity": "sha512-UFtAsOANsvihTQ6SSvOKguupmQkResyR9M9JNuOxYpKh7+3W+sTnbLXw2UbOSYIsKlc1mpqqW9bVr1SjqHDpUQ==", "dependencies": { "@ethereumjs/rlp": "^4.0.1", "crc-32": "^1.2.2", "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3487,17 +3561,17 @@ } }, "node_modules/web3-eth-contract": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.0.5.tgz", - "integrity": "sha512-gS21liRDutWQX9i+Ru2Porzefx+7AumRvk+ZLR9wy8l9iLZxldvsvMdgbsyf9lA7UHOqPEhg/zoDyEc0N0hAVw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.1.4.tgz", + "integrity": "sha512-tJ4z6QLgtu8EQu2sXnLA7g427oxmngnbAUh+9kJKbP6Yep/oe+z79PqJv7H3MwqwUNW9T+/FeB2PnSQSyxz6ig==", "dependencies": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3505,19 +3579,19 @@ } }, "node_modules/web3-eth-ens": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.5.tgz", - "integrity": "sha512-PBTCk7h3NlSKP9XWmUJbpTJfMK3IybMAjn+uKrvSbeP50/xaZ73s94nI0eaRmI2FxlSQwTsd7apxXzrE07iKJw==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.8.tgz", + "integrity": "sha512-nj0JfeD45BbzVJcVYpUJnSo8iwDcY9CQ7CZhhIVVOFjvpMAPw0zEwjTvZEIQyCW61OoDG9xcBzwxe2tZoYhMRw==", "dependencies": { "@adraffy/ens-normalize": "^1.8.8", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-contract": "^4.0.5", - "web3-net": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth": "^4.3.1", + "web3-eth-contract": "^4.1.2", + "web3-net": "^4.0.7", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3525,14 +3599,14 @@ } }, "node_modules/web3-eth-iban": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.5.tgz", - "integrity": "sha512-rAH4Dsk0G90W8UqQFomGNjLfxKhBJwkSnkjdG7TUCRhoFvqvrsW1YL+4a+UoODRyJ9BCdaRR71jrymmy4UTDHA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.7.tgz", + "integrity": "sha512-8weKLa9KuKRzibC87vNLdkinpUE30gn0IGY027F8doeJdcPUfsa4IlBgNC4k4HLBembBB2CTU0Kr/HAOqMeYVQ==", "dependencies": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3540,16 +3614,16 @@ } }, "node_modules/web3-eth-personal": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.5.tgz", - "integrity": "sha512-cypChpAaljYtd1fOfjvhDvty7SBdUvwz5hSimwb+81IJ4MtWc7Jdbn1Ka/g0ZxwoAm46OmeV0yHef7+QyfbpsQ==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.8.tgz", + "integrity": "sha512-sXeyLKJ7ddQdMxz1BZkAwImjqh7OmKxhXoBNF3isDmD4QDpMIwv/t237S3q4Z0sZQamPa/pHebJRWVuvP8jZdw==", "dependencies": { - "web3-core": "^4.1.1", - "web3-eth": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-eth": "^4.3.1", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3557,14 +3631,14 @@ } }, "node_modules/web3-net": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.5.tgz", - "integrity": "sha512-7Ir+Da5z3I3KxUn7nmg6NcXxWADYnQAkHX7Z4u4NE3yA+gNbiwPUjVpvSgzpNoDZj+EFovvP1AuOR5idHvyE0g==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.7.tgz", + "integrity": "sha512-SzEaXFrBjY25iQGk5myaOfO9ZyfTwQEa4l4Ps4HDNVMibgZji3WPzpjq8zomVHMwi8bRp6VV7YS71eEsX7zLow==", "dependencies": { - "web3-core": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-core": "^4.3.0", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" }, "engines": { "node": ">=14", @@ -3572,14 +3646,14 @@ } }, "node_modules/web3-providers-http": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.0.5.tgz", - "integrity": "sha512-JAY0GyLqRKbKw7m92EMg84otLU6N/NmYqepPid7B8XcPkGzhK6R/FsATyi+BGe2ecW9HRyCSz9SWllTjlKhRwQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.1.0.tgz", + "integrity": "sha512-6qRUGAhJfVQM41E5t+re5IHYmb5hSaLc02BE2MaRQsz2xKA6RjmHpOA5h/+ojJxEpI9NI2CrfDKOAgtJfoUJQg==", "dependencies": { - "cross-fetch": "^3.1.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "cross-fetch": "^4.0.0", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" }, "engines": { "node": ">=14", @@ -3587,14 +3661,14 @@ } }, "node_modules/web3-providers-ipc": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.5.tgz", - "integrity": "sha512-1mJWqBnKbQ6UGHVxuXDJRpw4NwkpJ7NabyF2XBmzctzFHKvzE0X1dAocy3tih49J38d0vKrmubTOqxxkMpq49Q==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.7.tgz", + "integrity": "sha512-YbNqY4zUvIaK2MHr1lQFE53/8t/ejHtJchrWn9zVbFMGXlTsOAbNoIoZWROrg1v+hCBvT2c9z8xt7e/+uz5p1g==", "optional": true, "dependencies": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" }, "engines": { "node": ">=14", @@ -3602,15 +3676,15 @@ } }, "node_modules/web3-providers-ws": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.5.tgz", - "integrity": "sha512-v9xE16Jjczy+7jMKY7rwTuXgwGK51NKvCGdFERPPcSNJCkS5YCBq9DpzJe8mcr5QhuhnTeGeQ7XmcjTzDRkwnQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.7.tgz", + "integrity": "sha512-n4Dal9/rQWjS7d6LjyEPM2R458V8blRm0eLJupDEJOOIBhGYlxw5/4FthZZ/cqB7y/sLVi7K09DdYx2MeRtU5w==", "dependencies": { "@types/ws": "8.5.3", "isomorphic-ws": "^5.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", "ws": "^8.8.1" }, "engines": { @@ -3619,13 +3693,13 @@ } }, "node_modules/web3-rpc-methods": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.1.tgz", - "integrity": "sha512-aAhm1eIKPWWBRf+BrYpKcvQX5qAg1LOU6NhriY0xpXJh01hbwkz0Q8rMJfCCjlGAElYHSp2K/odyAmyKRDr0LQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.4.tgz", + "integrity": "sha512-LTFNg4LFaeU8K9ecuT8fHDp/LOXyxCneeZjCrRYIW1u82Ly52SrY55FIzMIISGoG/iT5Wh7UiHOB3CQsWLBmbQ==", "dependencies": { - "web3-core": "^4.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3633,23 +3707,23 @@ } }, "node_modules/web3-types": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.1.1.tgz", - "integrity": "sha512-bXmIPJi/NPed43JBcya71gT+euZSMvfQx6NYv8G97PSNxR1HWwANYBKbamTZvzBbq10QCwQLh0hZw3tyOXuPFA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.3.1.tgz", + "integrity": "sha512-8fXi7h/t95VKRtgU4sxprLPZpsTh3jYDfSghshIDBgUD/OoGe5S+syP24SUzBZYllZ/L+hMr2gdp/0bGJa8pYQ==", "engines": { "node": ">=14", "npm": ">=6.12.0" } }, "node_modules/web3-utils": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.0.5.tgz", - "integrity": "sha512-43xIM7rr3htYNzliVQLpWLQmEf4XX8IXgjvqLcEuC/xje14O5UQM4kamRCtz8v3JZN3X6QTfsV6Zgby67mVmCg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.1.0.tgz", + "integrity": "sha512-+VJWR6FtCsgwuJr5tvSvQlSEG06586df8h2CxGc9tcNtIDyJKNkSDDWJkdNPvyDhhXFzQYFh8QOGymD1CIP6fw==", "dependencies": { "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -3657,14 +3731,14 @@ } }, "node_modules/web3-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.1.tgz", - "integrity": "sha512-RIdZCNhceBEOQpmzcEk6K3qqLHRfDIMkg2PJe7yllpuEc0fa0cmUZgGUl1FEnioc5Rx9GBEE8eTllaneIAiiQQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.3.tgz", + "integrity": "sha512-fJbAQh+9LSNWy+l5Ze6HABreml8fra98o5+vS073T35jUcLbRZ0IOjF/ZPJhJNbJDt+jP1vseZsc3z3uX9mxxQ==", "dependencies": { "ethereum-cryptography": "^2.0.0", "util": "^0.12.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", "zod": "^3.21.4" }, "engines": { @@ -3687,12 +3761,12 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -3736,9 +3810,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "engines": { "node": ">=10.0.0" }, @@ -3854,9 +3928,9 @@ }, "dependencies": { "@adraffy/ens-normalize": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz", - "integrity": "sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==" + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz", + "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==" }, "@cspotcode/source-map-support": { "version": "0.8.1", @@ -4287,363 +4361,378 @@ "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==" }, "@polkadot/api": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.9.1.tgz", - "integrity": "sha512-ND/2UqZBWvtt4PfV03OStTKg0mxmPk4UpMAgJKutdgsz/wP9CYJ1KbjwFgPNekL9JnzbKQsWyQNPVrcw7kQk8A==", - "requires": { - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/api-derive": "10.9.1", - "@polkadot/keyring": "^12.3.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/types-known": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.11.2.tgz", + "integrity": "sha512-AorCZxCWCoTtdbl4DPUZh+ACe/pbLIS1BkdQY0AFJuZllm0x/yWzjgampcPd5jQAA/O3iKShRBkZqj6Mk9yG/A==", + "requires": { + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/api-derive": "10.11.2", + "@polkadot/keyring": "^12.6.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/types-known": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "eventemitter3": "^5.0.1", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/api-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.9.1.tgz", - "integrity": "sha512-kRZZvCFVcN4hAH4dJ+Qzfdy27/4EEq3oLDf3ihj0LTVrAezSWcKPGE3EVFy+Mn6Lo4SUc7RVyoKvIUhSk2l4Dg==", - "requires": { - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.11.2.tgz", + "integrity": "sha512-PTpnqpezc75qBqUtgrc0GYB8h9UHjfbHSRZamAbecIVAJ2/zc6CqtnldeaBlIu1IKTgBzi3FFtTyYu+ZGbNT2Q==", + "requires": { + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/api-base": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.9.1.tgz", - "integrity": "sha512-Q3m2KzlceMK2kX8bhnUZWk3RT6emmijeeFZZQgCePpEcrSeNjnqG4qjuTPgkveaOkUT8MAoDc5Avuzcc2jlW9g==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.11.2.tgz", + "integrity": "sha512-4LIjaUfO9nOzilxo7XqzYKCNMtmUypdk8oHPdrRnSjKEsnK7vDsNi+979z2KXNXd2KFSCFHENmI523fYnMnReg==", "requires": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/api-derive": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.9.1.tgz", - "integrity": "sha512-mRud1UZCFIc4Z63qAoGSIHh/foyUYADfy1RQYCmPpeFKfIdCIrHpd7xFdJXTOMYOS0BwlM6u4qli/ZT4XigezQ==", - "requires": { - "@polkadot/api": "10.9.1", - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.11.2.tgz", + "integrity": "sha512-m3BQbPionkd1iSlknddxnL2hDtolPIsT+aRyrtn4zgMRPoLjHFmTmovvg8RaUyYofJtZeYrnjMw0mdxiSXx7eA==", + "requires": { + "@polkadot/api": "10.11.2", + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/keyring": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.4.2.tgz", - "integrity": "sha512-VH91feSL6GiVVLcJ6V8h6jIAuq62bfvhM75AMcjTFol6MDqFl25jdjkHfZ2bQhig330LIhLw89nKdYr2/OfwjA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.6.2.tgz", + "integrity": "sha512-O3Q7GVmRYm8q7HuB3S0+Yf/q/EB2egKRRU3fv9b3B7V+A52tKzA+vIwEmNVaD1g5FKW9oB97rmpggs0zaKFqHw==", "requires": { - "@polkadot/util": "12.4.2", - "@polkadot/util-crypto": "12.4.2", + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/networks": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.4.2.tgz", - "integrity": "sha512-dd7vss+86kpOyy/C+DuCWChGfhwHBHtrzJ9ArbbpY75qc8SqdP90lj/c13ZCHr5I1l+coy31gyyMj5i6ja1Dpg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.6.2.tgz", + "integrity": "sha512-1oWtZm1IvPWqvMrldVH6NI2gBoCndl5GEwx7lAuQWGr7eNL+6Bdc5K3Z9T0MzFvDGoi2/CBqjX9dRKo39pDC/w==", "requires": { - "@polkadot/util": "12.4.2", - "@substrate/ss58-registry": "^1.43.0", + "@polkadot/util": "12.6.2", + "@substrate/ss58-registry": "^1.44.0", "tslib": "^2.6.2" } }, "@polkadot/rpc-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.9.1.tgz", - "integrity": "sha512-MaLHkNlyqN20ZRYr6uNd1BZr1OsrnX9qLAmsl0mcrri1vPGRH6VHjfFH1RBLkikpWD82v17g0l2hLwdV1ZHMcw==", - "requires": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.11.2.tgz", + "integrity": "sha512-9AhT0WW81/8jYbRcAC6PRmuxXqNhJje8OYiulBQHbG1DTCcjAfz+6VQBke9BwTStzPq7d526+yyBKD17O3zlAA==", + "requires": { + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/rpc-core": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.9.1.tgz", - "integrity": "sha512-ZtA8B8SfXSAwVkBlCcKRHw0eSM7ec/sbiNOM5GasXPeRujUgT7lOwSH2GbUZSqe9RfRDMp6DvO9c2JoGc3LLWw==", - "requires": { - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.11.2.tgz", + "integrity": "sha512-Ot0CFLWx8sZhLZog20WDuniPA01Bk2StNDsdAQgcFKPwZw6ShPaZQCHuKLQK6I6DodOrem9FXX7c1hvoKJP5Ww==", + "requires": { + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/rpc-provider": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.9.1.tgz", - "integrity": "sha512-4QzT2QzD+320+eT6b79sGAA85Tt3Bb8fQvse4r5Mom2iiBd2SO81vOhxSAOaIe4GUsw25VzFJmsbe7+OObItdg==", - "requires": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-support": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", - "@polkadot/x-fetch": "^12.3.1", - "@polkadot/x-global": "^12.3.1", - "@polkadot/x-ws": "^12.3.1", - "@substrate/connect": "0.7.26", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.11.2.tgz", + "integrity": "sha512-he5jWMpDJp7e+vUzTZDzpkB7ps3H8psRally+/ZvZZScPvFEjfczT7I1WWY9h58s8+ImeVP/lkXjL9h/gUOt3Q==", + "requires": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-support": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "@polkadot/x-fetch": "^12.6.2", + "@polkadot/x-global": "^12.6.2", + "@polkadot/x-ws": "^12.6.2", + "@substrate/connect": "0.7.35", "eventemitter3": "^5.0.1", - "mock-socket": "^9.2.1", - "nock": "^13.3.1", - "tslib": "^2.5.3" + "mock-socket": "^9.3.1", + "nock": "^13.4.0", + "tslib": "^2.6.2" } }, "@polkadot/types": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.9.1.tgz", - "integrity": "sha512-AG33i2ZGGfq7u+5rkAdGrXAQHHl844/Yv+junH5ZzX69xiCoWO1bH/yzDUNBdpki2GlACWvF9nLYh3F2tVF93w==", - "requires": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.11.2.tgz", + "integrity": "sha512-d52j3xXni+C8GdYZVTSfu8ROAnzXFMlyRvXtor0PudUc8UQHOaC4+mYAkTBGA2gKdmL8MHSfRSbhcxHhsikY6Q==", + "requires": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/types-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.9.1.tgz", - "integrity": "sha512-OY9/jTMFRFqYdkUnfcGwqMLC64A0Q25bjvCuVQCVjsPFKE3wl0Kt5rNT01eV2UmLXrR6fY0xWbR2w80bLA7CIQ==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.11.2.tgz", + "integrity": "sha512-8eB8ew04wZiE5GnmFvEFW1euJWmF62SGxb1O+8wL3zoUtB9Xgo1vB6w6xbTrd+HLV6jNSeXXnbbF1BEUvi9cNg==", "requires": { - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-codec": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.9.1.tgz", - "integrity": "sha512-mJ5OegKGraY1FLvEa8FopRCr3pQrhDkcn5RNOjmgJQozENVeRaxhk0NwxYz7IojFvSDnKnc6lNQfKaaSe5pLHg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.11.2.tgz", + "integrity": "sha512-3xjOQL+LOOMzYqlgP9ROL0FQnzU8lGflgYewzau7AsDlFziSEtb49a9BpYo6zil4koC+QB8zQ9OHGFumG08T8w==", "requires": { - "@polkadot/util": "^12.3.1", - "@polkadot/x-bigint": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "@polkadot/x-bigint": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-create": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.9.1.tgz", - "integrity": "sha512-OVz50MGTTuiuVnRP/zAx4CTuLioc0hsiwNwqN2lNhmIJGtnQ4Vy/7mQRsIWehiYz6g0Vzzm5B3qWkTXO1NSN5w==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.11.2.tgz", + "integrity": "sha512-SJt23NxYvefRxVZZm6mT9ed1pR6FDoIGQ3xUpbjhTLfU2wuhpKjekMVorYQ6z/gK2JLMu2kV92Ardsz+6GX5XQ==", "requires": { - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-known": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.9.1.tgz", - "integrity": "sha512-zCMVWc4pJtkbMFPu72bD4IhvV/gkHXPX3C5uu92WdmCfnn0vEIEsMKWlVXVVvQQZKAqvs/awpqIfrUtEViOGEA==", - "requires": { - "@polkadot/networks": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.11.2.tgz", + "integrity": "sha512-kbEIX7NUQFxpDB0FFGNyXX/odY7jbp56RGD+Z4A731fW2xh/DgAQrI994xTzuh0c0EqPE26oQm3kATSpseqo9w==", + "requires": { + "@polkadot/networks": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-support": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.9.1.tgz", - "integrity": "sha512-XsieuLDsszvMZQlleacQBfx07i/JkwQV/UxH9q8Hz7Okmaz9pEVEW1h3ka2/cPuC7a4l32JhaORBUYshBZNdJg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.11.2.tgz", + "integrity": "sha512-X11hoykFYv/3efg4coZy2hUOUc97JhjQMJLzDhHniFwGLlYU8MeLnPdCVGkXx0xDDjTo4/ptS1XpZ5HYcg+gRw==", "requires": { - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/util": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.4.2.tgz", - "integrity": "sha512-NcTCbnIzMb/3TvJNEbaiu/9EvYIBuzDwZfqQ4hzL0GAptkF8aDkKMDCfQ/j3FI38rR+VTPQHNky9fvWglGKGRw==", - "requires": { - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-global": "12.4.2", - "@polkadot/x-textdecoder": "12.4.2", - "@polkadot/x-textencoder": "12.4.2", - "@types/bn.js": "^5.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.6.2.tgz", + "integrity": "sha512-l8TubR7CLEY47240uki0TQzFvtnxFIO7uI/0GoWzpYD/O62EIAMRsuY01N4DuwgKq2ZWD59WhzsLYmA5K6ksdw==", + "requires": { + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-global": "12.6.2", + "@polkadot/x-textdecoder": "12.6.2", + "@polkadot/x-textencoder": "12.6.2", + "@types/bn.js": "^5.1.5", "bn.js": "^5.2.1", "tslib": "^2.6.2" } }, "@polkadot/util-crypto": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.4.2.tgz", - "integrity": "sha512-JP7OrEKYx35P3wWc2Iu9F6BfYMIkywXik908zQqPxwoQhr8uDLP1Qoyu9Sws+hE97Yz1O4jBVvryS2le0yusog==", - "requires": { - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.1", - "@polkadot/networks": "12.4.2", - "@polkadot/util": "12.4.2", - "@polkadot/wasm-crypto": "^7.2.2", - "@polkadot/wasm-util": "^7.2.2", - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-randomvalues": "12.4.2", - "@scure/base": "1.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.6.2.tgz", + "integrity": "sha512-FEWI/dJ7wDMNN1WOzZAjQoIcCP/3vz3wvAp5QQm+lOrzOLj0iDmaIGIcBkz8HVm3ErfSe/uKP0KS4jgV/ib+Mg==", + "requires": { + "@noble/curves": "^1.3.0", + "@noble/hashes": "^1.3.3", + "@polkadot/networks": "12.6.2", + "@polkadot/util": "12.6.2", + "@polkadot/wasm-crypto": "^7.3.2", + "@polkadot/wasm-util": "^7.3.2", + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-randomvalues": "12.6.2", + "@scure/base": "^1.1.5", "tslib": "^2.6.2" + }, + "dependencies": { + "@noble/curves": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz", + "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==", + "requires": { + "@noble/hashes": "1.3.3" + } + }, + "@noble/hashes": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", + "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==" + } } }, "@polkadot/wasm-bridge": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.2.2.tgz", - "integrity": "sha512-CgNENd65DVYtackOVXXRA0D1RPoCv5+77IdBCf7kNqu6LeAnR4nfTI6qjaApUdN1xRweUsQjSH7tu7VjkMOA0A==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.3.2.tgz", + "integrity": "sha512-AJEXChcf/nKXd5Q/YLEV5dXQMle3UNT7jcXYmIffZAo/KI394a+/24PaISyQjoNC0fkzS1Q8T5pnGGHmXiVz2g==", "requires": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.2.2.tgz", - "integrity": "sha512-1ZY1rxUTawYm0m1zylvBMFovNIHYgG2v/XoASNp/EMG5c8FQIxCbhJRaTBA983GVq4lN/IAKREKEp9ZbLLqssA==", - "requires": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-init": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.3.2.tgz", + "integrity": "sha512-+neIDLSJ6jjVXsjyZ5oLSv16oIpwp+PxFqTUaZdZDoA2EyFRQB8pP7+qLsMNk+WJuhuJ4qXil/7XiOnZYZ+wxw==", + "requires": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-init": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto-asmjs": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.2.2.tgz", - "integrity": "sha512-wKg+cpsWQCTSVhjlHuNeB/184rxKqY3vaklacbLOMbUXieIfuDBav5PJdzS3yeiVE60TpYaHW4iX/5OYHS82gg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.3.2.tgz", + "integrity": "sha512-QP5eiUqUFur/2UoF2KKKYJcesc71fXhQFLT3D4ZjG28Mfk2ZPI0QNRUfpcxVQmIUpV5USHg4geCBNuCYsMm20Q==", "requires": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto-init": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.2.2.tgz", - "integrity": "sha512-vD4iPIp9x+SssUIWUenxWLPw4BVIwhXHNMpsV81egK990tvpyIxL205/EF5QRb1mKn8WfWcNFm5tYwwh9NdnnA==", - "requires": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.3.2.tgz", + "integrity": "sha512-FPq73zGmvZtnuJaFV44brze3Lkrki3b4PebxCy9Fplw8nTmisKo9Xxtfew08r0njyYh+uiJRAxPCXadkC9sc8g==", + "requires": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto-wasm": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.2.2.tgz", - "integrity": "sha512-3efoIB6jA3Hhv6k0YIBwCtlC8gCSWCk+R296yIXRLLr3cGN415KM/PO/d1JIXYI64lbrRzWRmZRhllw3jf6Atg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.3.2.tgz", + "integrity": "sha512-15wd0EMv9IXs5Abp1ZKpKKAVyZPhATIAHfKsyoWCEFDLSOA0/K0QGOxzrAlsrdUkiKZOq7uzSIgIDgW8okx2Mw==", "requires": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-util": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.2.2.tgz", - "integrity": "sha512-N/25960ifCc56sBlJZ2h5UBpEPvxBmMLgwYsl7CUuT+ea2LuJW9Xh8VHDN/guYXwmm92/KvuendYkEUykpm/JQ==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.3.2.tgz", + "integrity": "sha512-bmD+Dxo1lTZyZNxbyPE380wd82QsX+43mgCm40boyKrRppXEyQmWT98v/Poc7chLuskYb6X8IQ6lvvK2bGR4Tg==", "requires": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" } }, "@polkadot/x-bigint": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.4.2.tgz", - "integrity": "sha512-VRbkhdIf7CyWiUSyHemYi2fFWjBetUGyqpzsIHEclmzvqhKPfs7Kd2ZRdoXKU5QM56eD0sV2pyJxL34dv36/rw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.6.2.tgz", + "integrity": "sha512-HSIk60uFPX4GOFZSnIF7VYJz7WZA7tpFJsne7SzxOooRwMTWEtw3fUpFy5cYYOeLh17/kHH1Y7SVcuxzVLc74Q==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-fetch": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.4.2.tgz", - "integrity": "sha512-QEtYIUO6q6LupYkOl+vRwAkbBSSNHbALG8Y3+L/tFDubeXQl79vCkJFmsjhLewpsDIwTFTPNOwzA0ZEyb+0HZw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.6.2.tgz", + "integrity": "sha512-8wM/Z9JJPWN1pzSpU7XxTI1ldj/AfC8hKioBlUahZ8gUiJaOF7K9XEFCrCDLis/A1BoOu7Ne6WMx/vsJJIbDWw==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "node-fetch": "^3.3.2", "tslib": "^2.6.2" } }, "@polkadot/x-global": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.4.2.tgz", - "integrity": "sha512-CwbjSt1Grmn56xAj+hGC8ZB0uZxMl92K+VkBH0KxjgcbAX/D24ZD/0ds8pAnUYrO4aYHYq2j2MAGVSMdHcMBAQ==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.6.2.tgz", + "integrity": "sha512-a8d6m+PW98jmsYDtAWp88qS4dl8DyqUBsd0S+WgyfSMtpEXu6v9nXDgPZgwF5xdDvXhm+P0ZfVkVTnIGrScb5g==", "requires": { "tslib": "^2.6.2" } }, "@polkadot/x-randomvalues": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.4.2.tgz", - "integrity": "sha512-HVlXRWY9RfN54RgfDroDy2itWmtTUtr119DfPl3wjnBf9i4wl/M+848OYlmCZCTpViTJrvWVSEJH9zVgchlNnw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.6.2.tgz", + "integrity": "sha512-Vr8uG7rH2IcNJwtyf5ebdODMcr0XjoCpUbI91Zv6AlKVYOGKZlKLYJHIwpTaKKB+7KPWyQrk4Mlym/rS7v9feg==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-textdecoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.4.2.tgz", - "integrity": "sha512-cyUoKwdSIiBXAaWnGdMYqnaNHc5NV9skQh/fITis3ufKKi3pMwxJ5IwhhfDZpuKDl/3fDXF40Z3fqtTeUnoRXA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.6.2.tgz", + "integrity": "sha512-M1Bir7tYvNappfpFWXOJcnxUhBUFWkUFIdJSyH0zs5LmFtFdbKAeiDXxSp2Swp5ddOZdZgPac294/o2TnQKN1w==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-textencoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.4.2.tgz", - "integrity": "sha512-xrcwx55B2K7j9CnVucGLFl0qd5sb7W5Ei6dOsWgDnZNjZPBqsx9jTBQSBv9HmyHE4GEnF4z0rpO0msy3S7Sj9Q==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.6.2.tgz", + "integrity": "sha512-4N+3UVCpI489tUJ6cv3uf0PjOHvgGp9Dl+SZRLgFGt9mvxnvpW/7+XBADRMtlG4xi5gaRK7bgl5bmY6OMDsNdw==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-ws": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.4.2.tgz", - "integrity": "sha512-dYUtpbPa/JNd94tPAM9iHMzhR8MZ4wtOPh8gvueQRRYC8ZYQ9NPwjbBImY2FRfx7wCG1tFLAR6OEw4ToLLJNsA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.6.2.tgz", + "integrity": "sha512-cGZWo7K5eRRQCRl2LrcyCYsrc3lRbTlixZh3AzgU8uX4wASVGRlNWi/Hf4TtHNe1ExCDmxabJzdIsABIfrr7xw==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2", - "ws": "^8.13.0" + "ws": "^8.15.1" } }, "@scure/base": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz", - "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", + "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==" }, "@scure/bip32": { "version": "1.3.1", @@ -4665,22 +4754,13 @@ } }, "@substrate/connect": { - "version": "0.7.26", - "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.26.tgz", - "integrity": "sha512-uuGSiroGuKWj1+38n1kY5HReer5iL9bRwPCzuoLtqAOmI1fGI0hsSI2LlNQMAbfRgr7VRHXOk5MTuQf5ulsFRw==", + "version": "0.7.35", + "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.35.tgz", + "integrity": "sha512-Io8vkalbwaye+7yXfG1Nj52tOOoJln2bMlc7Q9Yy3vEWqZEVkgKmcPVzbwV0CWL3QD+KMPDA2Dnw/X7EdwgoLw==", "optional": true, "requires": { "@substrate/connect-extension-protocol": "^1.0.1", - "eventemitter3": "^4.0.7", - "smoldot": "1.0.4" - }, - "dependencies": { - "eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "optional": true - } + "smoldot": "2.0.7" } }, "@substrate/connect-extension-protocol": { @@ -4690,9 +4770,9 @@ "optional": true }, "@substrate/ss58-registry": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz", - "integrity": "sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==" + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.45.0.tgz", + "integrity": "sha512-NHmOkILimbLRPKvpnR+JGVckc1q4AJjxz9FnzZ3dKAVBL17AKknDy2FxXcwlJbmOXl9u7W3FS3bLDHgfKi4tQw==" }, "@tsconfig/node10": { "version": "1.0.8", @@ -4719,17 +4799,17 @@ "dev": true }, "@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz", + "integrity": "sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==", "requires": { "@types/node": "*" } }, "@types/chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==", + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", + "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", "dev": true }, "@types/glob": { @@ -4749,20 +4829,23 @@ "dev": true }, "@types/mocha": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz", - "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", + "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, "@types/node": { - "version": "20.5.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", - "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==" + "version": "20.10.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz", + "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==", + "requires": { + "undici-types": "~5.26.4" + } }, "@types/shelljs": { - "version": "0.8.12", - "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.12.tgz", - "integrity": "sha512-ZA8U81/gldY+rR5zl/7HSHrG2KDfEb3lzG6uCUDhW1DTQE9yC/VBQ45fXnXq8f3CgInfhZmjtdu/WOUlrXRQUg==", + "version": "0.8.15", + "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.15.tgz", + "integrity": "sha512-vzmnCHl6hViPu9GNLQJ+DZFd6BQI2DBTUeOvYHqkWQLMfKAAQYMb/xAmZkTogZI/vqXHCWkqDRymDI5p0QTi5Q==", "dev": true, "requires": { "@types/glob": "~7.2.0", @@ -4770,9 +4853,9 @@ } }, "@types/tcp-port-used": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/tcp-port-used/-/tcp-port-used-1.0.1.tgz", - "integrity": "sha512-6pwWTx8oUtWvsiZUCrhrK/53MzKVLnuNSSaZILPy3uMes9QnTrLMar9BDlJArbMOjDcjb3QXFk6Rz8qmmuySZw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/tcp-port-used/-/tcp-port-used-1.0.4.tgz", + "integrity": "sha512-0vQ4fz9TTM4bCdllYWEJ2JHBUXR9xqPtc70dJ7BMRDVfvZyYdrgey3nP5RRcVj+qAgnHJM8r9fvgrfnPMxdnhA==", "dev": true }, "@types/ws": { @@ -4784,9 +4867,9 @@ } }, "@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -4798,6 +4881,12 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, + "abitype": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.7.1.tgz", + "integrity": "sha512-VBkRHTDZf9Myaek/dO3yMmOzB/y2s3Zo6nVU7yaw1G+TvCHAjwaJzNGN9yo4K5D8bU/VZXKP1EJpRhFr862PlQ==", + "requires": {} + }, "acorn": { "version": "8.7.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", @@ -4875,11 +4964,11 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, "axios": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", - "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -4950,12 +5039,13 @@ } }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" } }, "camelcase": { @@ -4965,18 +5055,18 @@ "dev": true }, "chai": { - "version": "4.3.8", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz", - "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.0.tgz", + "integrity": "sha512-x9cHNq1uvkCdU+5xTkNh5WtgD4e4yDFCsp9jVc7N7qVeKeftv3gO/ZrviX5d+3ZfxdYnZXZYujjRInu1RogU6A==", "dev": true, "requires": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" } }, "chalk": { @@ -5007,10 +5097,13 @@ "dev": true }, "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "requires": { + "get-func-name": "^2.0.2" + } }, "chokidar": { "version": "3.5.3", @@ -5079,9 +5172,9 @@ "dev": true }, "cross-fetch": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", - "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "requires": { "node-fetch": "^2.6.12" }, @@ -5129,6 +5222,16 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, + "define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -5267,9 +5370,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==" }, "for-each": { "version": "0.3.3", @@ -5310,9 +5413,9 @@ "optional": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "get-caller-file": { "version": "2.0.5", @@ -5327,14 +5430,14 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "glob": { @@ -5382,6 +5485,14 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "requires": { + "get-intrinsic": "^1.2.2" + } + }, "has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", @@ -5409,6 +5520,14 @@ "minimalistic-assert": "^1.0.1" } }, + "hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "requires": { + "function-bind": "^1.1.2" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -5584,11 +5703,6 @@ "p-locate": "^5.0.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -5600,12 +5714,12 @@ } }, "loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, "requires": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "make-error": { @@ -5701,9 +5815,9 @@ } }, "mock-socket": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.0.tgz", - "integrity": "sha512-TFaQaIxXbzNke3z9nhSnMJFQn8l7QPmF+Luhh8MPHqkmr6B4fPquOTSILCjGUyxDBPv9AFxuaTGmRINDHDmkdQ==" + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.1.tgz", + "integrity": "sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw==" }, "ms": { "version": "2.1.2", @@ -5717,13 +5831,12 @@ "dev": true }, "nock": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz", - "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "requires": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" } }, @@ -5781,12 +5894,6 @@ "p-limit": "^3.0.2" } }, - "pako": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==", - "optional": true - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -5895,6 +6002,17 @@ "randombytes": "^2.1.0" } }, + "set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "requires": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -5926,12 +6044,11 @@ } }, "smoldot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-1.0.4.tgz", - "integrity": "sha512-N3TazI1C4GGrseFH/piWyZCCCRJTRx2QhDfrUKRT4SzILlW5m8ayZ3QTKICcz1C/536T9cbHHJyP7afxI6Mi1A==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-2.0.7.tgz", + "integrity": "sha512-VAOBqEen6vises36/zgrmAT1GWk2qE3X8AGnO7lmQFdskbKx8EovnwS22rtPAG+Y1Rk23/S22kDJUdPANyPkBA==", "optional": true, "requires": { - "pako": "^2.0.4", "ws": "^8.8.1" } }, @@ -6009,9 +6126,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", @@ -6058,10 +6175,14 @@ "dev": true }, "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "dev": true + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==" + }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "utf-8-validate": { "version": "5.0.10", @@ -6092,235 +6213,236 @@ "dev": true }, "web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz", + "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==" }, "web3": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-4.1.1.tgz", - "integrity": "sha512-vnPll2G+ZNktSu7oJVjAW0QYuY0kPHLs8LQMifml4kTR+hqhiTmzMIzO8FqkcsESLEu6H9R7Acj6EgyeU1hruQ==", - "requires": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-eth-contract": "^4.0.5", - "web3-eth-ens": "^4.0.5", - "web3-eth-iban": "^4.0.5", - "web3-eth-personal": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-4.3.0.tgz", + "integrity": "sha512-YiLCsb5wmgJlSxRLzt7Z7H+CmlVVIKD8VaUQaZ+xKVG3Q7CpsO5Z6jmeKnlr6M9c6fDDsDnRM6G8g+nchZehbA==", + "requires": { + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-contract": "^4.1.4", + "web3-eth-ens": "^4.0.8", + "web3-eth-iban": "^4.0.7", + "web3-eth-personal": "^4.0.8", + "web3-net": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" } }, "web3-core": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.1.1.tgz", - "integrity": "sha512-wzS01bC+ihf5DJ6mz2fz4d5yxnPEM5AYQIRihO8kUt3dil+X4V07CHks23wLbb9yk8U9+3a1Iod207WGF872rA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.3.2.tgz", + "integrity": "sha512-uIMVd/j4BgOnwfpY8ZT+QKubOyM4xohEhFZXz9xB8wimXWMMlYVlIK/TbfHqFolS9uOerdSGhsMbcK9lETae8g==", "requires": { - "web3-errors": "^1.1.1", - "web3-eth-iban": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ipc": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-iban": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ipc": "^4.0.7", + "web3-providers-ws": "^4.0.7", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" } }, "web3-errors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.1.tgz", - "integrity": "sha512-9IEhcympCJEK3Nmkz2oE/daKnOh+3CxHceuVWWRkHWKUfuIiJQgXAv9wRkPGk63JJTP/R9jtGmP+IbkScKoTBA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.4.tgz", + "integrity": "sha512-WahtszSqILez+83AxGecVroyZsMuuRT+KmQp4Si5P4Rnqbczno1k748PCrZTS1J4UCPmXMG2/Vt+0Bz2zwXkwQ==", "requires": { - "web3-types": "^1.1.1" + "web3-types": "^1.3.1" } }, "web3-eth": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.1.1.tgz", - "integrity": "sha512-0lftXINbeEOiYhHCWIKgeAOPnjoeHR8DTWLOjURDoz5CKbTj2wfcRQvuL6tUfvvVmrGWHEfIOncM30jhjlTxYQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.3.1.tgz", + "integrity": "sha512-zJir3GOXooHQT85JB8SrufE+Voo5TtXdjhf1D8IGXmxM8MrhI8AT+Pgt4siBTupJcu5hF17iGmTP/Nj2XnaibQ==", "requires": { "setimmediate": "^1.0.5", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-net": "^4.0.7", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-abi": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.1.tgz", - "integrity": "sha512-dOLwJ7Ua98WMXuxk7anYfSIqkuCdUvrvU/Um/OWPb6Gw10QciKUWXMIiRobNpWkpS8R77nDtecmQQ1OnTnLaNA==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.4.tgz", + "integrity": "sha512-YLOBVVxxxLYKXjaiwZjEWYEnkMmmrm0nswZsvzSsINy/UgbWbzfoiZU+zn4YNWIEhORhx1p37iS3u/dP6VyC2w==", "requires": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "abitype": "0.7.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-accounts": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.0.5.tgz", - "integrity": "sha512-cmaAH20zFe/7Xjga7EuRXL0UV4O894i6ElEXB9Cqd9fP/CBnhQYK/TYuU37xydHhs5WY+B0hKeaoTqxLaPWAYg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.1.0.tgz", + "integrity": "sha512-UFtAsOANsvihTQ6SSvOKguupmQkResyR9M9JNuOxYpKh7+3W+sTnbLXw2UbOSYIsKlc1mpqqW9bVr1SjqHDpUQ==", "requires": { "@ethereumjs/rlp": "^4.0.1", "crc-32": "^1.2.2", "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-contract": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.0.5.tgz", - "integrity": "sha512-gS21liRDutWQX9i+Ru2Porzefx+7AumRvk+ZLR9wy8l9iLZxldvsvMdgbsyf9lA7UHOqPEhg/zoDyEc0N0hAVw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.1.4.tgz", + "integrity": "sha512-tJ4z6QLgtu8EQu2sXnLA7g427oxmngnbAUh+9kJKbP6Yep/oe+z79PqJv7H3MwqwUNW9T+/FeB2PnSQSyxz6ig==", "requires": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" } }, "web3-eth-ens": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.5.tgz", - "integrity": "sha512-PBTCk7h3NlSKP9XWmUJbpTJfMK3IybMAjn+uKrvSbeP50/xaZ73s94nI0eaRmI2FxlSQwTsd7apxXzrE07iKJw==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.8.tgz", + "integrity": "sha512-nj0JfeD45BbzVJcVYpUJnSo8iwDcY9CQ7CZhhIVVOFjvpMAPw0zEwjTvZEIQyCW61OoDG9xcBzwxe2tZoYhMRw==", "requires": { "@adraffy/ens-normalize": "^1.8.8", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-contract": "^4.0.5", - "web3-net": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth": "^4.3.1", + "web3-eth-contract": "^4.1.2", + "web3-net": "^4.0.7", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-iban": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.5.tgz", - "integrity": "sha512-rAH4Dsk0G90W8UqQFomGNjLfxKhBJwkSnkjdG7TUCRhoFvqvrsW1YL+4a+UoODRyJ9BCdaRR71jrymmy4UTDHA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.7.tgz", + "integrity": "sha512-8weKLa9KuKRzibC87vNLdkinpUE30gn0IGY027F8doeJdcPUfsa4IlBgNC4k4HLBembBB2CTU0Kr/HAOqMeYVQ==", "requires": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-personal": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.5.tgz", - "integrity": "sha512-cypChpAaljYtd1fOfjvhDvty7SBdUvwz5hSimwb+81IJ4MtWc7Jdbn1Ka/g0ZxwoAm46OmeV0yHef7+QyfbpsQ==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.8.tgz", + "integrity": "sha512-sXeyLKJ7ddQdMxz1BZkAwImjqh7OmKxhXoBNF3isDmD4QDpMIwv/t237S3q4Z0sZQamPa/pHebJRWVuvP8jZdw==", "requires": { - "web3-core": "^4.1.1", - "web3-eth": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-eth": "^4.3.1", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-net": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.5.tgz", - "integrity": "sha512-7Ir+Da5z3I3KxUn7nmg6NcXxWADYnQAkHX7Z4u4NE3yA+gNbiwPUjVpvSgzpNoDZj+EFovvP1AuOR5idHvyE0g==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.7.tgz", + "integrity": "sha512-SzEaXFrBjY25iQGk5myaOfO9ZyfTwQEa4l4Ps4HDNVMibgZji3WPzpjq8zomVHMwi8bRp6VV7YS71eEsX7zLow==", "requires": { - "web3-core": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-core": "^4.3.0", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" } }, "web3-providers-http": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.0.5.tgz", - "integrity": "sha512-JAY0GyLqRKbKw7m92EMg84otLU6N/NmYqepPid7B8XcPkGzhK6R/FsATyi+BGe2ecW9HRyCSz9SWllTjlKhRwQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.1.0.tgz", + "integrity": "sha512-6qRUGAhJfVQM41E5t+re5IHYmb5hSaLc02BE2MaRQsz2xKA6RjmHpOA5h/+ojJxEpI9NI2CrfDKOAgtJfoUJQg==", "requires": { - "cross-fetch": "^3.1.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "cross-fetch": "^4.0.0", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" } }, "web3-providers-ipc": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.5.tgz", - "integrity": "sha512-1mJWqBnKbQ6UGHVxuXDJRpw4NwkpJ7NabyF2XBmzctzFHKvzE0X1dAocy3tih49J38d0vKrmubTOqxxkMpq49Q==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.7.tgz", + "integrity": "sha512-YbNqY4zUvIaK2MHr1lQFE53/8t/ejHtJchrWn9zVbFMGXlTsOAbNoIoZWROrg1v+hCBvT2c9z8xt7e/+uz5p1g==", "optional": true, "requires": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" } }, "web3-providers-ws": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.5.tgz", - "integrity": "sha512-v9xE16Jjczy+7jMKY7rwTuXgwGK51NKvCGdFERPPcSNJCkS5YCBq9DpzJe8mcr5QhuhnTeGeQ7XmcjTzDRkwnQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.7.tgz", + "integrity": "sha512-n4Dal9/rQWjS7d6LjyEPM2R458V8blRm0eLJupDEJOOIBhGYlxw5/4FthZZ/cqB7y/sLVi7K09DdYx2MeRtU5w==", "requires": { "@types/ws": "8.5.3", "isomorphic-ws": "^5.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", "ws": "^8.8.1" } }, "web3-rpc-methods": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.1.tgz", - "integrity": "sha512-aAhm1eIKPWWBRf+BrYpKcvQX5qAg1LOU6NhriY0xpXJh01hbwkz0Q8rMJfCCjlGAElYHSp2K/odyAmyKRDr0LQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.4.tgz", + "integrity": "sha512-LTFNg4LFaeU8K9ecuT8fHDp/LOXyxCneeZjCrRYIW1u82Ly52SrY55FIzMIISGoG/iT5Wh7UiHOB3CQsWLBmbQ==", "requires": { - "web3-core": "^4.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" } }, "web3-types": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.1.1.tgz", - "integrity": "sha512-bXmIPJi/NPed43JBcya71gT+euZSMvfQx6NYv8G97PSNxR1HWwANYBKbamTZvzBbq10QCwQLh0hZw3tyOXuPFA==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.3.1.tgz", + "integrity": "sha512-8fXi7h/t95VKRtgU4sxprLPZpsTh3jYDfSghshIDBgUD/OoGe5S+syP24SUzBZYllZ/L+hMr2gdp/0bGJa8pYQ==" }, "web3-utils": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.0.5.tgz", - "integrity": "sha512-43xIM7rr3htYNzliVQLpWLQmEf4XX8IXgjvqLcEuC/xje14O5UQM4kamRCtz8v3JZN3X6QTfsV6Zgby67mVmCg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.1.0.tgz", + "integrity": "sha512-+VJWR6FtCsgwuJr5tvSvQlSEG06586df8h2CxGc9tcNtIDyJKNkSDDWJkdNPvyDhhXFzQYFh8QOGymD1CIP6fw==", "requires": { "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" } }, "web3-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.1.tgz", - "integrity": "sha512-RIdZCNhceBEOQpmzcEk6K3qqLHRfDIMkg2PJe7yllpuEc0fa0cmUZgGUl1FEnioc5Rx9GBEE8eTllaneIAiiQQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.3.tgz", + "integrity": "sha512-fJbAQh+9LSNWy+l5Ze6HABreml8fra98o5+vS073T35jUcLbRZ0IOjF/ZPJhJNbJDt+jP1vseZsc3z3uX9mxxQ==", "requires": { "ethereum-cryptography": "^2.0.0", "util": "^0.12.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", "zod": "^3.21.4" } }, @@ -6339,12 +6461,12 @@ } }, "which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "requires": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -6373,9 +6495,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "requires": {} }, "y18n": { diff --git a/tests/package.json b/tests/package.json index cf992fbe..45dee99b 100644 --- a/tests/package.json +++ b/tests/package.json @@ -18,26 +18,26 @@ "url": "git+https://github.com/bifrost-platform/bifrost-node.git" }, "dependencies": { - "@polkadot/api": "10.9.1", - "axios": "1.6.3", + "@polkadot/api": "10.11.2", + "axios": "1.6.5", "bignumber.js": "9.1.2", "ethers": "5.7.2", "shelljs": "0.8.5", "tcp-port-used": "1.0.2", - "web3": "4.1.1" + "web3": "4.3.0" }, "devDependencies": { - "@types/chai": "4.3.6", - "@types/mocha": "10.0.1", - "@types/node": "20.5.9", - "@types/shelljs": "0.8.12", - "@types/tcp-port-used": "1.0.1", - "@types/yargs": "17.0.24", - "chai": "4.3.8", + "@types/chai": "4.3.11", + "@types/mocha": "10.0.6", + "@types/node": "20.10.8", + "@types/shelljs": "0.8.15", + "@types/tcp-port-used": "1.0.4", + "@types/yargs": "17.0.32", + "chai": "4.4.0", "char": "1.0.2", "mocha": "10.2.0", - "ts-node": "10.9.1", + "ts-node": "10.9.2", "ts-node-register": "1.0.0", - "typescript": "5.2.2" + "typescript": "5.3.3" } } diff --git a/tools/package-lock.json b/tools/package-lock.json index 9d92f065..6cb4f139 100644 --- a/tools/package-lock.json +++ b/tools/package-lock.json @@ -8,27 +8,27 @@ "name": "@bifrost-platform/bifrost-node", "version": "1.3.0", "dependencies": { - "@polkadot/api": "10.9.1", - "axios": "1.6.3", + "@polkadot/api": "10.11.2", + "axios": "1.6.5", "bignumber.js": "9.1.2", "gauge": "5.0.1", "shelljs": "0.8.5", - "web3": "4.1.1", + "web3": "4.3.0", "yargs": "17.7.2" }, "devDependencies": { - "@types/gauge": "5.0.0", - "@types/node": "20.2.1", - "@types/yargs": "17.0.24", - "ts-node": "10.9.1", + "@types/gauge": "5.0.4", + "@types/node": "20.11.0", + "@types/yargs": "17.0.32", + "ts-node": "10.9.2", "ts-node-register": "1.0.0", - "typescript": "5.0.4" + "typescript": "5.3.3" } }, "node_modules/@adraffy/ens-normalize": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz", - "integrity": "sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==" + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz", + "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==" }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", @@ -53,380 +53,6 @@ "node": ">=14" } }, - "node_modules/@ethersproject/abi": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/@ethersproject/abstract-provider": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0" - } - }, - "node_modules/@ethersproject/abstract-signer": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "node_modules/@ethersproject/address": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/rlp": "^5.7.0" - } - }, - "node_modules/@ethersproject/base64": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0" - } - }, - "node_modules/@ethersproject/bignumber": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.7.0.tgz", - "integrity": "sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "bn.js": "^5.2.1" - } - }, - "node_modules/@ethersproject/bytes": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.7.0.tgz", - "integrity": "sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/constants": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.7.0.tgz", - "integrity": "sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0" - } - }, - "node_modules/@ethersproject/hash": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/@ethersproject/keccak256": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.7.0.tgz", - "integrity": "sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "js-sha3": "0.8.0" - } - }, - "node_modules/@ethersproject/logger": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.7.0.tgz", - "integrity": "sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ] - }, - "node_modules/@ethersproject/networks": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/properties": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/rlp": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/signing-key": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "bn.js": "^5.2.1", - "elliptic": "6.5.4", - "hash.js": "1.1.7" - } - }, - "node_modules/@ethersproject/strings": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.7.0.tgz", - "integrity": "sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/transactions": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0" - } - }, - "node_modules/@ethersproject/web": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", @@ -453,20 +79,20 @@ } }, "node_modules/@noble/curves": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz", - "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz", + "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==", "dependencies": { - "@noble/hashes": "1.3.1" + "@noble/hashes": "1.3.3" }, "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/@noble/hashes": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", - "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", + "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==", "engines": { "node": ">= 16" }, @@ -475,306 +101,306 @@ } }, "node_modules/@polkadot/api": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.9.1.tgz", - "integrity": "sha512-ND/2UqZBWvtt4PfV03OStTKg0mxmPk4UpMAgJKutdgsz/wP9CYJ1KbjwFgPNekL9JnzbKQsWyQNPVrcw7kQk8A==", - "dependencies": { - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/api-derive": "10.9.1", - "@polkadot/keyring": "^12.3.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/types-known": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.11.2.tgz", + "integrity": "sha512-AorCZxCWCoTtdbl4DPUZh+ACe/pbLIS1BkdQY0AFJuZllm0x/yWzjgampcPd5jQAA/O3iKShRBkZqj6Mk9yG/A==", + "dependencies": { + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/api-derive": "10.11.2", + "@polkadot/keyring": "^12.6.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/types-known": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "eventemitter3": "^5.0.1", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/api-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.9.1.tgz", - "integrity": "sha512-kRZZvCFVcN4hAH4dJ+Qzfdy27/4EEq3oLDf3ihj0LTVrAezSWcKPGE3EVFy+Mn6Lo4SUc7RVyoKvIUhSk2l4Dg==", - "dependencies": { - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.11.2.tgz", + "integrity": "sha512-PTpnqpezc75qBqUtgrc0GYB8h9UHjfbHSRZamAbecIVAJ2/zc6CqtnldeaBlIu1IKTgBzi3FFtTyYu+ZGbNT2Q==", + "dependencies": { + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/api-base": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.9.1.tgz", - "integrity": "sha512-Q3m2KzlceMK2kX8bhnUZWk3RT6emmijeeFZZQgCePpEcrSeNjnqG4qjuTPgkveaOkUT8MAoDc5Avuzcc2jlW9g==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.11.2.tgz", + "integrity": "sha512-4LIjaUfO9nOzilxo7XqzYKCNMtmUypdk8oHPdrRnSjKEsnK7vDsNi+979z2KXNXd2KFSCFHENmI523fYnMnReg==", "dependencies": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/api-derive": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.9.1.tgz", - "integrity": "sha512-mRud1UZCFIc4Z63qAoGSIHh/foyUYADfy1RQYCmPpeFKfIdCIrHpd7xFdJXTOMYOS0BwlM6u4qli/ZT4XigezQ==", - "dependencies": { - "@polkadot/api": "10.9.1", - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.11.2.tgz", + "integrity": "sha512-m3BQbPionkd1iSlknddxnL2hDtolPIsT+aRyrtn4zgMRPoLjHFmTmovvg8RaUyYofJtZeYrnjMw0mdxiSXx7eA==", + "dependencies": { + "@polkadot/api": "10.11.2", + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/keyring": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.4.2.tgz", - "integrity": "sha512-VH91feSL6GiVVLcJ6V8h6jIAuq62bfvhM75AMcjTFol6MDqFl25jdjkHfZ2bQhig330LIhLw89nKdYr2/OfwjA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.6.2.tgz", + "integrity": "sha512-O3Q7GVmRYm8q7HuB3S0+Yf/q/EB2egKRRU3fv9b3B7V+A52tKzA+vIwEmNVaD1g5FKW9oB97rmpggs0zaKFqHw==", "dependencies": { - "@polkadot/util": "12.4.2", - "@polkadot/util-crypto": "12.4.2", + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "12.4.2", - "@polkadot/util-crypto": "12.4.2" + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2" } }, "node_modules/@polkadot/networks": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.4.2.tgz", - "integrity": "sha512-dd7vss+86kpOyy/C+DuCWChGfhwHBHtrzJ9ArbbpY75qc8SqdP90lj/c13ZCHr5I1l+coy31gyyMj5i6ja1Dpg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.6.2.tgz", + "integrity": "sha512-1oWtZm1IvPWqvMrldVH6NI2gBoCndl5GEwx7lAuQWGr7eNL+6Bdc5K3Z9T0MzFvDGoi2/CBqjX9dRKo39pDC/w==", "dependencies": { - "@polkadot/util": "12.4.2", - "@substrate/ss58-registry": "^1.43.0", + "@polkadot/util": "12.6.2", + "@substrate/ss58-registry": "^1.44.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/rpc-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.9.1.tgz", - "integrity": "sha512-MaLHkNlyqN20ZRYr6uNd1BZr1OsrnX9qLAmsl0mcrri1vPGRH6VHjfFH1RBLkikpWD82v17g0l2hLwdV1ZHMcw==", - "dependencies": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.11.2.tgz", + "integrity": "sha512-9AhT0WW81/8jYbRcAC6PRmuxXqNhJje8OYiulBQHbG1DTCcjAfz+6VQBke9BwTStzPq7d526+yyBKD17O3zlAA==", + "dependencies": { + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/rpc-core": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.9.1.tgz", - "integrity": "sha512-ZtA8B8SfXSAwVkBlCcKRHw0eSM7ec/sbiNOM5GasXPeRujUgT7lOwSH2GbUZSqe9RfRDMp6DvO9c2JoGc3LLWw==", - "dependencies": { - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.11.2.tgz", + "integrity": "sha512-Ot0CFLWx8sZhLZog20WDuniPA01Bk2StNDsdAQgcFKPwZw6ShPaZQCHuKLQK6I6DodOrem9FXX7c1hvoKJP5Ww==", + "dependencies": { + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/rpc-provider": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.9.1.tgz", - "integrity": "sha512-4QzT2QzD+320+eT6b79sGAA85Tt3Bb8fQvse4r5Mom2iiBd2SO81vOhxSAOaIe4GUsw25VzFJmsbe7+OObItdg==", - "dependencies": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-support": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", - "@polkadot/x-fetch": "^12.3.1", - "@polkadot/x-global": "^12.3.1", - "@polkadot/x-ws": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.11.2.tgz", + "integrity": "sha512-he5jWMpDJp7e+vUzTZDzpkB7ps3H8psRally+/ZvZZScPvFEjfczT7I1WWY9h58s8+ImeVP/lkXjL9h/gUOt3Q==", + "dependencies": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-support": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "@polkadot/x-fetch": "^12.6.2", + "@polkadot/x-global": "^12.6.2", + "@polkadot/x-ws": "^12.6.2", "eventemitter3": "^5.0.1", - "mock-socket": "^9.2.1", - "nock": "^13.3.1", - "tslib": "^2.5.3" + "mock-socket": "^9.3.1", + "nock": "^13.4.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "optionalDependencies": { - "@substrate/connect": "0.7.26" + "@substrate/connect": "0.7.35" } }, "node_modules/@polkadot/types": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.9.1.tgz", - "integrity": "sha512-AG33i2ZGGfq7u+5rkAdGrXAQHHl844/Yv+junH5ZzX69xiCoWO1bH/yzDUNBdpki2GlACWvF9nLYh3F2tVF93w==", - "dependencies": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.11.2.tgz", + "integrity": "sha512-d52j3xXni+C8GdYZVTSfu8ROAnzXFMlyRvXtor0PudUc8UQHOaC4+mYAkTBGA2gKdmL8MHSfRSbhcxHhsikY6Q==", + "dependencies": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.9.1.tgz", - "integrity": "sha512-OY9/jTMFRFqYdkUnfcGwqMLC64A0Q25bjvCuVQCVjsPFKE3wl0Kt5rNT01eV2UmLXrR6fY0xWbR2w80bLA7CIQ==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.11.2.tgz", + "integrity": "sha512-8eB8ew04wZiE5GnmFvEFW1euJWmF62SGxb1O+8wL3zoUtB9Xgo1vB6w6xbTrd+HLV6jNSeXXnbbF1BEUvi9cNg==", "dependencies": { - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-codec": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.9.1.tgz", - "integrity": "sha512-mJ5OegKGraY1FLvEa8FopRCr3pQrhDkcn5RNOjmgJQozENVeRaxhk0NwxYz7IojFvSDnKnc6lNQfKaaSe5pLHg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.11.2.tgz", + "integrity": "sha512-3xjOQL+LOOMzYqlgP9ROL0FQnzU8lGflgYewzau7AsDlFziSEtb49a9BpYo6zil4koC+QB8zQ9OHGFumG08T8w==", "dependencies": { - "@polkadot/util": "^12.3.1", - "@polkadot/x-bigint": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "@polkadot/x-bigint": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-create": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.9.1.tgz", - "integrity": "sha512-OVz50MGTTuiuVnRP/zAx4CTuLioc0hsiwNwqN2lNhmIJGtnQ4Vy/7mQRsIWehiYz6g0Vzzm5B3qWkTXO1NSN5w==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.11.2.tgz", + "integrity": "sha512-SJt23NxYvefRxVZZm6mT9ed1pR6FDoIGQ3xUpbjhTLfU2wuhpKjekMVorYQ6z/gK2JLMu2kV92Ardsz+6GX5XQ==", "dependencies": { - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-known": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.9.1.tgz", - "integrity": "sha512-zCMVWc4pJtkbMFPu72bD4IhvV/gkHXPX3C5uu92WdmCfnn0vEIEsMKWlVXVVvQQZKAqvs/awpqIfrUtEViOGEA==", - "dependencies": { - "@polkadot/networks": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.11.2.tgz", + "integrity": "sha512-kbEIX7NUQFxpDB0FFGNyXX/odY7jbp56RGD+Z4A731fW2xh/DgAQrI994xTzuh0c0EqPE26oQm3kATSpseqo9w==", + "dependencies": { + "@polkadot/networks": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/types-support": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.9.1.tgz", - "integrity": "sha512-XsieuLDsszvMZQlleacQBfx07i/JkwQV/UxH9q8Hz7Okmaz9pEVEW1h3ka2/cPuC7a4l32JhaORBUYshBZNdJg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.11.2.tgz", + "integrity": "sha512-X11hoykFYv/3efg4coZy2hUOUc97JhjQMJLzDhHniFwGLlYU8MeLnPdCVGkXx0xDDjTo4/ptS1XpZ5HYcg+gRw==", "dependencies": { - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/util": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.4.2.tgz", - "integrity": "sha512-NcTCbnIzMb/3TvJNEbaiu/9EvYIBuzDwZfqQ4hzL0GAptkF8aDkKMDCfQ/j3FI38rR+VTPQHNky9fvWglGKGRw==", - "dependencies": { - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-global": "12.4.2", - "@polkadot/x-textdecoder": "12.4.2", - "@polkadot/x-textencoder": "12.4.2", - "@types/bn.js": "^5.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.6.2.tgz", + "integrity": "sha512-l8TubR7CLEY47240uki0TQzFvtnxFIO7uI/0GoWzpYD/O62EIAMRsuY01N4DuwgKq2ZWD59WhzsLYmA5K6ksdw==", + "dependencies": { + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-global": "12.6.2", + "@polkadot/x-textdecoder": "12.6.2", + "@polkadot/x-textencoder": "12.6.2", + "@types/bn.js": "^5.1.5", "bn.js": "^5.2.1", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/util-crypto": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.4.2.tgz", - "integrity": "sha512-JP7OrEKYx35P3wWc2Iu9F6BfYMIkywXik908zQqPxwoQhr8uDLP1Qoyu9Sws+hE97Yz1O4jBVvryS2le0yusog==", - "dependencies": { - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.1", - "@polkadot/networks": "12.4.2", - "@polkadot/util": "12.4.2", - "@polkadot/wasm-crypto": "^7.2.2", - "@polkadot/wasm-util": "^7.2.2", - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-randomvalues": "12.4.2", - "@scure/base": "1.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.6.2.tgz", + "integrity": "sha512-FEWI/dJ7wDMNN1WOzZAjQoIcCP/3vz3wvAp5QQm+lOrzOLj0iDmaIGIcBkz8HVm3ErfSe/uKP0KS4jgV/ib+Mg==", + "dependencies": { + "@noble/curves": "^1.3.0", + "@noble/hashes": "^1.3.3", + "@polkadot/networks": "12.6.2", + "@polkadot/util": "12.6.2", + "@polkadot/wasm-crypto": "^7.3.2", + "@polkadot/wasm-util": "^7.3.2", + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-randomvalues": "12.6.2", + "@scure/base": "^1.1.5", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "12.4.2" + "@polkadot/util": "12.6.2" } }, "node_modules/@polkadot/wasm-bridge": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.2.2.tgz", - "integrity": "sha512-CgNENd65DVYtackOVXXRA0D1RPoCv5+77IdBCf7kNqu6LeAnR4nfTI6qjaApUdN1xRweUsQjSH7tu7VjkMOA0A==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.3.2.tgz", + "integrity": "sha512-AJEXChcf/nKXd5Q/YLEV5dXQMle3UNT7jcXYmIffZAo/KI394a+/24PaISyQjoNC0fkzS1Q8T5pnGGHmXiVz2g==", "dependencies": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", @@ -782,19 +408,19 @@ } }, "node_modules/@polkadot/wasm-crypto": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.2.2.tgz", - "integrity": "sha512-1ZY1rxUTawYm0m1zylvBMFovNIHYgG2v/XoASNp/EMG5c8FQIxCbhJRaTBA983GVq4lN/IAKREKEp9ZbLLqssA==", - "dependencies": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-init": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.3.2.tgz", + "integrity": "sha512-+neIDLSJ6jjVXsjyZ5oLSv16oIpwp+PxFqTUaZdZDoA2EyFRQB8pP7+qLsMNk+WJuhuJ4qXil/7XiOnZYZ+wxw==", + "dependencies": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-init": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", @@ -802,32 +428,32 @@ } }, "node_modules/@polkadot/wasm-crypto-asmjs": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.2.2.tgz", - "integrity": "sha512-wKg+cpsWQCTSVhjlHuNeB/184rxKqY3vaklacbLOMbUXieIfuDBav5PJdzS3yeiVE60TpYaHW4iX/5OYHS82gg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.3.2.tgz", + "integrity": "sha512-QP5eiUqUFur/2UoF2KKKYJcesc71fXhQFLT3D4ZjG28Mfk2ZPI0QNRUfpcxVQmIUpV5USHg4geCBNuCYsMm20Q==", "dependencies": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/wasm-crypto-init": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.2.2.tgz", - "integrity": "sha512-vD4iPIp9x+SssUIWUenxWLPw4BVIwhXHNMpsV81egK990tvpyIxL205/EF5QRb1mKn8WfWcNFm5tYwwh9NdnnA==", - "dependencies": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.3.2.tgz", + "integrity": "sha512-FPq73zGmvZtnuJaFV44brze3Lkrki3b4PebxCy9Fplw8nTmisKo9Xxtfew08r0njyYh+uiJRAxPCXadkC9sc8g==", + "dependencies": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", @@ -835,133 +461,130 @@ } }, "node_modules/@polkadot/wasm-crypto-wasm": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.2.2.tgz", - "integrity": "sha512-3efoIB6jA3Hhv6k0YIBwCtlC8gCSWCk+R296yIXRLLr3cGN415KM/PO/d1JIXYI64lbrRzWRmZRhllw3jf6Atg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.3.2.tgz", + "integrity": "sha512-15wd0EMv9IXs5Abp1ZKpKKAVyZPhATIAHfKsyoWCEFDLSOA0/K0QGOxzrAlsrdUkiKZOq7uzSIgIDgW8okx2Mw==", "dependencies": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/wasm-util": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.2.2.tgz", - "integrity": "sha512-N/25960ifCc56sBlJZ2h5UBpEPvxBmMLgwYsl7CUuT+ea2LuJW9Xh8VHDN/guYXwmm92/KvuendYkEUykpm/JQ==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.3.2.tgz", + "integrity": "sha512-bmD+Dxo1lTZyZNxbyPE380wd82QsX+43mgCm40boyKrRppXEyQmWT98v/Poc7chLuskYb6X8IQ6lvvK2bGR4Tg==", "dependencies": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/x-bigint": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.4.2.tgz", - "integrity": "sha512-VRbkhdIf7CyWiUSyHemYi2fFWjBetUGyqpzsIHEclmzvqhKPfs7Kd2ZRdoXKU5QM56eD0sV2pyJxL34dv36/rw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.6.2.tgz", + "integrity": "sha512-HSIk60uFPX4GOFZSnIF7VYJz7WZA7tpFJsne7SzxOooRwMTWEtw3fUpFy5cYYOeLh17/kHH1Y7SVcuxzVLc74Q==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-fetch": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.4.2.tgz", - "integrity": "sha512-QEtYIUO6q6LupYkOl+vRwAkbBSSNHbALG8Y3+L/tFDubeXQl79vCkJFmsjhLewpsDIwTFTPNOwzA0ZEyb+0HZw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.6.2.tgz", + "integrity": "sha512-8wM/Z9JJPWN1pzSpU7XxTI1ldj/AfC8hKioBlUahZ8gUiJaOF7K9XEFCrCDLis/A1BoOu7Ne6WMx/vsJJIbDWw==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "node-fetch": "^3.3.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-global": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.4.2.tgz", - "integrity": "sha512-CwbjSt1Grmn56xAj+hGC8ZB0uZxMl92K+VkBH0KxjgcbAX/D24ZD/0ds8pAnUYrO4aYHYq2j2MAGVSMdHcMBAQ==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.6.2.tgz", + "integrity": "sha512-a8d6m+PW98jmsYDtAWp88qS4dl8DyqUBsd0S+WgyfSMtpEXu6v9nXDgPZgwF5xdDvXhm+P0ZfVkVTnIGrScb5g==", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-randomvalues": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.4.2.tgz", - "integrity": "sha512-HVlXRWY9RfN54RgfDroDy2itWmtTUtr119DfPl3wjnBf9i4wl/M+848OYlmCZCTpViTJrvWVSEJH9zVgchlNnw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.6.2.tgz", + "integrity": "sha512-Vr8uG7rH2IcNJwtyf5ebdODMcr0XjoCpUbI91Zv6AlKVYOGKZlKLYJHIwpTaKKB+7KPWyQrk4Mlym/rS7v9feg==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "12.4.2", + "@polkadot/util": "12.6.2", "@polkadot/wasm-util": "*" } }, "node_modules/@polkadot/x-textdecoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.4.2.tgz", - "integrity": "sha512-cyUoKwdSIiBXAaWnGdMYqnaNHc5NV9skQh/fITis3ufKKi3pMwxJ5IwhhfDZpuKDl/3fDXF40Z3fqtTeUnoRXA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.6.2.tgz", + "integrity": "sha512-M1Bir7tYvNappfpFWXOJcnxUhBUFWkUFIdJSyH0zs5LmFtFdbKAeiDXxSp2Swp5ddOZdZgPac294/o2TnQKN1w==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-textencoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.4.2.tgz", - "integrity": "sha512-xrcwx55B2K7j9CnVucGLFl0qd5sb7W5Ei6dOsWgDnZNjZPBqsx9jTBQSBv9HmyHE4GEnF4z0rpO0msy3S7Sj9Q==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.6.2.tgz", + "integrity": "sha512-4N+3UVCpI489tUJ6cv3uf0PjOHvgGp9Dl+SZRLgFGt9mvxnvpW/7+XBADRMtlG4xi5gaRK7bgl5bmY6OMDsNdw==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@polkadot/x-ws": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.4.2.tgz", - "integrity": "sha512-dYUtpbPa/JNd94tPAM9iHMzhR8MZ4wtOPh8gvueQRRYC8ZYQ9NPwjbBImY2FRfx7wCG1tFLAR6OEw4ToLLJNsA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.6.2.tgz", + "integrity": "sha512-cGZWo7K5eRRQCRl2LrcyCYsrc3lRbTlixZh3AzgU8uX4wASVGRlNWi/Hf4TtHNe1ExCDmxabJzdIsABIfrr7xw==", "dependencies": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2", - "ws": "^8.13.0" + "ws": "^8.15.1" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@scure/base": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz", - "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", + "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==", + "funding": { + "url": "https://paulmillr.com/funding/" + } }, "node_modules/@scure/bip32": { "version": "1.3.1", @@ -976,6 +599,28 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/@scure/bip32/node_modules/@noble/curves": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz", + "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==", + "dependencies": { + "@noble/hashes": "1.3.1" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip32/node_modules/@noble/hashes": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@scure/bip39": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz", @@ -989,14 +634,14 @@ } }, "node_modules/@substrate/connect": { - "version": "0.7.26", - "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.26.tgz", - "integrity": "sha512-uuGSiroGuKWj1+38n1kY5HReer5iL9bRwPCzuoLtqAOmI1fGI0hsSI2LlNQMAbfRgr7VRHXOk5MTuQf5ulsFRw==", + "version": "0.7.35", + "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.35.tgz", + "integrity": "sha512-Io8vkalbwaye+7yXfG1Nj52tOOoJln2bMlc7Q9Yy3vEWqZEVkgKmcPVzbwV0CWL3QD+KMPDA2Dnw/X7EdwgoLw==", + "hasInstallScript": true, "optional": true, "dependencies": { "@substrate/connect-extension-protocol": "^1.0.1", - "eventemitter3": "^4.0.7", - "smoldot": "1.0.4" + "smoldot": "2.0.7" } }, "node_modules/@substrate/connect-extension-protocol": { @@ -1005,16 +650,10 @@ "integrity": "sha512-161JhCC1csjH3GE5mPLEd7HbWtwNSPJBg3p1Ksz9SFlTzj/bgEwudiRN2y5i0MoLGCIJRYKyKGMxVnd29PzNjg==", "optional": true }, - "node_modules/@substrate/connect/node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "optional": true - }, "node_modules/@substrate/ss58-registry": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz", - "integrity": "sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==" + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.45.0.tgz", + "integrity": "sha512-NHmOkILimbLRPKvpnR+JGVckc1q4AJjxz9FnzZ3dKAVBL17AKknDy2FxXcwlJbmOXl9u7W3FS3bLDHgfKi4tQw==" }, "node_modules/@tsconfig/node10": { "version": "1.0.9", @@ -1041,26 +680,29 @@ "dev": true }, "node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz", + "integrity": "sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==", "dependencies": { "@types/node": "*" } }, "node_modules/@types/gauge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/gauge/-/gauge-5.0.0.tgz", - "integrity": "sha512-ReBmByARt+ZZaYpNDHy4GUA7TQ1LicxVVooDfFW0z4Hto7wBObtcl4IixaDfMgl00OiqPhyfTp7aIex8h+9jdg==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/gauge/-/gauge-5.0.4.tgz", + "integrity": "sha512-JOrzc7pfeN4ZUfzaKRu2no4QqogFm8y2wnaV7NAA1nPEe/VLvPEyJokNN27e57NRWL1MjNUm5+5uoKiS90AfUw==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/node": { - "version": "20.2.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz", - "integrity": "sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==" + "version": "20.11.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz", + "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/ws": { "version": "8.5.3", @@ -1071,9 +713,9 @@ } }, "node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -1085,6 +727,20 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, + "node_modules/abitype": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.7.1.tgz", + "integrity": "sha512-VBkRHTDZf9Myaek/dO3yMmOzB/y2s3Zo6nVU7yaw1G+TvCHAjwaJzNGN9yo4K5D8bU/VZXKP1EJpRhFr862PlQ==", + "peerDependencies": { + "typescript": ">=4.9.4", + "zod": "^3 >=3.19.1" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, "node_modules/acorn": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", @@ -1156,11 +812,11 @@ } }, "node_modules/axios": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", - "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -1205,18 +861,14 @@ "concat-map": "0.0.1" } }, - "node_modules/brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" - }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1298,9 +950,9 @@ "dev": true }, "node_modules/cross-fetch": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", - "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "dependencies": { "node-fetch": "^2.6.12" } @@ -1348,6 +1000,19 @@ } } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -1361,29 +1026,10 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dependencies": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" + "engines": { + "node": ">=0.3.1" } }, - "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1408,6 +1054,28 @@ "@scure/bip39": "1.2.1" } }, + "node_modules/ethereum-cryptography/node_modules/@noble/curves": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz", + "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==", + "dependencies": { + "@noble/hashes": "1.3.1" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ethereum-cryptography/node_modules/@noble/hashes": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/eventemitter3": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", @@ -1436,9 +1104,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -1479,9 +1147,12 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/gauge": { "version": "5.0.1", @@ -1510,14 +1181,14 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1564,6 +1235,17 @@ "node": ">= 0.4.0" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", @@ -1605,23 +1287,15 @@ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" }, - "node_modules/hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dependencies": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "node_modules/hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", "dependencies": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/inflight": { @@ -1727,21 +1401,11 @@ "ws": "*" } }, - "node_modules/js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -1767,16 +1431,6 @@ "node": ">= 0.6" } }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "node_modules/minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" - }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -1802,13 +1456,12 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nock": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz", - "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "dependencies": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" }, "engines": { @@ -1858,12 +1511,6 @@ "wrappy": "1" } }, - "node_modules/pako": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==", - "optional": true - }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -1933,6 +1580,20 @@ "tslib": "^2.1.0" } }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -1966,12 +1627,11 @@ } }, "node_modules/smoldot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-1.0.4.tgz", - "integrity": "sha512-N3TazI1C4GGrseFH/piWyZCCCRJTRx2QhDfrUKRT4SzILlW5m8ayZ3QTKICcz1C/536T9cbHHJyP7afxI6Mi1A==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-2.0.7.tgz", + "integrity": "sha512-VAOBqEen6vises36/zgrmAT1GWk2qE3X8AGnO7lmQFdskbKx8EovnwS22rtPAG+Y1Rk23/S22kDJUdPANyPkBA==", "optional": true, "dependencies": { - "pako": "^2.0.4", "ws": "^8.8.1" } }, @@ -2016,9 +1676,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -2073,18 +1733,22 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -2104,34 +1768,34 @@ "dev": true }, "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz", + "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==", "engines": { "node": ">= 8" } }, "node_modules/web3": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-4.1.1.tgz", - "integrity": "sha512-vnPll2G+ZNktSu7oJVjAW0QYuY0kPHLs8LQMifml4kTR+hqhiTmzMIzO8FqkcsESLEu6H9R7Acj6EgyeU1hruQ==", - "dependencies": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-eth-contract": "^4.0.5", - "web3-eth-ens": "^4.0.5", - "web3-eth-iban": "^4.0.5", - "web3-eth-personal": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-4.3.0.tgz", + "integrity": "sha512-YiLCsb5wmgJlSxRLzt7Z7H+CmlVVIKD8VaUQaZ+xKVG3Q7CpsO5Z6jmeKnlr6M9c6fDDsDnRM6G8g+nchZehbA==", + "dependencies": { + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-contract": "^4.1.4", + "web3-eth-ens": "^4.0.8", + "web3-eth-iban": "^4.0.7", + "web3-eth-personal": "^4.0.8", + "web3-net": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14.0.0", @@ -2139,32 +1803,33 @@ } }, "node_modules/web3-core": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.1.1.tgz", - "integrity": "sha512-wzS01bC+ihf5DJ6mz2fz4d5yxnPEM5AYQIRihO8kUt3dil+X4V07CHks23wLbb9yk8U9+3a1Iod207WGF872rA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.3.2.tgz", + "integrity": "sha512-uIMVd/j4BgOnwfpY8ZT+QKubOyM4xohEhFZXz9xB8wimXWMMlYVlIK/TbfHqFolS9uOerdSGhsMbcK9lETae8g==", "dependencies": { - "web3-errors": "^1.1.1", - "web3-eth-iban": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-iban": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ws": "^4.0.7", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", "npm": ">=6.12.0" }, "optionalDependencies": { - "web3-providers-ipc": "^4.0.5" + "web3-providers-ipc": "^4.0.7" } }, "node_modules/web3-errors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.1.tgz", - "integrity": "sha512-9IEhcympCJEK3Nmkz2oE/daKnOh+3CxHceuVWWRkHWKUfuIiJQgXAv9wRkPGk63JJTP/R9jtGmP+IbkScKoTBA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.4.tgz", + "integrity": "sha512-WahtszSqILez+83AxGecVroyZsMuuRT+KmQp4Si5P4Rnqbczno1k748PCrZTS1J4UCPmXMG2/Vt+0Bz2zwXkwQ==", "dependencies": { - "web3-types": "^1.1.1" + "web3-types": "^1.3.1" }, "engines": { "node": ">=14", @@ -2172,21 +1837,21 @@ } }, "node_modules/web3-eth": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.1.1.tgz", - "integrity": "sha512-0lftXINbeEOiYhHCWIKgeAOPnjoeHR8DTWLOjURDoz5CKbTj2wfcRQvuL6tUfvvVmrGWHEfIOncM30jhjlTxYQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.3.1.tgz", + "integrity": "sha512-zJir3GOXooHQT85JB8SrufE+Voo5TtXdjhf1D8IGXmxM8MrhI8AT+Pgt4siBTupJcu5hF17iGmTP/Nj2XnaibQ==", "dependencies": { "setimmediate": "^1.0.5", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-net": "^4.0.7", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2194,15 +1859,15 @@ } }, "node_modules/web3-eth-abi": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.1.tgz", - "integrity": "sha512-dOLwJ7Ua98WMXuxk7anYfSIqkuCdUvrvU/Um/OWPb6Gw10QciKUWXMIiRobNpWkpS8R77nDtecmQQ1OnTnLaNA==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.4.tgz", + "integrity": "sha512-YLOBVVxxxLYKXjaiwZjEWYEnkMmmrm0nswZsvzSsINy/UgbWbzfoiZU+zn4YNWIEhORhx1p37iS3u/dP6VyC2w==", "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "abitype": "0.7.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2210,17 +1875,17 @@ } }, "node_modules/web3-eth-accounts": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.0.5.tgz", - "integrity": "sha512-cmaAH20zFe/7Xjga7EuRXL0UV4O894i6ElEXB9Cqd9fP/CBnhQYK/TYuU37xydHhs5WY+B0hKeaoTqxLaPWAYg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.1.0.tgz", + "integrity": "sha512-UFtAsOANsvihTQ6SSvOKguupmQkResyR9M9JNuOxYpKh7+3W+sTnbLXw2UbOSYIsKlc1mpqqW9bVr1SjqHDpUQ==", "dependencies": { "@ethereumjs/rlp": "^4.0.1", "crc-32": "^1.2.2", "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2228,17 +1893,17 @@ } }, "node_modules/web3-eth-contract": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.0.5.tgz", - "integrity": "sha512-gS21liRDutWQX9i+Ru2Porzefx+7AumRvk+ZLR9wy8l9iLZxldvsvMdgbsyf9lA7UHOqPEhg/zoDyEc0N0hAVw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.1.4.tgz", + "integrity": "sha512-tJ4z6QLgtu8EQu2sXnLA7g427oxmngnbAUh+9kJKbP6Yep/oe+z79PqJv7H3MwqwUNW9T+/FeB2PnSQSyxz6ig==", "dependencies": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2246,19 +1911,19 @@ } }, "node_modules/web3-eth-ens": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.5.tgz", - "integrity": "sha512-PBTCk7h3NlSKP9XWmUJbpTJfMK3IybMAjn+uKrvSbeP50/xaZ73s94nI0eaRmI2FxlSQwTsd7apxXzrE07iKJw==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.8.tgz", + "integrity": "sha512-nj0JfeD45BbzVJcVYpUJnSo8iwDcY9CQ7CZhhIVVOFjvpMAPw0zEwjTvZEIQyCW61OoDG9xcBzwxe2tZoYhMRw==", "dependencies": { "@adraffy/ens-normalize": "^1.8.8", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-contract": "^4.0.5", - "web3-net": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth": "^4.3.1", + "web3-eth-contract": "^4.1.2", + "web3-net": "^4.0.7", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2266,14 +1931,14 @@ } }, "node_modules/web3-eth-iban": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.5.tgz", - "integrity": "sha512-rAH4Dsk0G90W8UqQFomGNjLfxKhBJwkSnkjdG7TUCRhoFvqvrsW1YL+4a+UoODRyJ9BCdaRR71jrymmy4UTDHA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.7.tgz", + "integrity": "sha512-8weKLa9KuKRzibC87vNLdkinpUE30gn0IGY027F8doeJdcPUfsa4IlBgNC4k4HLBembBB2CTU0Kr/HAOqMeYVQ==", "dependencies": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2281,16 +1946,16 @@ } }, "node_modules/web3-eth-personal": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.5.tgz", - "integrity": "sha512-cypChpAaljYtd1fOfjvhDvty7SBdUvwz5hSimwb+81IJ4MtWc7Jdbn1Ka/g0ZxwoAm46OmeV0yHef7+QyfbpsQ==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.8.tgz", + "integrity": "sha512-sXeyLKJ7ddQdMxz1BZkAwImjqh7OmKxhXoBNF3isDmD4QDpMIwv/t237S3q4Z0sZQamPa/pHebJRWVuvP8jZdw==", "dependencies": { - "web3-core": "^4.1.1", - "web3-eth": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-eth": "^4.3.1", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2298,14 +1963,14 @@ } }, "node_modules/web3-net": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.5.tgz", - "integrity": "sha512-7Ir+Da5z3I3KxUn7nmg6NcXxWADYnQAkHX7Z4u4NE3yA+gNbiwPUjVpvSgzpNoDZj+EFovvP1AuOR5idHvyE0g==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.7.tgz", + "integrity": "sha512-SzEaXFrBjY25iQGk5myaOfO9ZyfTwQEa4l4Ps4HDNVMibgZji3WPzpjq8zomVHMwi8bRp6VV7YS71eEsX7zLow==", "dependencies": { - "web3-core": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-core": "^4.3.0", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" }, "engines": { "node": ">=14", @@ -2313,14 +1978,14 @@ } }, "node_modules/web3-providers-http": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.0.5.tgz", - "integrity": "sha512-JAY0GyLqRKbKw7m92EMg84otLU6N/NmYqepPid7B8XcPkGzhK6R/FsATyi+BGe2ecW9HRyCSz9SWllTjlKhRwQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.1.0.tgz", + "integrity": "sha512-6qRUGAhJfVQM41E5t+re5IHYmb5hSaLc02BE2MaRQsz2xKA6RjmHpOA5h/+ojJxEpI9NI2CrfDKOAgtJfoUJQg==", "dependencies": { - "cross-fetch": "^3.1.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "cross-fetch": "^4.0.0", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" }, "engines": { "node": ">=14", @@ -2328,14 +1993,14 @@ } }, "node_modules/web3-providers-ipc": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.5.tgz", - "integrity": "sha512-1mJWqBnKbQ6UGHVxuXDJRpw4NwkpJ7NabyF2XBmzctzFHKvzE0X1dAocy3tih49J38d0vKrmubTOqxxkMpq49Q==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.7.tgz", + "integrity": "sha512-YbNqY4zUvIaK2MHr1lQFE53/8t/ejHtJchrWn9zVbFMGXlTsOAbNoIoZWROrg1v+hCBvT2c9z8xt7e/+uz5p1g==", "optional": true, "dependencies": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" }, "engines": { "node": ">=14", @@ -2343,15 +2008,15 @@ } }, "node_modules/web3-providers-ws": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.5.tgz", - "integrity": "sha512-v9xE16Jjczy+7jMKY7rwTuXgwGK51NKvCGdFERPPcSNJCkS5YCBq9DpzJe8mcr5QhuhnTeGeQ7XmcjTzDRkwnQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.7.tgz", + "integrity": "sha512-n4Dal9/rQWjS7d6LjyEPM2R458V8blRm0eLJupDEJOOIBhGYlxw5/4FthZZ/cqB7y/sLVi7K09DdYx2MeRtU5w==", "dependencies": { "@types/ws": "8.5.3", "isomorphic-ws": "^5.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", "ws": "^8.8.1" }, "engines": { @@ -2360,13 +2025,13 @@ } }, "node_modules/web3-rpc-methods": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.1.tgz", - "integrity": "sha512-aAhm1eIKPWWBRf+BrYpKcvQX5qAg1LOU6NhriY0xpXJh01hbwkz0Q8rMJfCCjlGAElYHSp2K/odyAmyKRDr0LQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.4.tgz", + "integrity": "sha512-LTFNg4LFaeU8K9ecuT8fHDp/LOXyxCneeZjCrRYIW1u82Ly52SrY55FIzMIISGoG/iT5Wh7UiHOB3CQsWLBmbQ==", "dependencies": { - "web3-core": "^4.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2374,23 +2039,23 @@ } }, "node_modules/web3-types": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.1.1.tgz", - "integrity": "sha512-bXmIPJi/NPed43JBcya71gT+euZSMvfQx6NYv8G97PSNxR1HWwANYBKbamTZvzBbq10QCwQLh0hZw3tyOXuPFA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.3.1.tgz", + "integrity": "sha512-8fXi7h/t95VKRtgU4sxprLPZpsTh3jYDfSghshIDBgUD/OoGe5S+syP24SUzBZYllZ/L+hMr2gdp/0bGJa8pYQ==", "engines": { "node": ">=14", "npm": ">=6.12.0" } }, "node_modules/web3-utils": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.0.5.tgz", - "integrity": "sha512-43xIM7rr3htYNzliVQLpWLQmEf4XX8IXgjvqLcEuC/xje14O5UQM4kamRCtz8v3JZN3X6QTfsV6Zgby67mVmCg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.1.0.tgz", + "integrity": "sha512-+VJWR6FtCsgwuJr5tvSvQlSEG06586df8h2CxGc9tcNtIDyJKNkSDDWJkdNPvyDhhXFzQYFh8QOGymD1CIP6fw==", "dependencies": { "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -2398,14 +2063,14 @@ } }, "node_modules/web3-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.1.tgz", - "integrity": "sha512-RIdZCNhceBEOQpmzcEk6K3qqLHRfDIMkg2PJe7yllpuEc0fa0cmUZgGUl1FEnioc5Rx9GBEE8eTllaneIAiiQQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.3.tgz", + "integrity": "sha512-fJbAQh+9LSNWy+l5Ze6HABreml8fra98o5+vS073T35jUcLbRZ0IOjF/ZPJhJNbJDt+jP1vseZsc3z3uX9mxxQ==", "dependencies": { "ethereum-cryptography": "^2.0.0", "util": "^0.12.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", "zod": "^3.21.4" }, "engines": { @@ -2428,12 +2093,12 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -2475,9 +2140,9 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "engines": { "node": ">=10.0.0" }, @@ -2547,9 +2212,9 @@ }, "dependencies": { "@adraffy/ens-normalize": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz", - "integrity": "sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==" + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz", + "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==" }, "@cspotcode/source-map-support": { "version": "0.8.1", @@ -2565,200 +2230,6 @@ "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz", "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==" }, - "@ethersproject/abi": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", - "requires": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "@ethersproject/abstract-provider": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", - "requires": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0" - } - }, - "@ethersproject/abstract-signer": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", - "requires": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "@ethersproject/address": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", - "requires": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/rlp": "^5.7.0" - } - }, - "@ethersproject/base64": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", - "requires": { - "@ethersproject/bytes": "^5.7.0" - } - }, - "@ethersproject/bignumber": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.7.0.tgz", - "integrity": "sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==", - "requires": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "bn.js": "^5.2.1" - } - }, - "@ethersproject/bytes": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.7.0.tgz", - "integrity": "sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==", - "requires": { - "@ethersproject/logger": "^5.7.0" - } - }, - "@ethersproject/constants": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.7.0.tgz", - "integrity": "sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==", - "requires": { - "@ethersproject/bignumber": "^5.7.0" - } - }, - "@ethersproject/hash": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", - "requires": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "@ethersproject/keccak256": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.7.0.tgz", - "integrity": "sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==", - "requires": { - "@ethersproject/bytes": "^5.7.0", - "js-sha3": "0.8.0" - } - }, - "@ethersproject/logger": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.7.0.tgz", - "integrity": "sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==" - }, - "@ethersproject/networks": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", - "requires": { - "@ethersproject/logger": "^5.7.0" - } - }, - "@ethersproject/properties": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", - "requires": { - "@ethersproject/logger": "^5.7.0" - } - }, - "@ethersproject/rlp": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", - "requires": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "@ethersproject/signing-key": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", - "requires": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "bn.js": "^5.2.1", - "elliptic": "6.5.4", - "hash.js": "1.1.7" - } - }, - "@ethersproject/strings": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.7.0.tgz", - "integrity": "sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==", - "requires": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "@ethersproject/transactions": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", - "requires": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0" - } - }, - "@ethersproject/web": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", - "requires": { - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, "@jridgewell/resolve-uri": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", @@ -2782,376 +2253,376 @@ } }, "@noble/curves": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz", - "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz", + "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==", "requires": { - "@noble/hashes": "1.3.1" + "@noble/hashes": "1.3.3" } }, "@noble/hashes": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", - "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", + "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==" }, "@polkadot/api": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.9.1.tgz", - "integrity": "sha512-ND/2UqZBWvtt4PfV03OStTKg0mxmPk4UpMAgJKutdgsz/wP9CYJ1KbjwFgPNekL9JnzbKQsWyQNPVrcw7kQk8A==", - "requires": { - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/api-derive": "10.9.1", - "@polkadot/keyring": "^12.3.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/types-known": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.11.2.tgz", + "integrity": "sha512-AorCZxCWCoTtdbl4DPUZh+ACe/pbLIS1BkdQY0AFJuZllm0x/yWzjgampcPd5jQAA/O3iKShRBkZqj6Mk9yG/A==", + "requires": { + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/api-derive": "10.11.2", + "@polkadot/keyring": "^12.6.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/types-known": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "eventemitter3": "^5.0.1", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/api-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.9.1.tgz", - "integrity": "sha512-kRZZvCFVcN4hAH4dJ+Qzfdy27/4EEq3oLDf3ihj0LTVrAezSWcKPGE3EVFy+Mn6Lo4SUc7RVyoKvIUhSk2l4Dg==", - "requires": { - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.11.2.tgz", + "integrity": "sha512-PTpnqpezc75qBqUtgrc0GYB8h9UHjfbHSRZamAbecIVAJ2/zc6CqtnldeaBlIu1IKTgBzi3FFtTyYu+ZGbNT2Q==", + "requires": { + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/api-base": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.9.1.tgz", - "integrity": "sha512-Q3m2KzlceMK2kX8bhnUZWk3RT6emmijeeFZZQgCePpEcrSeNjnqG4qjuTPgkveaOkUT8MAoDc5Avuzcc2jlW9g==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.11.2.tgz", + "integrity": "sha512-4LIjaUfO9nOzilxo7XqzYKCNMtmUypdk8oHPdrRnSjKEsnK7vDsNi+979z2KXNXd2KFSCFHENmI523fYnMnReg==", "requires": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/api-derive": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.9.1.tgz", - "integrity": "sha512-mRud1UZCFIc4Z63qAoGSIHh/foyUYADfy1RQYCmPpeFKfIdCIrHpd7xFdJXTOMYOS0BwlM6u4qli/ZT4XigezQ==", - "requires": { - "@polkadot/api": "10.9.1", - "@polkadot/api-augment": "10.9.1", - "@polkadot/api-base": "10.9.1", - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.11.2.tgz", + "integrity": "sha512-m3BQbPionkd1iSlknddxnL2hDtolPIsT+aRyrtn4zgMRPoLjHFmTmovvg8RaUyYofJtZeYrnjMw0mdxiSXx7eA==", + "requires": { + "@polkadot/api": "10.11.2", + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/keyring": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.4.2.tgz", - "integrity": "sha512-VH91feSL6GiVVLcJ6V8h6jIAuq62bfvhM75AMcjTFol6MDqFl25jdjkHfZ2bQhig330LIhLw89nKdYr2/OfwjA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.6.2.tgz", + "integrity": "sha512-O3Q7GVmRYm8q7HuB3S0+Yf/q/EB2egKRRU3fv9b3B7V+A52tKzA+vIwEmNVaD1g5FKW9oB97rmpggs0zaKFqHw==", "requires": { - "@polkadot/util": "12.4.2", - "@polkadot/util-crypto": "12.4.2", + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/networks": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.4.2.tgz", - "integrity": "sha512-dd7vss+86kpOyy/C+DuCWChGfhwHBHtrzJ9ArbbpY75qc8SqdP90lj/c13ZCHr5I1l+coy31gyyMj5i6ja1Dpg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.6.2.tgz", + "integrity": "sha512-1oWtZm1IvPWqvMrldVH6NI2gBoCndl5GEwx7lAuQWGr7eNL+6Bdc5K3Z9T0MzFvDGoi2/CBqjX9dRKo39pDC/w==", "requires": { - "@polkadot/util": "12.4.2", - "@substrate/ss58-registry": "^1.43.0", + "@polkadot/util": "12.6.2", + "@substrate/ss58-registry": "^1.44.0", "tslib": "^2.6.2" } }, "@polkadot/rpc-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.9.1.tgz", - "integrity": "sha512-MaLHkNlyqN20ZRYr6uNd1BZr1OsrnX9qLAmsl0mcrri1vPGRH6VHjfFH1RBLkikpWD82v17g0l2hLwdV1ZHMcw==", - "requires": { - "@polkadot/rpc-core": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.11.2.tgz", + "integrity": "sha512-9AhT0WW81/8jYbRcAC6PRmuxXqNhJje8OYiulBQHbG1DTCcjAfz+6VQBke9BwTStzPq7d526+yyBKD17O3zlAA==", + "requires": { + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/rpc-core": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.9.1.tgz", - "integrity": "sha512-ZtA8B8SfXSAwVkBlCcKRHw0eSM7ec/sbiNOM5GasXPeRujUgT7lOwSH2GbUZSqe9RfRDMp6DvO9c2JoGc3LLWw==", - "requires": { - "@polkadot/rpc-augment": "10.9.1", - "@polkadot/rpc-provider": "10.9.1", - "@polkadot/types": "10.9.1", - "@polkadot/util": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.11.2.tgz", + "integrity": "sha512-Ot0CFLWx8sZhLZog20WDuniPA01Bk2StNDsdAQgcFKPwZw6ShPaZQCHuKLQK6I6DodOrem9FXX7c1hvoKJP5Ww==", + "requires": { + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/rpc-provider": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.9.1.tgz", - "integrity": "sha512-4QzT2QzD+320+eT6b79sGAA85Tt3Bb8fQvse4r5Mom2iiBd2SO81vOhxSAOaIe4GUsw25VzFJmsbe7+OObItdg==", - "requires": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-support": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", - "@polkadot/x-fetch": "^12.3.1", - "@polkadot/x-global": "^12.3.1", - "@polkadot/x-ws": "^12.3.1", - "@substrate/connect": "0.7.26", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.11.2.tgz", + "integrity": "sha512-he5jWMpDJp7e+vUzTZDzpkB7ps3H8psRally+/ZvZZScPvFEjfczT7I1WWY9h58s8+ImeVP/lkXjL9h/gUOt3Q==", + "requires": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-support": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "@polkadot/x-fetch": "^12.6.2", + "@polkadot/x-global": "^12.6.2", + "@polkadot/x-ws": "^12.6.2", + "@substrate/connect": "0.7.35", "eventemitter3": "^5.0.1", - "mock-socket": "^9.2.1", - "nock": "^13.3.1", - "tslib": "^2.5.3" + "mock-socket": "^9.3.1", + "nock": "^13.4.0", + "tslib": "^2.6.2" } }, "@polkadot/types": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.9.1.tgz", - "integrity": "sha512-AG33i2ZGGfq7u+5rkAdGrXAQHHl844/Yv+junH5ZzX69xiCoWO1bH/yzDUNBdpki2GlACWvF9nLYh3F2tVF93w==", - "requires": { - "@polkadot/keyring": "^12.3.1", - "@polkadot/types-augment": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "@polkadot/util-crypto": "^12.3.1", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.11.2.tgz", + "integrity": "sha512-d52j3xXni+C8GdYZVTSfu8ROAnzXFMlyRvXtor0PudUc8UQHOaC4+mYAkTBGA2gKdmL8MHSfRSbhcxHhsikY6Q==", + "requires": { + "@polkadot/keyring": "^12.6.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", "rxjs": "^7.8.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" } }, "@polkadot/types-augment": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.9.1.tgz", - "integrity": "sha512-OY9/jTMFRFqYdkUnfcGwqMLC64A0Q25bjvCuVQCVjsPFKE3wl0Kt5rNT01eV2UmLXrR6fY0xWbR2w80bLA7CIQ==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.11.2.tgz", + "integrity": "sha512-8eB8ew04wZiE5GnmFvEFW1euJWmF62SGxb1O+8wL3zoUtB9Xgo1vB6w6xbTrd+HLV6jNSeXXnbbF1BEUvi9cNg==", "requires": { - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-codec": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.9.1.tgz", - "integrity": "sha512-mJ5OegKGraY1FLvEa8FopRCr3pQrhDkcn5RNOjmgJQozENVeRaxhk0NwxYz7IojFvSDnKnc6lNQfKaaSe5pLHg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.11.2.tgz", + "integrity": "sha512-3xjOQL+LOOMzYqlgP9ROL0FQnzU8lGflgYewzau7AsDlFziSEtb49a9BpYo6zil4koC+QB8zQ9OHGFumG08T8w==", "requires": { - "@polkadot/util": "^12.3.1", - "@polkadot/x-bigint": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "@polkadot/x-bigint": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-create": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.9.1.tgz", - "integrity": "sha512-OVz50MGTTuiuVnRP/zAx4CTuLioc0hsiwNwqN2lNhmIJGtnQ4Vy/7mQRsIWehiYz6g0Vzzm5B3qWkTXO1NSN5w==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.11.2.tgz", + "integrity": "sha512-SJt23NxYvefRxVZZm6mT9ed1pR6FDoIGQ3xUpbjhTLfU2wuhpKjekMVorYQ6z/gK2JLMu2kV92Ardsz+6GX5XQ==", "requires": { - "@polkadot/types-codec": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-known": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.9.1.tgz", - "integrity": "sha512-zCMVWc4pJtkbMFPu72bD4IhvV/gkHXPX3C5uu92WdmCfnn0vEIEsMKWlVXVVvQQZKAqvs/awpqIfrUtEViOGEA==", - "requires": { - "@polkadot/networks": "^12.3.1", - "@polkadot/types": "10.9.1", - "@polkadot/types-codec": "10.9.1", - "@polkadot/types-create": "10.9.1", - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.11.2.tgz", + "integrity": "sha512-kbEIX7NUQFxpDB0FFGNyXX/odY7jbp56RGD+Z4A731fW2xh/DgAQrI994xTzuh0c0EqPE26oQm3kATSpseqo9w==", + "requires": { + "@polkadot/networks": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/types-support": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.9.1.tgz", - "integrity": "sha512-XsieuLDsszvMZQlleacQBfx07i/JkwQV/UxH9q8Hz7Okmaz9pEVEW1h3ka2/cPuC7a4l32JhaORBUYshBZNdJg==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.11.2.tgz", + "integrity": "sha512-X11hoykFYv/3efg4coZy2hUOUc97JhjQMJLzDhHniFwGLlYU8MeLnPdCVGkXx0xDDjTo4/ptS1XpZ5HYcg+gRw==", "requires": { - "@polkadot/util": "^12.3.1", - "tslib": "^2.5.3" + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" } }, "@polkadot/util": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.4.2.tgz", - "integrity": "sha512-NcTCbnIzMb/3TvJNEbaiu/9EvYIBuzDwZfqQ4hzL0GAptkF8aDkKMDCfQ/j3FI38rR+VTPQHNky9fvWglGKGRw==", - "requires": { - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-global": "12.4.2", - "@polkadot/x-textdecoder": "12.4.2", - "@polkadot/x-textencoder": "12.4.2", - "@types/bn.js": "^5.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.6.2.tgz", + "integrity": "sha512-l8TubR7CLEY47240uki0TQzFvtnxFIO7uI/0GoWzpYD/O62EIAMRsuY01N4DuwgKq2ZWD59WhzsLYmA5K6ksdw==", + "requires": { + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-global": "12.6.2", + "@polkadot/x-textdecoder": "12.6.2", + "@polkadot/x-textencoder": "12.6.2", + "@types/bn.js": "^5.1.5", "bn.js": "^5.2.1", "tslib": "^2.6.2" } }, "@polkadot/util-crypto": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.4.2.tgz", - "integrity": "sha512-JP7OrEKYx35P3wWc2Iu9F6BfYMIkywXik908zQqPxwoQhr8uDLP1Qoyu9Sws+hE97Yz1O4jBVvryS2le0yusog==", - "requires": { - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.1", - "@polkadot/networks": "12.4.2", - "@polkadot/util": "12.4.2", - "@polkadot/wasm-crypto": "^7.2.2", - "@polkadot/wasm-util": "^7.2.2", - "@polkadot/x-bigint": "12.4.2", - "@polkadot/x-randomvalues": "12.4.2", - "@scure/base": "1.1.1", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.6.2.tgz", + "integrity": "sha512-FEWI/dJ7wDMNN1WOzZAjQoIcCP/3vz3wvAp5QQm+lOrzOLj0iDmaIGIcBkz8HVm3ErfSe/uKP0KS4jgV/ib+Mg==", + "requires": { + "@noble/curves": "^1.3.0", + "@noble/hashes": "^1.3.3", + "@polkadot/networks": "12.6.2", + "@polkadot/util": "12.6.2", + "@polkadot/wasm-crypto": "^7.3.2", + "@polkadot/wasm-util": "^7.3.2", + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-randomvalues": "12.6.2", + "@scure/base": "^1.1.5", "tslib": "^2.6.2" } }, "@polkadot/wasm-bridge": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.2.2.tgz", - "integrity": "sha512-CgNENd65DVYtackOVXXRA0D1RPoCv5+77IdBCf7kNqu6LeAnR4nfTI6qjaApUdN1xRweUsQjSH7tu7VjkMOA0A==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.3.2.tgz", + "integrity": "sha512-AJEXChcf/nKXd5Q/YLEV5dXQMle3UNT7jcXYmIffZAo/KI394a+/24PaISyQjoNC0fkzS1Q8T5pnGGHmXiVz2g==", "requires": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.2.2.tgz", - "integrity": "sha512-1ZY1rxUTawYm0m1zylvBMFovNIHYgG2v/XoASNp/EMG5c8FQIxCbhJRaTBA983GVq4lN/IAKREKEp9ZbLLqssA==", - "requires": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-init": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.3.2.tgz", + "integrity": "sha512-+neIDLSJ6jjVXsjyZ5oLSv16oIpwp+PxFqTUaZdZDoA2EyFRQB8pP7+qLsMNk+WJuhuJ4qXil/7XiOnZYZ+wxw==", + "requires": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-init": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto-asmjs": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.2.2.tgz", - "integrity": "sha512-wKg+cpsWQCTSVhjlHuNeB/184rxKqY3vaklacbLOMbUXieIfuDBav5PJdzS3yeiVE60TpYaHW4iX/5OYHS82gg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.3.2.tgz", + "integrity": "sha512-QP5eiUqUFur/2UoF2KKKYJcesc71fXhQFLT3D4ZjG28Mfk2ZPI0QNRUfpcxVQmIUpV5USHg4geCBNuCYsMm20Q==", "requires": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto-init": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.2.2.tgz", - "integrity": "sha512-vD4iPIp9x+SssUIWUenxWLPw4BVIwhXHNMpsV81egK990tvpyIxL205/EF5QRb1mKn8WfWcNFm5tYwwh9NdnnA==", - "requires": { - "@polkadot/wasm-bridge": "7.2.2", - "@polkadot/wasm-crypto-asmjs": "7.2.2", - "@polkadot/wasm-crypto-wasm": "7.2.2", - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.3.2.tgz", + "integrity": "sha512-FPq73zGmvZtnuJaFV44brze3Lkrki3b4PebxCy9Fplw8nTmisKo9Xxtfew08r0njyYh+uiJRAxPCXadkC9sc8g==", + "requires": { + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-crypto-wasm": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.2.2.tgz", - "integrity": "sha512-3efoIB6jA3Hhv6k0YIBwCtlC8gCSWCk+R296yIXRLLr3cGN415KM/PO/d1JIXYI64lbrRzWRmZRhllw3jf6Atg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.3.2.tgz", + "integrity": "sha512-15wd0EMv9IXs5Abp1ZKpKKAVyZPhATIAHfKsyoWCEFDLSOA0/K0QGOxzrAlsrdUkiKZOq7uzSIgIDgW8okx2Mw==", "requires": { - "@polkadot/wasm-util": "7.2.2", - "tslib": "^2.6.1" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" } }, "@polkadot/wasm-util": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.2.2.tgz", - "integrity": "sha512-N/25960ifCc56sBlJZ2h5UBpEPvxBmMLgwYsl7CUuT+ea2LuJW9Xh8VHDN/guYXwmm92/KvuendYkEUykpm/JQ==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.3.2.tgz", + "integrity": "sha512-bmD+Dxo1lTZyZNxbyPE380wd82QsX+43mgCm40boyKrRppXEyQmWT98v/Poc7chLuskYb6X8IQ6lvvK2bGR4Tg==", "requires": { - "tslib": "^2.6.1" + "tslib": "^2.6.2" } }, "@polkadot/x-bigint": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.4.2.tgz", - "integrity": "sha512-VRbkhdIf7CyWiUSyHemYi2fFWjBetUGyqpzsIHEclmzvqhKPfs7Kd2ZRdoXKU5QM56eD0sV2pyJxL34dv36/rw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.6.2.tgz", + "integrity": "sha512-HSIk60uFPX4GOFZSnIF7VYJz7WZA7tpFJsne7SzxOooRwMTWEtw3fUpFy5cYYOeLh17/kHH1Y7SVcuxzVLc74Q==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-fetch": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.4.2.tgz", - "integrity": "sha512-QEtYIUO6q6LupYkOl+vRwAkbBSSNHbALG8Y3+L/tFDubeXQl79vCkJFmsjhLewpsDIwTFTPNOwzA0ZEyb+0HZw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.6.2.tgz", + "integrity": "sha512-8wM/Z9JJPWN1pzSpU7XxTI1ldj/AfC8hKioBlUahZ8gUiJaOF7K9XEFCrCDLis/A1BoOu7Ne6WMx/vsJJIbDWw==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "node-fetch": "^3.3.2", "tslib": "^2.6.2" } }, "@polkadot/x-global": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.4.2.tgz", - "integrity": "sha512-CwbjSt1Grmn56xAj+hGC8ZB0uZxMl92K+VkBH0KxjgcbAX/D24ZD/0ds8pAnUYrO4aYHYq2j2MAGVSMdHcMBAQ==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.6.2.tgz", + "integrity": "sha512-a8d6m+PW98jmsYDtAWp88qS4dl8DyqUBsd0S+WgyfSMtpEXu6v9nXDgPZgwF5xdDvXhm+P0ZfVkVTnIGrScb5g==", "requires": { "tslib": "^2.6.2" } }, "@polkadot/x-randomvalues": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.4.2.tgz", - "integrity": "sha512-HVlXRWY9RfN54RgfDroDy2itWmtTUtr119DfPl3wjnBf9i4wl/M+848OYlmCZCTpViTJrvWVSEJH9zVgchlNnw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.6.2.tgz", + "integrity": "sha512-Vr8uG7rH2IcNJwtyf5ebdODMcr0XjoCpUbI91Zv6AlKVYOGKZlKLYJHIwpTaKKB+7KPWyQrk4Mlym/rS7v9feg==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-textdecoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.4.2.tgz", - "integrity": "sha512-cyUoKwdSIiBXAaWnGdMYqnaNHc5NV9skQh/fITis3ufKKi3pMwxJ5IwhhfDZpuKDl/3fDXF40Z3fqtTeUnoRXA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.6.2.tgz", + "integrity": "sha512-M1Bir7tYvNappfpFWXOJcnxUhBUFWkUFIdJSyH0zs5LmFtFdbKAeiDXxSp2Swp5ddOZdZgPac294/o2TnQKN1w==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-textencoder": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.4.2.tgz", - "integrity": "sha512-xrcwx55B2K7j9CnVucGLFl0qd5sb7W5Ei6dOsWgDnZNjZPBqsx9jTBQSBv9HmyHE4GEnF4z0rpO0msy3S7Sj9Q==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.6.2.tgz", + "integrity": "sha512-4N+3UVCpI489tUJ6cv3uf0PjOHvgGp9Dl+SZRLgFGt9mvxnvpW/7+XBADRMtlG4xi5gaRK7bgl5bmY6OMDsNdw==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2" } }, "@polkadot/x-ws": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.4.2.tgz", - "integrity": "sha512-dYUtpbPa/JNd94tPAM9iHMzhR8MZ4wtOPh8gvueQRRYC8ZYQ9NPwjbBImY2FRfx7wCG1tFLAR6OEw4ToLLJNsA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.6.2.tgz", + "integrity": "sha512-cGZWo7K5eRRQCRl2LrcyCYsrc3lRbTlixZh3AzgU8uX4wASVGRlNWi/Hf4TtHNe1ExCDmxabJzdIsABIfrr7xw==", "requires": { - "@polkadot/x-global": "12.4.2", + "@polkadot/x-global": "12.6.2", "tslib": "^2.6.2", - "ws": "^8.13.0" + "ws": "^8.15.1" } }, "@scure/base": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz", - "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", + "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==" }, "@scure/bip32": { "version": "1.3.1", @@ -3161,6 +2632,21 @@ "@noble/curves": "~1.1.0", "@noble/hashes": "~1.3.1", "@scure/base": "~1.1.0" + }, + "dependencies": { + "@noble/curves": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz", + "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==", + "requires": { + "@noble/hashes": "1.3.1" + } + }, + "@noble/hashes": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==" + } } }, "@scure/bip39": { @@ -3173,22 +2659,13 @@ } }, "@substrate/connect": { - "version": "0.7.26", - "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.26.tgz", - "integrity": "sha512-uuGSiroGuKWj1+38n1kY5HReer5iL9bRwPCzuoLtqAOmI1fGI0hsSI2LlNQMAbfRgr7VRHXOk5MTuQf5ulsFRw==", + "version": "0.7.35", + "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.35.tgz", + "integrity": "sha512-Io8vkalbwaye+7yXfG1Nj52tOOoJln2bMlc7Q9Yy3vEWqZEVkgKmcPVzbwV0CWL3QD+KMPDA2Dnw/X7EdwgoLw==", "optional": true, "requires": { "@substrate/connect-extension-protocol": "^1.0.1", - "eventemitter3": "^4.0.7", - "smoldot": "1.0.4" - }, - "dependencies": { - "eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "optional": true - } + "smoldot": "2.0.7" } }, "@substrate/connect-extension-protocol": { @@ -3198,9 +2675,9 @@ "optional": true }, "@substrate/ss58-registry": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz", - "integrity": "sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==" + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.45.0.tgz", + "integrity": "sha512-NHmOkILimbLRPKvpnR+JGVckc1q4AJjxz9FnzZ3dKAVBL17AKknDy2FxXcwlJbmOXl9u7W3FS3bLDHgfKi4tQw==" }, "@tsconfig/node10": { "version": "1.0.9", @@ -3227,26 +2704,29 @@ "dev": true }, "@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz", + "integrity": "sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==", "requires": { "@types/node": "*" } }, "@types/gauge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/gauge/-/gauge-5.0.0.tgz", - "integrity": "sha512-ReBmByARt+ZZaYpNDHy4GUA7TQ1LicxVVooDfFW0z4Hto7wBObtcl4IixaDfMgl00OiqPhyfTp7aIex8h+9jdg==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/gauge/-/gauge-5.0.4.tgz", + "integrity": "sha512-JOrzc7pfeN4ZUfzaKRu2no4QqogFm8y2wnaV7NAA1nPEe/VLvPEyJokNN27e57NRWL1MjNUm5+5uoKiS90AfUw==", "dev": true, "requires": { "@types/node": "*" } }, "@types/node": { - "version": "20.2.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz", - "integrity": "sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==" + "version": "20.11.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz", + "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==", + "requires": { + "undici-types": "~5.26.4" + } }, "@types/ws": { "version": "8.5.3", @@ -3257,9 +2737,9 @@ } }, "@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -3271,6 +2751,12 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, + "abitype": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.7.1.tgz", + "integrity": "sha512-VBkRHTDZf9Myaek/dO3yMmOzB/y2s3Zo6nVU7yaw1G+TvCHAjwaJzNGN9yo4K5D8bU/VZXKP1EJpRhFr862PlQ==", + "requires": {} + }, "acorn": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", @@ -3318,11 +2804,11 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, "axios": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", - "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" }, @@ -3363,18 +2849,14 @@ "concat-map": "0.0.1" } }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" - }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" } }, "cliui": { @@ -3435,9 +2917,9 @@ "dev": true }, "cross-fetch": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", - "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "requires": { "node-fetch": "^2.6.12" }, @@ -3465,6 +2947,16 @@ "ms": "2.1.2" } }, + "define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -3476,27 +2968,6 @@ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, - "elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "requires": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3516,6 +2987,21 @@ "@noble/hashes": "1.3.1", "@scure/bip32": "1.3.1", "@scure/bip39": "1.2.1" + }, + "dependencies": { + "@noble/curves": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz", + "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==", + "requires": { + "@noble/hashes": "1.3.1" + } + }, + "@noble/hashes": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==" + } } }, "eventemitter3": { @@ -3533,9 +3019,9 @@ } }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==" }, "for-each": { "version": "0.3.3", @@ -3559,9 +3045,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "gauge": { "version": "5.0.1", @@ -3584,14 +3070,14 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "glob": { @@ -3623,6 +3109,14 @@ "function-bind": "^1.1.1" } }, + "has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "requires": { + "get-intrinsic": "^1.2.2" + } + }, "has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", @@ -3646,23 +3140,12 @@ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "function-bind": "^1.1.2" } }, "inflight": { @@ -3733,21 +3216,11 @@ "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==", "requires": {} }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -3767,16 +3240,6 @@ "mime-db": "1.52.0" } }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3796,13 +3259,12 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "nock": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz", - "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "requires": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" } }, @@ -3829,12 +3291,6 @@ "wrappy": "1" } }, - "pako": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==", - "optional": true - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -3886,6 +3342,17 @@ "tslib": "^2.1.0" } }, + "set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "requires": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -3907,12 +3374,11 @@ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" }, "smoldot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-1.0.4.tgz", - "integrity": "sha512-N3TazI1C4GGrseFH/piWyZCCCRJTRx2QhDfrUKRT4SzILlW5m8ayZ3QTKICcz1C/536T9cbHHJyP7afxI6Mi1A==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-2.0.7.tgz", + "integrity": "sha512-VAOBqEen6vises36/zgrmAT1GWk2qE3X8AGnO7lmQFdskbKx8EovnwS22rtPAG+Y1Rk23/S22kDJUdPANyPkBA==", "optional": true, "requires": { - "pako": "^2.0.4", "ws": "^8.8.1" } }, @@ -3945,9 +3411,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", @@ -3980,10 +3446,14 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==" + }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "util": { "version": "0.12.5", @@ -4004,235 +3474,236 @@ "dev": true }, "web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz", + "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==" }, "web3": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-4.1.1.tgz", - "integrity": "sha512-vnPll2G+ZNktSu7oJVjAW0QYuY0kPHLs8LQMifml4kTR+hqhiTmzMIzO8FqkcsESLEu6H9R7Acj6EgyeU1hruQ==", - "requires": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-eth-contract": "^4.0.5", - "web3-eth-ens": "^4.0.5", - "web3-eth-iban": "^4.0.5", - "web3-eth-personal": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-4.3.0.tgz", + "integrity": "sha512-YiLCsb5wmgJlSxRLzt7Z7H+CmlVVIKD8VaUQaZ+xKVG3Q7CpsO5Z6jmeKnlr6M9c6fDDsDnRM6G8g+nchZehbA==", + "requires": { + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-contract": "^4.1.4", + "web3-eth-ens": "^4.0.8", + "web3-eth-iban": "^4.0.7", + "web3-eth-personal": "^4.0.8", + "web3-net": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" } }, "web3-core": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.1.1.tgz", - "integrity": "sha512-wzS01bC+ihf5DJ6mz2fz4d5yxnPEM5AYQIRihO8kUt3dil+X4V07CHks23wLbb9yk8U9+3a1Iod207WGF872rA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.3.2.tgz", + "integrity": "sha512-uIMVd/j4BgOnwfpY8ZT+QKubOyM4xohEhFZXz9xB8wimXWMMlYVlIK/TbfHqFolS9uOerdSGhsMbcK9lETae8g==", "requires": { - "web3-errors": "^1.1.1", - "web3-eth-iban": "^4.0.5", - "web3-providers-http": "^4.0.5", - "web3-providers-ipc": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-eth-iban": "^4.0.7", + "web3-providers-http": "^4.1.0", + "web3-providers-ipc": "^4.0.7", + "web3-providers-ws": "^4.0.7", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" } }, "web3-errors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.1.tgz", - "integrity": "sha512-9IEhcympCJEK3Nmkz2oE/daKnOh+3CxHceuVWWRkHWKUfuIiJQgXAv9wRkPGk63JJTP/R9jtGmP+IbkScKoTBA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-errors/-/web3-errors-1.1.4.tgz", + "integrity": "sha512-WahtszSqILez+83AxGecVroyZsMuuRT+KmQp4Si5P4Rnqbczno1k748PCrZTS1J4UCPmXMG2/Vt+0Bz2zwXkwQ==", "requires": { - "web3-types": "^1.1.1" + "web3-types": "^1.3.1" } }, "web3-eth": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.1.1.tgz", - "integrity": "sha512-0lftXINbeEOiYhHCWIKgeAOPnjoeHR8DTWLOjURDoz5CKbTj2wfcRQvuL6tUfvvVmrGWHEfIOncM30jhjlTxYQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.3.1.tgz", + "integrity": "sha512-zJir3GOXooHQT85JB8SrufE+Voo5TtXdjhf1D8IGXmxM8MrhI8AT+Pgt4siBTupJcu5hF17iGmTP/Nj2XnaibQ==", "requires": { "setimmediate": "^1.0.5", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth-abi": "^4.1.1", - "web3-eth-accounts": "^4.0.5", - "web3-net": "^4.0.5", - "web3-providers-ws": "^4.0.5", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", + "web3-net": "^4.0.7", + "web3-providers-ws": "^4.0.7", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-abi": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.1.tgz", - "integrity": "sha512-dOLwJ7Ua98WMXuxk7anYfSIqkuCdUvrvU/Um/OWPb6Gw10QciKUWXMIiRobNpWkpS8R77nDtecmQQ1OnTnLaNA==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.4.tgz", + "integrity": "sha512-YLOBVVxxxLYKXjaiwZjEWYEnkMmmrm0nswZsvzSsINy/UgbWbzfoiZU+zn4YNWIEhORhx1p37iS3u/dP6VyC2w==", "requires": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "abitype": "0.7.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-accounts": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.0.5.tgz", - "integrity": "sha512-cmaAH20zFe/7Xjga7EuRXL0UV4O894i6ElEXB9Cqd9fP/CBnhQYK/TYuU37xydHhs5WY+B0hKeaoTqxLaPWAYg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.1.0.tgz", + "integrity": "sha512-UFtAsOANsvihTQ6SSvOKguupmQkResyR9M9JNuOxYpKh7+3W+sTnbLXw2UbOSYIsKlc1mpqqW9bVr1SjqHDpUQ==", "requires": { "@ethereumjs/rlp": "^4.0.1", "crc-32": "^1.2.2", "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-contract": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.0.5.tgz", - "integrity": "sha512-gS21liRDutWQX9i+Ru2Porzefx+7AumRvk+ZLR9wy8l9iLZxldvsvMdgbsyf9lA7UHOqPEhg/zoDyEc0N0hAVw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.1.4.tgz", + "integrity": "sha512-tJ4z6QLgtu8EQu2sXnLA7g427oxmngnbAUh+9kJKbP6Yep/oe+z79PqJv7H3MwqwUNW9T+/FeB2PnSQSyxz6ig==", "requires": { - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-abi": "^4.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" } }, "web3-eth-ens": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.5.tgz", - "integrity": "sha512-PBTCk7h3NlSKP9XWmUJbpTJfMK3IybMAjn+uKrvSbeP50/xaZ73s94nI0eaRmI2FxlSQwTsd7apxXzrE07iKJw==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.8.tgz", + "integrity": "sha512-nj0JfeD45BbzVJcVYpUJnSo8iwDcY9CQ7CZhhIVVOFjvpMAPw0zEwjTvZEIQyCW61OoDG9xcBzwxe2tZoYhMRw==", "requires": { "@adraffy/ens-normalize": "^1.8.8", - "web3-core": "^4.1.1", - "web3-errors": "^1.1.1", - "web3-eth": "^4.1.1", - "web3-eth-contract": "^4.0.5", - "web3-net": "^4.0.5", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth": "^4.3.1", + "web3-eth-contract": "^4.1.2", + "web3-net": "^4.0.7", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-iban": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.5.tgz", - "integrity": "sha512-rAH4Dsk0G90W8UqQFomGNjLfxKhBJwkSnkjdG7TUCRhoFvqvrsW1YL+4a+UoODRyJ9BCdaRR71jrymmy4UTDHA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.7.tgz", + "integrity": "sha512-8weKLa9KuKRzibC87vNLdkinpUE30gn0IGY027F8doeJdcPUfsa4IlBgNC4k4HLBembBB2CTU0Kr/HAOqMeYVQ==", "requires": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-eth-personal": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.5.tgz", - "integrity": "sha512-cypChpAaljYtd1fOfjvhDvty7SBdUvwz5hSimwb+81IJ4MtWc7Jdbn1Ka/g0ZxwoAm46OmeV0yHef7+QyfbpsQ==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.8.tgz", + "integrity": "sha512-sXeyLKJ7ddQdMxz1BZkAwImjqh7OmKxhXoBNF3isDmD4QDpMIwv/t237S3q4Z0sZQamPa/pHebJRWVuvP8jZdw==", "requires": { - "web3-core": "^4.1.1", - "web3-eth": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.0", + "web3-eth": "^4.3.1", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" } }, "web3-net": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.5.tgz", - "integrity": "sha512-7Ir+Da5z3I3KxUn7nmg6NcXxWADYnQAkHX7Z4u4NE3yA+gNbiwPUjVpvSgzpNoDZj+EFovvP1AuOR5idHvyE0g==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.7.tgz", + "integrity": "sha512-SzEaXFrBjY25iQGk5myaOfO9ZyfTwQEa4l4Ps4HDNVMibgZji3WPzpjq8zomVHMwi8bRp6VV7YS71eEsX7zLow==", "requires": { - "web3-core": "^4.1.1", - "web3-rpc-methods": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-core": "^4.3.0", + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" } }, "web3-providers-http": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.0.5.tgz", - "integrity": "sha512-JAY0GyLqRKbKw7m92EMg84otLU6N/NmYqepPid7B8XcPkGzhK6R/FsATyi+BGe2ecW9HRyCSz9SWllTjlKhRwQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.1.0.tgz", + "integrity": "sha512-6qRUGAhJfVQM41E5t+re5IHYmb5hSaLc02BE2MaRQsz2xKA6RjmHpOA5h/+ojJxEpI9NI2CrfDKOAgtJfoUJQg==", "requires": { - "cross-fetch": "^3.1.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "cross-fetch": "^4.0.0", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" } }, "web3-providers-ipc": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.5.tgz", - "integrity": "sha512-1mJWqBnKbQ6UGHVxuXDJRpw4NwkpJ7NabyF2XBmzctzFHKvzE0X1dAocy3tih49J38d0vKrmubTOqxxkMpq49Q==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.7.tgz", + "integrity": "sha512-YbNqY4zUvIaK2MHr1lQFE53/8t/ejHtJchrWn9zVbFMGXlTsOAbNoIoZWROrg1v+hCBvT2c9z8xt7e/+uz5p1g==", "optional": true, "requires": { - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7" } }, "web3-providers-ws": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.5.tgz", - "integrity": "sha512-v9xE16Jjczy+7jMKY7rwTuXgwGK51NKvCGdFERPPcSNJCkS5YCBq9DpzJe8mcr5QhuhnTeGeQ7XmcjTzDRkwnQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.7.tgz", + "integrity": "sha512-n4Dal9/rQWjS7d6LjyEPM2R458V8blRm0eLJupDEJOOIBhGYlxw5/4FthZZ/cqB7y/sLVi7K09DdYx2MeRtU5w==", "requires": { "@types/ws": "8.5.3", "isomorphic-ws": "^5.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-utils": "^4.0.5", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", "ws": "^8.8.1" } }, "web3-rpc-methods": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.1.tgz", - "integrity": "sha512-aAhm1eIKPWWBRf+BrYpKcvQX5qAg1LOU6NhriY0xpXJh01hbwkz0Q8rMJfCCjlGAElYHSp2K/odyAmyKRDr0LQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.4.tgz", + "integrity": "sha512-LTFNg4LFaeU8K9ecuT8fHDp/LOXyxCneeZjCrRYIW1u82Ly52SrY55FIzMIISGoG/iT5Wh7UiHOB3CQsWLBmbQ==", "requires": { - "web3-core": "^4.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-core": "^4.3.2", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" } }, "web3-types": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.1.1.tgz", - "integrity": "sha512-bXmIPJi/NPed43JBcya71gT+euZSMvfQx6NYv8G97PSNxR1HWwANYBKbamTZvzBbq10QCwQLh0hZw3tyOXuPFA==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/web3-types/-/web3-types-1.3.1.tgz", + "integrity": "sha512-8fXi7h/t95VKRtgU4sxprLPZpsTh3jYDfSghshIDBgUD/OoGe5S+syP24SUzBZYllZ/L+hMr2gdp/0bGJa8pYQ==" }, "web3-utils": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.0.5.tgz", - "integrity": "sha512-43xIM7rr3htYNzliVQLpWLQmEf4XX8IXgjvqLcEuC/xje14O5UQM4kamRCtz8v3JZN3X6QTfsV6Zgby67mVmCg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.1.0.tgz", + "integrity": "sha512-+VJWR6FtCsgwuJr5tvSvQlSEG06586df8h2CxGc9tcNtIDyJKNkSDDWJkdNPvyDhhXFzQYFh8QOGymD1CIP6fw==", "requires": { "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", - "web3-validator": "^2.0.1" + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "web3-validator": "^2.0.3" } }, "web3-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.1.tgz", - "integrity": "sha512-RIdZCNhceBEOQpmzcEk6K3qqLHRfDIMkg2PJe7yllpuEc0fa0cmUZgGUl1FEnioc5Rx9GBEE8eTllaneIAiiQQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/web3-validator/-/web3-validator-2.0.3.tgz", + "integrity": "sha512-fJbAQh+9LSNWy+l5Ze6HABreml8fra98o5+vS073T35jUcLbRZ0IOjF/ZPJhJNbJDt+jP1vseZsc3z3uX9mxxQ==", "requires": { "ethereum-cryptography": "^2.0.0", "util": "^0.12.5", - "web3-errors": "^1.1.1", - "web3-types": "^1.1.1", + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", "zod": "^3.21.4" } }, @@ -4251,12 +3722,12 @@ } }, "which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "requires": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -4286,9 +3757,9 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "requires": {} }, "y18n": { diff --git a/tools/package.json b/tools/package.json index 3478c685..3ada7d65 100644 --- a/tools/package.json +++ b/tools/package.json @@ -16,20 +16,20 @@ "url": "git+https://github.com/bifrost-platform/bifrost-node.git" }, "dependencies": { - "@polkadot/api": "10.9.1", - "axios": "1.6.3", + "@polkadot/api": "10.11.2", + "axios": "1.6.5", "bignumber.js": "9.1.2", "gauge": "5.0.1", "shelljs": "0.8.5", - "web3": "4.1.1", + "web3": "4.3.0", "yargs": "17.7.2" }, "devDependencies": { - "@types/gauge": "5.0.0", - "@types/node": "20.2.1", - "@types/yargs": "17.0.24", - "ts-node": "10.9.1", + "@types/gauge": "5.0.4", + "@types/node": "20.11.0", + "@types/yargs": "17.0.32", + "ts-node": "10.9.2", "ts-node-register": "1.0.0", - "typescript": "5.0.4" + "typescript": "5.3.3" } } From 8881b4304afaf6c9587241d407c54f5e6057a95b Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 12 Jan 2024 15:54:31 +0900 Subject: [PATCH 50/53] NODE-65, deps: update Cargo.lock --- Cargo.lock | 80 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92ff07e3..b22d7026 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2671,7 +2671,7 @@ dependencies = [ [[package]] name = "evm" version = "0.39.1" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v1.3.0#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "auto_impl", "environmental", @@ -2691,7 +2691,7 @@ dependencies = [ [[package]] name = "evm-core" version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v1.3.0#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "parity-scale-codec", "primitive-types", @@ -2702,7 +2702,7 @@ dependencies = [ [[package]] name = "evm-gasometer" version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v1.3.0#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "environmental", "evm-core", @@ -2713,7 +2713,7 @@ dependencies = [ [[package]] name = "evm-runtime" version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v1.3.0#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "auto_impl", "environmental", @@ -2725,7 +2725,7 @@ dependencies = [ [[package]] name = "evm-tracer" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "evm", @@ -2785,7 +2785,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "async-trait", "fp-storage", @@ -2797,7 +2797,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "async-trait", "fp-consensus", @@ -2813,7 +2813,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "async-trait", "ethereum", @@ -2844,7 +2844,7 @@ dependencies = [ [[package]] name = "fc-evm-tracing" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "fp-rpc-debug", @@ -2859,7 +2859,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "fc-db", "fc-storage", @@ -2882,7 +2882,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -2936,7 +2936,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -2949,7 +2949,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2964,7 +2964,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2978,7 +2978,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -2991,7 +2991,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-types" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "serde", @@ -3001,7 +3001,7 @@ dependencies = [ [[package]] name = "fc-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -3032,7 +3032,7 @@ dependencies = [ [[package]] name = "fc-rpc-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -3068,7 +3068,7 @@ dependencies = [ [[package]] name = "fc-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "fc-rpc", @@ -3091,7 +3091,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -3272,7 +3272,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "hex", "impl-serde", @@ -3291,7 +3291,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "parity-scale-codec", @@ -3303,7 +3303,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -3316,7 +3316,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "evm", "frame-support", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "fp-ext" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum-types", "fp-rpc-evm-tracing-events", @@ -3345,7 +3345,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -3362,7 +3362,7 @@ dependencies = [ [[package]] name = "fp-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "environmental", "ethereum", @@ -3380,7 +3380,7 @@ dependencies = [ [[package]] name = "fp-rpc-evm-tracing-events" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "environmental", "ethereum", @@ -3395,7 +3395,7 @@ dependencies = [ [[package]] name = "fp-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "parity-scale-codec", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "frame-support", "parity-scale-codec", @@ -3421,7 +3421,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "parity-scale-codec", "serde", @@ -6038,7 +6038,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "fp-evm", "frame-support", @@ -6156,7 +6156,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "ethereum", "ethereum-types", @@ -6179,7 +6179,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "environmental", "evm", @@ -6205,7 +6205,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "fp-evm", ] @@ -6213,7 +6213,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "fp-evm", "sp-core", @@ -6223,7 +6223,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "fp-evm", "num", @@ -6232,7 +6232,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "fp-evm", "ripemd", @@ -7011,7 +7011,7 @@ dependencies = [ [[package]] name = "precompile-utils" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "environmental", "evm", @@ -7034,7 +7034,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#001dc907de5ccd5efd9345bbd4184467638d1767" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" dependencies = [ "case", "num_enum", diff --git a/Cargo.toml b/Cargo.toml index d9c04e91..398cfe3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ parity-scale-codec = { version = "3.6.4", default-features = false, features = [ scale-info = { version = "2.9.0", default-features = false, features = [ "derive", ] } -evm = { git = "https://github.com/bifrost-platform/evm", default-features = false, branch = "bifrost-polkadot-v0.9.43" } +evm = { git = "https://github.com/bifrost-platform/evm", default-features = false, branch = "bifrost-polkadot-v1.3.0" } environmental = { version = "1.1.2", default-features = false } clap = { version = "4.0.9", features = ["derive"] } hex = { version = "0.4.3", default-features = false } From 246a9815fbf40bf17e7734eceaa568aee3ac37bc Mon Sep 17 00:00:00 2001 From: dnjscksdn98 Date: Fri, 12 Jan 2024 17:38:46 +0900 Subject: [PATCH 51/53] NODE-65, fix: remove test config --- tests/.gitignore | 3 --- tests/runtime/config.local.json | 7 ------- tests/runtime/config.testnet.json | 7 ------- 3 files changed, 17 deletions(-) delete mode 100644 tests/runtime/config.local.json delete mode 100644 tests/runtime/config.testnet.json diff --git a/tests/.gitignore b/tests/.gitignore index 57d02457..2dba6caf 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -194,6 +194,3 @@ $RECYCLE.BIN/ *.lnk config.json -config.local.json -config.testnet.json -config.mainnet.json diff --git a/tests/runtime/config.local.json b/tests/runtime/config.local.json deleted file mode 100644 index bd14392f..00000000 --- a/tests/runtime/config.local.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "nodeEndpoint": "http://localhost:9944", - "testerPk": "0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b", - "tester": "0x3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0", - "tester2": "0x798d4Ba9baf0064Ec19eB4F0a1a45785ae9D6DFc", - "validator": "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac" -} diff --git a/tests/runtime/config.testnet.json b/tests/runtime/config.testnet.json deleted file mode 100644 index edbfc4a6..00000000 --- a/tests/runtime/config.testnet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "nodeEndpoint": "https://private.testnet.thebifrost.io/rpc", - "testerPk": "0x551bc2c70de4d7db6506b3599071876f99143227f48fddd19c7f9ca4db2f41eb", - "tester": "0x81143D1d29B101B84FE87BCB2f684534b20EBaAd", - "tester2": "0xEc27264491E0B8DcD6D9b7155A7951BFA13236FD", - "validator": "0x45A96ACA1Cd759306B05B05b40B082254E77699b" -} From 07b5283a0a75e4ae7faf534323e9edb0ef9e738d Mon Sep 17 00:00:00 2001 From: Min-seong Kwon Date: Thu, 18 Jan 2024 13:45:08 +0900 Subject: [PATCH 52/53] NODE-84, chore: bifrost-frontier/pull/12 (#37) --- Cargo.lock | 80 ++++++++++++++++++++----------------- node/common/src/rpc.rs | 4 ++ node/core/src/command.rs | 2 +- node/dev/src/rpc.rs | 3 +- node/dev/src/service.rs | 2 + node/mainnet/src/rpc.rs | 3 +- node/mainnet/src/service.rs | 2 + node/testnet/src/rpc.rs | 3 +- node/testnet/src/service.rs | 2 + tests/package-lock.json | 38 +++++++++--------- 10 files changed, 80 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b22d7026..f20bc4b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2725,7 +2725,7 @@ dependencies = [ [[package]] name = "evm-tracer" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "evm", @@ -2785,7 +2785,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "async-trait", "fp-storage", @@ -2797,7 +2797,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "async-trait", "fp-consensus", @@ -2813,7 +2813,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "async-trait", "ethereum", @@ -2844,7 +2844,7 @@ dependencies = [ [[package]] name = "fc-evm-tracing" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "fp-rpc-debug", @@ -2859,7 +2859,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "fc-db", "fc-storage", @@ -2882,7 +2882,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -2904,6 +2904,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "rlp", + "rustc_version", "sc-client-api", "sc-consensus-aura", "sc-network", @@ -2929,6 +2930,7 @@ dependencies = [ "sp-storage", "sp-timestamp", "substrate-prometheus-endpoint", + "target_info", "thiserror", "tokio", ] @@ -2936,7 +2938,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -2949,7 +2951,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2964,7 +2966,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2978,7 +2980,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -2991,7 +2993,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-types" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "serde", @@ -3001,7 +3003,7 @@ dependencies = [ [[package]] name = "fc-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -3032,7 +3034,7 @@ dependencies = [ [[package]] name = "fc-rpc-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -3068,7 +3070,7 @@ dependencies = [ [[package]] name = "fc-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "fc-rpc", @@ -3091,7 +3093,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -3272,7 +3274,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "hex", "impl-serde", @@ -3291,7 +3293,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "parity-scale-codec", @@ -3303,7 +3305,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -3316,7 +3318,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "evm", "frame-support", @@ -3332,7 +3334,7 @@ dependencies = [ [[package]] name = "fp-ext" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum-types", "fp-rpc-evm-tracing-events", @@ -3345,7 +3347,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -3362,7 +3364,7 @@ dependencies = [ [[package]] name = "fp-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "environmental", "ethereum", @@ -3380,7 +3382,7 @@ dependencies = [ [[package]] name = "fp-rpc-evm-tracing-events" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "environmental", "ethereum", @@ -3395,7 +3397,7 @@ dependencies = [ [[package]] name = "fp-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "parity-scale-codec", @@ -3409,7 +3411,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "frame-support", "parity-scale-codec", @@ -3421,7 +3423,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "parity-scale-codec", "serde", @@ -6038,7 +6040,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "fp-evm", "frame-support", @@ -6156,7 +6158,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "ethereum", "ethereum-types", @@ -6179,7 +6181,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "environmental", "evm", @@ -6205,7 +6207,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "fp-evm", ] @@ -6213,7 +6215,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "fp-evm", "sp-core", @@ -6223,7 +6225,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "fp-evm", "num", @@ -6232,7 +6234,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "fp-evm", "ripemd", @@ -7011,7 +7013,7 @@ dependencies = [ [[package]] name = "precompile-utils" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "environmental", "evm", @@ -7034,7 +7036,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b989bf6ce5c68deb9a176d48c9766c75be34ed65" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v1.3.0#b265b1cfd1586a17513578fc933e206e343dac40" dependencies = [ "case", "num_enum", @@ -10435,6 +10437,12 @@ version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +[[package]] +name = "target_info" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" + [[package]] name = "tempfile" version = "3.9.0" diff --git a/node/common/src/rpc.rs b/node/common/src/rpc.rs index 1215292a..fdf87660 100644 --- a/node/common/src/rpc.rs +++ b/node/common/src/rpc.rs @@ -86,6 +86,8 @@ pub struct GrandpaDeps { /// Full client dependencies. pub struct FullDevDeps { + /// Client version. + pub client_version: String, /// The client instance to use. pub client: Arc, /// Transaction pool instance. @@ -136,6 +138,8 @@ pub struct FullDevDeps { /// Mainnet/Testnet client dependencies. pub struct FullDeps { + /// Client version. + pub client_version: String, /// The client instance to use. pub client: Arc, /// Transaction pool instance. diff --git a/node/core/src/command.rs b/node/core/src/command.rs index a13b9bd8..5db084f9 100644 --- a/node/core/src/command.rs +++ b/node/core/src/command.rs @@ -55,7 +55,7 @@ impl SubstrateCli for Cli { } fn support_url() -> String { - "support.anonymous.an".into() + env!("CARGO_PKG_HOMEPAGE").into() } fn copyright_start_year() -> i32 { diff --git a/node/dev/src/rpc.rs b/node/dev/src/rpc.rs index d956b109..e18200e8 100644 --- a/node/dev/src/rpc.rs +++ b/node/dev/src/rpc.rs @@ -81,6 +81,7 @@ where let mut io = RpcModule::new(()); let FullDevDeps { + client_version, client, pool, select_chain: _, @@ -169,7 +170,7 @@ where ) .ok(); - io.merge(Web3::new(Arc::clone(&client)).into_rpc()).ok(); + io.merge(Web3::new(&client_version).into_rpc()).ok(); if ethapi_cmd.contains(&EthApiCmd::Txpool) { io.merge(TxPool::new(Arc::clone(&client), graph.clone()).into_rpc()).ok(); diff --git a/node/dev/src/service.rs b/node/dev/src/service.rs index c7abc0df..7978a340 100644 --- a/node/dev/src/service.rs +++ b/node/dev/src/service.rs @@ -632,6 +632,7 @@ pub fn build_rpc_extensions_builder( Some(shared_authority_set.clone()), ); + let client_version = config.impl_version.clone(); let client = builder.client.clone(); let pool = builder.transaction_pool.clone(); let network = builder.network.clone(); @@ -774,6 +775,7 @@ pub fn build_rpc_extensions_builder( let rpc_extensions_builder = move |deny_unsafe, subscription_executor| { let deps = FullDevDeps { + client_version: client_version.clone(), client: client.clone(), pool: pool.clone(), graph: pool.pool().clone(), diff --git a/node/mainnet/src/rpc.rs b/node/mainnet/src/rpc.rs index 03a0ace4..1a69f02b 100644 --- a/node/mainnet/src/rpc.rs +++ b/node/mainnet/src/rpc.rs @@ -80,6 +80,7 @@ where let mut io = RpcModule::new(()); let FullDeps { + client_version, client, pool, select_chain: _, @@ -167,7 +168,7 @@ where ) .ok(); - io.merge(Web3::new(Arc::clone(&client)).into_rpc()).ok(); + io.merge(Web3::new(&client_version).into_rpc()).ok(); if ethapi_cmd.contains(&EthApiCmd::Txpool) { io.merge(TxPool::new(Arc::clone(&client), graph.clone()).into_rpc()).ok(); diff --git a/node/mainnet/src/service.rs b/node/mainnet/src/service.rs index 9a71e666..8e9c52ab 100644 --- a/node/mainnet/src/service.rs +++ b/node/mainnet/src/service.rs @@ -430,6 +430,7 @@ pub fn build_rpc_extensions_builder( Some(shared_authority_set.clone()), ); + let client_version = config.impl_version.clone(); let client = builder.client.clone(); let pool = builder.transaction_pool.clone(); let network = builder.network.clone(); @@ -571,6 +572,7 @@ pub fn build_rpc_extensions_builder( let rpc_extensions_builder = move |deny_unsafe, subscription_executor| { let deps = FullDeps { + client_version: client_version.clone(), client: client.clone(), pool: pool.clone(), graph: pool.pool().clone(), diff --git a/node/testnet/src/rpc.rs b/node/testnet/src/rpc.rs index a51d6d19..57434f5e 100644 --- a/node/testnet/src/rpc.rs +++ b/node/testnet/src/rpc.rs @@ -80,6 +80,7 @@ where let mut io = RpcModule::new(()); let FullDeps { + client_version, client, pool, select_chain: _, @@ -154,7 +155,7 @@ where ) .ok(); - io.merge(Web3::new(Arc::clone(&client)).into_rpc()).ok(); + io.merge(Web3::new(&client_version).into_rpc()).ok(); io.merge( EthPubSub::new( diff --git a/node/testnet/src/service.rs b/node/testnet/src/service.rs index b3d7c066..40ac52e1 100644 --- a/node/testnet/src/service.rs +++ b/node/testnet/src/service.rs @@ -430,6 +430,7 @@ pub fn build_rpc_extensions_builder( Some(shared_authority_set.clone()), ); + let client_version = config.impl_version.clone(); let client = builder.client.clone(); let pool = builder.transaction_pool.clone(); let network = builder.network.clone(); @@ -571,6 +572,7 @@ pub fn build_rpc_extensions_builder( let rpc_extensions_builder = move |deny_unsafe, subscription_executor| { let deps = FullDeps { + client_version: client_version.clone(), client: client.clone(), pool: pool.clone(), graph: pool.pool().clone(), diff --git a/tests/package-lock.json b/tests/package-lock.json index 2767e647..6d179cc0 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -8,27 +8,27 @@ "name": "@bifrost-platform/bifrost-node", "version": "1.3.0", "dependencies": { - "@polkadot/api": "^10.11.2", - "axios": "^1.6.5", - "bignumber.js": "^9.1.2", - "ethers": "^5.7.2", - "shelljs": "^0.8.5", - "tcp-port-used": "^1.0.2", - "web3": "^4.3.0" + "@polkadot/api": "10.11.2", + "axios": "1.6.5", + "bignumber.js": "9.1.2", + "ethers": "5.7.2", + "shelljs": "0.8.5", + "tcp-port-used": "1.0.2", + "web3": "4.3.0" }, "devDependencies": { - "@types/chai": "^4.3.11", - "@types/mocha": "^10.0.6", - "@types/node": "^20.10.8", - "@types/shelljs": "^0.8.15", - "@types/tcp-port-used": "^1.0.4", - "@types/yargs": "^17.0.32", - "chai": "^4.4.0", - "char": "^1.0.2", - "mocha": "^10.2.0", - "ts-node": "^10.9.2", - "ts-node-register": "^1.0.0", - "typescript": "^5.3.3" + "@types/chai": "4.3.11", + "@types/mocha": "10.0.6", + "@types/node": "20.10.8", + "@types/shelljs": "0.8.15", + "@types/tcp-port-used": "1.0.4", + "@types/yargs": "17.0.32", + "chai": "4.4.0", + "char": "1.0.2", + "mocha": "10.2.0", + "ts-node": "10.9.2", + "ts-node-register": "1.0.0", + "typescript": "5.3.3" } }, "node_modules/@adraffy/ens-normalize": { From 121659e7852cf2bf3eca2bad1240adf3bedf065f Mon Sep 17 00:00:00 2001 From: alstjd0921 Date: Fri, 19 Jan 2024 12:40:56 +0900 Subject: [PATCH 53/53] NODE-65, test: bifrost-frontier/pull/12 test code --- tests/tests/rpc/test_web3api.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/tests/rpc/test_web3api.ts b/tests/tests/rpc/test_web3api.ts index 80f5d97d..5d2f1df5 100644 --- a/tests/tests/rpc/test_web3api.ts +++ b/tests/tests/rpc/test_web3api.ts @@ -6,10 +6,7 @@ import { describeDevNode } from '../set_dev_node'; describeDevNode('Web3Api Information', (context) => { it('should include client version', async function () { const version = await context.web3.eth.getNodeInfo(); - const specName: string = context.polkadotApi.runtimeVersion.specName.toString(); - const specVersion: string = context.polkadotApi.runtimeVersion.specVersion.toString(); - const implVersion: string = context.polkadotApi.runtimeVersion.implVersion.toString(); - const regex = new RegExp(specName + '/v' + specVersion + '.' + implVersion + '/fc-rpc-2.0.0'); + const regex = new RegExp('^bifrost-node\\/v\\d+\\.\\d+\\.\\d+-[0-9a-f]+\\/[^\\/]+\\/rustc\\d+\\.\\d+\\.\\d+$'); expect(version).to.be.match(regex); });