Merge branch 'master' of github.com:AstarNetwork/Astar into feat/add-…

…pallet-migrations
AstarNetwork · Aug 12, 2024 · 1c909e8 · 1c909e8
2 parents ae9e337 + 3ab689e
commit 1c909e8
Show file tree

Hide file tree

Showing 116 changed files with 462 additions and 11,791 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -129,7 +129,7 @@ jobs:
       run: rustup target list --installed
 
     - name: Build optimized binary with evm tracing
-      run: CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="-C codegen-units=1" cargo build --release --target x86_64-unknown-linux-gnu --features evm-tracing --verbose --locked
+      run: CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="-C codegen-units=1" cargo build --release --target x86_64-unknown-linux-gnu --features on-chain-release-build,evm-tracing --verbose --locked
 
     - uses: actions/upload-artifact@v3
       with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -209,6 +209,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/Cargo.toml b/bin/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.42.2"
+version = "5.43.0"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"

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