Erc 20

Cargo.toml

@@ -3,6 +3,7 @@ members = [
 	"node",
 	"precompiles/session",
 	"precompiles/zk-groth16-verify",
+	"primitives",
 	"runtime/sydney",
 	"runtime/brooklyn",
 	"runtime/runtime-common",
@@ -24,9 +25,11 @@ repository = "https://github.com/ggxchain/ggxnode/"
 # General purpose dependencies
 assert_cmd = "2.0.2"
 async-trait = "0.1"
+bstringify = { version = "0.1.2" }
 cfg-if = "1.0"
 clap = { version = "4.1", features = ["derive"] }
 derive_more = { version = "0.99" }
+ethereum-types = { version = "0.14.0", default-features = false }
 env_logger = "0.10.0"
 ethers = { version = "2.0.4" }
 futures = "0.3.28"
@@ -159,6 +162,8 @@ substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/pa
 substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
 substrate-test-utils = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
 substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
+
 
 # Frontier Client
 fc-cli = { version = "1.0.0-dev", git = "https://github.com/AstarNetwork/frontier.git", branch = "polkadot-v0.9.43" }
@@ -196,8 +201,10 @@ ggxchain-runtime-brooklyn = { path = "runtime/brooklyn", default-features = fals
 ggxchain-runtime-sydney = { path = "runtime/sydney", default-features = false }
 pallet-evm-precompile-session = { path = "precompiles/session", default-features = false }
 pallet-evm-precompile-zk-groth16-verify = { path = "precompiles/zk-groth16-verify", default-features = false }
+ggx-primitives = { path = "primitives", default-features = false }
 runtime-common = { path = "runtime/runtime-common", default-features = false }
 
+
 # Astar
 astar-primitives = { git = "https://github.com/AstarNetwork/Astar.git", rev = "df73ca435bbfa30548bb2446b5dbb58492c928bb", default-features = false }
 pallet-chain-extension-xvm = { version = "0.1.0", git = "https://github.com/AstarNetwork/Astar.git", rev = "df73ca435bbfa30548bb2446b5dbb58492c928bb", default-features = false }
@@ -256,6 +263,7 @@ ark-std = { version = "0.4.0", default-features = false }
 
 # Orml dependencies
 orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "28a2e6f0df9540d91db4018c7ecebb8bfc217a2a", default-features = false }
+orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "28a2e6f0df9540d91db4018c7ecebb8bfc217a2a", default-features = false }
 orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "28a2e6f0df9540d91db4018c7ecebb8bfc217a2a", default-features = false }
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "28a2e6f0df9540d91db4018c7ecebb8bfc217a2a", default-features = false }
 
@@ -296,7 +304,10 @@ reward-rpc-runtime-api = { git = "https://github.com/ggxchain/interbtc.git", bra
 vault-registry-rpc-runtime-api = { git = "https://github.com/ggxchain/interbtc.git", branch = "polkadot-v0.9.43", default-features = false }
 
 # Dex
+pallet-currencies = { path = "pallet/currencies", default-features = false }
+pallet-erc20 = { path = "pallet/erc-20", default-features = false }
 pallet-dex = { path = "pallet/dex", default-features = false }
+pallet-ggx-tokens = { path = "pallet/ggx-tokens", default-features = false }
 
 # Supress warnings from the peerset in logs during syncing
 # The polkadot did the same in the next release. See:

node/Cargo.toml

@@ -100,6 +100,9 @@ replace-rpc.workspace = true
 reward-rpc.workspace = true
 vault-registry-rpc.workspace = true
 
+# dex
+ggx-primitives.workspace = true
+
 [dev-dependencies]
 alloy-rlp = { workspace = true }
 assert_cmd = { workspace = true }

node/src/runtime/mainnet.rs

@@ -2,6 +2,7 @@ use bitcoin::utils::{
 	virtual_transaction_size, InputType, TransactionInputMetadata, TransactionOutputMetadata,
 };
 
+use ggx_primitives::currency::CurrencyId::ForeignAsset;
 pub use ggxchain_runtime_sydney::{btcbridge::CurrencyId::Token, opaque::SessionKeys, *};
 use primitives::{CurrencyId, Rate, TokenSymbol::GGXT, VaultCurrencyPair};
 use rand::SeedableRng;
@@ -268,6 +269,43 @@ pub fn testnet_genesis(
 				.flat_map(|k| vec![(k.clone().0, Token(GGXT), 1 << 70)])
 				.collect(),
 		},
+		ggx_tokens: GGXTokensConfig {
+			balances: endowed_accounts
+				.iter()
+				.flat_map(|k| {
+					vec![
+						(
+							k.clone().0,
+							ggx_primitives::currency::CurrencyId::Token(
+								ggx_primitives::currency::TokenSymbol::GGX,
+							),
+							1u128 << 70,
+						),
+						(
+							k.clone().0,
+							ggx_primitives::currency::CurrencyId::Token(
+								ggx_primitives::currency::TokenSymbol::BTC,
+							),
+							1u128 << 70,
+						),
+						(
+							k.clone().0,
+							ggx_primitives::currency::CurrencyId::Token(
+								ggx_primitives::currency::TokenSymbol::GGXT,
+							),
+							1u128 << 70,
+						),
+						(
+							k.clone().0,
+							ggx_primitives::currency::CurrencyId::Token(
+								ggx_primitives::currency::TokenSymbol::USDT,
+							),
+							1u128 << 70,
+						),
+					]
+				})
+				.collect(),
+		},
 		oracle: OracleConfig {
 			authorized_oracles: endowed_accounts
 				.iter()
@@ -333,8 +371,29 @@ pub fn testnet_genesis(
 			min_exchange_rate: Rate::from_inner(loans::DEFAULT_MIN_EXCHANGE_RATE),
 		},
 		dex: DexConfig {
-			asset_ids: vec![8888, 999, 888, 777, 666, 667],
-			native_asset_id: 8888,
+			asset_ids: vec![
+				ggx_primitives::currency::CurrencyId::Token(
+					ggx_primitives::currency::TokenSymbol::GGX,
+				),
+				ForeignAsset(8888),
+				ForeignAsset(999),
+				ForeignAsset(888),
+				ForeignAsset(777),
+				ForeignAsset(666),
+				ForeignAsset(667),
+				ggx_primitives::currency::CurrencyId::Token(
+					ggx_primitives::currency::TokenSymbol::USDT,
+				),
+				ggx_primitives::currency::CurrencyId::Token(
+					ggx_primitives::currency::TokenSymbol::GGXT,
+				),
+				ggx_primitives::currency::CurrencyId::Token(
+					ggx_primitives::currency::TokenSymbol::BTC,
+				),
+			],
+			native_asset_id: ggx_primitives::currency::CurrencyId::Token(
+				ggx_primitives::currency::TokenSymbol::GGX,
+			),
 		},
 	}
 }