git.delta.rocks / unique-network / refs/commits / 2f9c8d434e2f

difftreelog

build upgrade to polkadot v0.9.19

Yaroslav Bolyukin2022-04-26parent: #1853893.patch.diff
in: master

34 files changed

modifiedCargo.lockdiffbeforeafterboth
before · Cargo.lock
994 packageslockfile v3
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,3 +13,298 @@
 ]
 [profile.release]
 panic = 'unwind'
+
+[patch."https://github.com/paritytech/substrate.git"]
+beefy-gadget = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+beefy-gadget-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+beefy-merkle-tree = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+beefy-primitives = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+fork-tree = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-benchmarking = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-benchmarking-cli = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-election-provider-support = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-executive = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-support = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-support-procedural = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-support-procedural-tools = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-support-procedural-tools-derive = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-system = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-system-benchmarking = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-system-rpc-runtime-api = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+frame-try-runtime = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-aura = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-authority-discovery = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-authorship = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-babe = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-bags-list = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-balances = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-beefy = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-beefy-mmr = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-bounties = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-collective = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-democracy = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-election-provider-multi-phase = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-elections-phragmen = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-gilt = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-grandpa = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-identity = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-im-online = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-indices = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-membership = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-mmr = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-mmr-primitives = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-mmr-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-multisig = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-nicks = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-offences = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-offences-benchmarking = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-preimage = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-proxy = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-randomness-collective-flip = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-recovery = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-scheduler = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-session = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-session-benchmarking = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-society = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-staking = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-staking-reward-curve = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-staking-reward-fn = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-sudo = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-timestamp = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-tips = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-transaction-payment = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-transaction-payment-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-treasury = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-utility = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-vesting = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+remote-externalities = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-allocator = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-authority-discovery = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-basic-authorship = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-block-builder = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-chain-spec = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-chain-spec-derive = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-cli = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-client-api = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-client-db = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-aura = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-babe = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-babe-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-epochs = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-manual-seal = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-slots = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-consensus-uncles = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-executor = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-executor-common = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-executor-wasmi = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-executor-wasmtime = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-finality-grandpa = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-finality-grandpa-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-informant = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-keystore = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-network = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-network-gossip = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-offchain = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-peerset = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-proposer-metrics = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-rpc-api = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-rpc-server = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-service = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-state-db = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-sync-state-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-telemetry = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-tracing = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-tracing-proc-macro = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-transaction-pool = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-transaction-pool-api = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sc-utils = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-api = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-api-proc-macro = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-application-crypto = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-arithmetic = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-authority-discovery = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-authorship = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-block-builder = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-blockchain = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-consensus = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-consensus-aura = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-consensus-babe = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-consensus-slots = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-consensus-vrf = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-core = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-core-hashing = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-core-hashing-proc-macro = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-database = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-debug-derive = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-externalities = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-finality-grandpa = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-inherents = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-io = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-keyring = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-keystore = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-maybe-compressed-blob = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-npos-elections = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-offchain = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-panic-handler = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-runtime = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-runtime-interface = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-runtime-interface-proc-macro = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-serializer = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-session = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-staking = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-state-machine = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-std = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-storage = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-tasks = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-timestamp = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-tracing = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-transaction-pool = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-transaction-storage-proof = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-trie = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-version = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-version-proc-macro = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+sp-wasm-interface = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-build-script-utils = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-frame-rpc-system = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-prometheus-endpoint = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-test-client = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-test-utils = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-test-utils-derive = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-wasm-builder = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+try-runtime-cli = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+pallet-child-bounties = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+substrate-state-trie-migration-rpc = { git = "https://github.com//paritytech/substrate", branch = "polkadot-v0.9.19" }
+
+[patch."https://github.com/paritytech/polkadot"]
+bp-header-chain = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-message-dispatch = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-messages = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-polkadot-core = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-rococo = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-runtime = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-test-utils = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bp-wococo = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+bridge-runtime-common = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+kusama-runtime = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+kusama-runtime-constants = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+metered-channel = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+pallet-bridge-dispatch = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+pallet-bridge-grandpa = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+pallet-bridge-messages = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+pallet-xcm = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+pallet-xcm-benchmarks = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-approval-distribution = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-availability-bitfield-distribution = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-availability-distribution = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-availability-recovery = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-cli = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-client = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-collator-protocol = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-core-primitives = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-dispute-distribution = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-erasure-coding = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-gossip-support = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-network-bridge = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-collation-generation = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-approval-voting = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-av-store = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-backing = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-bitfield-signing = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-candidate-validation = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-chain-api = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-chain-selection = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-dispute-coordinator = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-parachains-inherent = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-provisioner = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-pvf = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-pvf-checker = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-core-runtime-api = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-jaeger = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-metrics = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-network-protocol = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-primitives = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-subsystem = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-subsystem-types = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-node-subsystem-util = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-overseer = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-overseer-gen = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-overseer-gen-proc-macro = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-parachain = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-performance-test = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-primitives = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-rpc = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-runtime = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-runtime-common = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-runtime-constants = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-runtime-metrics = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-runtime-parachains = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-service = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-statement-distribution = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-statement-table = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-test-runtime = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+polkadot-test-service = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+rococo-runtime = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+rococo-runtime-constants = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+slot-range-helper = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+test-runtime-constants = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+westend-runtime = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+westend-runtime-constants = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+xcm = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+xcm-builder = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+xcm-executor = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+xcm-procedural = { git = "https://github.com//paritytech/polkadot", branch = "release-v0.9.19" }
+
+[patch."https://github.com/paritytech/cumulus.git"]
+cumulus-client-cli = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-client-collator = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-client-consensus-aura = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-client-consensus-common = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-client-network = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-client-pov-recovery = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-client-service = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-pallet-aura-ext = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-pallet-dmp-queue = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-pallet-parachain-system = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-pallet-xcm = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-primitives-core = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-primitives-timestamp = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-primitives-utility = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-relay-chain-interface = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+parachain-info = { git = "https://github.com//paritytech/cumulus", branch = "polkadot-v0.9.19" }
+
+[patch."https://github.com/uniquenetwork/frontier.git"]
+fc-consensus = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fc-db = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fc-mapping-sync = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fc-rpc = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fc-rpc-core = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fp-consensus = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fp-evm = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fp-evm-mapping = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fp-rpc = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fp-self-contained = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+fp-storage = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+pallet-base-fee = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+pallet-ethereum = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+pallet-evm = { git = "https://github.com//uniquenetwork/frontier", branch = "unique-polkadot-v0.9.19" }
+
+[patch."https://github.com/UniqueNetwork/pallet-sponsoring"]
+pallet-template-transaction-payment = { git = "https://github.com//uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.19" }
+up-sponsorship = { git = "https://github.com//uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.19" }
+
+[patch.crates-io]
+evm = { git = "https://github.com//uniquenetwork/evm", branch = "unique-polkadot-v0.9.19" }
+evm-core = { git = "https://github.com//uniquenetwork/evm", branch = "unique-polkadot-v0.9.19" }
+
+[patch."https://github.com/uniquenetwork/open-runtime-module-library"]
+orml-vesting = { git = "https://github.com//uniquenetwork/open-runtime-module-library", branch = "unique-polkadot-v0.9.19" }
modifiedclient/rpc/Cargo.tomldiffbeforeafterboth
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -13,9 +13,9 @@
 jsonrpc-core-client = "18.0.0"
 jsonrpc-derive = "18.0.0"
 
-sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
-sp-blockchain = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
-sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
modifiedcrates/evm-coder/Cargo.tomldiffbeforeafterboth
--- a/crates/evm-coder/Cargo.toml
+++ b/crates/evm-coder/Cargo.toml
@@ -9,7 +9,7 @@
 primitive-types = { version = "0.11.1", default-features = false }
 hex-literal = "0.3.3"
 ethereum = { version = "0.12.0", default-features = false }
-evm-core = { default-features = false, git = "https://github.com/uniquenetwork/evm.git", branch = "unique-polkadot-v0.9.18" }
+evm-core = { version = "0.35.0", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -2,8 +2,8 @@
 # Build Dependencies
 
 [build-dependencies.substrate-build-script-utils]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 ################################################################################
 # Substrate Dependecies
@@ -15,151 +15,151 @@
 version = '3.1.2'
 
 [dependencies.frame-benchmarking]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-benchmarking-cli]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment-rpc]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.substrate-prometheus-endpoint]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-basic-authorship]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-chain-spec]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-cli]
 features = ['wasmtime']
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-client-api]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-consensus]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-consensus-aura]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-executor]
 features = ['wasmtime']
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-finality-grandpa]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-keystore]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-rpc]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-rpc-api]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-service]
 features = ['wasmtime']
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-telemetry]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-transaction-pool]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-tracing]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-block-builder]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-api]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-blockchain]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-consensus]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-consensus-aura]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-core]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-finality-grandpa]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-inherents]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-keystore]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-offchain]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-runtime]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-session]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-timestamp]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-transaction-pool]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-trie]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.substrate-frame-rpc-system]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sc-network]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.serde]
 features = ['derive']
@@ -169,77 +169,77 @@
 version = '1.0.68'
 
 [dependencies.sc-consensus-manual-seal]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 ################################################################################
 # Cumulus dependencies
 
 [dependencies.cumulus-client-consensus-aura]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-client-consensus-common]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-client-collator]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-client-cli]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-client-network]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-primitives-core]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-primitives-parachain-inherent]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-client-service]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-relay-chain-interface]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-relay-chain-inprocess-interface]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-relay-chain-rpc-interface]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 ################################################################################
 # Polkadot dependencies
 [dependencies.polkadot-primitives]
 git = "https://github.com/paritytech/polkadot"
-branch = 'release-v0.9.18'
+branch = 'master'
 
 [dependencies.polkadot-service]
 git = "https://github.com/paritytech/polkadot"
-branch = 'release-v0.9.18'
+branch = 'master'
 
 [dependencies.polkadot-cli]
 git = "https://github.com/paritytech/polkadot"
-branch = 'release-v0.9.18'
+branch = 'master'
 
 [dependencies.polkadot-test-service]
 git = "https://github.com/paritytech/polkadot"
-branch = 'release-v0.9.18'
+branch = 'master'
 
 [dependencies.polkadot-parachain]
 git = "https://github.com/paritytech/polkadot"
-branch = 'release-v0.9.18'
+branch = 'master'
 
 
 ################################################################################
@@ -268,8 +268,8 @@
 path = "../../primitives/rpc"
 
 [dependencies.pallet-transaction-payment-rpc-runtime-api]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 ################################################################################
 # Package
@@ -302,13 +302,13 @@
 jsonrpc-pubsub = "18.0.0"
 tokio = { version = "1.17.0", features = ["time"] }
 
-fc-rpc-core = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-consensus = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-mapping-sync = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-rpc = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-db = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-rpc = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+fc-rpc-core = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-consensus = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-mapping-sync = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-rpc = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-db = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-rpc = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 unique-rpc = { default-features = false, path = "../rpc" }
modifiednode/cli/src/cli.rsdiffbeforeafterboth
--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -53,7 +53,7 @@
 	Revert(sc_cli::RevertCmd),
 
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
-	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
+	#[clap(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 }
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -325,7 +325,7 @@
 			})
 		}
 		Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {
-			Ok(cmd.run(components.client, components.backend))
+			Ok(cmd.run(components.client, components.backend, None))
 		}),
 		Some(Subcommand::ExportGenesisState(params)) => {
 			let mut builder = sc_cli::LoggerBuilder::new("");
@@ -371,25 +371,8 @@
 
 			Ok(())
 		}
-		Some(Subcommand::Benchmark(cmd)) => {
-			if cfg!(feature = "runtime-benchmarks") {
-				let runner = cli.create_runner(cmd)?;
-				runner.sync_run(|config| match config.chain_spec.runtime_id() {
-					#[cfg(feature = "unique-runtime")]
-					RuntimeId::Unique => cmd.run::<Block, UniqueRuntimeExecutor>(config),
-
-					#[cfg(feature = "quartz-runtime")]
-					RuntimeId::Quartz => cmd.run::<Block, QuartzRuntimeExecutor>(config),
 
-					RuntimeId::Opal => cmd.run::<Block, OpalRuntimeExecutor>(config),
-					RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),
-				})
-			} else {
-				Err("Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`."
-					.into())
-			}
-		}
+		Some(Subcommand::Benchmark(_cmd)) => todo!(),
 		None => {
 			let runner = cli.create_runner(&cli.run.normalize())?;
 			let collator_options = cli.run.collator_options();
@@ -426,7 +409,7 @@
 				let para_id = ParaId::from(para_id);
 
 				let parachain_account =
-					AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(
+					AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account(
 						&para_id,
 					);
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -341,6 +341,7 @@
 		+ 'static,
 	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
 		+ fp_rpc::EthereumRuntimeRPCApi<Block>
+		+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 		+ sp_session::SessionKeys<Block>
 		+ sp_block_builder::BlockBuilder<Block>
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
@@ -474,6 +475,8 @@
 			client.clone(),
 			backend.clone(),
 			frontier_backend.clone(),
+			3,
+			0,
 			SyncStrategy::Normal,
 		)
 		.for_each(|()| futures::future::ready(())),
@@ -619,6 +622,7 @@
 		+ 'static,
 	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
 		+ fp_rpc::EthereumRuntimeRPCApi<Block>
+		+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 		+ sp_session::SessionKeys<Block>
 		+ sp_block_builder::BlockBuilder<Block>
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
@@ -751,6 +755,7 @@
 		+ 'static,
 	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
 		+ fp_rpc::EthereumRuntimeRPCApi<Block>
+		+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 		+ sp_session::SessionKeys<Block>
 		+ sp_block_builder::BlockBuilder<Block>
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
@@ -913,6 +918,8 @@
 			client.clone(),
 			backend.clone(),
 			frontier_backend.clone(),
+			3,
+			0,
 			SyncStrategy::Normal,
 		)
 		.for_each(|()| futures::future::ready(())),
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -13,40 +13,41 @@
 futures = { version = "0.3.17", features = ["compat"] }
 jsonrpc-core = "18.0.0"
 jsonrpc-pubsub = "18.0.0"
-# pallet-contracts-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-consensus-epochs = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-finality-grandpa = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-finality-grandpa-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-network = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-storage = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+# pallet-contracts-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-consensus-epochs = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-finality-grandpa-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-network = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-service = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-storage = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
+substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
 tokio = { version = "0.2.25", features = ["macros", "sync"] }
 
-pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-db = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-db = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 pallet-common = { default-features = false, path = "../../pallets/common" }
 unique-runtime-common = { default-features = false, path = "../../runtime/common" }
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -21,7 +21,7 @@
 };
 use fc_rpc_core::types::{FilterPool, FeeHistoryCache};
 use jsonrpc_pubsub::manager::SubscriptionManager;
-use pallet_ethereum::EthereumStorageSchema;
+use fp_storage::EthereumStorageSchema;
 use sc_client_api::{
 	backend::{AuxStore, StorageProvider},
 	client::BlockchainEvents,
@@ -38,7 +38,7 @@
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sc_service::TransactionPool;
-use std::{collections::BTreeMap, marker::PhantomData, sync::Arc};
+use std::{collections::BTreeMap, sync::Arc};
 
 use unique_runtime_common::types::{
 	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
@@ -93,44 +93,7 @@
 	pub block_data_cache: Arc<EthBlockDataCache<Block>>,
 }
 
-struct AccountCodes<C, B, R> {
-	client: Arc<C>,
-	_blk_marker: PhantomData<B>,
-	_runtime_marker: PhantomData<R>,
-}
-
-impl<C, Block, R> AccountCodes<C, Block, R>
-where
-	Block: sp_api::BlockT,
-	C: ProvideRuntimeApi<Block>,
-	R: RuntimeInstance,
-{
-	fn new(client: Arc<C>) -> Self {
-		Self {
-			client,
-			_blk_marker: PhantomData,
-			_runtime_marker: PhantomData,
-		}
-	}
-}
 
-impl<C, Block, Runtime> fc_rpc::AccountCodeProvider<Block> for AccountCodes<C, Block, Runtime>
-where
-	Block: sp_api::BlockT,
-	C: ProvideRuntimeApi<Block>,
-	C::Api: up_rpc::UniqueApi<Block, <Runtime as RuntimeInstance>::CrossAccountId, AccountId>,
-	Runtime: RuntimeInstance,
-{
-	fn code(&self, block: &sp_api::BlockId<Block>, account: sp_core::H160) -> Option<Vec<u8>> {
-		use up_rpc::UniqueApi;
-		self.client
-			.runtime_api()
-			.eth_contract_code(block, account)
-			.ok()
-			.flatten()
-	}
-}
-
 pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>
 where
 	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,
@@ -145,10 +108,8 @@
 	let mut overrides_map = BTreeMap::new();
 	overrides_map.insert(
 		EthereumStorageSchema::V1,
-		Box::new(SchemaV1Override::new_with_code_provider(
-			client.clone(),
-			Arc::new(AccountCodes::<C, Block, R>::new(client.clone())),
-		)) as Box<dyn StorageOverride<_> + Send + Sync>,
+		Box::new(SchemaV1Override::new(client.clone()))
+			as Box<dyn StorageOverride<_> + Send + Sync>,
 	);
 	overrides_map.insert(
 		EthereumStorageSchema::V2,
@@ -182,6 +143,7 @@
 	// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
+	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,
 	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,
 	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
@@ -242,13 +204,12 @@
 		client.clone(),
 		pool.clone(),
 		graph,
-		<R as RuntimeInstance>::get_transaction_converter(),
+		Some(<R as RuntimeInstance>::get_transaction_converter()),
 		network.clone(),
 		signers,
 		overrides.clone(),
 		backend.clone(),
 		is_authority,
-		max_past_logs,
 		block_data_cache.clone(),
 		fee_history_limit,
 		fee_history_cache,
modifiedpallets/common/Cargo.tomldiffbeforeafterboth
--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -11,16 +11,16 @@
 version = '3.1.2'
 
 [dependencies]
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
 pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 serde = { version = "1.0.130", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
modifiedpallets/evm-coder-substrate/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-coder-substrate/Cargo.toml
+++ b/pallets/evm-coder-substrate/Cargo.toml
@@ -8,15 +8,15 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 ethereum = { version = "0.12.0", default-features = false }
 evm-coder = { default-features = false, path = "../../crates/evm-coder" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 
 [dependencies.codec]
 default-features = false
modifiedpallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -44,8 +44,7 @@
 	use pallet_ethereum::EthereumTransactionSender;
 	use sp_std::cell::RefCell;
 	use sp_std::vec::Vec;
-	use sp_core::{H160, H256};
-	use ethereum::TransactionV2;
+	use sp_core::H160;
 	use frame_support::{pallet_prelude::*, traits::PalletInfo};
 	use frame_system::pallet_prelude::*;
 
@@ -81,21 +80,6 @@
 	// From instabul hardfork configuration: https://github.com/rust-blockchain/evm/blob/fd4fd6acc0ca3208d6770fdb3ba407c94cdf97c6/runtime/src/lib.rs#L284
 	pub const G_SLOAD_WORD: u64 = 800;
 	pub const G_SSTORE_WORD: u64 = 20000;
-
-	pub fn generate_transaction() -> TransactionV2 {
-		use ethereum::{TransactionV0, TransactionAction, TransactionSignature};
-		TransactionV2::Legacy(TransactionV0 {
-			nonce: 0.into(),
-			gas_price: 0.into(),
-			gas_limit: 0.into(),
-			action: TransactionAction::Call(H160([0; 20])),
-			value: 0.into(),
-			// zero selector, this transaction always has same sender, so all data should be acquired from logs
-			input: Vec::from([0, 0, 0, 0]),
-			// if v is not 27 - then we need to pass some other validity checks
-			signature: TransactionSignature::new(27, H256([0x88; 32]), H256([0x88; 32])).unwrap(),
-		})
-	}
 
 	#[derive(Default)]
 	pub struct SubstrateRecorder<T: Config> {
@@ -214,7 +198,6 @@
 			}
 			T::EthereumTransactionSender::submit_logs_transaction(
 				Default::default(),
-				generate_transaction(),
 				logs,
 			)
 		}
@@ -229,9 +212,10 @@
 						.expect("evm-coder-substrate is a pallet, which should be added to runtime")
 						as u8 =>
 			{
-				match error {
-					v if v == Error::<T>::OutOfGas.as_u8() => ExError::Error(ExitError::OutOfGas),
-					v if v == Error::<T>::OutOfFund.as_u8() => ExError::Error(ExitError::OutOfFund),
+				let mut read = &error as &[u8];
+				match Error::<T>::decode(&mut read) {
+					Ok(Error::<T>::OutOfGas) => ExError::Error(ExitError::OutOfGas),
+					Ok(Error::<T>::OutOfFund) => ExError::Error(ExitError::OutOfFund),
 					_ => unreachable!("this pallet only defines two possible errors"),
 				}
 			}
@@ -239,7 +223,7 @@
 				message: Some(msg), ..
 			}) => ExError::Revert(msg.into()),
 			DispatchError::Module(ModuleError { index, error, .. }) => {
-				ExError::Revert(format!("error {} in pallet {}", error, index))
+				ExError::Revert(format!("error {:?} in pallet {}", error, index))
 			}
 			e => ExError::Revert(format!("substrate error: {:?}", e)),
 		}
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -8,16 +8,16 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master' }
 log = "0.4.14"
 
 [dependencies.codec]
modifiedpallets/evm-migration/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-migration/Cargo.toml
+++ b/pallets/evm-migration/Cargo.toml
@@ -8,15 +8,15 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 [dependencies.codec]
 default-features = false
modifiedpallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -8,17 +8,17 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master' }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 [dependencies.codec]
 default-features = false
modifiedpallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -22,7 +22,7 @@
 pub use pallet::*;
 use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin, account::CrossAccountId};
 use sp_core::{H160, U256};
-use sp_runtime::TransactionOutcome;
+use sp_runtime::{TransactionOutcome, DispatchError};
 use up_sponsorship::SponsorshipHandler;
 
 #[frame_support::pallet]
@@ -63,11 +63,13 @@
 				// This method is only used for checking, we shouldn't touch storage in it
 				frame_support::storage::with_transaction(|| {
 					let origin_sub = T::CrossAccountId::from_eth(origin);
-					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
+					TransactionOutcome::Rollback(Ok::<_, DispatchError>(T::EvmSponsorshipHandler::get_sponsor(
 						&origin_sub,
 						&(*target, input.clone()),
-					))
+					)))
 				})
+				// FIXME: it may fail with DispatchError in case of depth limit
+				.ok()?
 			}
 			_ => None,
 		}
@@ -146,11 +148,13 @@
 				// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner
 				// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?
 				let sponsor = frame_support::storage::with_transaction(|| {
-					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
+					TransactionOutcome::Rollback(Ok::<_, DispatchError>(T::EvmSponsorshipHandler::get_sponsor(
 						&who,
 						&(*target, input.clone()),
-					))
-				})?;
+					)))
+				})
+				// FIXME: it may fail with DispatchError in case of depth limit
+				.map_err(|e| panic!("err?!")).ok()??;
 				Some(sponsor.as_sub().clone())
 			}
 			_ => None,
modifiedpallets/fungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -11,18 +11,18 @@
 version = '3.1.2'
 
 [dependencies]
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 pallet-common = { default-features = false, path = '../common' }
 up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 pallet-evm-coder-substrate = { default-features = false, path = '../evm-coder-substrate' }
 ethereum = { version = "0.12.0", default-features = false }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
modifiedpallets/inflation/Cargo.tomldiffbeforeafterboth
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -4,7 +4,7 @@
 [package]
 authors = ['Unique Network <support@uniquenetwork.io>']
 description = 'Unique Inflation Pallet'
-edition = '2018'
+edition = '2021'
 homepage = 'https://unique.network'
 license = 'GPLv3'
 name = 'pallet-inflation'
@@ -42,38 +42,38 @@
 [dependencies.frame-benchmarking]
 default-features = false
 optional = true
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-support]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-balances]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-timestamp]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-randomness-collective-flip]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-std]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.serde]
 default-features = false
@@ -82,18 +82,18 @@
 
 [dependencies.sp-runtime]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-core]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-io]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies]
 scale-info = { version = "2.0.1", default-features = false, features = [
modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -11,18 +11,18 @@
 version = '3.1.2'
 
 [dependencies]
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 pallet-common = { default-features = false, path = '../common' }
 up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 pallet-evm-coder-substrate = { default-features = false, path = '../evm-coder-substrate' }
 ethereum = { version = "0.12.0", default-features = false }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -11,15 +11,15 @@
 version = '3.1.2'
 
 [dependencies]
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 pallet-common = { default-features = false, path = '../common' }
 up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 scale-info = { version = "2.0.1", default-features = false, features = [
     "derive",
 ] }
modifiedpallets/scheduler/Cargo.tomldiffbeforeafterboth
--- a/pallets/scheduler/Cargo.toml
+++ b/pallets/scheduler/Cargo.toml
@@ -15,19 +15,19 @@
 scale-info = { version = "2.0.1", default-features = false, features = [
 	"derive",
 ] }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master' }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-substrate-test-utils = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+substrate-test-utils = { git = 'https://github.com/paritytech/substrate', branch = 'master' }
 
 [features]
 default = ["std"]
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -4,7 +4,7 @@
 [package]
 authors = ['Unique Network <support@uniquenetwork.io>']
 description = 'Unique Pallet'
-edition = '2018'
+edition = '2021'
 homepage = 'https://unique.network'
 license = 'GPLv3'
 name = 'pallet-unique'
@@ -60,43 +60,43 @@
 [dependencies.frame-benchmarking]
 default-features = false
 optional = true
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-support]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-balances]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-timestamp]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-randomness-collective-flip]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-std]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.serde]
 default-features = false
@@ -105,18 +105,18 @@
 
 [dependencies.sp-runtime]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-core]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-io]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 
 ################################################################################
@@ -129,19 +129,19 @@
 ] }
 ethereum = { version = "0.12.0", default-features = false }
 rlp = { default-features = false, version = "0.5.0" }
-sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
 
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master' }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 evm-coder = { default-features = false, path = "../../crates/evm-coder" }
 pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
 primitive-types = { version = "0.11.1", default-features = false, features = [
     "serde_no_std",
 ] }
 
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 hex-literal = "0.3.3"
 
 pallet-common = { default-features = false, path = "../common" }
modifiedpallets/unique/src/sponsorship.rsdiffbeforeafterboth
--- a/pallets/unique/src/sponsorship.rs
+++ b/pallets/unique/src/sponsorship.rs
@@ -304,7 +304,6 @@
 }
 
 use crate::SponsorshipPredict;
-use up_data_structs::SponsorshipState;
 pub struct UniqueSponsorshipPredict<T>(PhantomData<T>);
 
 impl<T> SponsorshipPredict<T> for UniqueSponsorshipPredict<T>
modifiedprimitives/data-structs/Cargo.tomldiffbeforeafterboth
--- a/primitives/data-structs/Cargo.toml
+++ b/primitives/data-structs/Cargo.toml
@@ -18,11 +18,11 @@
 serde = { version = "1.0.130", features = [
   'derive',
 ], default-features = false, optional = true }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
 derivative = "2.2.0"
 
 [features]
modifiedprimitives/rpc/Cargo.tomldiffbeforeafterboth
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -10,11 +10,11 @@
 codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = [
 	"derive",
 ] }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18' }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'master' }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 [features]
 default = ["std"]
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -18,7 +18,6 @@
 
 use up_data_structs::{CollectionId, TokenId, Collection, CollectionStats, CollectionLimits};
 use sp_std::vec::Vec;
-use sp_core::H160;
 use codec::Decode;
 use sp_runtime::DispatchError;
 
@@ -49,9 +48,6 @@
 			spender: CrossAccountId,
 			token: TokenId,
 		) -> Result<u128>;
-
-		/// Used for ethereum integration
-		fn eth_contract_code(account: H160) -> Option<Vec<u8>>;
 
 		fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;
 		fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>>;
modifiedruntime/common/Cargo.tomldiffbeforeafterboth
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -28,13 +28,13 @@
 
 [dependencies.sp-core]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-runtime]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.codec]
 default-features = false
@@ -49,13 +49,13 @@
 
 [dependencies.frame-support]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-common]
 default-features = false
@@ -63,13 +63,13 @@
 
 [dependencies.sp-consensus-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.fp-rpc]
 default-features = false
-git = "https://github.com/uniquenetwork/frontier.git"
-branch = "unique-polkadot-v0.9.18-2"
+git = "https://github.com/uniquenetwork/frontier"
+branch = "master"
 
 [dependencies]
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
\ No newline at end of file
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
\ No newline at end of file
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -46,11 +46,6 @@
                     dispatch_unique_runtime!(collection.allowance(sender, spender, token))
                 }
 
-                fn eth_contract_code(account: H160) -> Option<Vec<u8>> {
-                    <pallet_unique::UniqueErcSupport<Runtime>>::get_code(&account)
-                        .or_else(|| <pallet_evm_migration::OnMethodCall<Runtime>>::get_code(&account))
-                        .or_else(|| <pallet_evm_contract_helpers::HelpersOnMethodCall<Self>>::get_code(&account))
-                }
                 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {
                     Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))
                 }
@@ -274,6 +269,14 @@
                 }
             }
 
+            impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {
+                fn convert_transaction(transaction: pallet_ethereum::Transaction) -> <Block as BlockT>::Extrinsic  {
+                    UncheckedExtrinsic::new_unsigned(
+                        pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),
+                    )
+                }
+            }
+
             impl sp_session::SessionKeys<Block> for Runtime {
                 fn decode_session_keys(
                     encoded: Vec<u8>,
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -117,35 +117,35 @@
 
 [dependencies.frame-benchmarking]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
+git = 'https://github.com/paritytech/substrate'
 optional = true
-branch = 'polkadot-v0.9.18'
+branch = 'master'
 
 [dependencies.frame-executive]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-support]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system-benchmarking]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
+git = 'https://github.com/paritytech/substrate'
 optional = true
-branch = 'polkadot-v0.9.18'
+branch = 'master'
 
 [dependencies.frame-system-rpc-runtime-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.hex-literal]
 optional = true
@@ -159,132 +159,132 @@
 
 [dependencies.pallet-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-balances]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 # Contracts specific packages
 # [dependencies.pallet-contracts]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 # [dependencies.pallet-contracts-primitives]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 # [dependencies.pallet-contracts-rpc-runtime-api]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 [dependencies.pallet-randomness-collective-flip]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-sudo]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-timestamp]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment-rpc-runtime-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-treasury]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 # [dependencies.pallet-vesting]
 # default-features = false
-# git = 'https://github.com/paritytech/substrate.git'
-# branch = 'polkadot-v0.9.18'
+# git = 'https://github.com/paritytech/substrate'
+# branch = 'master'
 
 [dependencies.sp-arithmetic]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-block-builder]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-core]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-consensus-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-inherents]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-io]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-offchain]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-runtime]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-session]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-std]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-transaction-pool]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-version]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.smallvec]
 version = '1.6.1'
@@ -294,47 +294,47 @@
 
 [dependencies.parachain-info]
 default-features = false
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-pallet-aura-ext]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-parachain-system]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-core]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-xcm]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-dmp-queue]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-xcmp-queue]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-utility]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-timestamp]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 ################################################################################
@@ -342,32 +342,32 @@
 
 [dependencies.polkadot-parachain]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm-builder]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm-executor]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.pallet-xcm]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.orml-vesting]
-git = 'https://github.com/UniqueNetwork/open-runtime-module-library'
-branch = 'unique-polkadot-v0.9.18'
+git = 'https://github.com/uniquenetwork/open-runtime-module-library'
+branch = 'master'
 version = "0.4.1-dev"
 default-features = false
 
@@ -382,7 +382,7 @@
 derivative = "2.2.0"
 pallet-unique = { path = '../../pallets/unique', default-features = false }
 up-rpc = { path = "../../primitives/rpc", default-features = false }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 pallet-inflation = { path = '../../pallets/inflation', default-features = false }
 up-data-structs = { path = '../../primitives/data-structs', default-features = false }
 pallet-common = { default-features = false, path = "../../pallets/common" }
@@ -391,20 +391,20 @@
 pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
 pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
 # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
-pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
+pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
 pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
 pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
 pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
 pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 ################################################################################
 # Build Dependencies
 
 [build-dependencies.substrate-wasm-builder]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -52,7 +52,7 @@
 	EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _,
 };
 pub use frame_support::{
-	construct_runtime, match_type,
+	construct_runtime, match_types,
 	dispatch::DispatchResult,
 	PalletId, parameter_types, StorageValue, ConsensusEngineId,
 	traits::{
@@ -63,7 +63,7 @@
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
 		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
-		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,
+		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
 	},
 };
 use up_data_structs::*;
@@ -78,7 +78,7 @@
 };
 use smallvec::smallvec;
 use codec::{Encode, Decode};
-use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, OnMethodCall};
+use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping};
 use fp_rpc::TransactionStatus;
 use sp_runtime::{
 	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},
@@ -326,7 +326,7 @@
 
 impl pallet_ethereum::Config for Runtime {
 	type Event = Event;
-	type StateRoot = pallet_ethereum::IntermediateStateRoot;
+	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
 }
 
 impl pallet_randomness_collective_flip::Config for Runtime {}
@@ -494,7 +494,7 @@
 
 impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
-	type TransactionByteFee = TransactionByteFee;
+	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
 	type WeightToFee = LinearFee<Balance>;
 	type FeeMultiplierUpdate = ();
@@ -673,7 +673,7 @@
 	pub const MaxAuthorities: u32 = 100_000;
 }
 
-match_type! {
+match_types! {
 	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -117,35 +117,35 @@
 
 [dependencies.frame-benchmarking]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
+git = 'https://github.com/paritytech/substrate'
 optional = true
-branch = 'polkadot-v0.9.18'
+branch = 'master'
 
 [dependencies.frame-executive]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-support]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system-benchmarking]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
+git = 'https://github.com/paritytech/substrate'
 optional = true
-branch = 'polkadot-v0.9.18'
+branch = 'master'
 
 [dependencies.frame-system-rpc-runtime-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.hex-literal]
 optional = true
@@ -159,132 +159,132 @@
 
 [dependencies.pallet-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-balances]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 # Contracts specific packages
 # [dependencies.pallet-contracts]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 # [dependencies.pallet-contracts-primitives]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 # [dependencies.pallet-contracts-rpc-runtime-api]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 [dependencies.pallet-randomness-collective-flip]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-sudo]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-timestamp]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment-rpc-runtime-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-treasury]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 # [dependencies.pallet-vesting]
 # default-features = false
-# git = 'https://github.com/paritytech/substrate.git'
-# branch = 'polkadot-v0.9.18'
+# git = 'https://github.com/paritytech/substrate'
+# branch = 'master'
 
 [dependencies.sp-arithmetic]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-block-builder]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-core]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-consensus-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-inherents]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-io]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-offchain]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-runtime]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-session]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-std]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-transaction-pool]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-version]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.smallvec]
 version = '1.6.1'
@@ -294,47 +294,47 @@
 
 [dependencies.parachain-info]
 default-features = false
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-pallet-aura-ext]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-parachain-system]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-core]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-xcm]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-dmp-queue]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-xcmp-queue]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-utility]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-timestamp]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 ################################################################################
@@ -342,32 +342,32 @@
 
 [dependencies.polkadot-parachain]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm-builder]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm-executor]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.pallet-xcm]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.orml-vesting]
-git = 'https://github.com/UniqueNetwork/open-runtime-module-library'
-branch = 'unique-polkadot-v0.9.18'
+git = 'https://github.com/uniquenetwork/open-runtime-module-library'
+branch = 'master'
 version = "0.4.1-dev"
 default-features = false
 
@@ -382,7 +382,7 @@
 derivative = "2.2.0"
 pallet-unique = { path = '../../pallets/unique', default-features = false }
 up-rpc = { path = "../../primitives/rpc", default-features = false }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 pallet-inflation = { path = '../../pallets/inflation', default-features = false }
 up-data-structs = { path = '../../primitives/data-structs', default-features = false }
 pallet-common = { default-features = false, path = "../../pallets/common" }
@@ -391,20 +391,20 @@
 pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
 pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
 # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
-pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
+pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
 pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
 pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
 pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
 pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 ################################################################################
 # Build Dependencies
 
 [build-dependencies.substrate-wasm-builder]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -117,35 +117,35 @@
 
 [dependencies.frame-benchmarking]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
+git = 'https://github.com/paritytech/substrate'
 optional = true
-branch = 'polkadot-v0.9.18'
+branch = 'master'
 
 [dependencies.frame-executive]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-support]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.frame-system-benchmarking]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
+git = 'https://github.com/paritytech/substrate'
 optional = true
-branch = 'polkadot-v0.9.18'
+branch = 'master'
 
 [dependencies.frame-system-rpc-runtime-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.hex-literal]
 optional = true
@@ -159,132 +159,132 @@
 
 [dependencies.pallet-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-balances]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 # Contracts specific packages
 # [dependencies.pallet-contracts]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 # [dependencies.pallet-contracts-primitives]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 # [dependencies.pallet-contracts-rpc-runtime-api]
-# git = 'https://github.com/paritytech/substrate.git'
+# git = 'https://github.com/paritytech/substrate'
 # default-features = false
-# branch = 'polkadot-v0.9.18'
+# branch = 'master'
 # version = '4.0.0-dev'
 
 [dependencies.pallet-randomness-collective-flip]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-sudo]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-timestamp]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-transaction-payment-rpc-runtime-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.pallet-treasury]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 # [dependencies.pallet-vesting]
 # default-features = false
-# git = 'https://github.com/paritytech/substrate.git'
-# branch = 'polkadot-v0.9.18'
+# git = 'https://github.com/paritytech/substrate'
+# branch = 'master'
 
 [dependencies.sp-arithmetic]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-api]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-block-builder]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-core]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-consensus-aura]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-inherents]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-io]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-offchain]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-runtime]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-session]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-std]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-transaction-pool]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.sp-version]
 default-features = false
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
 
 [dependencies.smallvec]
 version = '1.6.1'
@@ -294,47 +294,47 @@
 
 [dependencies.parachain-info]
 default-features = false
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 
 [dependencies.cumulus-pallet-aura-ext]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-parachain-system]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-core]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-xcm]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-dmp-queue]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-pallet-xcmp-queue]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-utility]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 [dependencies.cumulus-primitives-timestamp]
-git = 'https://github.com/paritytech/cumulus.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/cumulus'
+branch = 'master'
 default-features = false
 
 ################################################################################
@@ -342,32 +342,32 @@
 
 [dependencies.polkadot-parachain]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm-builder]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.xcm-executor]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.pallet-xcm]
 git = 'https://github.com/paritytech/polkadot'
-branch = 'release-v0.9.18'
+branch = 'master'
 default-features = false
 
 [dependencies.orml-vesting]
-git = 'https://github.com/UniqueNetwork/open-runtime-module-library'
-branch = 'unique-polkadot-v0.9.18'
+git = 'https://github.com/uniquenetwork/open-runtime-module-library'
+branch = 'master'
 version = "0.4.1-dev"
 default-features = false
 
@@ -390,21 +390,21 @@
 pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
 pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
 # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
-pallet-charge-transaction = { git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
+pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'master', package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
 pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
 pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
 pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
 pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
-fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18-2" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
+fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "master" }
 
 ################################################################################
 # Build Dependencies
 
 [build-dependencies.substrate-wasm-builder]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.18'
+git = 'https://github.com/paritytech/substrate'
+branch = 'master'
modifiedtests/src/eth/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -31,7 +31,7 @@
 import getBalance from '../../substrate/get-balance';
 import waitNewBlocks from '../../substrate/wait-new-blocks';
 
-export const GAS_ARGS = {gas: 2500000};
+export const GAS_ARGS = {gas: 2500000, maxPriorityFeePerGas: 0};
 
 export enum SponsoringMode {
   Disabled = 0,