Merge branch 'master' of github.com:AstarNetwork/Astar

Author: PierreOssun

.github/scripts/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "dependencies": {
     "@polkadot/util-crypto": "^10.1.10",
-    "octokit": "^2.0.7",
+    "octokit": "^3.1.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4",
     "yargs": "^17.6.0"

.github/scripts/yarn.lock

@@ -47,7 +47,7 @@ jobs:
       uses: actions-rs/tarpaulin@v0.1
       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/*'
+        args: '--workspace --features try-runtime,runtime-benchmarks -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

.github/workflows/coverage.yaml

@@ -255,6 +255,7 @@ polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot",
 cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false }
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
 xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
@@ -282,6 +283,7 @@ pallet-ethereum-checked = { path = "./pallets/ethereum-checked", default-feature
 pallet-inflation = { path = "./pallets/inflation", default-features = false }
 pallet-dynamic-evm-base-fee = { path = "./pallets/dynamic-evm-base-fee", default-features = false }
 pallet-unified-accounts = { path = "./pallets/unified-accounts", default-features = false }
+astar-xcm-benchmarks = { path = "./pallets/astar-xcm-benchmarks", default-features = false }
 pallet-static-price-provider = { path = "./pallets/static-price-provider", default-features = false }
 
 dapp-staking-v3-runtime-api = { path = "./pallets/dapp-staking-v3/rpc/runtime-api", default-features = false }
@@ -297,6 +299,7 @@ pallet-evm-precompile-xvm = { path = "./precompiles/xvm", default-features = fal
 pallet-evm-precompile-dapps-staking = { path = "./precompiles/dapps-staking", default-features = false }
 pallet-evm-precompile-dapp-staking-v3 = { path = "./precompiles/dapp-staking-v3", default-features = false }
 pallet-evm-precompile-unified-accounts = { path = "./precompiles/unified-accounts", default-features = false }
+pallet-evm-precompile-dispatch-lockdrop = { path = "./precompiles/dispatch-lockdrop", default-features = false }
 
 pallet-chain-extension-xvm = { path = "./chain-extensions/xvm", default-features = false }
 pallet-chain-extension-assets = { path = "./chain-extensions/pallet-assets", default-features = false }

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.28.0"
+version = "5.31.0"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"

Cargo.toml

@@ -176,7 +176,6 @@ fn make_genesis(
                 Permill::from_percent(30),
                 Permill::from_percent(40),
             ],
-            // TODO: adjust this if needed
             tier_thresholds: vec![
                 TierThreshold::DynamicTvlAmount {
                     amount: 100 * SBY,
@@ -194,7 +193,6 @@ fn make_genesis(
             ],
             slots_per_tier: vec![10, 20, 30, 40],
         },
-        // TODO: adjust this if needed
         inflation: InflationConfig {
             params: InflationParameters::default(),
         },

bin/collator/Cargo.toml

@@ -21,14 +21,15 @@
 use cumulus_primitives_core::ParaId;
 use sc_service::ChainType;
 use shiden_runtime::{
-    wasm_binary_unwrap, AccountId, AuraId, Balance, BlockRewardConfig, EVMConfig,
-    ParachainInfoConfig, Precompiles, RewardDistributionConfig, Signature, SystemConfig, SDN,
+    wasm_binary_unwrap, AccountId, AuraId, Balance, DappStakingConfig, EVMConfig, InflationConfig,
+    InflationParameters, ParachainInfoConfig, Precompiles, Signature, SystemConfig, TierThreshold,
+    SDN,
 };
 use sp_core::{sr25519, Pair, Public};
 
 use sp_runtime::{
     traits::{IdentifyAccount, Verify},
-    Perbill,
+    Permill,
 };
 
 use super::{get_from_seed, Extensions};
@@ -111,17 +112,6 @@ fn make_genesis(
         },
         parachain_info: ParachainInfoConfig { parachain_id },
         balances: shiden_runtime::BalancesConfig { balances },
-        block_reward: BlockRewardConfig {
-            // Make sure sum is 100
-            reward_config: RewardDistributionConfig {
-                treasury_percent: Perbill::from_percent(40),
-                base_staker_percent: Perbill::from_percent(25),
-                dapps_percent: Perbill::from_percent(25),
-                collators_percent: Perbill::from_percent(10),
-                adjustable_percent: Perbill::from_percent(0),
-                ideal_dapps_staking_tvl: Perbill::from_percent(0),
-            },
-        },
         vesting: shiden_runtime::VestingConfig { vesting: vec![] },
         session: shiden_runtime::SessionConfig {
             keys: authorities
@@ -160,6 +150,39 @@ fn make_genesis(
         assets: Default::default(),
         parachain_system: Default::default(),
         transaction_payment: Default::default(),
+        dapp_staking: DappStakingConfig {
+            reward_portion: vec![
+                Permill::from_percent(40),
+                Permill::from_percent(30),
+                Permill::from_percent(20),
+                Permill::from_percent(10),
+            ],
+            slot_distribution: vec![
+                Permill::from_percent(10),
+                Permill::from_percent(20),
+                Permill::from_percent(30),
+                Permill::from_percent(40),
+            ],
+            tier_thresholds: vec![
+                TierThreshold::DynamicTvlAmount {
+                    amount: 30000 * SDN,
+                    minimum_amount: 20000 * SDN,
+                },
+                TierThreshold::DynamicTvlAmount {
+                    amount: 7500 * SDN,
+                    minimum_amount: 5000 * SDN,
+                },
+                TierThreshold::DynamicTvlAmount {
+                    amount: 20000 * SDN,
+                    minimum_amount: 15000 * SDN,
+                },
+                TierThreshold::FixedTvlAmount { amount: 5000 * SDN },
+            ],
+            slots_per_tier: vec![10, 20, 30, 40],
+        },
+        inflation: InflationConfig {
+            params: InflationParameters::default(),
+        },
     }
 }