diff --git a/docker-compose.yml b/docker-compose.yml index 8d2829df7..17df2c691 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: # ---------- No Subql Realm ---------- # # ------------------------------------ # mandala-node: - image: ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 + image: ghcr.io/acalanetwork/mandala-node:sha-b5fdedd ports: - 9944:9944 command: diff --git a/eth-rpc-adapter/README.md b/eth-rpc-adapter/README.md index 2e665a6f8..b533f7729 100644 --- a/eth-rpc-adapter/README.md +++ b/eth-rpc-adapter/README.md @@ -4,7 +4,7 @@ A node service that provides [JSON-RPC](https://eth.wiki/json-rpc/API) for [Acal ## Run First run a Mandala node locally ``` -docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing +docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-b5fdedd --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing ``` Then there are 3 ways to run an RPC adapter: diff --git a/eth-rpc-adapter/docker-compose.yml b/eth-rpc-adapter/docker-compose.yml index f04d22d2c..027f814c2 100644 --- a/eth-rpc-adapter/docker-compose.yml +++ b/eth-rpc-adapter/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mandala-node: - image: ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 + image: ghcr.io/acalanetwork/mandala-node:sha-b5fdedd ports: - 9944:9944 command: diff --git a/evm-subql/README.md b/evm-subql/README.md index ca7b29283..1e188aef2 100644 --- a/evm-subql/README.md +++ b/evm-subql/README.md @@ -51,7 +51,7 @@ npm i -g @subql/node@1.17.0 @subql/query@1.4.0 If you already have a node running elsewhere, you can skip this step. ```shell -docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing +docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-b5fdedd --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing ``` 3. Run a Postgres service and listen to port number 5432 (in the second terminal) diff --git a/evm-subql/docker-compose.yml b/evm-subql/docker-compose.yml index 639fbd85d..ca64c25dd 100644 --- a/evm-subql/docker-compose.yml +++ b/evm-subql/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mandala-node: - image: ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 + image: ghcr.io/acalanetwork/mandala-node:sha-b5fdedd ports: - 9944:9944 command: diff --git a/evm-subql/project.yaml b/evm-subql/project.yaml index 9f7adba87..b4d4a136b 100644 --- a/evm-subql/project.yaml +++ b/evm-subql/project.yaml @@ -14,7 +14,7 @@ schema: file: ./schema.graphql network: # local mandala - chainId: '0xcc21956e925ef44bece477484e03de867fa0e403539803d9a741279e49cccf32' + chainId: '0x9d61a6ca0199919598c202cc571bce64914e142d781b557f442eff7992277eaa' endpoint: ws://localhost:9944 chaintypes: # TODO: can generate this dynamically with `yarn build` using `@acala-network/types` diff --git a/examples/waffle/README.md b/examples/waffle/README.md index a18461ae9..81299f981 100644 --- a/examples/waffle/README.md +++ b/examples/waffle/README.md @@ -23,7 +23,7 @@ compile and build all contracts start a local mandala node with docker ``` -docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing +docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-b5fdedd --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing ``` run all tests diff --git a/examples/waffle/arbitrager/README.md b/examples/waffle/arbitrager/README.md index 2e2055fb1..323b89b7b 100644 --- a/examples/waffle/arbitrager/README.md +++ b/examples/waffle/arbitrager/README.md @@ -22,7 +22,7 @@ source. If you prefer Docker, you need to run it and use the following command: ``` -docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-6eefbb4 --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing +docker run -it --rm -p 9944:9944 -p 9933:9933 ghcr.io/acalanetwork/mandala-node:sha-b5fdedd --dev --ws-external --rpc-port=9933 --rpc-external --rpc-cors=all --rpc-methods=unsafe -levm=debug --pruning=archive --keep-blocks=archive --instant-sealing ``` If you whish to build and run the local development network from source, you can clone the diff --git a/examples/waffle/scheduler/test/Scheduler.test.ts b/examples/waffle/scheduler/test/Scheduler.test.ts index 675c171f7..e5f03b6b0 100644 --- a/examples/waffle/scheduler/test/Scheduler.test.ts +++ b/examples/waffle/scheduler/test/Scheduler.test.ts @@ -149,18 +149,17 @@ describe('Schedule', () => { current_block_number = Number(await provider.api.query.system.number()); } - // TODO: after mandala-2.12.0 - // expect((await provider.getBalance(recurringPayment.address)).toString()).to.equal('0'); - // 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_959_678_683_168_000_000') - // ); - // expect((await erc20.balanceOf(transferTo)).toString()).to.equal(formatAmount('4_999_959_678_683_168')); - // } 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()); - // } + expect((await provider.getBalance(recurringPayment.address)).toString()).to.equal('0'); + 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_960_624_507_449_000_000') + ); + expect((await erc20.balanceOf(transferTo)).toString()).to.equal(formatAmount('4_999_960_624_507_449')); + } 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()); + } }); it('works with Subscription', async () => {