feat(scripts): Ensure chopsticks compatability by passing nonce manually

azero-id · Jul 30, 2024 · ab64a72 · ab64a72
1 parent 32960f4
commit ab64a72
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 20 deletions.
diff --git a/scripts/deploy/deployFeeCalculator.ts b/scripts/deploy/deployFeeCalculator.ts
@@ -32,11 +32,16 @@ export const deployFeeCalculator: DeployFn<FeeCalculatorArgs> = async (
     customArgs,
   )
   const { abi, wasm } = await getDeploymentData('azns_fee_calculator')
+  const nonce = await api.rpc.system.accountNextIndex(account.address)
 
-  return await deployContract(api, account, abi, wasm, 'new', [
-    args.admin,
-    args.maxRegistrationDuration,
-    args.commonPrice,
-    args.pricePoints,
-  ])
+  return await deployContract(
+    api,
+    account,
+    abi,
+    wasm,
+    'new',
+    [args.admin, args.maxRegistrationDuration, args.commonPrice, args.pricePoints],
+    undefined,
+    { nonce },
+  )
 }
diff --git a/scripts/deploy/deployNameChecker.ts b/scripts/deploy/deployNameChecker.ts
@@ -29,11 +29,21 @@ export const deployNameChecker: DeployFn<NameCheckerArgs> = async (
     customArgs,
   )
   const { abi, wasm } = await getDeploymentData('azns_name_checker')
+  const nonce = await api.rpc.system.accountNextIndex(account.address)
 
-  return await deployContract(api, account, abi, wasm, 'new', [
-    args.admin,
-    args.allowedLength,
-    args.allowedUnicodeRanges,
-    args.disallowedUnicodeRangesForEdges,
-  ])
+  return await deployContract(
+    api,
+    account,
+    abi,
+    wasm,
+    'new',
+    [
+      args.admin,
+      args.allowedLength,
+      args.allowedUnicodeRanges,
+      args.disallowedUnicodeRangesForEdges,
+    ],
+    undefined,
+    { nonce },
+  )
 }
diff --git a/scripts/deploy/deployRegistry.ts b/scripts/deploy/deployRegistry.ts
@@ -24,12 +24,16 @@ export const deployRegistry: DeployFn<RegistryArgs> = async ({ api, account }, c
     customArgs,
   )
   const { abi, wasm } = await getDeploymentData('azns_registry')
+  const nonce = await api.rpc.system.accountNextIndex(account.address)
 
-  return await deployContract(api, account, abi, wasm, 'new', [
-    args.admin,
-    args.nameCheckerAddress,
-    args.feeCalculatorAddress,
-    args.tld,
-    args.baseUri,
-  ])
+  return await deployContract(
+    api,
+    account,
+    abi,
+    wasm,
+    'new',
+    [args.admin, args.nameCheckerAddress, args.feeCalculatorAddress, args.tld, args.baseUri],
+    undefined,
+    { nonce },
+  )
 }
diff --git a/scripts/deploy/deployRouter.ts b/scripts/deploy/deployRouter.ts
@@ -18,8 +18,9 @@ export const deployRouter: DeployFn<RouterArgs> = async ({ api, account }, custo
     customArgs,
   )
   const { abi, wasm } = await getDeploymentData('azns_router')
+  const nonce = await api.rpc.system.accountNextIndex(account.address)
 
-  return await deployContract(api, account, abi, wasm, 'new', [args.admin])
+  return await deployContract(api, account, abi, wasm, 'new', [args.admin], undefined, { nonce })
 }
 
 /**