From 566a3c731937ecc4087006eb7971b7a2f4ee8c92 Mon Sep 17 00:00:00 2001 From: clostao <49268919+clostao@users.noreply.github.com> Date: Wed, 8 Nov 2023 17:03:20 +0100 Subject: [PATCH] fix: default token config (#137) --- pallets/erc20-manager/src/mock.rs | 2 +- .../token-fee-controller/supported-tokens-manager/src/mock.rs | 2 +- pallets/token-fee-controller/user-fee-selector/src/mock.rs | 2 +- .../token-fee-controller/validator-fee-selector/src/mock.rs | 2 +- .../token-fee-controller/fee-token-selector/src/mock.rs | 2 +- .../token-fee-controller/validator-fee-selector/src/mock.rs | 2 +- runtime/src/stability_config.rs | 4 ++-- stability-rpc/README.md | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pallets/erc20-manager/src/mock.rs b/pallets/erc20-manager/src/mock.rs index 84a5fe0b..54e12b3d 100644 --- a/pallets/erc20-manager/src/mock.rs +++ b/pallets/erc20-manager/src/mock.rs @@ -119,7 +119,7 @@ impl pallet_evm::Config for Test { } parameter_types! { - pub MockDefaultFeeToken: H160 = H160::from_str("0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43").expect("invalid address"); + pub MockDefaultFeeToken: H160 = H160::from_str("0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5").expect("invalid address"); pub MeaninglessAddress:H160 = H160::from_str("0xaf537bd156c7E548D0BF2CD43168dABF7aF2feb5").expect("invalid address"); pub MeaninglessTokenAddress:H160 = H160::from_str("0xdAC17F958D2ee523a2206206994597C13D831ec7").expect("invalid address"); } diff --git a/pallets/token-fee-controller/supported-tokens-manager/src/mock.rs b/pallets/token-fee-controller/supported-tokens-manager/src/mock.rs index 7d2b3e69..be16fef6 100644 --- a/pallets/token-fee-controller/supported-tokens-manager/src/mock.rs +++ b/pallets/token-fee-controller/supported-tokens-manager/src/mock.rs @@ -96,7 +96,7 @@ impl pallet_balances::Config for Runtime { } parameter_types! { - pub MockDefaultFeeToken: H160 = H160::from_str("0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43").expect("invalid address"); + pub MockDefaultFeeToken: H160 = H160::from_str("0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5").expect("invalid address"); pub MeaninglessTokenAddress:H160 = H160::from_str("0xdAC17F958D2ee523a2206206994597C13D831ec7").expect("invalid address"); pub MockDefaultTokenBalanceSlot:H256 = H256::from_low_u64_be(0); } diff --git a/pallets/token-fee-controller/user-fee-selector/src/mock.rs b/pallets/token-fee-controller/user-fee-selector/src/mock.rs index c758fe0a..0633c09a 100644 --- a/pallets/token-fee-controller/user-fee-selector/src/mock.rs +++ b/pallets/token-fee-controller/user-fee-selector/src/mock.rs @@ -96,7 +96,7 @@ impl pallet_balances::Config for Runtime { } parameter_types! { - pub MockDefaultFeeToken: H160 = H160::from_str("0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43").expect("invalid address"); + pub MockDefaultFeeToken: H160 = H160::from_str("0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5").expect("invalid address"); pub MeaninglessTokenAddress:H160 = H160::from_str("0xdAC17F958D2ee523a2206206994597C13D831ec7").expect("invalid address"); } diff --git a/pallets/token-fee-controller/validator-fee-selector/src/mock.rs b/pallets/token-fee-controller/validator-fee-selector/src/mock.rs index 96de3418..6e152b91 100644 --- a/pallets/token-fee-controller/validator-fee-selector/src/mock.rs +++ b/pallets/token-fee-controller/validator-fee-selector/src/mock.rs @@ -100,7 +100,7 @@ impl pallet_balances::Config for Runtime { } parameter_types! { - pub MockDefaultFeeToken: H160 = H160::from_str("0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43").expect("invalid address"); + pub MockDefaultFeeToken: H160 = H160::from_str("0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5").expect("invalid address"); pub MeaninglessTokenAddress:H160 = H160::from_str("0xdAC17F958D2ee523a2206206994597C13D831ec7").expect("invalid address"); pub NotSupportedToken:H160 = H160::from_str("0xdAC17F958D2ee523a2206206994597C13D831123").expect("invalid address"); } diff --git a/precompiles/token-fee-controller/fee-token-selector/src/mock.rs b/precompiles/token-fee-controller/fee-token-selector/src/mock.rs index d4beb0b1..bce40e5f 100644 --- a/precompiles/token-fee-controller/fee-token-selector/src/mock.rs +++ b/precompiles/token-fee-controller/fee-token-selector/src/mock.rs @@ -92,7 +92,7 @@ impl pallet_balances::Config for Runtime { } parameter_types! { - pub MockDefaultFeeToken: H160 = H160::from_str("0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43").expect("invalid address"); + pub MockDefaultFeeToken: H160 = H160::from_str("0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5").expect("invalid address"); pub MeaninglessTokenAddress:H160 = H160::from_str("0xdAC17F958D2ee523a2206206994597C13D831ec7").expect("invalid address"); } diff --git a/precompiles/token-fee-controller/validator-fee-selector/src/mock.rs b/precompiles/token-fee-controller/validator-fee-selector/src/mock.rs index dd5e4529..23ad425e 100644 --- a/precompiles/token-fee-controller/validator-fee-selector/src/mock.rs +++ b/precompiles/token-fee-controller/validator-fee-selector/src/mock.rs @@ -117,7 +117,7 @@ impl pallet_balances::Config for Runtime { } parameter_types! { - pub MockDefaultFeeToken: H160 = H160::from_str("0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43").expect("invalid address"); + pub MockDefaultFeeToken: H160 = H160::from_str("0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5").expect("invalid address"); pub UnpermissionedAccount:H160 = H160::from_str("0x1000000000000000000000000000000000000000").expect("invalid address"); pub UnpermissionedAccount2:H160 = H160::from_str("0x2000000000000000000000000000000000000000").expect("invalid address"); pub MeaninglessTokenAddress: H160 = H160::from_str("0x3000000000000000000000000000000000000000").expect("invalid address"); diff --git a/runtime/src/stability_config.rs b/runtime/src/stability_config.rs index bafbbedd..a608440f 100644 --- a/runtime/src/stability_config.rs +++ b/runtime/src/stability_config.rs @@ -14,7 +14,7 @@ const COMPUTATION_POWER_MULTIPLIER: u64 = 6; // 6 times more computation power t // how much weight for normal extrinsics could be processed in a block pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_MILLIS) .mul(MILLISECS_PER_BLOCK) - .mul(COMPUTATION_POWER_MULTIPLIER) + .mul(COMPUTATION_POWER_MULTIPLIER) .mul(COMPUTATION_BLOCK_TIME_RATIO.0) .div(COMPUTATION_BLOCK_TIME_RATIO.1) // 8_000_000_000_000 .set_proof_size(u64::MAX); @@ -32,7 +32,7 @@ pub const COUNCIL_MAX_MEMBERS: u32 = 100; pub const DEFAULT_OWNER: &str = "0xaf537bd156c7E548D0BF2CD43168dABF7aF2feb5"; -pub const DEFAULT_FEE_TOKEN: &str = "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"; +pub const DEFAULT_FEE_TOKEN: &str = "0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5"; /// Minimum deposit of an account to exist. /// Since this minimum deposit would be reduced diff --git a/stability-rpc/README.md b/stability-rpc/README.md index e5629ae9..429ba6fb 100644 --- a/stability-rpc/README.md +++ b/stability-rpc/README.md @@ -16,5 +16,5 @@ $ curl 'http://localhost:9933' \ --data '{"method":"stability_getSupportedTokens","params":[], "id":1,"jsonrpc":"2.0"}' -{"jsonrpc":"2.0","result":{"code":200,"value":["0xdc2b93f3291030f3f7a6d9363ac37757f7ad5c43"]},"id":1} +{"jsonrpc":"2.0","result":{"code":200,"value":["0x261FB2d971eFBBFd027A9C9Cebb8548Cf7d0d2d5"]},"id":1} ```