fix

Author: zjb0807

chopsticks/wasm/acala-2310.wasm

@@ -11,7 +11,7 @@
     "test:coverage": "yarn test --run --coverage"
   },
   "peerDependencies": {
-    "@acala-network/api": "~6.2.0",
+    "@acala-network/api": "~6.3.0",
     "@polkadot/api": "^16.4.8"
   },
   "dependencies": {
@@ -24,7 +24,7 @@
     "lru-cache": "~7.8.2"
   },
   "devDependencies": {
-    "@acala-network/api": "~6.2.0",
+    "@acala-network/api": "~6.3.0",
     "@polkadot/api": "^16.4.8",
     "@types/bn.js": "^5.1.5",
     "@types/lru-cache": "~7.6.1",

packages/eth-providers/package.json

@@ -958,12 +958,21 @@ export abstract class BaseProvider extends AbstractProvider {
     const blockHash = at ?? this.bestBlockHash;
     const apiAt = await apiCache.getApiAt(this.api, blockHash);
 
-    const u8a = extrinsic.toU8a();
     const lenIncreaseAfterSignature = 100;    // approximate length increase after signature
-    const feeDetails = await apiAt.call.transactionPaymentCallApi.queryCallFeeDetails(
-      u8a,
-      u8a.length + lenIncreaseAfterSignature,
-    );
+    let feeDetails = null;
+    if (!apiAt.call.transactionPaymentCallApi) {
+      // for old api
+      feeDetails = await apiAt.call.transactionPaymentApi.queryFeeDetails(
+        extrinsic.toU8a(),
+        extrinsic.toU8a().length + lenIncreaseAfterSignature,
+      );
+    } else {
+      // for new api with runtime 2310
+      feeDetails = await apiAt.call.transactionPaymentCallApi.queryCallFeeDetails(
+        extrinsic,
+        extrinsic.toU8a().length + lenIncreaseAfterSignature,
+      );
+    }
     const { baseFee, lenFee, adjustedWeightFee } = feeDetails.inclusionFee.unwrap();
 
     const nativeTxFee = BigNumber.from(

packages/eth-providers/src/base-provider.ts

@@ -33,7 +33,7 @@ export const queryStorage = async <T extends Codec = Codec>(
 
   // we convert to Uint8Array since it maps to the raw encoding, all
   // data will be correctly encoded (incl. numbers, excl. :code)
-  const input = value === null
+  const input = (value === null || value.isEmpty)
     ? null
     : u8aToU8a(
       entry.meta.modifier.isOptional

packages/eth-providers/src/utils/queryStoarge.ts

@@ -5,26 +5,26 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@acala-network/api-derive@npm:6.2.0":
-  version: 6.2.0
-  resolution: "@acala-network/api-derive@npm:6.2.0"
+"@acala-network/api-derive@npm:6.3.0":
+  version: 6.3.0
+  resolution: "@acala-network/api-derive@npm:6.3.0"
   dependencies:
-    "@acala-network/types": 6.2.0
+    "@acala-network/types": 6.3.0
   peerDependencies:
-    "@polkadot/api": ^14
-  checksum: e243d5c4afb54744ea80dfc61706ba536c1433874acd8e881c00c7b717e39c63558049202c6f08d9d0406878dc8be7f073201943f254e3026d004e9466f496ee
+    "@polkadot/api": ^16
+  checksum: ebf26806f072e89233f3446ec8edab813bb3cfe63e38b285a99ff91dd0a37400a9b9c98758f7aa107e033f822db322ee4a0bf05e8d978a734a81a3c173c1b93e
   languageName: node
   linkType: hard
 
-"@acala-network/api@npm:~6.2.0":
-  version: 6.2.0
-  resolution: "@acala-network/api@npm:6.2.0"
+"@acala-network/api@npm:~6.3.0":
+  version: 6.3.0
+  resolution: "@acala-network/api@npm:6.3.0"
   dependencies:
-    "@acala-network/api-derive": 6.2.0
-    "@acala-network/types": 6.2.0
+    "@acala-network/api-derive": 6.3.0
+    "@acala-network/types": 6.3.0
   peerDependencies:
-    "@polkadot/api": ^14
-  checksum: e4e2f5e2b9189c18c794d2a40b3b6e8bae32a02aa2dc5c9e0ad9f536d7be50a01f2266e2ad7887bb5eadb1e4aed8fd880fb30ed7ed99e028e97d89386ecf9848
+    "@polkadot/api": ^16
+  checksum: ba1306d20fb6dcf1877a477e02abeb591f0a878ed4caf1e188441c5633d5f7c37eb31f011cfa12353be4015ce2a7f9b9ac08b3c866093aed204f7b0fed1970df
   languageName: node
   linkType: hard
 
@@ -53,7 +53,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@acala-network/eth-providers@workspace:packages/eth-providers"
   dependencies:
-    "@acala-network/api": ~6.2.0
+    "@acala-network/api": ~6.3.0
     "@acala-network/contracts": 4.3.4
     "@acala-network/eth-transactions": "workspace:*"
     "@polkadot/api": ^16.4.8
@@ -67,7 +67,7 @@ __metadata:
     lru-cache: ~7.8.2
     vitest: ^2.1.1
   peerDependencies:
-    "@acala-network/api": ~6.2.0
+    "@acala-network/api": ~6.3.0
     "@polkadot/api": ^16.4.8
   languageName: unknown
   linkType: soft
@@ -134,12 +134,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@acala-network/types@npm:6.2.0":
-  version: 6.2.0
-  resolution: "@acala-network/types@npm:6.2.0"
+"@acala-network/types@npm:6.3.0":
+  version: 6.3.0
+  resolution: "@acala-network/types@npm:6.3.0"
   peerDependencies:
-    "@polkadot/api": ^14
-  checksum: 570a9e75a2e7c02a2b4ec02c8bf3fcc41e81ffee748bc997fea3c4d055f3b60827562f94027a47f8e6b760eaa6d4b5ecee9f795821ae20fed581116a6d3ba980
+    "@polkadot/api": ^16
+  checksum: c6e4fa204cba7be233a24ef6feccedcecc66270faed115c7c42939de6d4147c79a66f72c8c7decd7a7427fb6c3f667b52e7e7351b56d8f926415f03ca0858367
   languageName: node
   linkType: hard