Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@lightsing
lightsing committed Nov 16, 2021
2 parents 4e8fb45 + 4b46b49 commit e9f3bb8
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 27 deletions.
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ list:
tail_log:
docker-compose --file orchestra/docker/docker-compose.yaml --project-name orchestra logs > orchestra/docker-compose.log
docker-compose --file regnbue-bridge/docker/docker-compose.yaml --project-name faucet logs > regnbue-bridge/docker-compose.log
ls rollup-state-manager/*.log prover-cluster/*.log dingir-exchange/*.log dingir-exchange/logs/*.log regnbue-bridge/*.log contracts/*.log orchestra/*.log | xargs tail -n 3
docker-compose --file blockscout/docker/docker-compose.yaml --project-name blockscout logs > blockscout/docker-compose.log
ls rollup-state-manager/*.log prover-cluster/*.log dingir-exchange/*.log dingir-exchange/logs/*.log orchestra/*.log regnbue-bridge/*.log blockscout/*.log contracts/*.log | xargs tail -n 3
clean_log:
ls rollup-state-manager/*.log prover-cluster/*.log dingir-exchange/*.log dingir-exchange/logs/*.log regnbue-bridge/*.log contracts/*.log orchestra/*.log | xargs rm
ls rollup-state-manager/*.log prover-cluster/*.log dingir-exchange/*.log dingir-exchange/logs/*.log orchestra/*.log regnbue-bridge/*.log blockscout/*.log contracts/*.log | xargs rm

# code related
shfmt:
Expand Down
2 changes: 1 addition & 1 deletion circuits
Submodule circuits updated 29 files
+37 −7 src/block.circom
+72 −112 src/decode_tx.circom
+0 −41 src/decode_tx_pick_data.circom
+273 −0 src/encode_data.circom
+2 −17 src/lib/bitify.circom
+23 −2 src/spot_trade.circom
+59 −0 src/tx_dec_enc.circom
+43 −6 test/codec/bitstream.ts
+131 −0 test/codec/encode_data.ts
+3 −2 test/codec/tx_data.ts
+98 −34 test/common/da_hashing.ts
+8 −0 test/common/tx.ts
+1 −2 test/export_all_tests.ts
+66 −27 test/global_state.ts
+35 −13 test/integration_test_cases.ts
+8 −7 test/testcases/block.ts
+92 −30 test/testcases/encode_txdata.ts
+58 −28 test/testcases/hash_txdata.ts
+8 −4 test/testcases/spot_trade.ts
+46 −4 tpl/config.js
+56 −0 tpl/ejs/extra/rollup-state-manager/src/types/l2/tx_encode.rs.ejs
+21 −7 tpl/ejs/src/block.circom.ejs
+9 −47 tpl/ejs/src/decode_tx.circom.ejs
+72 −0 tpl/ejs/src/encode_data.circom.ejs
+17 −0 tpl/ejs/src/spot_trade.circom.ejs
+42 −0 tpl/ejs/src/tx_dec_enc.circom.ejs
+72 −0 tpl/ejs/test/codec/encode_data.ts.ejs
+60 −4 tpl/preprocess.js
+83 −9 tpl/templates.js
2 changes: 1 addition & 1 deletion contracts
Submodule contracts updated 1 files
+6 −8 hardhat.config.ts
2 changes: 1 addition & 1 deletion dingir-exchange
Submodule dingir-exchange updated from e44d30 to 991607
2 changes: 1 addition & 1 deletion orchestra
Submodule orchestra updated 16 files
+3 −3 Makefile
+4 −4 README.md
+3 −0 build.rs
+66 −0 docker/docker-compose-for-mac.yaml
+3 −4 docker/docker-compose.yaml
+117 −0 docker/envoy-for-mac.yaml
+1 −1 docker/envoy.yaml
+ − docker/ping
+ − proto/exchange/matchengine.pb
+14 −14 proto/exchange/matchengine.proto
+16 −16 proto/exchange/matchengine.swagger.json
+ − proto/rollup/rollup.pb
+65 −12 proto/rollup/rollup.proto
+160 −14 proto/rollup/rollup.swagger.json
+4 −4 src/rpc/exchange/matchengine.rs
+111 −13 src/rpc/rollup/rollup_state.rs
2 changes: 1 addition & 1 deletion prover-cluster
Submodule prover-cluster updated 11 files
+2 −2 .github/workflows/integration-test.yml
+3 −3 .github/workflows/lint.yml
+3 −3 .github/workflows/unit-test.yml
+2 −1 Cargo.lock
+1 −1 Cargo.toml
+2 −0 Makefile
+1 −1 rust-toolchain
+1 −1 rustfmt.toml
+1 −1 src/client/watch.rs
+14 −2 test/run.sh
+1 −1 test/stop.sh
2 changes: 1 addition & 1 deletion regnbue-bridge
Submodule regnbue-bridge updated 8 files
+3 −3 .github/workflows/lint.yaml
+3 −3 .github/workflows/unit-test.yaml
+118 −18 Cargo.lock
+4 −4 Cargo.toml
+1 −1 config/block_submitter.yaml.template
+1 −1 rust-toolchain
+1 −1 rustfmt.toml
+19 −16 src/grpc_client.rs
2 changes: 1 addition & 1 deletion rollup-state-manager
Submodule rollup-state-manager updated 37 files
+19 −3 .github/workflows/export-circuit-test.yaml
+19 −3 .github/workflows/global-state-test.yaml
+4 −3 .github/workflows/integration-test.yml
+3 −3 .github/workflows/lint.yml
+3 −3 .github/workflows/unit-test.yml
+178 −243 Cargo.lock
+2 −2 Cargo.toml
+3 −0 Makefile
+1 −1 circuits
+110 −21 examples/js/get_l2_block_by_id.ts
+54 −5 examples/js/get_token_balance.ts
+11 −0 examples/js/package-lock.json
+1 −0 examples/js/package.json
+19 −1 examples/js/rest_client.ts
+15 −5 examples/js/rest_get_l2_blocks.ts
+46 −0 examples/js/rest_get_token_balance.ts
+1 −1 orchestra
+1 −1 rust-toolchain
+1 −1 rustfmt.toml
+18 −0 scripts/install_deps.sh
+10 −431 src/account.rs
+8 −12 src/bin/main.rs
+172 −17 src/grpc/controller.rs
+19 −24 src/msg/msg_processor.rs
+1 −1 src/msg/msg_utils.rs
+245 −40 src/state/manager_wrapper.rs
+2 −2 src/test_utils/circuit.rs
+1 −0 src/types/l2/block.rs
+1 −0 src/types/l2/mod.rs
+3 −1 src/types/l2/order.rs
+316 −70 src/types/l2/tx.rs
+36 −35 src/types/l2/tx_data.rs
+77 −0 src/types/l2/tx_encode.rs
+8 −4 tests/circuit_tests/test.sh
+35 −15 tests/circuit_tests/test_l2_block.rs
+1 −1 tests/global_state/gen_testcase.rs
+7 −3 tests/global_state/test.sh
21 changes: 4 additions & 17 deletions run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export DIRTY=true
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
STATE_MNGR_DIR=$DIR/rollup-state-manager
CIRCUITS_DIR=$DIR/circuits
BLOCKSCOUT_DIR=$DIR/blockscout
TARGET_CIRCUIT_DIR=$CIRCUITS_DIR/testdata/Block_$NTXS"_"$BALANCELEVELS"_"$ORDERLEVELS"_"$ACCOUNTLEVELS
PROVER_DIR=$DIR/prover-cluster
EXCHANGE_DIR=$DIR/dingir-exchange
Expand Down Expand Up @@ -91,6 +92,7 @@ function start_docker_compose() {
function run_docker_compose() {
start_docker_compose $ORCHESTRA_DIR orchestra
start_docker_compose $FAUCET_DIR faucet
start_docker_compose $BLOCKSCOUT_DIR blockscout # ganache node & blockscout stuff
sleep 10
}

Expand Down Expand Up @@ -138,26 +140,11 @@ function run_prove_workers() {
fi
}

function run_eth_node() {
function boostrap_contract() {
# a mainnet like 50 Gwei gas price
# base on 21,000 units limit from mainnet (21,000 units * 50 Gwei)
cd $CONTRACTS_DIR
yarn install
GANACHE_CLI_ARG="--networkId 53371 \
--chainId 53371 \
--db $CONTRACTS_DIR/ganache \
--gasPrice 50000000000 \
--gasLimit 1050000000000000 \
--allowUnlimitedContractSize \
--accounts 20 \
--defaultBalanceEther 1000 \
--deterministic \
--mnemonic=$MNEMONIC"
if [ $VERBOSE_GANACHE == 'TRUE' ]; then
GANACHE_CLI_ARG=$GANACHE_CLI_ARG" --verbose"
fi
nohup npx ganache-cli $GANACHE_CLI_ARG >> $CONTRACTS_DIR/ganache.$CURRENTDATE.log 2>&1 &
sleep 1
}

function deploy_contracts() {
Expand Down Expand Up @@ -195,7 +182,7 @@ function run_bin() {
run_prove_workers
run_rollup
sleep 10
run_eth_node
boostrap_contract
if [ $DX_CLEAN == 'TRUE' ]; then
deploy_contracts
else
Expand Down
3 changes: 2 additions & 1 deletion stop.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ EXCHANGE_DIR=$DIR/dingir-exchange
STATE_MNGR_DIR=$DIR/rollup-state-manager
FAUCET_DIR=$DIR/regnbue-bridge
ORCHESTRA_DIR=$DIR/orchestra
BLOCKSCOUT_DIR=$DIR/blockscout

echo "DX_CLEAN: $DX_CLEAN"

Expand Down Expand Up @@ -35,11 +36,11 @@ function stop_docker_compose() {
function stop_docker_composes() {
stop_docker_compose $ORCHESTRA_DIR orchestra
stop_docker_compose $FAUCET_DIR faucet
stop_docker_compose $BLOCKSCOUT_DIR blockscout
}

function clean_data() {
rm -rf rollup-state-manager/circuits/testdata/persist/
rm -rf contracts/ganache
}

kill_tasks
Expand Down

0 comments on commit e9f3bb8

Please sign in to comment.