Merge remote-tracking branch 'origin/master' into feat/dapp-staking-v3

AstarNetwork · Dec 18, 2023 · 38d2b72 · 38d2b72
2 parents 98653bc + ae668a0
commit 38d2b72
Show file tree

Hide file tree

Showing 154 changed files with 2,278 additions and 6,035 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -47,7 +47,7 @@ jobs:
       uses: actions-rs/[email protected]
       with:
         version: 0.22.0
-        args: '--workspace -e astar-collator xcm-tools local-runtime shibuya-runtime shiden-runtime astar-runtime integration-tests --exclude-files vendor/* bin/* runtime/* tests/* **/mock.rs **/weights.rs precompiles/utils_v2/*'
+        args: '--workspace -e astar-collator xcm-tools local-runtime shibuya-runtime shiden-runtime astar-runtime integration-tests --exclude-files vendor/* bin/* runtime/* tests/* **/mock.rs **/weights.rs precompiles/utils/*'
         out-type: Xml
 
     - name: Code Coverage Summary Report

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -308,7 +308,6 @@ assets-chain-extension-types = { path = "./chain-extensions/types/assets", defau
 unified-accounts-chain-extension-types = { path = "./chain-extensions/types/unified-accounts", default-features = false }
 
 precompile-utils = { path = "./precompiles/utils", default-features = false }
-precompile-utils-v2 = { path = "./precompiles/utils_v2", default-features = false }
 
 local-runtime = { path = "./runtime/local", default-features = false }
 shibuya-runtime = { path = "./runtime/shibuya", default-features = false }

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

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

diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml
@@ -12,7 +12,7 @@ log = { workspace = true }
 num_enum = { workspace = true }
 slices = { workspace = true }
 
-precompile-utils = { workspace = true }
+precompile-utils = { workspace = true, default-features = false }
 
 # Substrate
 frame-support = { workspace = true }