diff --git a/.github/workflows/prover.yml b/.github/workflows/prover.yml index f600b11cb..94b85ed21 100644 --- a/.github/workflows/prover.yml +++ b/.github/workflows/prover.yml @@ -1,25 +1,38 @@ name: Prover -# on: -# push: -# branches: -# - main -# paths: -# - "prover/**" -# - ".github/workflows/prover.yaml" -# pull_request: -# paths: -# - "prover/**" -# - ".github/workflows/prover.yaml" -# -# defaults: -# run: -# working-directory: "prover" -# -# jobs: -# check: -# runs-on: ubuntu-22.04 -# steps: -# - uses: actions/checkout@v3 -# - name: Run build -# run: make build-prover +on: + push: + branches: + - main + paths: + - "prover/**" + - ".github/workflows/prover.yaml" + pull_request: + paths: + - "prover/**" + - ".github/workflows/prover.yaml" + +defaults: + run: + working-directory: "prover" + +jobs: + fmt: + name: fmt + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + components: rustfmt + - run: cargo fmt --all --check + + build: + name: build + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: make build-shadow-prove && make build-shadow-prove diff --git a/MakefileEks.mk b/MakefileEks.mk index 0b935d10a..efef15103 100644 --- a/MakefileEks.mk +++ b/MakefileEks.mk @@ -107,6 +107,20 @@ build-bk-prod-morph-prod-testnet-to-morph-gas-price-oracle-holesky: start-bk-prod-morph-prod-testnet-to-morph-gas-price-oracle-holesky: /data/secret-manager-wrapper ./app +# gas-oracle +# hoodi +build-bk-prod-morph-prod-testnet-to-morph-gas-price-oracle-hoodi: + if [ ! -d dist ]; then mkdir -p dist; fi + cd $(PWD)/gas-oracle/app && cargo build --release + cp gas-oracle/app/target/release/app dist/ + aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/hoodi/morph-setup/secret-manager-wrapper.tar.gz ./ + tar -xvzf secret-manager-wrapper.tar.gz + + +start-bk-prod-morph-prod-testnet-to-morph-gas-price-oracle-hoodi: + /data/secret-manager-wrapper ./app + + # prover # testnet build-bk-prod-morph-prod-testnet-to-morph-prover-holesky: diff --git a/ops/devnet-morph/devnet/setup_nodes.py b/ops/devnet-morph/devnet/setup_nodes.py index d47a6c61f..9169e74fc 100644 --- a/ops/devnet-morph/devnet/setup_nodes.py +++ b/ops/devnet-morph/devnet/setup_nodes.py @@ -25,7 +25,7 @@ def setup_devnet_nodes(): print("Error: Failed to build Tendermint. Exiting.") sys.exit(1) - os.chdir(ops_dir) + os.chdir(root_dir) print("Tendermint build process completed.") # Check if .devnet directory already exists diff --git a/ops/docker/Dockerfile.l1 b/ops/docker/Dockerfile.l1 index ff74e4ba8..16ac1be45 100644 --- a/ops/docker/Dockerfile.l1 +++ b/ops/docker/Dockerfile.l1 @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.12.2 +FROM ethereum/client-go:v1.14.11 RUN apk add --no-cache jq diff --git a/ops/docker/Dockerfile.l1-beacon b/ops/docker/Dockerfile.l1-beacon index da0035632..a48869810 100644 --- a/ops/docker/Dockerfile.l1-beacon +++ b/ops/docker/Dockerfile.l1-beacon @@ -6,9 +6,9 @@ COPY ops/docker/consensus /consensus COPY ops/docker/execution /execution RUN ./prysmctl testnet generate-genesis --fork=deneb --num-validators=64 --genesis-time-delay=0 --output-ssz=/consensus/genesis.ssz --chain-config-file=/consensus/config.yml --geth-genesis-json-in=/execution/genesis.json --geth-genesis-json-out=/execution/genesis.json -FROM ethereum/client-go:latest as geth-genesis +FROM ethereum/client-go:v1.14.11 as geth-genesis COPY --from=chain-genesis /execution /execution -RUN geth --datadir=/execution init /execution/genesis.json +RUN geth --datadir=/execution --state.scheme=hash init /execution/genesis.json FROM gcr.io/prysmaticlabs/prysm/beacon-chain:v4.2.1 as beacon-chain diff --git a/ops/docker/docker-compose-4nodes.yml b/ops/docker/docker-compose-4nodes.yml index 152bab54e..7353ee639 100644 --- a/ops/docker/docker-compose-4nodes.yml +++ b/ops/docker/docker-compose-4nodes.yml @@ -84,7 +84,7 @@ services: # APIs to allow for proof-of-stake consensus via Prysm. l1: container_name: l1-geth - image: ethereum/client-go:v1.13.12 + image: ethereum/client-go:v1.14.11 command: - --http - --http.api=web3,debug,eth,txpool,net,engine diff --git a/ops/l2-genesis/deploy-config/qanet-deploy-config.json b/ops/l2-genesis/deploy-config/qanet-deploy-config.json index 82ea5fcbf..09957a5b5 100644 --- a/ops/l2-genesis/deploy-config/qanet-deploy-config.json +++ b/ops/l2-genesis/deploy-config/qanet-deploy-config.json @@ -37,15 +37,15 @@ "morphTokenOwner": "0x716173f5BBE0b4B51AaDF5A5840fA9A79D01636E", "morphTokenInitialSupply": 1000000000, "morphTokenDailyInflationRate": 1596535874529, - + "l2StakingSequencerMaxSize": 4, "l2StakingUnDelegatedLockEpochs": 2, "l2StakingRewardStartTime": 1728000000, "l2StakingAddresses": [ - "0x25d36d94b64165f72a817ae0ff9bad2ce6914c70", - "0x4a1f64dec538835c125874e275edca367bf6022a", - "0xbb8605961105bb3dcd0e86ef94a1bf9fb2270a29", - "0x7d7201ad7da2b9b9ab9a36c454a3c2d55c4fbdd8" + "0x675cfc328f9f2e79a51e499b2be44462270572fe", + "0xb096665645994775eeba8aa114752d569734dcb4", + "0x3a587733d38e5487d2a7e81d84625f25c99ab3a1", + "0xb6346ded94fc61b637763610d0c59846b7781080" ], "l2StakingTmKeys": [ "0x5280d0eee2a64d3ad29480d15ffd1b048ce5908f180b5ccd65cc3dcf00941abb", diff --git a/ops/l2-genesis/morph-chain-ops/genesis/config.go b/ops/l2-genesis/morph-chain-ops/genesis/config.go index 9102c780e..650e283b9 100644 --- a/ops/l2-genesis/morph-chain-ops/genesis/config.go +++ b/ops/l2-genesis/morph-chain-ops/genesis/config.go @@ -125,6 +125,9 @@ type DeployConfig struct { //MorphTokenDailyInflationRate uint64 `json:"morphTokenDailyInflationRate"` FundDevAccounts bool `json:"fundDevAccounts"` + + // Upgrade configs + Morph203Time *uint64 `json:"morph203Time,omitempty"` } // GetDeployedAddresses will get the deployed addresses of deployed L1 contracts diff --git a/ops/l2-genesis/morph-chain-ops/genesis/genesis.go b/ops/l2-genesis/morph-chain-ops/genesis/genesis.go index 89f6ca4ad..3e896273d 100644 --- a/ops/l2-genesis/morph-chain-ops/genesis/genesis.go +++ b/ops/l2-genesis/morph-chain-ops/genesis/genesis.go @@ -35,6 +35,11 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro sequencerFeeVaultReceipt = predeploys.L2TxFeeVaultAddr } + var morph203Time *uint64 + if config.Morph203Time != nil { + morph203Time = config.Morph203Time + } + morphChainConfig := params.ChainConfig{ ChainID: new(big.Int).SetUint64(config.L2ChainID), HomesteadBlock: big.NewInt(0), @@ -55,6 +60,7 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro ShanghaiBlock: big.NewInt(0), BernoulliBlock: big.NewInt(0), CurieBlock: big.NewInt(0), + Morph203Time: morph203Time, TerminalTotalDifficulty: big.NewInt(0), Morph: params.MorphConfig{ UseZktrie: true, diff --git a/prover/Makefile b/prover/Makefile index ff397cdcb..4b860bd77 100644 --- a/prover/Makefile +++ b/prover/Makefile @@ -19,9 +19,7 @@ stop-server: build-shadow-prove: - cd bin/shadow-prove - cargo build --release + cd bin/shadow-prove && cargo build --release build-challenge: - cd bin/challenge - cargo build --release \ No newline at end of file + cd bin/challenge && cargo build --release