fix(revive): Support chains with renamed gas_limit to weight_limit

examples/governance/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@polkadot-api/descriptors": "file:.papi/descriptors",
     "@polkadot-api/sdk-governance": "workspace:*",
-    "polkadot-api": "^1.22.0",
+    "polkadot-api": "^1.23.1",
     "rxjs": "7.8.2"
   }
 }

examples/ink-playground/.papi/contracts/ballot.json

@@ -10,73 +10,6 @@
     "stateMutability": "nonpayable",
     "type": "constructor"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "available",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "required",
-        "type": "uint256"
-      }
-    ],
-    "name": "InsufficientBalance",
-    "type": "error"
-  },
-  {
-    "anonymous": true,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "voter",
-        "type": "address"
-      }
-    ],
-    "name": "AnonRightGiven",
-    "type": "event"
-  },
-  {
-    "anonymous": true,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "voter",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "AnonRightGiven2",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "voter",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "RightGiven",
-    "type": "event"
-  },
   {
     "inputs": [],
     "name": "chairperson",

examples/ink-playground/contracts/ballot_sol/3_Ballot.sol

@@ -43,11 +43,6 @@ contract Ballot {
         }
     }
 
-    error InsufficientBalance(uint available, uint required);
-    event RightGiven(address indexed voter, uint value);
-    event AnonRightGiven(address indexed voter) anonymous;
-    event AnonRightGiven2(address voter, uint value) anonymous;
-
     /**
      * @dev Give 'voter' the right to vote on this ballot. May only be called by 'chairperson'.
      * @param voter address of voter
@@ -60,11 +55,6 @@ contract Ballot {
         require(!voters[voter].voted, "The voter already voted.");
         require(voters[voter].weight == 0);
         voters[voter].weight = 1;
-
-        revert InsufficientBalance({available: 100, required: 400});
-        // emit RightGiven(voter, 5);
-        // emit AnonRightGiven(voter);
-        // emit AnonRightGiven2(voter, 5);
     }
 
     /**

examples/ink-playground/contracts/ballot_sol/3_Ballot_sol_Ballot.abi

@@ -1 +1 @@
-[{"inputs":[{"internalType":"bytes32[]","name":"proposalNames","type":"bytes32[]"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"uint256","name":"available","type":"uint256"},{"internalType":"uint256","name":"required","type":"uint256"}],"name":"InsufficientBalance","type":"error"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"address","name":"voter","type":"address"}],"name":"AnonRightGiven","type":"event"},{"anonymous":true,"inputs":[{"indexed":false,"internalType":"address","name":"voter","type":"address"},{"indexed":false,"internalType":"uint256","name":"value","type":"uint256"}],"name":"AnonRightGiven2","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"voter","type":"address"},{"indexed":false,"internalType":"uint256","name":"value","type":"uint256"}],"name":"RightGiven","type":"event"},{"inputs":[],"name":"chairperson","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"delegate","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"function (bool) pure external","name":"someFn","type":"function"}],"name":"fn_as_arg","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"voter","type":"address"}],"name":"giveRightToVote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int48","name":"value","type":"int48"}],"name":"number","outputs":[{"internalType":"int48","name":"_value","type":"int48"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"int48","name":"numeric","type":"int48"},{"internalType":"int56","name":"big","type":"int56"}],"name":"numbers","outputs":[{"internalType":"int48","name":"_numeric","type":"int48"},{"internalType":"int56","name":"_big","type":"int56"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"proposals","outputs":[{"internalType":"bytes32","name":"name","type":"bytes32"},{"internalType":"uint256","name":"voteCount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_calldata","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_memory","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"proposal","type":"uint256"}],"name":"vote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"voters","outputs":[{"internalType":"uint256","name":"weight","type":"uint256"},{"internalType":"bool","name":"voted","type":"bool"},{"internalType":"address","name":"delegate","type":"address"},{"internalType":"uint256","name":"vote","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winnerName","outputs":[{"internalType":"bytes32","name":"winnerName_","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winningProposal","outputs":[{"internalType":"uint256","name":"winningProposal_","type":"uint256"}],"stateMutability":"view","type":"function"}]
+[{"inputs":[{"internalType":"bytes32[]","name":"proposalNames","type":"bytes32[]"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"chairperson","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"delegate","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"function (bool) pure external","name":"someFn","type":"function"}],"name":"fn_as_arg","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"voter","type":"address"}],"name":"giveRightToVote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int48","name":"value","type":"int48"}],"name":"number","outputs":[{"internalType":"int48","name":"_value","type":"int48"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"int48","name":"numeric","type":"int48"},{"internalType":"int56","name":"big","type":"int56"}],"name":"numbers","outputs":[{"internalType":"int48","name":"_numeric","type":"int48"},{"internalType":"int56","name":"_big","type":"int56"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"proposals","outputs":[{"internalType":"bytes32","name":"name","type":"bytes32"},{"internalType":"uint256","name":"voteCount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_calldata","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_memory","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"proposal","type":"uint256"}],"name":"vote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"voters","outputs":[{"internalType":"uint256","name":"weight","type":"uint256"},{"internalType":"bool","name":"voted","type":"bool"},{"internalType":"address","name":"delegate","type":"address"},{"internalType":"uint256","name":"vote","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winnerName","outputs":[{"internalType":"bytes32","name":"winnerName_","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winningProposal","outputs":[{"internalType":"uint256","name":"winningProposal_","type":"uint256"}],"stateMutability":"view","type":"function"}]

examples/ink-playground/package.json

@@ -11,9 +11,9 @@
   "dependencies": {
     "@polkadot-api/descriptors": "file:.papi/descriptors",
     "@polkadot-api/sdk-ink": "workspace:*",
-    "@polkadot-labs/hdkd": "^0.0.25",
-    "@polkadot-labs/hdkd-helpers": "^0.0.26",
-    "polkadot-api": "^1.22.0",
+    "@polkadot-labs/hdkd": "^0.0.26",
+    "@polkadot-labs/hdkd-helpers": "^0.0.27",
+    "polkadot-api": "^1.23.1",
     "rxjs": "7.8.2"
   }
 }

examples/ink-playground/src/util/address.ts

@@ -3,5 +3,5 @@ export const ADDRESS = {
   bob: "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
   psp22: "13RUUKAVEUdafihJZdd6dppNHXpCeLGDFGB3goyzRugUBkrx",
   flipper: "0x6f38a07b338aed6b7146df28ea2a4f8d2c420afc",
-  ballot: "0x0149fa81394fe954cf518df4916b0f81865e06e9",
+  ballot: "0xf2eb1d64d27105769772753cbf36766def13e947",
 }

examples/remote-proxy/package.json

@@ -10,15 +10,15 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@types/node": "^24.10.1",
+    "@types/node": "^25.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "vite": "^7.2.4"
+    "vite": "^7.2.7"
   },
   "dependencies": {
     "@polkadot-api/descriptors": "file:.papi/descriptors",
     "@polkadot-api/sdk-remote-proxy": "workspace:*",
-    "polkadot-api": "1.22.0",
+    "polkadot-api": "1.23.1",
     "rxjs": "^7.8.2"
   }
 }

examples/staking/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@polkadot-api/descriptors": "file:.papi/descriptors",
     "@polkadot-api/sdk-staking": "workspace:*",
-    "polkadot-api": "^1.22.0",
+    "polkadot-api": "^1.23.1",
     "rxjs": "7.8.2"
   }
 }

examples/statement-playground/package.json

@@ -6,10 +6,10 @@
   "dependencies": {
     "@polkadot-api/sdk-statement": "workspace:*",
     "@polkadot-api/substrate-bindings": "^0.16.5",
-    "@polkadot-api/substrate-client": "^0.4.7",
+    "@polkadot-api/substrate-client": "^0.5.0",
     "@polkadot-api/utils": "^0.2.0",
     "@polkadot-api/ws-provider": "^0.7.4",
-    "@scure/sr25519": "^0.3.0"
+    "@scure/sr25519": "^1.0.0"
   },
   "devDependencies": {
     "@types/bun": "latest"

package.json

@@ -19,16 +19,16 @@
     ]
   },
   "devDependencies": {
-    "@homer0/prettier-plugin-jsdoc": "^10.0.1",
+    "@homer0/prettier-plugin-jsdoc": "^11.0.1",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "prettier": "^3.7.1",
+    "prettier": "^3.7.4",
     "rollup": "^4.53.3",
     "rollup-plugin-dts": "^6.3.0",
     "rollup-plugin-esbuild": "^6.2.1",
     "typescript": "^5.9.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^4.0.14"
+    "vitest": "^4.0.15"
   },
   "packageManager": "[email protected]+sha512.01ff8ae71b4419903b65c60fb2dc9d34cf8bb6e06d03bde112ef38f7a34d6904c424ba66bea5cdcf12890230bf39f9580473140ed9c946fef328b6e5238a345a"
 }

packages/common-utils/package.json

@@ -45,7 +45,7 @@
     "rxjs": ">=7.8.1"
   },
   "devDependencies": {
-    "polkadot-api": "^1.22.0",
+    "polkadot-api": "^1.23.1",
     "rxjs": "^7.8.2"
   }
 }

packages/sdk-accounts/package.json

@@ -50,7 +50,7 @@
     "rxjs": ">=7.8.0"
   },
   "devDependencies": {
-    "polkadot-api": "^1.22.0",
+    "polkadot-api": "^1.23.1",
     "rxjs": "^7.8.2"
   }
 }

packages/sdk-governance/package.json

@@ -51,7 +51,7 @@
     "rxjs": ">=7.8.0"
   },
   "devDependencies": {
-    "polkadot-api": "^1.22.0",
+    "polkadot-api": "^1.23.1",
     "rxjs": "^7.8.2"
   }
 }

packages/sdk-ink/.papi/descriptors/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-autogenerated.3833955331883012294",
+  "version": "0.1.0-autogenerated.9351423096552553535",
   "name": "@polkadot-api/descriptors",
   "files": [
     "dist"

packages/sdk-ink/.papi/polkadot-api.json

@@ -2,20 +2,27 @@
   "version": 0,
   "descriptorPath": ".papi/descriptors",
   "options": {
-    "noDescriptorsPackage": true
+    "noDescriptorsPackage": true,
+    "whitelist": ".papi/whitelist.ts"
   },
   "entries": {
     "wndAh": {
       "chain": "westend2_asset_hub",
       "metadata": ".papi/metadata/wndAh.scale",
       "genesis": "0x67f9723393ef76214df0118c34bbbd3dbebc8ed46a10973a8c969d48fe7598c9",
-      "codeHash": "0x316c9a0415aeefd1bce69b48dfaf3e335729bfe157b7b1c464dbe4955ceca865"
+      "codeHash": "0xac70e823f8800dd6bfa9eacfd0b52a6b6a7426bb97682fa7f8c5b077051bb4fa"
     },
     "passet": {
       "wsUrl": "wss://testnet-passet-hub.polkadot.io",
       "metadata": ".papi/metadata/passet.scale",
       "genesis": "0xfd974cf9eaf028f5e44b9fdd1949ab039c6cf9cc54449b0b60d71b042e79aeb6",
-      "codeHash": "0x3e088e61b3cb51e74c67cb3634a699109bf3ded14fbd35ed731968d0aa82a441"
+      "codeHash": "0xedc99e025ff3d49960fb34d8005e91f555638f4e7f997b602507946876c12f50"
+    },
+    "pasAh": {
+      "chain": "paseo_asset_hub",
+      "metadata": ".papi/metadata/pasAh.scale",
+      "genesis": "0xd6eec26135305a8ad257a20d003357284c8aa03d0bdb2b357ab0a22371e11ef2",
+      "codeHash": "0x580f8c8474f117c97f7027f89598e7dfa83d1c9cb5cdd24aee121a70787be206"
     }
   }
 }

packages/sdk-ink/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.6.1 2025-12-13
+
+### Fixed
+
+- Support chains with renamed `gas_limit` to `weight_limit` 
+
 ## 0.6.0 2025-11-28
 
 ### Fixed

packages/sdk-ink/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot-api/sdk-ink",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "sideEffects": false,
   "author": "Victor Oliva (https://github.com/voliva)",
   "repository": {
@@ -34,7 +34,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "papi generate --whitelist .papi/whitelist.ts && mv .papi/descriptors/dist/index.mjs .papi/descriptors/dist/index.js && tsc --noEmit && rollup -c ../../rollup.config.js",
+    "build": "papi generate && mv .papi/descriptors/dist/index.mjs .papi/descriptors/dist/index.js && tsc --noEmit && rollup -c ../../rollup.config.js",
     "lint": "prettier --check README.md \"src/**/*.{js,jsx,ts,tsx,json,md}\"",
     "format": "prettier --write README.md \"src/**/*.{js,jsx,ts,tsx,json,md}\"",
     "prepack": "pnpm run build"
@@ -44,17 +44,17 @@
     "@ethereumjs/rlp": "^10.1.0",
     "@polkadot-api/common-sdk-utils": "workspace:*",
     "@polkadot-api/substrate-bindings": "^0.16.5",
-    "abitype": "^1.2.0",
-    "viem": "^2.40.3"
+    "abitype": "^1.2.2",
+    "viem": "^2.41.2"
   },
   "peerDependencies": {
     "@polkadot-api/ink-contracts": ">=0.4.0",
     "polkadot-api": ">=1.22.0",
     "rxjs": ">=7.8.0"
   },
   "devDependencies": {
-    "@polkadot-api/ink-contracts": "^0.4.3",
-    "polkadot-api": "^1.22.0",
+    "@polkadot-api/ink-contracts": "^0.4.4",
+    "polkadot-api": "^1.23.1",
     "rxjs": "^7.8.2"
   }
 }

packages/sdk-ink/src/get-contract.ts

@@ -13,11 +13,11 @@ import { EncodingProvider } from "./encoding-provider"
 import { getDeployer } from "./get-deployer"
 import { getStorage } from "./get-storage"
 import { ContractsProvider } from "./provider"
-import type { Contract } from "./sdk-types"
+import type { CommonTypedApi, Contract } from "./sdk-types"
 import { getSignedStorage, getStorageLimit } from "./util"
 
 export function getContract<
-  T extends InkSdkTypedApi | ReviveSdkTypedApi,
+  T extends InkSdkTypedApi | ReviveSdkTypedApi | CommonTypedApi,
   Addr,
   StorageErr,
   D extends GenericInkDescriptors,
@@ -152,7 +152,7 @@ export function getContract<
           gas_limit: limits.gas,
           storage_deposit_limit: limits.storage,
           data,
-        })
+        }).waited
       }),
     dryRunRedeploy: deployer.dryRun,
     redeploy: deployer.deploy,

packages/sdk-ink/src/get-deployer.ts

@@ -12,11 +12,11 @@ import type {
 } from "./descriptor-types"
 import { EncodingProvider } from "./encoding-provider"
 import { ContractsProvider } from "./provider"
-import type { Deployer } from "./sdk-types"
+import type { CommonTypedApi, Deployer } from "./sdk-types"
 import { getSignedStorage, getStorageLimit } from "./util"
 
 export function getDeployer<
-  T extends InkSdkTypedApi | ReviveSdkTypedApi,
+  T extends InkSdkTypedApi | ReviveSdkTypedApi | CommonTypedApi,
   Addr,
   StorageErr,
   D extends GenericInkDescriptors,
@@ -135,11 +135,11 @@ export function getDeployer<
           ? provider.txInstantiateWithCode({
               ...params,
               code: code.value,
-            })
+            }).waited
           : provider.txInstantiate({
               ...params,
               code_hash: await code.value,
-            })
+            }).waited
       }),
     estimateAddress: async (constructorLabel, args) => {
       const ctor = encodingProvider.constructor(constructorLabel)

packages/sdk-ink/src/ink-sdk.ts

@@ -1,12 +1,13 @@
 import { Binary, Enum, HexString, PolkadotClient } from "polkadot-api"
-import { wndAh } from "../.papi/descriptors/dist"
+import { pasAh, passet, wndAh } from "../.papi/descriptors/dist"
 import { GenericInkDescriptors, ReviveStorageError } from "./descriptor-types"
 import { EncodingProvider, inkEncoding, solEncoding } from "./encoding-provider"
 import { getContract } from "./get-contract"
 import { getDeployer } from "./get-deployer"
 import { reviveProvider } from "./provider"
 import { getAccountId } from "./revive-sdk"
 import {
+  AllTypedApis,
   CommonTypedApi,
   Contract,
   defaultOptions,
@@ -21,7 +22,11 @@ export const createInkSdk = (
   client: PolkadotClient,
   options?: Partial<InkSdkOptions>,
 ): InkSdk => {
-  const typedApi: CommonTypedApi = client.getTypedApi(wndAh)
+  const typedApi: AllTypedApis = {
+    passet: client.getTypedApi(passet),
+    pasAh: client.getTypedApi(pasAh),
+    wndAh: client.getTypedApi(wndAh),
+  }
 
   const { atBest } = { ...defaultOptions, ...options }
   const provider = reviveProvider(typedApi, atBest)
@@ -68,7 +73,7 @@ export const createInkSdk = (
 
   return {
     addressIsMapped(address) {
-      return reviveAddressIsMapped(typedApi, address)
+      return reviveAddressIsMapped(typedApi.passet, address)
     },
     getContract: curriedGetContract,
     getDeployer: getDeployerSdk,