From b6f730ecff6840ea18e2d64f5e819be0c6e31ca9 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Fri, 11 Jun 2021 07:26:47 +0000 Subject: [PATCH] build: fix remote frontier version --- --- a/Cargo.lock +++ b/Cargo.lock @@ -1547,9 +1547,10 @@ [[package]] name = "evm" -version = "0.26.0" -source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" +version = "0.27.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#081b56a17b8e587655bf45cacc1c823265530b50" dependencies = [ + "environmental", "ethereum", "evm-core", "evm-gasometer", @@ -1588,8 +1589,8 @@ [[package]] name = "evm-core" -version = "0.26.0" -source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" +version = "0.27.1" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#081b56a17b8e587655bf45cacc1c823265530b50" dependencies = [ "funty", "parity-scale-codec 2.1.1", @@ -1599,9 +1600,10 @@ [[package]] name = "evm-gasometer" -version = "0.26.0" -source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" +version = "0.27.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#081b56a17b8e587655bf45cacc1c823265530b50" dependencies = [ + "environmental", "evm-core", "evm-runtime", "primitive-types 0.9.0", @@ -1609,9 +1611,10 @@ [[package]] name = "evm-runtime" -version = "0.26.0" -source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" +version = "0.27.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#081b56a17b8e587655bf45cacc1c823265530b50" dependencies = [ + "environmental", "evm-core", "primitive-types 0.9.0", "sha3 0.8.2", @@ -1671,8 +1674,8 @@ [[package]] name = "fc-consensus" -version = "1.0.1-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +version = "2.0.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "derive_more", "fc-db", @@ -1696,7 +1699,7 @@ [[package]] name = "fc-db" version = "1.0.0" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "kvdb", "kvdb-rocksdb", @@ -1709,8 +1712,8 @@ [[package]] name = "fc-mapping-sync" -version = "1.1.0-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +version = "2.0.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "fc-consensus", "fc-db", @@ -1728,7 +1731,7 @@ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "ethereum", "ethereum-types 0.11.0", @@ -1769,7 +1772,7 @@ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "ethereum-types 0.11.0", "jsonrpc-core 15.1.0", @@ -1901,7 +1904,7 @@ [[package]] name = "fp-consensus" version = "1.0.0" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "ethereum", "parity-scale-codec 2.1.1", @@ -1914,8 +1917,8 @@ [[package]] name = "fp-evm" -version = "1.0.1-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +version = "2.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "evm", "impl-trait-for-tuples 0.1.3", @@ -1927,8 +1930,8 @@ [[package]] name = "fp-rpc" -version = "1.0.1-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +version = "2.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "ethereum", "ethereum-types 0.11.0", @@ -1943,18 +1946,8 @@ [[package]] name = "fp-storage" -version = "1.0.1-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" -dependencies = [ - "ethereum", - "ethereum-types 0.11.0", - "fp-evm", - "parity-scale-codec 2.1.1", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", -] +version = "1.0.1" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" [[package]] name = "frame-benchmarking" @@ -4494,8 +4487,8 @@ [[package]] name = "pallet-ethereum" -version = "1.0.1-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +version = "2.0.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "ethereum", "ethereum-types 0.11.0", @@ -4522,8 +4515,8 @@ [[package]] name = "pallet-evm" -version = "3.0.1-dev" -source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7facf3dd69644e19d13e5622353d84d97080d1c4" +version = "4.0.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#7b3b742c4e95eb7ae6c5435137670365f17ae1fa" dependencies = [ "evm", "evm-gasometer", @@ -8559,7 +8552,7 @@ checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ "cfg-if 0.1.10", - "rand 0.7.3", + "rand 0.3.23", "static_assertions", ] --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -34,11 +34,11 @@ frame-benchmarking-cli = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-transaction-payment-rpc = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } fc-rpc-core = { version = "1.1.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } -fc-consensus = { version = "1.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } -fc-mapping-sync = { version = "1.1.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +fc-consensus = { version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +fc-mapping-sync = { version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } fc-rpc = { version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } fc-db = { version = "1.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } -fp-rpc = { version = "1.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +fp-rpc = { version = "2.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } sc-basic-authorship = { version = '0.9.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sc-cli = { version = '0.9.0', features = ['wasmtime'], git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sc-client-api = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } @@ -66,7 +66,7 @@ substrate-frame-rpc-system = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sc-network = { version = '0.9.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-contracts-rpc = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } -pallet-ethereum = { version = "1.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +pallet-ethereum = { version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } sc-telemetry = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } serde = { version = "1.0.102", features = ["derive"] } --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -23,13 +23,13 @@ frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } -pallet-evm = { default-features = false, version = "3.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } -pallet-ethereum = { default-features = false, version = "1.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +pallet-evm = { default-features = false, version = "4.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +pallet-ethereum = { default-features = false, version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } pallet-timestamp = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-randomness-collective-flip = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sp-std = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } frame-benchmarking = { default-features = false, version = '3.0.0', optional = true, git = "https://github.com/paritytech/substrate.git", branch = "frontier" } -fp-evm = { default-features = false, version = '1.0.1-dev', git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +fp-evm = { default-features = false, version = '2.0.0', git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } sp-core = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sp-io = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sp-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -40,8 +40,8 @@ pallet-contracts = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-contracts-primitives = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-contracts-rpc-runtime-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } -pallet-evm = { default-features = false, version = "3.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } -pallet-ethereum = { default-features = false, version = "1.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +pallet-evm = { default-features = false, version = "4.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +pallet-ethereum = { default-features = false, version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } pallet-grandpa = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-randomness-collective-flip = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-sudo = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } @@ -50,7 +50,7 @@ pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-treasury = { default-features = false, version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-vesting = { default-features = false, version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "frontier" } -fp-rpc = { default-features = false, version = "1.0.1-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +fp-rpc = { default-features = false, version = "2.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } sp-arithmetic = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sp-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } sp-block-builder = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } -- gitstuff