Merge commit '1d167fd97183fca44c4c2032aee886f5a17c39f9' into pangolin

darwinia-network · Jan 30, 2021 · 2dfa213 · 2dfa213
1 parent f35f6ea
commit 2dfa213
Show file tree

Hide file tree

Showing 43 changed files with 1,874 additions and 5,972 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,6 +27,12 @@ members = [
 	"frame/dvm/rpc/runtime-api",
 	"frame/elections-phragmen",
 	"frame/evm",
+	"frame/evm/precompile/blake2",
+	"frame/evm/precompile/bn128",
+	"frame/evm/precompile/dispatch",
+	"frame/evm/precompile/ed25519",
+	"frame/evm/precompile/modexp",
+	"frame/evm/precompile/simple",
 	"frame/header-mmr",
 	"frame/header-mmr/rpc",
 	"frame/header-mmr/rpc/runtime-api",

diff --git a/bin/node/runtime/pangolin/Cargo.toml b/bin/node/runtime/pangolin/Cargo.toml
@@ -26,6 +26,7 @@ darwinia-elections-phragmen         = { default-features = false, path = "../../
 darwinia-ethereum-backing           = { default-features = false, path = "../../../../frame/bridge/ethereum/backing" }
 darwinia-ethereum-relay             = { default-features = false, path = "../../../../frame/bridge/ethereum/relay" }
 darwinia-evm                        = { default-features = false, path = "../../../../frame/evm" }
+darwinia-evm-precompile-simple      = { default-features = false, path = "../../../../frame/evm/precompile/simple" }
 darwinia-header-mmr                 = { default-features = false, path = "../../../../frame/header-mmr" }
 darwinia-header-mmr-rpc-runtime-api = { default-features = false, path = "../../../../frame/header-mmr/rpc/runtime-api" }
 darwinia-relay-authorities          = { default-features = false, path = "../../../../frame/bridge/relay-authorities" }
@@ -97,6 +98,7 @@ std     = [
 	"darwinia-ethereum-backing/std",
 	"darwinia-ethereum-relay/std",
 	"darwinia-evm/std",
+	"darwinia-evm-precompile-simple/std",
 	"darwinia-header-mmr/std",
 	"darwinia-header-mmr-rpc-runtime-api/std",
 	"darwinia-relay-authorities/std",