Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

bump #381

Merged
merged 2 commits into from
Oct 7, 2021
Merged

bump #381

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contracts/root/withdrawManager/WithdrawManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ contract WithdrawManager is WithdrawManagerStorage, IWithdrawManager {

vars.headerNumber = payload.getHeaderNumber();
vars.branchMaskBytes = payload.getBranchMaskAsBytes();
require(vars.branchMaskBytes[0] == 0, "incorrect mask");
vars.txRoot = payload.getTxRoot();
vars.receiptRoot = payload.getReceiptRoot();
require(
Expand Down
2 changes: 1 addition & 1 deletion test-blockchain/run-docker.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env sh

docker run --name bor-test -it -d -p 8545:8545 -v $(pwd):/bordata maticnetwork/bor:develop /bin/sh -c "cd /bordata; sh start.sh"
docker run --name bor-test -it -d -p 8545:8545 -v $(pwd):/bordata maticnetwork/bor:v0.2.8 /bin/sh -c "cd /bordata; sh start.sh"
15 changes: 7 additions & 8 deletions test-blockchain/start.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ $BOR --datadir $DIR/data init $DIR/genesis.json
cp -rf $DIR/keystore $DIR/data/

$BOR --datadir $DIR/data \
--port 30341 \
--rpc --rpcaddr '0.0.0.0' \
--rpcvhosts '*' \
--rpccorsdomain '*' \
--rpcport 8545 \
--port 30342 \
--http --http.addr '0.0.0.0' \
--http.vhosts '*' \
--http.corsdomain '*' \
--http.port 8545 \
--ipcpath $DIR/geth.ipc \
--rpcapi 'personal,db,eth,net,web3,txpool,miner,admin,bor' \
--http.api 'personal,db,eth,net,web3,txpool,miner,admin,bor' \
--syncmode 'full' \
--networkid '{{ borChainId }}' \
--gasprice '0' \
--unlock '0x96C42C56fdb78294F96B0cFa33c92bed7D75F96a,0x9fb29aac15b9a4b7f17c3385939b007540f4d791' \
--password $DIR/password.txt \
--allow-insecure-unlock \
--miner.gastarget '20000000' \
--miner.gaslimit '20000000' \
--without-heimdall \
--bor.withoutheimdall \
--mine