Merge pull request #113 from azero-id/feat/add-renewal-feature

Add renewal functionality

package.json

@@ -4,9 +4,9 @@
   "author": "AZERO.ID <[email protected]> (https://azero.id)",
   "type": "module",
   "engines": {
-    "node": "20",
-    "pnpm": "9"
+    "node": "20"
   },
+  "packageManager": "[email protected]",
   "scripts": {
     "test": "bash test-all.sh",
     "build": "bash build-all.sh",
@@ -23,24 +23,24 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^8.3.1",
-    "@polkadot/api": "^12.2.1",
-    "@polkadot/api-contract": "^12.2.1",
+    "@polkadot/api": "^12.2.3",
+    "@polkadot/api-contract": "^12.2.3",
     "@polkadot/keyring": "^13.0.2",
-    "@polkadot/types": "^12.2.1",
+    "@polkadot/types": "^12.2.3",
     "@polkadot/util": "^13.0.2",
     "@polkadot/util-crypto": "^13.0.2",
-    "@scio-labs/use-inkathon": "0.10.0",
-    "@types/node": "^20.10.0",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.16.0",
+    "@scio-labs/use-inkathon": "0.11.0",
+    "@types/node": "^20.14.13",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "bn.js": "^5.2.1",
     "cli-progress": "^3.12.0",
-    "csv": "^6.3.5",
+    "csv": "^6.3.10",
     "dotenv": "^16.3.1",
     "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
     "prettier": "^3.1.0",
     "tsx": "^4.5.0",
-    "typescript": "^5.3.2"
+    "typescript": "^5.5.4"
   }
 }

scripts/deploy.ts

@@ -18,6 +18,7 @@ import { writeContractAddresses } from './utils/writeContractAddresses'
  *  - `CHAIN`: Chain ID (optional, defaults to `development`)
  *  - `ADMIN`: Address of contract admin (optional, defaults to caller)
  *  - `RESERVATIONS`: Path to .csv file with reserved names & addresses
+ *  - `NEW_CONFIG`: If set, use new default price (10 AZERO) & max registration duration (200 years)
  *
  * Example usage:
  *  - `CHAIN=alephzero-testnet ADMIN=5fei… RESERVATIONS=reserved-names.csv pnpm run deploy`
@@ -27,8 +28,15 @@ const main = async () => {
   const chainId = initParams.chain.network
 
   // Deploy all contracts
+  const useNewConfig = ['true', true, '1', 1].includes(process.env.NEW_CONFIG || '')
+  const feeCalculator = await deployFeeCalculator(
+    initParams,
+    useNewConfig && {
+      maxRegistrationDuration: 200,
+      commonPrice: initParams.toBNWithDecimals(10),
+    },
+  )
   const nameChecker = await deployNameChecker(initParams)
-  const feeCalculator = await deployFeeCalculator(initParams)
   const tlds = chainId === alephzero.network ? ['azero', 'a0'] : ['tzero']
   const tld = tlds[0]
   const baseUri =

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 },
+  )
 }

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 },
+  )
 }

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 },
+  )
 }

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 })
 }
 
 /**

scripts/testContractStorage.ts

@@ -148,7 +148,7 @@ const main = async () => {
  */
 const registerDomain = async (api, account, contract, domainPrice, domainName) => {
   try {
-    await contractTx(api, account, contract, 'register', { value: domainPrice }, [
+    await contractTx(api, account, contract, 'register_v2', { value: domainPrice }, [
       domainName,
       1,
       null,

src/azns_fee_calculator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "azns_fee_calculator"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["AZERO.ID <[email protected]>"]
 edition = "2021"
 

src/azns_registry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "azns_registry"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["AZERO.ID <[email protected]>"]
 edition = "2021"
 publish = false