Remove vendor precompile-utils (#1321)

AstarNetwork · Aug 9, 2024 · 2ad07ab · 2ad07ab
1 parent 6609050
commit 2ad07ab
Show file tree

Hide file tree

Showing 103 changed files with 13 additions and 11,233 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -208,6 +208,7 @@ pallet-base-fee = { git = "https://github.com/AstarNetwork/frontier", branch = "
 pallet-evm-chain-id = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false }
 fp-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false }
 fp-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false }
+precompile-utils = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false }
 
 # (native)
 fc-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" }
@@ -313,8 +314,6 @@ pallet-chain-extension-unified-accounts = { path = "./chain-extensions/unified-a
 assets-chain-extension-types = { path = "./chain-extensions/types/assets", default-features = false }
 unified-accounts-chain-extension-types = { path = "./chain-extensions/types/unified-accounts", default-features = false }
 
-precompile-utils = { path = "./precompiles/utils", default-features = false }
-
 local-runtime = { path = "./runtime/local", default-features = false }
 shibuya-runtime = { path = "./runtime/shibuya", default-features = false }
 shiden-runtime = { path = "./runtime/shiden", default-features = false }

diff --git a/bin/collator/src/local/chain_spec.rs b/bin/collator/src/local/chain_spec.rs
@@ -128,7 +128,7 @@ fn testnet_genesis(
         evm: EVMConfig {
             // We need _some_ code inserted at the precompile address so that
             // the evm will actually call the address.
-            accounts: Precompiles::used_addresses()
+            accounts: Precompiles::used_addresses_h160()
                 .map(|addr| {
                     (
                         addr,

diff --git a/bin/collator/src/parachain/chain_spec/astar.rs b/bin/collator/src/parachain/chain_spec/astar.rs
@@ -134,7 +134,7 @@ fn make_genesis(
         evm: EVMConfig {
             // We need _some_ code inserted at the precompile address so that
             // the evm will actually call the address.
-            accounts: Precompiles::used_addresses()
+            accounts: Precompiles::used_addresses_h160()
                 .map(|addr| {
                     (
                         addr,

diff --git a/bin/collator/src/parachain/chain_spec/shibuya.rs b/bin/collator/src/parachain/chain_spec/shibuya.rs
@@ -142,7 +142,7 @@ fn make_genesis(
         evm: EVMConfig {
             // We need _some_ code inserted at the precompile address so that
             // the evm will actually call the address.
-            accounts: Precompiles::used_addresses()
+            accounts: Precompiles::used_addresses_h160()
                 .map(|addr| {
                     (
                         addr,

diff --git a/bin/collator/src/parachain/chain_spec/shiden.rs b/bin/collator/src/parachain/chain_spec/shiden.rs
@@ -136,7 +136,7 @@ fn make_genesis(
         evm: EVMConfig {
             // We need _some_ code inserted at the precompile address so that
             // the evm will actually call the address.
-            accounts: Precompiles::used_addresses()
+            accounts: Precompiles::used_addresses_h160()
                 .map(|addr| {
                     (
                         addr,

diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml