git.delta.rocks / unique-network / refs/commits / 01896baccffe

difftreelog

fix after rebase

Trubnikov Sergey2022-10-13parent: #b44fe9b.patch.diff
in: master

7 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1097,18 +1097,18 @@
 
 [[package]]
 name = "const_format"
-version = "0.2.26"
+version = "0.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "939dc9e2eb9077e0679d2ce32de1ded8531779360b003b4a972a7a39ec263495"
+checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.22"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d"
+checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2333,13 +2333,13 @@
 [[package]]
 name = "evm"
 version = "0.35.0"
-source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27#e9252ed42dc26fc85b6703b1ba50660a08209e55"
+source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55"
 dependencies = [
  "auto_impl",
  "ethereum",
- "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
- "evm-gasometer 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
- "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
+ "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
+ "evm-gasometer 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
+ "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
  "log",
  "parity-scale-codec 3.2.1",
  "primitive-types",
@@ -2381,7 +2381,7 @@
  "hex",
  "hex-literal",
  "impl-trait-for-tuples",
- "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.27-fee-limit)",
+ "pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29)",
  "primitive-types",
  "sha3-const",
  "similar-asserts",
@@ -2403,7 +2403,7 @@
 [[package]]
 name = "evm-core"
 version = "0.35.0"
-source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27#e9252ed42dc26fc85b6703b1ba50660a08209e55"
+source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "primitive-types",
@@ -2424,10 +2424,10 @@
 [[package]]
 name = "evm-gasometer"
 version = "0.35.0"
-source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27#e9252ed42dc26fc85b6703b1ba50660a08209e55"
+source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55"
 dependencies = [
- "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
- "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
+ "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
+ "evm-runtime 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
  "primitive-types",
 ]
 
@@ -2445,10 +2445,10 @@
 [[package]]
 name = "evm-runtime"
 version = "0.35.0"
-source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27#e9252ed42dc26fc85b6703b1ba50660a08209e55"
+source = "git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29#e9252ed42dc26fc85b6703b1ba50660a08209e55"
 dependencies = [
  "auto_impl",
- "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
+ "evm-core 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
  "primitive-types",
  "sha3",
 ]
@@ -2794,14 +2794,14 @@
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.27-fee-limit#0ae36821312f4a26e7f96225f1b2cb16216cddf5"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29#852f994e82f9e5718dde75e8c4d877db5a44dd45"
 dependencies = [
- "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
- "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
+ "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "impl-trait-for-tuples",
  "parity-scale-codec 3.2.1",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -2821,10 +2821,10 @@
 [[package]]
 name = "fp-evm-mapping"
 version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.27-fee-limit#0ae36821312f4a26e7f96225f1b2cb16216cddf5"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29#852f994e82f9e5718dde75e8c4d877db5a44dd45"
 dependencies = [
- "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -3010,11 +3010,11 @@
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "bitflags",
  "frame-metadata",
- "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "impl-trait-for-tuples",
  "k256",
  "log",
@@ -3022,15 +3022,16 @@
  "paste",
  "scale-info",
  "smallvec",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "tt-call",
 ]
 
@@ -3069,10 +3070,12 @@
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "Inflector",
- "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "cfg-expr",
+ "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn",
@@ -3095,9 +3098,9 @@
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
- "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
@@ -3119,7 +3122,7 @@
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3139,17 +3142,17 @@
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
- "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "log",
  "parity-scale-codec 3.2.1",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -6137,26 +6140,26 @@
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.27-fee-limit#0ae36821312f4a26e7f96225f1b2cb16216cddf5"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29#852f994e82f9e5718dde75e8c4d877db5a44dd45"
 dependencies = [
- "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.27)",
- "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.27-fee-limit)",
- "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.27-fee-limit)",
- "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "evm 0.35.0 (git+https://github.com/uniquenetwork/evm?branch=unique-polkadot-v0.9.29)",
+ "fp-evm 3.0.0-dev (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29)",
+ "fp-evm-mapping 0.1.0 (git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.29)",
+ "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "hex",
  "impl-trait-for-tuples",
  "log",
- "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "parity-scale-codec 3.2.1",
  "primitive-types",
  "rlp",
  "scale-info",
  "sha3",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -6914,17 +6917,17 @@
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
- "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "log",
  "parity-scale-codec 3.2.1",
  "scale-info",
- "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -11108,9 +11111,9 @@
 
 [[package]]
 name = "sha3-const"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9625d558d174dbdc711248b479271c0fdca39e9d3d67f6e890b3d4251fbf8e"
+checksum = "b04774de876479a8f712e787f8271b14712971329a4be66c6dff144db7cfc343"
 
 [[package]]
 name = "sharded-slab"
@@ -11282,15 +11285,15 @@
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "log",
  "parity-scale-codec 3.2.1",
- "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -11314,7 +11317,7 @@
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -11338,13 +11341,13 @@
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -11363,14 +11366,14 @@
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec 3.2.1",
  "scale-info",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "static_assertions",
 ]
 
@@ -11534,7 +11537,7 @@
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "bitflags",
  "byteorder",
@@ -11547,10 +11550,10 @@
  "primitive-types",
  "scale-info",
  "secrecy",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "ss58-registry",
  "zeroize",
 ]
@@ -11604,14 +11607,14 @@
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "blake2",
  "byteorder",
  "digest 0.10.5",
  "sha2 0.10.6",
  "sha3",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "twox-hash",
 ]
 
@@ -11632,11 +11635,11 @@
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "proc-macro2",
  "quote",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "syn",
 ]
 
@@ -11663,7 +11666,7 @@
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11683,12 +11686,12 @@
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "environmental",
  "parity-scale-codec 3.2.1",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -11723,12 +11726,12 @@
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec 3.2.1",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -11748,16 +11751,17 @@
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
+ "bytes",
  "hash-db",
  "parity-scale-codec 3.2.1",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "tracing",
  "tracing-core",
 ]
@@ -11887,7 +11891,7 @@
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11897,11 +11901,11 @@
  "parity-util-mem",
  "paste",
  "scale-info",
- "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -11930,17 +11934,18 @@
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec 3.2.1",
  "primitive-types",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "static_assertions",
 ]
 
@@ -11965,7 +11970,7 @@
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -12017,12 +12022,12 @@
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "scale-info",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -12061,7 +12066,7 @@
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 
 [[package]]
 name = "sp-std"
@@ -12071,12 +12076,12 @@
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "ref-cast",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -12108,13 +12113,13 @@
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
- "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -12136,10 +12141,10 @@
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
  "tracing",
  "tracing-core",
 ]
@@ -12207,14 +12212,14 @@
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "scale-info",
- "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
- "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
+ "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
@@ -12237,7 +12242,7 @@
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "parity-scale-codec 3.2.1",
  "proc-macro2",
@@ -12259,11 +12264,11 @@
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec 3.2.1",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)",
+ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29)",
 ]
 
 [[package]]
modifiedcrates/evm-coder/Cargo.tomldiffbeforeafterboth
--- a/crates/evm-coder/Cargo.toml
+++ b/crates/evm-coder/Cargo.toml
@@ -6,7 +6,7 @@
 
 [dependencies]
 const_format = { version = "0.2.26", default-features = false }
-sha3-const = { version = "0.1.0", default-features = false }
+sha3-const = { version = "0.1.1", default-features = false }
 # Ethereum uses keccak (=sha3) for selectors
 # sha3 = "0.10.1"
 # evm-coder reexports those proc-macro
@@ -22,7 +22,7 @@
 # We have tuple-heavy code in solidity.rs
 impl-trait-for-tuples = "0.2.2"
 
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.27-fee-limit" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.29" }
 
 [dev-dependencies]
 # We want to assert some large binary blobs equality in tests
modifiedcrates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -895,7 +895,7 @@
 		};
 		custom_signature.extend(custom_signature_group.to_token_stream());
 
-		// println!("!!!!! {}", custom_signature);
+		println!("!!!!! {}", custom_signature);
 		custom_signature
 	}
modifiedcrates/evm-coder/src/abi.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi.rs
+++ b/crates/evm-coder/src/abi.rs
@@ -424,44 +424,16 @@
 	fn is_dynamic() -> bool {
 		address::is_dynamic() || uint256::is_dynamic()
 	}
-}
 
-impl AbiRead<EthCrossAccount> for AbiReader<'_> {
-	fn abi_read(&mut self) -> Result<EthCrossAccount> {
-		let size = if !EthCrossAccount::is_dynamic() {
-			Some(<Self as AbiRead<EthCrossAccount>>::size())
-		} else {
-			None
-		};
-		let mut subresult = self.subresult(size)?;
-		let eth = <Self as AbiRead<address>>::abi_read(&mut subresult)?;
-		let sub = <Self as AbiRead<uint256>>::abi_read(&mut subresult)?;
-
-		Ok(EthCrossAccount { eth: eth, sub: sub })
-	}
-
 	fn size() -> usize {
-		<Self as AbiRead<address>>::size() + <Self as AbiRead<uint256>>::size()
-	}
-}
-
-impl AbiWrite for &EthCrossAccount {
-	fn abi_write(&self, writer: &mut AbiWriter) {
-		self.eth.abi_write(writer);
-		self.sub.abi_write(writer);
+		<address as TypeHelper>::size() + <uint256 as TypeHelper>::size()
 	}
 }
 
-impl TypeHelper for EthCrossAccount {
-	fn is_dynamic() -> bool {
-		address::is_dynamic() || uint256::is_dynamic()
-	}
-}
-
 impl AbiRead<EthCrossAccount> for AbiReader<'_> {
 	fn abi_read(&mut self) -> Result<EthCrossAccount> {
 		let size = if !EthCrossAccount::is_dynamic() {
-			Some(<Self as AbiRead<EthCrossAccount>>::size())
+			Some(<EthCrossAccount as TypeHelper>::size())
 		} else {
 			None
 		};
@@ -469,11 +441,7 @@
 		let eth = <Self as AbiRead<address>>::abi_read(&mut subresult)?;
 		let sub = <Self as AbiRead<uint256>>::abi_read(&mut subresult)?;
 
-		Ok(EthCrossAccount { eth: eth, sub: sub })
-	}
-
-	fn size() -> usize {
-		<Self as AbiRead<address>>::size() + <Self as AbiRead<uint256>>::size()
+		Ok(EthCrossAccount { eth, sub })
 	}
 }
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
before · crates/evm-coder/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![doc = include_str!("../README.md")]18#![deny(missing_docs)]19#![cfg_attr(not(feature = "std"), no_std)]20#[cfg(not(feature = "std"))]21extern crate alloc;2223use abi::{AbiRead, AbiReader, AbiWriter};24pub use evm_coder_procedural::{event_topic, fn_selector};25pub mod abi;26pub use events::{ToLog, ToTopic};27use execution::DispatchInfo;28pub mod execution;2930/// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]31/// and [`crate::Call`] from impl block.32///33/// ## Macro syntax34///35/// `#[solidity_interface(name, is, inline_is, events)]`36/// - *name* - used in generated code, and for Call enum name37/// - *is* - used to provide inheritance in Solidity38/// - *inline_is* - same as `is`, but ERC165::SupportsInterface will work differently: For `is` SupportsInterface(A) will return true39///   if A is one of the interfaces the contract is inherited from (e.g. B is created as `is(A)`). If B is created as `inline_is(A)`40///   SupportsInterface(A) will internally create a new interface that combines all methods of A and B, so SupportsInterface(A) will return41///   false.42///43/// `#[weight(value)]`44/// Can be added to every method of impl block, used for deriving [`crate::Weighted`], which45/// is used by substrate bridge.46/// - *value*: expression, which evaluates to weight required to call this method.47/// This expression can use call arguments to calculate non-constant execution time.48/// This expression should evaluate faster than actual execution does, and may provide worse case49/// than one is called.50///51/// `#[solidity_interface(rename_selector)]`52/// - *rename_selector* - by default, selector name will be generated by transforming method name53/// from snake_case to camelCase. Use this option, if other naming convention is required.54/// I.e: method `token_uri` will be automatically renamed to `tokenUri` in selector, but name55/// required by ERC721 standard is `tokenURI`, thus we need to specify `rename_selector = "tokenURI"`56/// explicitly.57///58/// Both contract and contract methods may have doccomments, which will end up in a generated59/// solidity interface file, thus you should use [solidity syntax](https://docs.soliditylang.org/en/latest/natspec-format.html) for writing documentation in this macro60///61/// ## Example62///63/// ```ignore64/// struct SuperContract;65/// struct InlineContract;66/// struct Contract;67///68/// #[derive(ToLog)]69/// enum ContractEvents {70///     Event(#[indexed] uint32),71/// }72///73/// /// @dev This contract provides function to multiply two numbers74/// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]75/// impl Contract {76///     /// Multiply two numbers77///     /// @param a First number78///     /// @param b Second number79///     /// @return uint32 Product of two passed numbers80///     /// @dev This function returns error in case of overflow81///     #[weight(200 + a + b)]82///     #[solidity_interface(rename_selector = "mul")]83///     fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {84///         Ok(a.checked_mul(b).ok_or("overflow")?)85///     }86/// }87/// ```88pub use evm_coder_procedural::solidity_interface;89/// See [`solidity_interface`]90pub use evm_coder_procedural::solidity;91/// See [`solidity_interface`]92pub use evm_coder_procedural::weight;93pub use const_format;94pub use sha3_const;9596/// Derives [`ToLog`] for enum97///98/// Selectors will be derived from variant names, there is currently no way to have custom naming99/// for them100///101/// `#[indexed]`102/// Marks this field as indexed, so it will appear in [`ethereum::Log`] topics instead of data103pub use evm_coder_procedural::ToLog;104105// Api of those modules shouldn't be consumed directly, it is only exported for usage in proc macros106#[doc(hidden)]107pub mod events;108#[doc(hidden)]109pub mod solidity;110111/// Solidity type definitions (aliases from solidity name to rust type)112/// To be used in [`solidity_interface`] definitions, to make sure there is no113/// type conflict between Rust code and generated definitions114pub mod types {115	#![allow(non_camel_case_types, missing_docs)]116117	#[cfg(not(feature = "std"))]118	use alloc::{vec::Vec};119	use pallet_evm::account::CrossAccountId;120	use primitive_types::{U256, H160, H256};121122	pub type address = H160;123124	pub type uint8 = u8;125	pub type uint16 = u16;126	pub type uint32 = u32;127	pub type uint64 = u64;128	pub type uint128 = u128;129	pub type uint256 = U256;130131	pub type bytes4 = [u8; 4];132133	pub type topic = H256;134135	#[cfg(not(feature = "std"))]136	pub type string = ::alloc::string::String;137	#[cfg(feature = "std")]138	pub type string = ::std::string::String;139140	#[derive(Default, Debug)]141	pub struct bytes(pub Vec<u8>);142143	/// Solidity doesn't have `void` type, however we have special implementation144	/// for empty tuple return type145	pub type void = ();146147	//#region Special types148	/// Makes function payable149	pub type value = U256;150	/// Makes function caller-sensitive151	pub type caller = address;152	//#endregion153154	/// Ethereum typed call message, similar to solidity155	/// `msg` object.156	pub struct Msg<C> {157		pub call: C,158		/// Address of user, which called this contract.159		pub caller: H160,160		/// Payment amount to contract.161		/// Contract should reject payment, if target call is not payable,162		/// and there is no `receiver()` function defined.163		pub value: U256,164	}165166	impl From<Vec<u8>> for bytes {167		fn from(src: Vec<u8>) -> Self {168			Self(src)169		}170	}171172	impl Into<Vec<u8>> for bytes {173		fn into(self) -> Vec<u8> {174			self.0175		}176	}177178	impl bytes {179		#[must_use]180		pub fn len(&self) -> usize {181			self.0.len()182		}183184		#[must_use]185		pub fn is_empty(&self) -> bool {186			self.len() == 0187		}188	}189190	#[derive(Debug)]191	pub struct EthCrossAccount {192		pub(crate) eth: address,193		pub(crate) sub: uint256,194	}195196	impl EthCrossAccount {197		pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self198		where199			T: pallet_evm::account::Config,200			T::AccountId: AsRef<[u8; 32]>,201		{202			if cross_account_id.is_canonical_substrate() {203				Self {204					eth: Default::default(),205					sub: convert_cross_account_to_uint256::<T>(cross_account_id),206				}207			} else {208				Self {209					eth: *cross_account_id.as_eth(),210					sub: Default::default(),211				}212			}213		}214215		pub fn into_sub_cross_account<T>(&self) -> crate::execution::Result<T::CrossAccountId>216		where217			T: pallet_evm::account::Config,218			T::AccountId: From<[u8; 32]>,219		{220			if self.eth == Default::default() && self.sub == Default::default() {221				Err("All fields of cross account is zeroed".into())222			} else if self.eth == Default::default() {223				Ok(convert_uint256_to_cross_account::<T>(self.sub))224			} else if self.sub == Default::default() {225				Ok(T::CrossAccountId::from_eth(self.eth))226			} else {227				Err("All fields of cross account is non zeroed".into())228			}229		}230	}231232	impl SignatureString for EthCrossAccount {233		const SIGNATURE_STRING: &'static str = "(address,uint256)";234	}235236	pub trait SignatureString {237		const SIGNATURE_STRING: &'static str;238	}239240	/// Convert `CrossAccountId` to `uint256`.241	pub fn convert_cross_account_to_uint256<T: pallet_evm::account::Config>(242		from: &T::CrossAccountId,243	) -> uint256244	where245		T::AccountId: AsRef<[u8; 32]>,246	{247		let slice = from.as_sub().as_ref();248		uint256::from_big_endian(slice)249	}250251	/// Convert `uint256` to `CrossAccountId`.252	pub fn convert_uint256_to_cross_account<T: pallet_evm::account::Config>(253		from: uint256,254	) -> T::CrossAccountId255	where256		T::AccountId: From<[u8; 32]>,257	{258		let mut new_admin_arr = [0_u8; 32];259		from.to_big_endian(&mut new_admin_arr);260		let account_id = T::AccountId::from(new_admin_arr);261		T::CrossAccountId::from_sub(account_id)262	}263}264265/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro266pub trait Call: Sized {267	/// Parse call buffer into typed call enum268	fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;269}270271/// Intended to be used as `#[weight]` output type272/// Should be same between evm-coder and substrate to avoid confusion273///274/// Isn't same thing as gas, some mapping is required between those types275pub type Weight = frame_support::weights::Weight;276277/// In substrate, we have benchmarking, which allows278/// us to not rely on gas metering, but instead predict amount of gas to execute call279pub trait Weighted: Call {280	/// Predict weight of this call281	fn weight(&self) -> DispatchInfo;282}283284/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro285/// on interface implementation, or for externally-owned real EVM contract286pub trait Callable<C: Call> {287	/// Call contract using specified call data288	fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;289}290291/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],292/// this structure holds parsed data for ERC165Call subvariant293///294/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every295/// implementing contract296///297/// See <https://eips.ethereum.org/EIPS/eip-165>298#[derive(Debug)]299pub enum ERC165Call {300	/// ERC165 provides single method, which returns true, if contract301	/// implements specified interface302	SupportsInterface {303		/// Requested interface304		interface_id: types::bytes4,305	},306}307308impl ERC165Call {309	/// ERC165 selector is provided by standard310	pub const INTERFACE_ID: types::bytes4 = u32::to_be_bytes(0x01ffc9a7);311}312313impl Call for ERC165Call {314	fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {315		if selector != Self::INTERFACE_ID {316			return Ok(None);317		}318		Ok(Some(Self::SupportsInterface {319			interface_id: input.abi_read()?,320		}))321	}322}323324/// Generate "tests", which will generate solidity code on execution and print it to stdout325/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime326///327/// This macro receives type usage as second argument, but you can use anything as generics,328/// because no bounds are implied329#[macro_export]330macro_rules! generate_stubgen {331	($name:ident, $decl:ty, $is_impl:literal) => {332		#[test]333		#[ignore]334		fn $name() {335			use evm_coder::solidity::TypeCollector;336			let mut out = TypeCollector::new();337			<$decl>::generate_solidity_interface(&mut out, $is_impl);338			println!("=== SNIP START ===");339			println!("// SPDX-License-Identifier: OTHER");340			println!("// This code is automatically generated");341			println!();342			println!("pragma solidity >=0.8.0 <0.9.0;");343			println!();344			for b in out.finish() {345				println!("{}", b);346			}347			println!("=== SNIP END ===");348		}349	};350}351352#[cfg(test)]353mod tests {354	use super::*;355356	#[test]357	fn function_selector_generation() {358		assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);359	}360361	// #[test]362	// fn function_selector_generation_1() {363	// 	assert_eq!(364	// 		fn_selector!(transferFromCrossAccountToCrossAccount(365	// 			EthCrossAccount,366	// 			EthCrossAccount,367	// 			uint256368	// 		)),369	// 		2543295963370	// 	);371	// }372373	#[test]374	fn event_topic_generation() {375		assert_eq!(376			hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),377			"ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",378		);379	}380}
after · crates/evm-coder/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![doc = include_str!("../README.md")]18#![deny(missing_docs)]19#![cfg_attr(not(feature = "std"), no_std)]20#[cfg(not(feature = "std"))]21extern crate alloc;2223use abi::{AbiRead, AbiReader, AbiWriter};24pub use evm_coder_procedural::{event_topic, fn_selector};25pub mod abi;26pub use events::{ToLog, ToTopic};27use execution::DispatchInfo;28pub mod execution;2930/// Derives call enum implementing [`crate::Callable`], [`crate::Weighted`]31/// and [`crate::Call`] from impl block.32///33/// ## Macro syntax34///35/// `#[solidity_interface(name, is, inline_is, events)]`36/// - *name* - used in generated code, and for Call enum name37/// - *is* - used to provide inheritance in Solidity38/// - *inline_is* - same as `is`, but ERC165::SupportsInterface will work differently: For `is` SupportsInterface(A) will return true39///   if A is one of the interfaces the contract is inherited from (e.g. B is created as `is(A)`). If B is created as `inline_is(A)`40///   SupportsInterface(A) will internally create a new interface that combines all methods of A and B, so SupportsInterface(A) will return41///   false.42///43/// `#[weight(value)]`44/// Can be added to every method of impl block, used for deriving [`crate::Weighted`], which45/// is used by substrate bridge.46/// - *value*: expression, which evaluates to weight required to call this method.47/// This expression can use call arguments to calculate non-constant execution time.48/// This expression should evaluate faster than actual execution does, and may provide worse case49/// than one is called.50///51/// `#[solidity_interface(rename_selector)]`52/// - *rename_selector* - by default, selector name will be generated by transforming method name53/// from snake_case to camelCase. Use this option, if other naming convention is required.54/// I.e: method `token_uri` will be automatically renamed to `tokenUri` in selector, but name55/// required by ERC721 standard is `tokenURI`, thus we need to specify `rename_selector = "tokenURI"`56/// explicitly.57///58/// Both contract and contract methods may have doccomments, which will end up in a generated59/// solidity interface file, thus you should use [solidity syntax](https://docs.soliditylang.org/en/latest/natspec-format.html) for writing documentation in this macro60///61/// ## Example62///63/// ```ignore64/// struct SuperContract;65/// struct InlineContract;66/// struct Contract;67///68/// #[derive(ToLog)]69/// enum ContractEvents {70///     Event(#[indexed] uint32),71/// }72///73/// /// @dev This contract provides function to multiply two numbers74/// #[solidity_interface(name = MyContract, is(SuperContract), inline_is(InlineContract))]75/// impl Contract {76///     /// Multiply two numbers77///     /// @param a First number78///     /// @param b Second number79///     /// @return uint32 Product of two passed numbers80///     /// @dev This function returns error in case of overflow81///     #[weight(200 + a + b)]82///     #[solidity_interface(rename_selector = "mul")]83///     fn mul(&mut self, a: uint32, b: uint32) -> Result<uint32> {84///         Ok(a.checked_mul(b).ok_or("overflow")?)85///     }86/// }87/// ```88pub use evm_coder_procedural::solidity_interface;89/// See [`solidity_interface`]90pub use evm_coder_procedural::solidity;91/// See [`solidity_interface`]92pub use evm_coder_procedural::weight;93pub use const_format;94pub use sha3_const;9596/// Derives [`ToLog`] for enum97///98/// Selectors will be derived from variant names, there is currently no way to have custom naming99/// for them100///101/// `#[indexed]`102/// Marks this field as indexed, so it will appear in [`ethereum::Log`] topics instead of data103pub use evm_coder_procedural::ToLog;104105// Api of those modules shouldn't be consumed directly, it is only exported for usage in proc macros106#[doc(hidden)]107pub mod events;108#[doc(hidden)]109pub mod solidity;110111/// Solidity type definitions (aliases from solidity name to rust type)112/// To be used in [`solidity_interface`] definitions, to make sure there is no113/// type conflict between Rust code and generated definitions114pub mod types {115	#![allow(non_camel_case_types, missing_docs)]116117	#[cfg(not(feature = "std"))]118	use alloc::{vec::Vec};119	use pallet_evm::account::CrossAccountId;120	use primitive_types::{U256, H160, H256};121122	pub type address = H160;123124	pub type uint8 = u8;125	pub type uint16 = u16;126	pub type uint32 = u32;127	pub type uint64 = u64;128	pub type uint128 = u128;129	pub type uint256 = U256;130131	pub type bytes4 = [u8; 4];132133	pub type topic = H256;134135	#[cfg(not(feature = "std"))]136	pub type string = ::alloc::string::String;137	#[cfg(feature = "std")]138	pub type string = ::std::string::String;139140	#[derive(Default, Debug)]141	pub struct bytes(pub Vec<u8>);142143	/// Solidity doesn't have `void` type, however we have special implementation144	/// for empty tuple return type145	pub type void = ();146147	//#region Special types148	/// Makes function payable149	pub type value = U256;150	/// Makes function caller-sensitive151	pub type caller = address;152	//#endregion153154	/// Ethereum typed call message, similar to solidity155	/// `msg` object.156	pub struct Msg<C> {157		pub call: C,158		/// Address of user, which called this contract.159		pub caller: H160,160		/// Payment amount to contract.161		/// Contract should reject payment, if target call is not payable,162		/// and there is no `receiver()` function defined.163		pub value: U256,164	}165166	impl From<Vec<u8>> for bytes {167		fn from(src: Vec<u8>) -> Self {168			Self(src)169		}170	}171172	#[allow(clippy::from_over_into)]173	impl Into<Vec<u8>> for bytes {174		fn into(self) -> Vec<u8> {175			self.0176		}177	}178179	impl bytes {180		#[must_use]181		pub fn len(&self) -> usize {182			self.0.len()183		}184185		#[must_use]186		pub fn is_empty(&self) -> bool {187			self.len() == 0188		}189	}190191	#[derive(Debug)]192	pub struct EthCrossAccount {193		pub(crate) eth: address,194		pub(crate) sub: uint256,195	}196197	impl EthCrossAccount {198		pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self199		where200			T: pallet_evm::account::Config,201			T::AccountId: AsRef<[u8; 32]>,202		{203			if cross_account_id.is_canonical_substrate() {204				Self {205					eth: Default::default(),206					sub: convert_cross_account_to_uint256::<T>(cross_account_id),207				}208			} else {209				Self {210					eth: *cross_account_id.as_eth(),211					sub: Default::default(),212				}213			}214		}215216		pub fn into_sub_cross_account<T>(&self) -> crate::execution::Result<T::CrossAccountId>217		where218			T: pallet_evm::account::Config,219			T::AccountId: From<[u8; 32]>,220		{221			if self.eth == Default::default() && self.sub == Default::default() {222				Err("All fields of cross account is zeroed".into())223			} else if self.eth == Default::default() {224				Ok(convert_uint256_to_cross_account::<T>(self.sub))225			} else if self.sub == Default::default() {226				Ok(T::CrossAccountId::from_eth(self.eth))227			} else {228				Err("All fields of cross account is non zeroed".into())229			}230		}231	}232233	impl SignatureString for EthCrossAccount {234		const SIGNATURE_STRING: &'static str = "(address,uint256)";235	}236237	pub trait SignatureString {238		const SIGNATURE_STRING: &'static str;239	}240241	/// Convert `CrossAccountId` to `uint256`.242	pub fn convert_cross_account_to_uint256<T: pallet_evm::account::Config>(243		from: &T::CrossAccountId,244	) -> uint256245	where246		T::AccountId: AsRef<[u8; 32]>,247	{248		let slice = from.as_sub().as_ref();249		uint256::from_big_endian(slice)250	}251252	/// Convert `uint256` to `CrossAccountId`.253	pub fn convert_uint256_to_cross_account<T: pallet_evm::account::Config>(254		from: uint256,255	) -> T::CrossAccountId256	where257		T::AccountId: From<[u8; 32]>,258	{259		let mut new_admin_arr = [0_u8; 32];260		from.to_big_endian(&mut new_admin_arr);261		let account_id = T::AccountId::from(new_admin_arr);262		T::CrossAccountId::from_sub(account_id)263	}264}265266/// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro267pub trait Call: Sized {268	/// Parse call buffer into typed call enum269	fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>>;270}271272/// Intended to be used as `#[weight]` output type273/// Should be same between evm-coder and substrate to avoid confusion274///275/// Isn't same thing as gas, some mapping is required between those types276pub type Weight = frame_support::weights::Weight;277278/// In substrate, we have benchmarking, which allows279/// us to not rely on gas metering, but instead predict amount of gas to execute call280pub trait Weighted: Call {281	/// Predict weight of this call282	fn weight(&self) -> DispatchInfo;283}284285/// Type callable with ethereum message, may be implemented by [`solidity_interface`] macro286/// on interface implementation, or for externally-owned real EVM contract287pub trait Callable<C: Call> {288	/// Call contract using specified call data289	fn call(&mut self, call: types::Msg<C>) -> execution::ResultWithPostInfo<AbiWriter>;290}291292/// Implementation of ERC165 is implicitly generated for all interfaces in [`solidity_interface`],293/// this structure holds parsed data for ERC165Call subvariant294///295/// Note: no [`Callable`] implementation is provided, call implementation is inlined into every296/// implementing contract297///298/// See <https://eips.ethereum.org/EIPS/eip-165>299#[derive(Debug)]300pub enum ERC165Call {301	/// ERC165 provides single method, which returns true, if contract302	/// implements specified interface303	SupportsInterface {304		/// Requested interface305		interface_id: types::bytes4,306	},307}308309impl ERC165Call {310	/// ERC165 selector is provided by standard311	pub const INTERFACE_ID: types::bytes4 = u32::to_be_bytes(0x01ffc9a7);312}313314impl Call for ERC165Call {315	fn parse(selector: types::bytes4, input: &mut AbiReader) -> execution::Result<Option<Self>> {316		if selector != Self::INTERFACE_ID {317			return Ok(None);318		}319		Ok(Some(Self::SupportsInterface {320			interface_id: input.abi_read()?,321		}))322	}323}324325/// Generate "tests", which will generate solidity code on execution and print it to stdout326/// Script at .maintain/scripts/generate_api.sh can split this output from test runtime327///328/// This macro receives type usage as second argument, but you can use anything as generics,329/// because no bounds are implied330#[macro_export]331macro_rules! generate_stubgen {332	($name:ident, $decl:ty, $is_impl:literal) => {333		#[test]334		#[ignore]335		fn $name() {336			use evm_coder::solidity::TypeCollector;337			let mut out = TypeCollector::new();338			<$decl>::generate_solidity_interface(&mut out, $is_impl);339			println!("=== SNIP START ===");340			println!("// SPDX-License-Identifier: OTHER");341			println!("// This code is automatically generated");342			println!();343			println!("pragma solidity >=0.8.0 <0.9.0;");344			println!();345			for b in out.finish() {346				println!("{}", b);347			}348			println!("=== SNIP END ===");349		}350	};351}352353#[cfg(test)]354mod tests {355	use super::*;356357	#[test]358	fn function_selector_generation() {359		assert_eq!(fn_selector!(transfer(address, uint256)), 0xa9059cbb);360	}361362	// #[test]363	// fn function_selector_generation_1() {364	// 	assert_eq!(365	// 		fn_selector!(transferFromCrossAccountToCrossAccount(366	// 			EthCrossAccount,367	// 			EthCrossAccount,368	// 			uint256369	// 		)),370	// 		2543295963371	// 	);372	// }373374	#[test]375	fn event_topic_generation() {376		assert_eq!(377			hex::encode(&event_topic!(Transfer(address, address, uint256))[..]),378			"ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",379		);380	}381}
modifiedcrates/evm-coder/src/solidity.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -35,12 +35,6 @@
 use crate::types::*;
 
 #[derive(Default)]
-pub struct FunctionSelectorMaker {
-	pub name: string,
-	pub args: Vec<fn() -> string>,
-}
-
-#[derive(Default)]
 pub struct TypeCollector {
 	/// Code => id
 	/// id ordering is required to perform topo-sort on the resulting data
@@ -488,19 +482,6 @@
 	View,
 	Mutable,
 }
-
-// fn fn_selector_str(input: &str) -> u32 {
-// 	use sha3::Digest;
-// 	let mut hasher = sha3::Keccak256::new();
-// 	hasher.update(input.as_bytes());
-// 	let result = hasher.finalize();
-
-// 	let mut selector_bytes = [0; 4];
-// 	selector_bytes.copy_from_slice(&result[0..4]);
-
-// 	u32::from_be_bytes(selector_bytes)
-// }
-
 pub struct SolidityFunction<A, R> {
 	pub docs: &'static [&'static str],
 	pub selector_str: &'static str,
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -16,7 +16,7 @@
 
 //! The module contains a number of functions for converting and checking ethereum identifiers.
 
-use evm_coder::types::{uint256, address, EthCrossAccount};
+use evm_coder::types::{uint256, address};
 pub use pallet_evm::account::{Config, CrossAccountId};
 use sp_core::H160;
 use up_data_structs::CollectionId;