Runtime 2310 (#1072)

zjb0807 · web-flow · commit a010701539a7 · 2025-10-02T10:40:19.000+08:00
* fix ci

* runtime 2310

* update

* update

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* update wasm

* update docker compose

* fix

* update

* update
diff --git a/chopsticks/configs/acala.yml b/chopsticks/configs/acala.yml
@@ -1,8 +1,8 @@
-endpoint: wss://acala-rpc.dwellir.com
+endpoint: wss://acala-rpc.n.dwellir.com
 mock-signature-host: true
 runtime-log-level: 5
 # block: 7000000
-wasm-override: ./chopsticks/wasm/acala-2290.wasm
+wasm-override: ./chopsticks/wasm/acala-2310.wasm
 
 import-storage:
   Sudo:
@@ -15,12 +15,24 @@ import-storage:
         - providers: 1
           data:
             free: 1000000000000000
+      -
+        -
+          - 5GNJqTPyNqANBkUVMN1LPPrxXnFouWXoe2wNSmmEoLctxiZY
+        - providers: 1
+          data:
+            free: 1000000000000000
       -
         -
           - 246gNkjCexYRsCpdjtVhz35sHjcb21jpqipzT9u4uwKV8iEE
         - providers: 1
           data:
             free: 1000000000000000
+      -
+        -
+          - 5HpG9w8EBLe5XCrbczpwq5TSXvedjrBGCwqxK1iQ7qUsSWFc
+        - providers: 1
+          data:
+            free: 1000000000000000
       -
         -
           - 249LSvsEyxS4VpEJGg62yhYA7sHy1KcgGW6KzACBCLW1RsZF
diff --git a/chopsticks/wasm/acala-2310.wasm b/chopsticks/wasm/acala-2310.wasm
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   node:
     container_name: node
@@ -11,7 +9,7 @@ services:
       # TODO: cache does not seem to work
       # - ~/.bun/install/cache:/root/.bun/install/cache
     command:
-      bunx @acala-network/chopsticks@0.15.0 -c /app/chopsticks/configs/acala.yml -p 9944
+      bunx @acala-network/chopsticks@latest -c /app/chopsticks/configs/acala.yml -p 9944
     ports:
       - 9944:9944
     healthcheck:
diff --git a/e2e-tests/e2e-hardhat/test/token.test.ts b/e2e-tests/e2e-hardhat/test/token.test.ts
@@ -121,6 +121,14 @@ describe('Token contract', () => {
 
         const initialBalance = await token.balanceOf(userAddress);
 
+        const transfer = await deployer.sendTransaction({
+          to: userAddress,
+          value: ethers.parseEther('1.0'), // 1 ETH
+        });
+        await transfer.wait();
+        const userBalance = await ethers.provider.getBalance(userAddress);
+        console.log(`initialBalance: ${initialBalance}, userBalance: ${userBalance}`);
+
         const tx = await token.connect(user).transferFrom(deployerAddress, userAddress, 50);
         await tx.wait();
 
diff --git a/packages/bodhi/package.json b/packages/bodhi/package.json
@@ -11,7 +11,7 @@
     "test:coverage": "vitest --run --coverage"
   },
   "peerDependencies": {
-    "@polkadot/api": "^14.3.1"
+    "@polkadot/api": "^16.4.8"
   },
   "dependencies": {
     "@acala-network/eth-providers": "workspace:*",
diff --git a/packages/bodhi/src/utils.ts b/packages/bodhi/src/utils.ts
@@ -43,14 +43,19 @@ export const getTestUtils = async (
 
   const wallets: BodhiSigner[] = [];
   for (const pair of pairs) {
-    const wallet = BodhiSigner.fromPair(provider, pair);
+    try {
+      const wallet = BodhiSigner.fromPair(provider, pair);
 
-    const isClaimed = await wallet.isClaimed();
-    if (!isClaimed && claimDefault) {
-      await wallet.claimDefaultAccount();
-    }
+      const isClaimed = await wallet.isClaimed();
+      if (!isClaimed && claimDefault) {
+        await wallet.claimDefaultAccount();
+      }
 
-    wallets.push(wallet);
+      wallets.push(wallet);
+    } catch (error) {
+      console.error('Error processing pair:', error);
+      throw error;
+    }
   }
 
   return {
diff --git a/packages/eth-providers/package.json b/packages/eth-providers/package.json
@@ -11,8 +11,8 @@
     "test:coverage": "yarn test --run --coverage"
   },
   "peerDependencies": {
-    "@acala-network/api": "~6.2.0",
-    "@polkadot/api": "^14.3.1"
+    "@acala-network/api": "~6.3.0",
+    "@polkadot/api": "^16.4.8"
   },
   "dependencies": {
     "@acala-network/contracts": "4.3.4",
@@ -24,8 +24,8 @@
     "lru-cache": "~7.8.2"
   },
   "devDependencies": {
-    "@acala-network/api": "~6.2.0",
-    "@polkadot/api": "^14.3.1",
+    "@acala-network/api": "~6.3.0",
+    "@polkadot/api": "^16.4.8",
     "@types/bn.js": "^5.1.5",
     "@types/lru-cache": "~7.6.1",
     "dotenv": "~10.0.0",
diff --git a/packages/eth-providers/src/__tests__/evm-rpc-provider.test.ts b/packages/eth-providers/src/__tests__/evm-rpc-provider.test.ts
@@ -6,7 +6,7 @@ import { sleep } from '../utils';
 
 dotenv.config();
 
-const ACALA_NODE_URL = 'wss://acala-rpc.dwellir.com';
+const ACALA_NODE_URL = 'wss://acala-rpc.n.dwellir.com';
 const ACALA_SUBQL = 'https://subql-query-acala.aca-api.network';
 const endpoint = process.env.ENDPOINT_URL || 'ws://127.0.0.1:9944';
 
diff --git a/packages/eth-providers/src/__tests__/parseBlock.test.ts b/packages/eth-providers/src/__tests__/parseBlock.test.ts
@@ -48,7 +48,7 @@ describe.concurrent('getAllReceiptsAtBlock', () => {
   beforeAll(async () => {
     console.log('connecting to node...');
     const KARURA_NODE_URL = 'wss://karura-rpc.aca-api.network';
-    const ACALA_NODE_URL = 'wss://acala-rpc.dwellir.com';
+    const ACALA_NODE_URL = 'wss://acala-rpc.n.dwellir.com';
 
     apiK = new ApiPromise(
       options({
diff --git a/packages/eth-providers/src/__tests__/provider-cache.test.ts b/packages/eth-providers/src/__tests__/provider-cache.test.ts
@@ -7,7 +7,7 @@ import { runWithTiming } from '../utils';
 
 dotenv.config();
 
-const ACALA_NODE_URL = 'wss://acala-rpc.dwellir.com';
+const ACALA_NODE_URL = 'wss://acala-rpc.n.dwellir.com';
 
 describe.concurrent('provider cache', async () => {
   let provider: EvmRpcProvider;
diff --git a/packages/eth-providers/src/base-provider.ts b/packages/eth-providers/src/base-provider.ts
@@ -958,12 +958,30 @@ 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.transactionPaymentApi.queryFeeDetails(
-      u8a,
-      u8a.length + lenIncreaseAfterSignature,
-    );
+    let feeDetails = null;
+    if (apiAt.call.transactionPaymentCallApi) {
+      // for new api with runtime 2310
+      feeDetails = await apiAt.call.transactionPaymentCallApi.queryCallFeeDetails(
+        extrinsic,
+        extrinsic.toU8a().length + lenIncreaseAfterSignature,
+      );
+    } else if (this.api.call.transactionPaymentCallApi && blockHash === this.bestBlockHash) {
+      // for chopsticks test
+      feeDetails = await this.api.call.transactionPaymentCallApi.queryCallFeeDetails(
+        extrinsic,
+        extrinsic.toU8a().length + lenIncreaseAfterSignature,
+      );
+    } else {
+      // for old api
+      feeDetails = await apiAt.call.transactionPaymentApi.queryFeeDetails(
+        extrinsic.toU8a(),
+        extrinsic.toU8a().length + lenIncreaseAfterSignature,
+      );
+    }
+    if (feeDetails.isEmpty || feeDetails.inclusionFee.isEmpty) {
+      return logger.throwError('failed to estimate gas', Logger.errors.CALL_EXCEPTION);
+    }
     const { baseFee, lenFee, adjustedWeightFee } = feeDetails.inclusionFee.unwrap();
 
     const nativeTxFee = BigNumber.from(
diff --git a/packages/eth-providers/src/utils/queryStoarge.ts b/packages/eth-providers/src/utils/queryStoarge.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
diff --git a/packages/eth-rpc-adapter/package.json b/packages/eth-rpc-adapter/package.json
@@ -18,7 +18,7 @@
     "test:coverage": "COVERAGE_DIR=${COVERAGE_DIR:-eth-rpc-adapter/coverage} yarn start:coverage && COVERAGE_DIR=${COVERAGE_DIR:-eth-rpc-adapter/coverage} yarn test --run && yarn stop:coverage"
   },
   "peerDependencies": {
-    "@polkadot/api": "^14.3.1"
+    "@polkadot/api": "^16.4.8"
   },
   "dependencies": {
     "@acala-network/eth-providers": "workspace:*",
diff --git a/packages/evm-subql/docker-compose.yml b/packages/evm-subql/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   postgres:
     image: postgres:12-alpine
diff --git a/scripts/subway-perf/README.md b/scripts/subway-perf/README.md
@@ -6,7 +6,7 @@ Test the performance of eth rpc adapter with subway.
 docker run \
   -p 9955:9955 \
   -e PORT=9955 \
-  -e ENDPOINTS=wss://acala-rpc.dwellir.com:443 \
+  -e ENDPOINTS=wss://acala-rpc.n.dwellir.com:443 \
   acala/subway:sha-7c1610c
 ```
 
diff --git a/scripts/subway-perf/src/index.ts b/scripts/subway-perf/src/index.ts
@@ -2,7 +2,7 @@ import { runWithTiming, EvmRpcProvider } from '@acala-network/eth-providers';
 
 const endpoints = {
   localSubway: 'ws://localhost:9955',
-  acalaDwellir: 'wss://acala-rpc.dwellir.com',
+  acalaDwellir: 'wss://acala-rpc.n.dwellir.com',
   acala0: 'wss://acala-rpc-0.aca-api.network',
 };
 
diff --git a/yarn.lock b/yarn.lock
