diff --git a/tx-submitter/Dockerfile b/tx-submitter/Dockerfile deleted file mode 100644 index 841e48b79..000000000 --- a/tx-submitter/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# Build Geth in a stock Go builder container -FROM golang:1.20-alpine as builder - -RUN apk add --no-cache gcc musl-dev linux-headers git make - -COPY . /tx-submitter - -WORKDIR /tx-submitter - -RUN make build - -# Pull Geth into a second stage deploy alpine container -FROM alpine:latest - -RUN apk add --no-cache ca-certificates -COPY --from=builder /tx-submitter/tx-submitter /usr/local/bin/ - -CMD ["tx-submitter"] \ No newline at end of file diff --git a/tx-submitter/Dockerfile.submitter b/tx-submitter/Dockerfile.submitter deleted file mode 100644 index b94c86686..000000000 --- a/tx-submitter/Dockerfile.submitter +++ /dev/null @@ -1,12 +0,0 @@ -# Pull Geth into a second stage deploy alpine container -FROM alpine:latest - -ENV TZ Asia/Shanghai - -RUN apk add tzdata && cp /usr/share/zoneinfo/${TZ} /etc/localtime \ - && echo ${TZ} > /etc/timezone - -RUN apk add --no-cache ca-certificates -COPY /tx-submitter /usr/local/bin - -CMD ["tx-submitter"] diff --git a/tx-submitter/Makefile b/tx-submitter/Makefile index a049a2bfa..ab7a3c1c7 100644 --- a/tx-submitter/Makefile +++ b/tx-submitter/Makefile @@ -32,7 +32,7 @@ run: build ./tx-submitter \ --build-env=dev \ --l1-eth-rpc=http://127.0.0.1:9545 \ - --private-key="59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" \ + --private-key="your_private_key" \ --l2-eth-rpc=http://127.0.0.1:8545 \ --poll-interval=3s \ --safe-minimum-ether-balance=1 \ diff --git a/tx-submitter/README.md b/tx-submitter/README.md index 191ce1ce0..428197da2 100644 --- a/tx-submitter/README.md +++ b/tx-submitter/README.md @@ -9,12 +9,8 @@ ### commands useful for debugging ```bash -# stake -cast send 0x6900000000000000000000000000000000000010 "stake()" --rpc-url http://127.0.0.1:9545 --private-key 59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d --value 2ether# query submitter -cast call 0x6900000000000000000000000000000000000010 "submitter()" --rpc-url http://127.0.0.1:9545 --private-key 59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d -# query contract map -cast call 0x6900000000000000000000000000000000000010 "storageBatchs(uint64)" 1 --rpc-url http://127.0.0.1:9545 --private-key 59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d -cast call 0x6900000000000000000000000000000000000010 "lastL2BlockNumber()" -r http://127.0.0.1:9545 -cast call 0xb7f8bc63bbcad18155201308c8f3540b07f84f5e "lastFinalizedBatchIndex()" -r http://127.0.0.1:9545 -cast call 0xb7f8bc63bbcad18155201308c8f3540b07f84f5e "lastCommittedBatchIndex()" -r http://127.0.0.1:9545 +cast call $ROLLUP_ADDR "lastFinalizedBatchIndex()" -r $L1RPC +cast call $ROLLUP_ADDR "lastCommittedBatchIndex()" -r $L1RPC +cast call $L2_SEQUENCER_ADDR "getSequencerSet2()(address[])" -r $L2RPC +cast call $L1_STAKING_ADDR "getActiveStakers()(address[])" -r $L1RPC ``` \ No newline at end of file diff --git a/tx-submitter/docker-compose-testnet.yml b/tx-submitter/docker-compose-testnet.yml deleted file mode 100644 index a8fff0439..000000000 --- a/tx-submitter/docker-compose-testnet.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3.8" - -services: - tx-submitter: - image: morph-tx-submitter:latest - container_name: 'morph-tx-submitter' - build: - context: . - dockerfile: Dockerfile.submitter - restart: unless-stopped - command: tx-submitter - environment: - - TX_SUBMITTER_BUILD_ENV=dev - - TX_SUBMITTER_L1_ETH_RPC=${L1_ETH_RPC} - - TX_SUBMITTER_L1_PRIVATE_KEY=${L1_PRIVATE_KEY} - - TX_SUBMITTER_L2_ETH_RPC=${L2_ETH_RPC} - - TX_SUBMITTER_MAX_BATCH_BUILD_TIME=60s - - TX_SUBMITTER_MAX_TX_SIZE=125952 - - TX_SUBMITTER_POLL_INTERVAL=3s - - TX_SUBMITTER_SAFE_MINIMUM_ETHER_BALANCE=1 - - TX_SUBMITTER_TX_TIMEOUT=60s - - TX_SUBMITTER_ROLLUP_ADDRESS=${ROLLUP_ADDRESS} - - TX_SUBMITTER_NETWORK_TIMEOUT=20s - - TX_SUBMITTER_METRICS_SERVER_ENABLE=${TX_SUBMITTER_METRICS_SERVER_ENABLE:-true} - - TX_SUBMITTER_METRICS_HOSTNAME=${TX_SUBMITTER_METRICS_HOSTNAME:-} - - TX_SUBMITTER_METRICS_PORT=${TX_SUBMITTER_METRICS_PORT:-6060} - - Tx_SUBMITTER_MAX_BLOCK=1000 - - TX_SUBMITTER_MIN_BLOCK=50 - ports: - - "6060:6060" - - - diff --git a/tx-submitter/docker-compose.yml b/tx-submitter/docker-compose.yml deleted file mode 100644 index e99ae633f..000000000 --- a/tx-submitter/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: "3.8" - -services: - sequencer-txsubmitter: - image: tx-submitter - build: - context: . - dockerfile: Dockerfile - command: tx-submitter - environment: - - BATCH_SUBMITTER_BUILD_ENV=v0.0.1 - - BATCH_SUBMITTER_CLEAR_PENDING_TXS=true - - BATCH_SUBMITTER_L1_ETH_RPC=http://127.0.0.1:9545 - - BATCH_SUBMITTER_L1_PRIVATE_KEY=59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d - - BATCH_SUBMITTER_L2_ETH_RPC=http://127.0.0.1:8545 - - BATCH_SUBMITTER_MAX_BATCH_SUBMISSION_TIME=5s - - BATCH_SUBMITTER_NUM_CONFIRMATIONS=2 - - BATCH_SUBMITTER_POLL_INTERVAL=3s - - BATCH_SUBMITTER_RESUBMISSION_TIMEOUT=120s - - BATCH_SUBMITTER_RUN_STATE_BATCH_SUBMITTER=false - - BATCH_SUBMITTER_RUN_TX_BATCH_SUBMITTER=true - - BATCH_SUBMITTER_SAFE_ABORT_NONCE_TOO_LOW_COUNT=1 - - BATCH_SUBMITTER_SAFE_MINIMUM_ETHER_BALANCE=1 - - BATCH_SUBMITTER_ROLLUP_ADDRESS=0x6900000000000000000000000000000000000010 \ No newline at end of file