fix: support calamari parachain fee calculations (#749)

* support calamari fee calculation * lose redundant import * calamari runtime constants * calamari handler * whitespace for the linter * wasm-pack * sorting for the linter * minCalcFeeRuntime correction * lint * whitespace fix
paritytech · Nov 4, 2021 · 1e2f4a5 · jsdw · Nov 5, 2021 · TarikGul
1 parent 0a1e63e
commit 1e2f4a5
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 0 deletions.
diff --git a/calc/pkg/calc_bg.wasm b/calc/pkg/calc_bg.wasm
diff --git a/calc/src/calc_fee.rs b/calc/src/calc_fee.rs
@@ -61,6 +61,8 @@ impl Multiplier {
             ("dock-pos-main-runtime", _) => V2(new_u128(inner)),
             ("dock-pos-test-runtime", _) => V2(new_u128(inner)),
 
+            ("calamari", _v) => V2(new_u128(inner)),
+
             _ => {
                 info!("Unsupported runtime: {}#{}", spec_name, spec_version);
                 return None;

diff --git a/src/chains-config/calamariControllers.ts b/src/chains-config/calamariControllers.ts
@@ -0,0 +1,37 @@
+import { ControllerConfig } from '../types/chains-config';
+import { initLRUCache } from './cache/lruCache';
+import { getBlockWeight } from './metadata-consts';
+
+/**
+ * Controllers for calamari collator
+ */
+export const calamariControllers: ControllerConfig = {
+	controllers: [
+		'AccountsBalanceInfo',
+		'AccountsStakingInfo',
+		'AccountsStakingPayouts',
+		'AccountsValidate',
+		'AccountsVestingInfo',
+		'Blocks',
+		'BlocksExtrinsics',
+		'NodeNetwork',
+		'NodeTransactionPool',
+		'NodeVersion',
+		'PalletsStakingProgress',
+		'PalletsStorage',
+		'Paras',
+		'RuntimeCode',
+		'RuntimeMetadata',
+		'RuntimeSpec',
+		'TransactionDryRun',
+		'TransactionFeeEstimate',
+		'TransactionMaterial',
+		'TransactionSubmit',
+	],
+	options: {
+		finalizes: true,
+		minCalcFeeRuntime: 1,
+		blockWeightStore: getBlockWeight('calamari'),
+		blockStore: initLRUCache(),
+	},
+};
diff --git a/src/chains-config/index.ts b/src/chains-config/index.ts
@@ -4,6 +4,7 @@ import { AbstractService } from 'src/services/AbstractService';
 
 import { controllers } from '../controllers';
 import { ControllerConfig } from '../types/chains-config';
+import { calamariControllers } from './calamariControllers';
 import { defaultControllers } from './defaultControllers';
 import { dockMainnetControllers } from './dockMainnetControllers';
 import { dockPoSMainnetControllers } from './dockPoSMainnetControllers';
@@ -37,6 +38,7 @@ const specToControllerMap = {
 	westmint: statemintControllers,
 	shiden: shidenControllers,
 	sora: soraControllers,
+	calamari: calamariControllers,
 };
 
 /**

diff --git a/src/chains-config/metadata-consts/calamariConsts.ts b/src/chains-config/metadata-consts/calamariConsts.ts
@@ -0,0 +1,9 @@
+import { MetadataConsts } from '../../types/chains-config';
+import { extrinsicBaseWeight } from './substrateConsts';
+
+export const calamariDefinitions: MetadataConsts[] = [
+	{
+		runtimeVersions: [1, 2, 3, 4],
+		extrinsicBaseWeight,
+	},
+];
diff --git a/src/chains-config/metadata-consts/index.ts b/src/chains-config/metadata-consts/index.ts
@@ -6,6 +6,7 @@ import {
 	MetadataConsts,
 	PerClassValue,
 } from '../../types/chains-config';
+import { calamariDefinitions } from './calamariConsts';
 import {
 	dockMainnetDefinitions,
 	dockPoSMainnetDefinitions,
@@ -88,6 +89,8 @@ export function getBlockWeight(specName: string): BlockWeightStore {
 			return generateBlockWeightStore(dockPoSTestnetDefinitions);
 		case 'shiden':
 			return generateBlockWeightStore(shidenDefinitions);
+		case 'calamari':
+			return generateBlockWeightStore(calamariDefinitions);
 		default:
 			return {};
 	}