Skip to content

Commit

Permalink
Update mandala 2.13.0 (#641)
Browse files Browse the repository at this point in the history
* update mandala-2.13.0

* fix tests

* fix tests
  • Loading branch information
zjb0807 committed Feb 1, 2023
1 parent affa614 commit bd1fbf6
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eth-rpc-adapter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eth-rpc-adapter/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion evm-subql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion evm-subql/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion evm-subql/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion examples/waffle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/waffle/arbitrager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 11 additions & 12 deletions examples/waffle/scheduler/test/Scheduler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down

0 comments on commit bd1fbf6

Please sign in to comment.