Merge remote-tracking branch 'origin/master' into support-eip-2930-tx

docker-compose.yml

@@ -117,7 +117,7 @@ services:
   # ---------- No Subql Realm ---------- #
   # ------------------------------------ #
   mandala-node:
-    image: ghcr.io/acalanetwork/mandala-node:sha-7ae4bf4
+    image: ghcr.io/acalanetwork/mandala-node:sha-06e988b
     ports:
       - 9944:9944
     healthcheck:

examples/docker-compose-bodhi-stack.yml

@@ -1,6 +1,6 @@
 services:
   mandala-node:
-    image: ghcr.io/acalanetwork/mandala-node:sha-7ae4bf4
+    image: ghcr.io/acalanetwork/mandala-node:sha-06e988b
     container_name: mandala-node
     ports:
       - 9944:9944

examples/viem/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mandala-node:
-    image: ghcr.io/acalanetwork/mandala-node:sha-7ae4bf4
+    image: ghcr.io/acalanetwork/mandala-node:sha-06e988b
     container_name: mandala-node
     ports:
       - 9944:9944

examples/waffle/scheduler/test/Scheduler.test.ts

@@ -161,10 +161,10 @@ describe('Schedule', () => {
     expect((await erc20.balanceOf(recurringPayment.address)).toNumber()).to.equal(0);
     if (!process.argv.includes('--with-ethereum-compatibility')) {
       expect((await provider.getBalance(transferTo)).toString()).to.equal(
-        formatAmount('4_999_969_004_075_107_000_000')
+        formatAmount('4999968960671632000000')
       );
 
-      expect((await erc20.balanceOf(transferTo)).toString()).to.equal(formatAmount('4_999_969_004_075_107'));
+      expect((await erc20.balanceOf(transferTo)).toString()).to.equal(formatAmount('4999968960671632'));
     } else {
       expect((await provider.getBalance(transferTo)).toString()).to.equal(dollar.mul(5000000000).toString());
       expect((await erc20.balanceOf(transferTo)).toString()).to.equal(dollar.mul(5000).toString());

packages/bodhi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/bodhi",
-  "version": "2.7.19",
+  "version": "2.7.20",
   "repository": "[email protected]:AcalaNetwork/bodhi.js.git",
   "author": "Acala Developers <[email protected]>",
   "license": "Apache-2.0",

packages/bodhi/src/BodhiSigner.ts

@@ -208,7 +208,7 @@ export class BodhiSigner extends AbstractSigner implements TypedDataSigner {
       ..._transaction,
     };
 
-    const { gasLimit, usedStorage: storageLimit } = await this.provider.estimateResources(transaction);
+    const { gasLimit, safeStorage: storageLimit } = await this.provider.estimateResources(transaction);
 
     const tx = await this.populateTransaction(transaction);
     const data = tx.data?.toString() ?? '0x';

packages/bodhi/src/_version.ts

@@ -1 +1 @@
-export const version = 'bodhi.js/bodhi/2.7.19';
+export const version = 'bodhi.js/bodhi/2.7.20';

packages/eth-providers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/eth-providers",
-  "version": "2.7.19",
+  "version": "2.7.20",
   "license": "MIT",
   "author": "Acala Developers <[email protected]>",
   "scripts": {
@@ -10,7 +10,7 @@
     "test:e2e": "vitest --run --config vitest.config.e2e.ts"
   },
   "peerDependencies": {
-    "@acala-network/api": "~6.0.4",
+    "@acala-network/api": "6.1.0",
     "@polkadot/api": "^10.11.1"
   },
   "dependencies": {
@@ -23,7 +23,7 @@
     "lru-cache": "~7.8.2"
   },
   "devDependencies": {
-    "@acala-network/api": "~6.0.4",
+    "@acala-network/api": "6.1.0",
     "@types/bn.js": "~5.1.0",
     "@types/lru-cache": "~7.6.1",
     "dotenv": "~10.0.0",

packages/eth-providers/src/__tests__/e2e/tx.test.ts

@@ -65,27 +65,6 @@ describe('transaction tests', () => {
   });
 
   describe.concurrent('test eth gas', () => {
-    it('getEthResources', async () => {
-      const randomWallet = Wallet.createRandom().connect(provider);
-
-      const amount = '1000000000000000000';
-      const resources = await provider.getEthResources({
-        type: 0,
-        from: wallet3.address,
-        to: randomWallet.address,
-        value: BigNumber.from(amount),
-      });
-
-      await wallet3.sendTransaction({
-        type: 0,
-        to: randomWallet.address,
-        value: BigNumber.from(amount),
-        ...resources,
-      });
-
-      expect((await randomWallet.getBalance()).toString()).eq(amount);
-    });
-
     it('use v2 gas params', async () => {
       const randomWallet = Wallet.createRandom().connect(provider);
 
@@ -102,7 +81,7 @@ describe('transaction tests', () => {
       const expectedGasPrice = 100000000000 + validUntil;
 
       expect(Math.abs((params.gasPrice as BigNumber).toNumber() - expectedGasPrice)).to.lt(2);
-      expect((params.gasLimit as BigNumber).toNumber()).eq(100100);
+      expect(params.gasLimit?.toString()).toMatchInlineSnapshot('"100100"');
     });
   });
 

packages/eth-providers/src/_version.ts

@@ -1 +1 @@
-export const version = 'bodhi.js/providers/2.7.19';
+export const version = 'bodhi.js/providers/2.7.20';