Merge pull request #42 from AstarNetwork/feature/pallet-asset-ce

Added pallet-asset chain-extension
inkdevhub · Nov 18, 2022 · f816a57 · f816a57
2 parents ec9e74c + 6f0642b
commit f816a57
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -54,6 +54,9 @@ pallet-rmrk-equip = { git = "https://github.com/AstarNetwork/rmrk-substrate", br
 pallet-rmrk-market = { git = "https://github.com/AstarNetwork/rmrk-substrate", branch = "polkadot-v0.9.30", default-features = false }
 rmrk-traits = { git = "https://github.com/AstarNetwork/rmrk-substrate", branch = "polkadot-v0.9.30", default-features = false }
 
+# pallet-asset chain-extension
+pallet-assets-chain-extension = { git = "https://github.com/AstarNetwork/pallet-assets-chain-extension", default-features = false, features = ["substrate"], branch = "polkadot-v0.9.30" }
+
 # Used for the node template's RPCs
 frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" }
 pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" }
@@ -102,6 +105,7 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
+	"pallet-assets-chain-extension/substrate-std",
 ]
 contracts-unstable-interface = [
 	"pallet-contracts/unstable-interface",
@@ -116,6 +120,9 @@ runtime-benchmarks = [
 	"pallet-dapps-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-assets-chain-extension/runtime-benchmarks",
 ]
 try-runtime = [
 	"log",

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -314,7 +314,11 @@ impl pallet_contracts::Config for Runtime {
 	type DepositPerByte = DepositPerByte;
 	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
-	type ChainExtension = (DappsStakingExtension<Self>, RmrkExtension<Self>);
+	type ChainExtension = (
+		DappsStakingExtension<Self>,
+		RmrkExtension<Self>,
+		pallet_assets_chain_extension::substrate::AssetsExtension,
+	);
 	type DeletionQueueDepth = ConstU32<128>;
 	type DeletionWeightLimit = DeletionWeightLimit;
 	type Schedule = Schedule;