From e5bc882ab8baeae9f978a2981c3e99f9ed10f4c2 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Fri, 30 Apr 2021 15:21:44 +0000 Subject: [PATCH] build: upgrade dependencies Signed-off-by: Yaroslav Bolyukin (cherry picked from commit fa7165616a5499e708f260a521e00381db5175f7) --- --- a/Cargo.lock +++ b/Cargo.lock @@ -447,12 +447,22 @@ [[package]] name = "bitvec" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +dependencies = [ + "either", + "radium 0.3.0", +] + +[[package]] +name = "bitvec" version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1" dependencies = [ "funty", - "radium", + "radium 0.6.2", "tap", "wyz", ] @@ -607,6 +617,12 @@ [[package]] name = "byte-slice-cast" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" + +[[package]] +name = "byte-slice-cast" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" @@ -1360,14 +1376,27 @@ [[package]] name = "ethbloom" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df" +dependencies = [ + "crunchy", + "fixed-hash 0.6.1", + "impl-rlp 0.2.1", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethbloom" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "779864b9c7f7ead1f092972c3257496c6a84b46dba2ce131dd8a282cb2cc5972" dependencies = [ "crunchy", - "fixed-hash", - "impl-codec", - "impl-rlp", + "fixed-hash 0.7.0", + "impl-codec 0.5.0", + "impl-rlp 0.3.0", "impl-serde", "tiny-keccak", ] @@ -1378,12 +1407,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567ce064a8232c16e2b2c2173a936b91fbe35c2f2c5278871f5a1a31688b42e9" dependencies = [ - "ethereum-types", + "ethereum-types 0.11.0", "funty", "hash-db", "hash256-std-hasher", - "parity-scale-codec", - "rlp", + "parity-scale-codec 2.0.1", + "rlp 0.5.0", "rlp-derive", "serde", "sha3 0.9.1", @@ -1391,18 +1420,48 @@ ] [[package]] +name = "ethereum-tx-sign" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdcbb5f48282fa71ba2864818a442d0ee0ca04ebc9ef9eb1837c48298c3b8cbf" +dependencies = [ + "ethereum-types 0.9.2", + "num-traits", + "rlp 0.4.6", + "secp256k1", + "serde", + "serde_derive", + "serde_json", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0" +dependencies = [ + "ethbloom 0.9.2", + "fixed-hash 0.6.1", + "impl-rlp 0.2.1", + "impl-serde", + "primitive-types 0.7.3", + "uint 0.8.5", +] + +[[package]] name = "ethereum-types" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" dependencies = [ - "ethbloom", - "fixed-hash", - "impl-codec", - "impl-rlp", + "ethbloom 0.11.0", + "fixed-hash 0.7.0", + "impl-codec 0.5.0", + "impl-rlp 0.3.0", "impl-serde", - "primitive-types", - "uint", + "primitive-types 0.9.0", + "uint 0.9.0", ] [[package]] @@ -1413,53 +1472,49 @@ [[package]] name = "evm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4bd1fb06a4962a243c8be285d8a9b2493ffa79acb32633ad07a0bc523b1acd" +version = "0.26.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" dependencies = [ "ethereum", "evm-core", "evm-gasometer", "evm-runtime", "log", - "parity-scale-codec", - "primitive-types", - "rlp", + "parity-scale-codec 2.0.1", + "primitive-types 0.9.0", + "rlp 0.5.0", "serde", "sha3 0.8.2", ] [[package]] name = "evm-core" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4eea3882c798813a6f92e8855ec1fc3f5ababd8b274cb81d4bedee701b478e" +version = "0.26.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" dependencies = [ "funty", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 2.0.1", + "primitive-types 0.9.0", "serde", ] [[package]] name = "evm-gasometer" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a8f04dcc8b0296652eabfa443a08ebed6071a1178e0f42a7f7b63a612bddf0b" +version = "0.26.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" dependencies = [ "evm-core", "evm-runtime", - "primitive-types", + "primitive-types 0.9.0", ] [[package]] name = "evm-runtime" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c302f29ca8bba82a382aa52d427869964179e4f24eae57bde70958ce9b7607" +version = "0.26.0" +source = "git+https://github.com/usetech-llc/evm.git?branch=precompile-output#e667bc507590bc67024e5d12c65241d4aef2a1b9" dependencies = [ "evm-core", - "primitive-types", + "primitive-types 0.9.0", "sha3 0.8.2", ] @@ -1517,8 +1572,8 @@ [[package]] name = "fc-consensus" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "derive_more", "fc-db", @@ -1526,7 +1581,7 @@ "fp-rpc", "futures 0.3.12", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-client-api", "sp-api", "sp-block-builder", @@ -1541,12 +1596,12 @@ [[package]] name = "fc-db" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "kvdb", "kvdb-rocksdb", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sp-core", "sp-database", @@ -1555,8 +1610,8 @@ [[package]] name = "fc-mapping-sync" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.1.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "fc-consensus", "fc-db", @@ -1573,11 +1628,12 @@ [[package]] name = "fc-rpc" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "2.0.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "ethereum", - "ethereum-types", + "ethereum-types 0.11.0", + "evm", "fc-consensus", "fc-db", "fc-rpc-core", @@ -1594,9 +1650,9 @@ "log", "pallet-ethereum", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "rand 0.7.3", - "rlp", + "rlp 0.5.0", "rustc-hex", "sc-client-api", "sc-network", @@ -1613,10 +1669,10 @@ [[package]] name = "fc-rpc-core" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.1.0-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ - "ethereum-types", + "ethereum-types 0.11.0", "jsonrpc-core 15.1.0", "jsonrpc-core-client 14.2.0", "jsonrpc-derive 14.2.2", @@ -1656,12 +1712,24 @@ "futures-timer 3.0.2", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", ] [[package]] name = "fixed-hash" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c" +dependencies = [ + "byteorder", + "rand 0.7.3", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "fixed-hash" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" @@ -1718,7 +1786,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", ] [[package]] @@ -1733,12 +1801,12 @@ [[package]] name = "fp-consensus" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "ethereum", - "parity-scale-codec", - "rlp", + "parity-scale-codec 2.0.1", + "rlp 0.5.0", "sha3 0.8.2", "sp-core", "sp-runtime", @@ -1747,12 +1815,12 @@ [[package]] name = "fp-evm" -version = "0.8.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "evm", "impl-trait-for-tuples 0.1.3", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-core", "sp-std", @@ -1760,13 +1828,13 @@ [[package]] name = "fp-rpc" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "ethereum", - "ethereum-types", + "ethereum-types 0.11.0", "fp-evm", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-core", "sp-io", @@ -1776,13 +1844,13 @@ [[package]] name = "fp-storage" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.0" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "ethereum", - "ethereum-types", + "ethereum-types 0.11.0", "fp-evm", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-core", "sp-runtime", @@ -1798,7 +1866,7 @@ "frame-system", "linregress", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "paste 1.0.4", "sp-api", "sp-io", @@ -1817,7 +1885,7 @@ "chrono", "frame-benchmarking", "handlebars", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-cli", "sc-client-db", "sc-executor", @@ -1838,7 +1906,7 @@ dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-core", "sp-io", @@ -1852,7 +1920,7 @@ version = "13.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-core", "sp-std", @@ -1869,7 +1937,7 @@ "impl-trait-for-tuples 0.2.1", "log", "once_cell", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "paste 1.0.4", "serde", "smallvec 1.6.1", @@ -1926,7 +1994,7 @@ "frame-support", "impl-trait-for-tuples 0.2.1", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-core", "sp-io", @@ -1943,7 +2011,7 @@ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-core", "sp-runtime", "sp-std", @@ -1954,7 +2022,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", ] @@ -2638,11 +2706,29 @@ [[package]] name = "impl-codec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +dependencies = [ + "parity-scale-codec 1.3.7", +] + +[[package]] +name = "impl-codec" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", +] + +[[package]] +name = "impl-rlp" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" +dependencies = [ + "rlp 0.4.6", ] [[package]] @@ -2651,7 +2737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" dependencies = [ - "rlp", + "rlp 0.5.0", ] [[package]] @@ -3241,7 +3327,7 @@ "rand 0.7.3", "sha2 0.9.3", "smallvec 1.6.1", - "uint", + "uint 0.9.0", "unsigned-varint 0.7.0", "void", "wasm-timer", @@ -3935,6 +4021,7 @@ "nft-runtime", "pallet-contracts-rpc", "pallet-ethereum", + "pallet-nft", "pallet-transaction-payment-rpc", "parking_lot 0.10.2", "sc-basic-authorship", @@ -3997,7 +4084,7 @@ "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "smallvec 1.6.1", "sp-api", @@ -4161,7 +4248,7 @@ "frame-system", "pallet-session", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -4177,7 +4264,7 @@ "frame-support", "frame-system", "impl-trait-for-tuples 0.2.1", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-authorship", "sp-inherents", "sp-runtime", @@ -4193,7 +4280,7 @@ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-runtime", "sp-std", @@ -4209,7 +4296,7 @@ "log", "pallet-contracts-primitives", "pallet-contracts-proc-macro", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-wasm 0.41.0", "pwasm-utils 0.16.0", "serde", @@ -4227,7 +4314,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "bitflags", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-runtime", "sp-std", ] @@ -4252,7 +4339,7 @@ "jsonrpc-derive 15.1.0", "pallet-contracts-primitives", "pallet-contracts-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-api", "sp-blockchain", @@ -4267,7 +4354,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "pallet-contracts-primitives", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-runtime", "sp-std", @@ -4275,11 +4362,11 @@ [[package]] name = "pallet-ethereum" -version = "0.1.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +version = "1.0.1-dev" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "ethereum", - "ethereum-types", + "ethereum-types 0.11.0", "evm", "fp-consensus", "fp-evm", @@ -4291,8 +4378,8 @@ "pallet-balances", "pallet-evm", "pallet-timestamp", - "parity-scale-codec", - "rlp", + "parity-scale-codec 2.0.1", + "rlp 0.5.0", "rustc-hex", "serde", "sha3 0.8.2", @@ -4304,7 +4391,7 @@ [[package]] name = "pallet-evm" version = "3.0.0" -source = "git+https://github.com/PureStake/frontier.git?branch=notlesh-substrate-8b3e5bc#1f8de106db767ad957193ca4bc5b398a4191c778" +source = "git+https://github.com/usetech-llc/frontier.git?branch=injected-transactions#bd8cd6db44be646a059698371497de64128940af" dependencies = [ "evm", "evm-gasometer", @@ -4312,11 +4399,13 @@ "fp-evm", "frame-support", "frame-system", + "impl-trait-for-tuples 0.2.1", + "log", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", - "primitive-types", - "rlp", + "parity-scale-codec 2.0.1", + "primitive-types 0.9.0", + "rlp 0.5.0", "serde", "sha3 0.8.2", "sp-core", @@ -4336,7 +4425,7 @@ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-application-crypto", "sp-core", @@ -4351,16 +4440,24 @@ name = "pallet-nft" version = "3.0.0" dependencies = [ + "ethereum", + "ethereum-tx-sign", + "fp-evm", "frame-benchmarking", "frame-support", "frame-system", + "hex-literal", "pallet-balances", "pallet-contracts", + "pallet-ethereum", + "pallet-evm", "pallet-randomness-collective-flip", "pallet-timestamp", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 2.0.1", + "rlp 0.5.0", "serde", + "sp-api", "sp-core", "sp-io", "sp-runtime", @@ -4374,7 +4471,7 @@ dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "safe-mix", "sp-runtime", "sp-std", @@ -4389,7 +4486,7 @@ "frame-system", "impl-trait-for-tuples 0.2.1", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-core", "sp-io", @@ -4407,7 +4504,7 @@ dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-io", "sp-runtime", @@ -4424,7 +4521,7 @@ "frame-system", "impl-trait-for-tuples 0.2.1", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-inherents", "sp-io", @@ -4440,7 +4537,7 @@ dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "smallvec 1.6.1", "sp-core", @@ -4458,7 +4555,7 @@ "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-blockchain", "sp-core", @@ -4472,7 +4569,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-runtime", ] @@ -4486,7 +4583,7 @@ "frame-system", "impl-trait-for-tuples 0.2.1", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-runtime", "sp-std", @@ -4500,7 +4597,7 @@ "enumflags2", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-runtime", "sp-std", @@ -4543,13 +4640,25 @@ [[package]] name = "parity-scale-codec" +version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" +dependencies = [ + "arrayvec 0.5.2", + "bitvec 0.17.4", + "byte-slice-cast 0.3.5", + "serde", +] + +[[package]] +name = "parity-scale-codec" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8" dependencies = [ "arrayvec 0.5.2", - "bitvec", - "byte-slice-cast", + "bitvec 0.20.2", + "byte-slice-cast 1.0.0", "parity-scale-codec-derive", "serde", ] @@ -4602,7 +4711,7 @@ "impl-trait-for-tuples 0.2.1", "parity-util-mem-derive", "parking_lot 0.11.1", - "primitive-types", + "primitive-types 0.9.0", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -4965,15 +5074,28 @@ [[package]] name = "primitive-types" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809" +dependencies = [ + "fixed-hash 0.6.1", + "impl-codec 0.4.2", + "impl-rlp 0.2.1", + "impl-serde", + "uint 0.8.5", +] + +[[package]] +name = "primitive-types" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace" dependencies = [ - "fixed-hash", - "impl-codec", - "impl-rlp", + "fixed-hash 0.7.0", + "impl-codec 0.5.0", + "impl-rlp 0.3.0", "impl-serde", - "uint", + "uint 0.9.0", ] [[package]] @@ -5170,6 +5292,12 @@ [[package]] name = "radium" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" + +[[package]] +name = "radium" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" @@ -5502,6 +5630,15 @@ [[package]] name = "rlp" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" +dependencies = [ + "rustc-hex", +] + +[[package]] +name = "rlp" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" @@ -5676,7 +5813,7 @@ "futures 0.3.12", "futures-timer 3.0.2", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -5696,7 +5833,7 @@ version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-client-api", "sp-api", "sp-block-builder", @@ -5713,7 +5850,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-chain-spec-derive", "sc-consensus-babe", "sc-consensus-epochs", @@ -5751,7 +5888,7 @@ "libp2p", "log", "names", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "rand 0.7.3", "regex", "rpassword", @@ -5789,7 +5926,7 @@ "kvdb", "lazy_static", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sc-executor", "sp-api", @@ -5824,7 +5961,7 @@ "linked-hash-map", "log", "parity-db", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-util-mem", "parking_lot 0.11.1", "sc-client-api", @@ -5861,7 +5998,7 @@ "futures 0.3.12", "futures-timer 3.0.2", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sc-block-builder", "sc-client-api", @@ -5898,7 +6035,7 @@ "num-bigint", "num-rational", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "pdqselect", "rand 0.7.3", @@ -5936,7 +6073,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "fork-tree", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sc-client-api", "sp-blockchain", @@ -5951,7 +6088,7 @@ "futures 0.3.12", "futures-timer 3.0.2", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sc-client-api", "sc-telemetry", @@ -5992,7 +6129,7 @@ "lazy_static", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-wasm 0.41.0", "parking_lot 0.11.1", "sc-executor-common", @@ -6018,7 +6155,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "derive_more", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-wasm 0.41.0", "sp-allocator", "sp-core", @@ -6034,7 +6171,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-executor-common", "sp-allocator", "sp-core", @@ -6049,7 +6186,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-wasm 0.41.0", "pwasm-utils 0.14.0", "sc-executor-common", @@ -6074,7 +6211,7 @@ "futures-timer 3.0.2", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "pin-project 1.0.5", "rand 0.7.3", @@ -6145,7 +6282,7 @@ dependencies = [ "hash-db", "lazy_static", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sc-client-api", "sc-executor", @@ -6184,7 +6321,7 @@ "log", "lru", "nohash-hasher", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "pin-project 1.0.5", "prost", @@ -6240,7 +6377,7 @@ "hyper-rustls", "log", "num_cpus", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "rand 0.7.3", "sc-client-api", @@ -6286,7 +6423,7 @@ "jsonrpc-core 15.1.0", "jsonrpc-pubsub 15.1.0", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sc-block-builder", "sc-client-api", @@ -6322,7 +6459,7 @@ "jsonrpc-derive 15.1.0", "jsonrpc-pubsub 15.1.0", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "serde", "serde_json", @@ -6367,7 +6504,7 @@ "jsonrpc-pubsub 15.1.0", "lazy_static", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-util-mem", "parking_lot 0.11.1", "pin-project 1.0.5", @@ -6421,7 +6558,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.11.1", @@ -6519,7 +6656,7 @@ "futures-diagnose", "intervalier", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-util-mem", "parking_lot 0.11.1", "sc-client-api", @@ -6608,6 +6745,24 @@ ] [[package]] +name = "secp256k1" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6179428c22c73ac0fbb7b5579a56353ce78ba29759b3b8575183336ea74cdfb" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11553d210db090930f4432bea123b31f70bbf693ace14504ea2a35e796c28dd2" +dependencies = [ + "cc", +] + +[[package]] name = "secrecy" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6925,7 +7080,7 @@ dependencies = [ "hash-db", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -6952,7 +7107,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-core", "sp-io", @@ -6966,7 +7121,7 @@ dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-debug-derive", "sp-std", @@ -6977,7 +7132,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-inherents", "sp-runtime", "sp-std", @@ -6988,7 +7143,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-inherents", "sp-runtime", @@ -7003,7 +7158,7 @@ "futures 0.3.12", "log", "lru", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sp-api", "sp-consensus", @@ -7031,7 +7186,7 @@ "futures-timer 3.0.2", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "serde", "sp-api", @@ -7053,7 +7208,7 @@ version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-application-crypto", "sp-consensus-slots", @@ -7069,7 +7224,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "merlin", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-api", "sp-application-crypto", @@ -7089,7 +7244,7 @@ version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-arithmetic", "sp-runtime", ] @@ -7099,7 +7254,7 @@ version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "schnorrkel", "sp-core", "sp-runtime", @@ -7126,10 +7281,10 @@ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-util-mem", "parking_lot 0.11.1", - "primitive-types", + "primitive-types 0.9.0", "rand 0.7.3", "regex", "schnorrkel", @@ -7175,7 +7330,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-std", "sp-storage", ] @@ -7187,7 +7342,7 @@ dependencies = [ "finality-grandpa", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-api", "sp-application-crypto", @@ -7202,7 +7357,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sp-core", "sp-std", @@ -7218,7 +7373,7 @@ "hash-db", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "sp-core", "sp-externalities", @@ -7253,7 +7408,7 @@ "derive_more", "futures 0.3.12", "merlin", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "schnorrkel", "serde", @@ -7297,7 +7452,7 @@ "hash256-std-hasher", "impl-trait-for-tuples 0.2.1", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parity-util-mem", "paste 1.0.4", "rand 0.7.3", @@ -7315,8 +7470,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 2.0.1", + "primitive-types 0.9.0", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -7343,7 +7498,7 @@ version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-core", "sp-io", "sp-std", @@ -7365,7 +7520,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-core", "sp-runtime", @@ -7378,7 +7533,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-runtime", "sp-std", ] @@ -7391,7 +7546,7 @@ "hash-db", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.6.1", @@ -7416,7 +7571,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "ref-cast", "serde", "sp-debug-derive", @@ -7441,7 +7596,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-api", "sp-inherents", "sp-runtime", @@ -7455,7 +7610,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-std", "tracing", "tracing-core", @@ -7470,7 +7625,7 @@ "derive_more", "futures 0.3.12", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-api", "sp-blockchain", @@ -7485,7 +7640,7 @@ dependencies = [ "hash-db", "memory-db", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-core", "sp-std", "trie-db", @@ -7510,7 +7665,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "serde", "sp-runtime", "sp-std", @@ -7522,7 +7677,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=frontier#39b31316815ec6d709e7ad7c1a31c436d14c53e6" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sp-std", "wasmi", ] @@ -7657,7 +7812,7 @@ "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", "log", - "parity-scale-codec", + "parity-scale-codec 2.0.1", "sc-client-api", "sc-rpc-api", "serde", @@ -8268,7 +8423,7 @@ checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c" dependencies = [ "hash-db", - "rlp", + "rlp 0.5.0", ] [[package]] @@ -8302,6 +8457,18 @@ [[package]] name = "uint" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" +dependencies = [ + "byteorder", + "crunchy", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "uint" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -28,16 +28,17 @@ jsonrpc-pubsub = "15.0.0" # Substrate dependencies +pallet-nft = { path = '../pallets/nft', version = '3.0.0' } nft-runtime = { path = '../runtime', version = '3.0.0' } frame-benchmarking = { version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } 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 = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } -fc-consensus = { version = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } -fc-mapping-sync = { version = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } -fc-rpc = { version = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } -fc-db = { version = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } -fp-rpc = { version = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } +fc-rpc-core = { version = "1.1.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions" } +fc-consensus = { version = "1.0.0", 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-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.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" } @@ -65,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 = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } +pallet-ethereum = { version = "1.0.1-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,16 +23,26 @@ 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.0", 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-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.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" } sp-runtime = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-contracts = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-transaction-payment = { default-features = false, version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "frontier" } +ethereum-tx-sign = { version = "3.0.4", optional = true } +ethereum = { default-features = false, version = "0.7.1" } +rlp = { default-features = false, version = "0.5.0" } + +hex-literal = "0.3.1" + [features] default = ['std'] std = [ @@ -41,12 +51,18 @@ 'frame-support/std', 'frame-system/std', 'pallet-balances/std', + 'pallet-evm/std', 'pallet-timestamp/std', 'pallet-contracts/std', 'pallet-randomness-collective-flip/std', 'pallet-transaction-payment/std', + 'fp-evm/std', 'sp-std/std', 'sp-runtime/std', 'frame-benchmarking/std', + 'ethereum/std', + 'rlp/std', + + 'ethereum-tx-sign', ] runtime-benchmarks = ["frame-benchmarking"] --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -39,8 +39,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.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } -pallet-ethereum = { default-features = false, version = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } +pallet-evm = { default-features = false, version = "3.0.0", 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-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" } @@ -49,7 +49,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 = "0.1.0", git = "https://github.com/PureStake/frontier.git", branch = "notlesh-substrate-8b3e5bc" } +fp-rpc = { default-features = false, version = "1.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" } @@ -98,8 +98,10 @@ 'pallet-treasury/std', 'pallet-vesting/std', 'pallet-evm/std', + 'pallet-ethereum/std', 'pallet-nft/std', + 'fp-rpc/std', 'sp-api/std', 'sp-block-builder/std', 'sp-consensus-aura/std', -- gitstuff