fix: update types for Dock (#600)

* Update types for Dock
paritytech · Jul 9, 2021 · 0300941 · 0300941
1 parent 333cd24
commit 0300941
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 8 deletions.
diff --git a/calc/pkg/calc_bg.wasm b/calc/pkg/calc_bg.wasm
diff --git a/calc/pkg/package.json b/calc/pkg/package.json
@@ -13,7 +13,6 @@
   "files": [
     "calc_bg.wasm",
     "calc.js",
-    "calc_bg.js",
     "calc.d.ts"
   ],
   "main": "calc.js",

diff --git a/calc/src/calc_fee.rs b/calc/src/calc_fee.rs
@@ -50,7 +50,8 @@ impl Multiplier {
             ("westend", v) if 31 <= v => V2(new_u128(inner)),
 
             ("dock-main-runtime", _) => V2(new_u128(inner)),
-            ("dock-testnet", _) => V2(new_u128(inner)),
+            ("dock-pos-main-runtime", _) => V2(new_u128(inner)),
+            ("dock-pos-test-runtime", _) => V2(new_u128(inner)),
 
             _ => {
                 info!("Unsupported runtime: {}#{}", spec_name, spec_version);

diff --git a/src/chains-config/dockPoSMainnetControllers.ts b/src/chains-config/dockPoSMainnetControllers.ts
@@ -0,0 +1,32 @@
+import { ControllerConfig } from '../types/chains-config';
+import { getBlockWeight } from './metadata-consts';
+
+/**
+ * Controllers for Dock's mainnet.
+ */
+export const dockPoSMainnetControllers: ControllerConfig = {
+	controllers: [
+		'AccountsBalanceInfo',
+		'AccountsStakingInfo',
+		'AccountsStakingPayouts',
+		'Blocks',
+		'BlocksExtrinsics',
+		'NodeNetwork',
+		'NodeTransactionPool',
+		'NodeVersion',
+		'PalletsStakingProgress',
+		'PalletsStorage',
+		'RuntimeCode',
+		'RuntimeMetadata',
+		'RuntimeSpec',
+		'TransactionDryRun',
+		'TransactionFeeEstimate',
+		'TransactionMaterial',
+		'TransactionSubmit',
+	],
+	options: {
+		finalizes: true,
+		minCalcFeeRuntime: 29,
+		blockWeightStore: getBlockWeight('dock-pos-main-runtime'),
+	},
+};
diff --git a/src/chains-config/dockTestnetControllers.ts → ...hains-config/dockPoSTestnetControllers.ts b/src/chains-config/dockTestnetControllers.ts → ...hains-config/dockPoSTestnetControllers.ts
@@ -1,16 +1,20 @@
 import { ControllerConfig } from '../types/chains-config';
+import { getBlockWeight } from './metadata-consts';
 
 /**
  * Controllers for Dock's test network.
  */
 export const dockTestnetControllers: ControllerConfig = {
 	controllers: [
 		'AccountsBalanceInfo',
+		'AccountsStakingInfo',
+		'AccountsStakingPayouts',
 		'Blocks',
 		'BlocksExtrinsics',
 		'NodeNetwork',
 		'NodeTransactionPool',
 		'NodeVersion',
+		'PalletsStakingProgress',
 		'PalletsStorage',
 		'RuntimeCode',
 		'RuntimeMetadata',
@@ -22,7 +26,7 @@ export const dockTestnetControllers: ControllerConfig = {
 	],
 	options: {
 		finalizes: true,
-		minCalcFeeRuntime: 1,
-		blockWeightStore: {},
+		minCalcFeeRuntime: 26,
+		blockWeightStore: getBlockWeight('dock-pos-test-runtime'),
 	},
 };
diff --git a/src/chains-config/index.ts b/src/chains-config/index.ts
@@ -6,7 +6,8 @@ import { controllers } from '../controllers';
 import { ControllerConfig } from '../types/chains-config';
 import { defaultControllers } from './defaultControllers';
 import { dockMainnetControllers } from './dockMainnetControllers';
-import { dockTestnetControllers } from './dockTestnetControllers';
+import { dockPoSMainnetControllers } from './dockPoSMainnetControllers';
+import { dockTestnetControllers } from './dockPoSTestnetControllers';
 import { kiltControllers } from './kiltControllers';
 import { kulupuControllers } from './kulupuControllers';
 import { kusamaControllers } from './kusamaControllers';
@@ -24,8 +25,9 @@ const specToControllerMap = {
 	kulupu: kulupuControllers,
 	kilt: kiltControllers,
 	mandala: mandalaControllers,
-	'dock-testnet': dockTestnetControllers,
 	'dock-main-runtime': dockMainnetControllers,
+	'dock-pos-main-runtime': dockPoSMainnetControllers,
+	'dock-pos-test-runtime': dockTestnetControllers,
 	statemint: statemintControllers,
 	statemine: statemintControllers,
 	westmine: statemintControllers,

diff --git a/src/chains-config/metadata-consts/dockConsts.ts b/src/chains-config/metadata-consts/dockConsts.ts
@@ -1,10 +1,25 @@
 import { MetadataConsts } from '../../types/chains-config';
+import { extrinsicBaseWeight, perClass } from './substrateConsts';
 
 export const dockMainnetDefinitions: MetadataConsts[] = [
 	{
 		runtimeVersions: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
 		],
-		extrinsicBaseWeight: BigInt(125000000),
+		extrinsicBaseWeight,
+	},
+];
+
+export const dockPoSMainnetDefinitions: MetadataConsts[] = [
+	{
+		runtimeVersions: [29],
+		perClass,
+	},
+];
+
+export const dockPoSTestnetDefinitions: MetadataConsts[] = [
+	{
+		runtimeVersions: [26, 27, 28, 29],
+		perClass,
 	},
 ];
diff --git a/src/chains-config/metadata-consts/index.ts b/src/chains-config/metadata-consts/index.ts
@@ -6,7 +6,11 @@ import {
 	MetadataConsts,
 	PerClassValue,
 } from '../../types/chains-config';
-import { dockMainnetDefinitions } from './dockConsts';
+import {
+	dockMainnetDefinitions,
+	dockPoSMainnetDefinitions,
+	dockPoSTestnetDefinitions,
+} from './dockConsts';
 import { kusamaDefinitions } from './kusamaConsts';
 import { polkadotDefinitions } from './polkadotConsts';
 import { polymeshDefinitions } from './polymeshConsts';
@@ -77,6 +81,10 @@ export function getBlockWeight(specName: string): BlockWeightStore {
 			return generateBlockWeightStore(westendDefinitions);
 		case 'dock-main-runtime':
 			return generateBlockWeightStore(dockMainnetDefinitions);
+		case 'dock-pos-main-runtime':
+			return generateBlockWeightStore(dockPoSMainnetDefinitions);
+		case 'dock-pos-test-runtime':
+			return generateBlockWeightStore(dockPoSTestnetDefinitions);
 		default:
 			return {};
 	}