Skip to content

Commit ff125b0

Browse files
gosunutsgosunuts
authored
Merge pull request #19 from rabbitprincess/feature/v1.8.0
Feature/v1.8.0
2 parents 2cacc97 + 4255137 commit ff125b0

6 files changed

Lines changed: 42 additions & 43 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ buildx: buildx-init buildx-run buildx-bridge
2424
buildx-init:
2525
docker buildx build \
2626
--platform linux/amd64,linux/arm64 \
27-
-t dreamcacao/builderism_init:1.7.7 \
27+
-t dreamcacao/builderism_init:1.8.0 \
2828
-t dreamcacao/builderism_init:latest \
2929
--push ./init
3030

3131
buildx-run:
3232
docker buildx build \
3333
--platform linux/amd64,linux/arm64 \
34-
-t dreamcacao/builderism_run:1.7.7 \
34+
-t dreamcacao/builderism_run:1.8.0 \
3535
-t dreamcacao/builderism_run:latest \
3636
--push ./run
3737

‎init/3_generate_config.sh‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ config=$(cat << EOL
4747
"l2BlockTime": 2,
4848
"l1BlockTime": 12,
4949
50-
"maxSequencerDrift": 300,
51-
"sequencerWindowSize": 200,
52-
"channelTimeout": 120,
50+
"maxSequencerDrift": 600,
51+
"sequencerWindowSize": 3600,
52+
"channelTimeout": 300,
5353
5454
"p2pSequencerAddress": "$SEQUENCER_ADDRESS",
5555
"batchInboxAddress": "$BatchInboxAddress",
@@ -78,50 +78,48 @@ config=$(cat << EOL
7878
"l1FeeVaultWithdrawalNetwork": 0,
7979
"sequencerFeeVaultWithdrawalNetwork": 0,
8080
81+
"gasPriceOracleOverhead": 2100,
82+
"gasPriceOracleScalar": 1000000,
8183
"gasPriceOracleBaseFeeScalar": 1368,
8284
"gasPriceOracleBlobBaseFeeScalar": 810949,
8385
8486
$govConfig
8587
88+
"l2GenesisBlockGasLimit": "0x1c9c380",
89+
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
90+
"l2GenesisRegolithTimeOffset": "0x0",
91+
8692
"eip1559Denominator": 50,
8793
"eip1559DenominatorCanyon": 250,
8894
"eip1559Elasticity": 6,
8995
90-
"l2GenesisBlockGasLimit": "0x1c9c380",
91-
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
92-
"l2GenesisRegolithTimeOffset": "0x0",
93-
"l2GenesisDeltaTimeOffset": "0x0",
94-
"l2GenesisEcotoneTimeOffset": "0x0",
95-
"l1CancunTimeOffset": "0x0",
96+
"l2GenesisDeltaTimeOffset": null,
9697
"l2GenesisCanyonTimeOffset": "0x0",
9798
9899
"systemConfigStartBlock": 0,
99100
100-
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
101-
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
102-
103-
"faultGameAbsolutePrestate": "0x0000000000000000000000000000000000000000000000000000000000000000",
104-
"faultGameMaxDepth": 50,
105-
"faultGameClockExtension": 0,
106-
"faultGameMaxClockDuration": 1200,
101+
"requiredProtocolVersion": "0x0000000000000000000000000000000000000004000000000000000000000001",
102+
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000004000000000000000000000001",
103+
"fundDevAccounts": false,
104+
"faultGameAbsolutePrestate": "0x037ef3c1a487960b0e633d3e513df020c43432769f41a634d18a9595cbf53c55",
105+
"faultGameMaxDepth": 73,
106+
"faultGameClockExtension": 10800,
107+
"faultGameMaxClockDuration": 302400,
107108
"faultGameGenesisBlock": 0,
108109
"faultGameGenesisOutputRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
109-
"faultGameSplitDepth": 14,
110+
"faultGameSplitDepth": 30,
110111
"faultGameWithdrawalDelay": 604800,
111-
112-
"preimageOracleMinProposalSize": 18000,
113-
"preimageOracleChallengePeriod": 120,
114-
115-
"fundDevAccounts": false,
116-
"useFaultProofs": false,
112+
"preimageOracleMinProposalSize": 126000,
113+
"preimageOracleChallengePeriod": 86400,
117114
"proofMaturityDelaySeconds": 604800,
118-
"disputeGameFinalityDelaySeconds": 604800,
119-
"respectedGameType": 0
120-
}
115+
"disputeGameFinalityDelaySeconds": 302400,
116+
"respectedGameType": 0,
117+
"useFaultProofs": true
118+
}
121119
EOL
122120
)
123121

124122
# Write the config file
125123
cd ~/optimism/packages/contracts-bedrock && \
126124
mkdir -p ./deployments/$DEPLOYMENT_CONTEXT && \
127-
echo "$config" > ./deployments/$DEPLOYMENT_CONTEXT/config.json
125+
echo "$config" > ./deployments/$DEPLOYMENT_CONTEXT/.deploy

‎init/4_deploy_contract.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ set -eu
44
echo "[4/5] : deploy contract"
55

66
cd ~/optimism/packages/contracts-bedrock && \
7-
DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/config.json" \
8-
forge script scripts/Deploy.s.sol:Deploy \
7+
DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/.deploy" \
8+
forge script scripts/deploy/Deploy.s.sol:Deploy \
99
--private-key $ADMIN_PRIVATE_KEY \
1010
--broadcast \
1111
--rpc-url $L1_RPC_URL \
12-
--priority-gas-price $PRIORITY_GAS_PRICE \
13-
--slow
12+
--priority-gas-price $PRIORITY_GAS_PRICE
1413

15-
echo "run upgrader"
14+
echo "[deploy contract done!]"
1615

1716
CONTRACT_ADDRESSES_PATH="./deployments/$L1_CHAIN_ID-deploy.json" \
18-
DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/config.json" \
17+
DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/.deploy" \
1918
forge script scripts/L2Genesis.s.sol:L2Genesis \
2019
--sig 'runWithAllUpgrades()' \
21-
--rpc-url $L1_RPC_URL
20+
--chain-id $L2_CHAIN_ID \
21+
--rpc-url $L1_RPC_URL \

‎init/5_export_genesis.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ set -eu
44
echo "[5/5] : export genesis files"
55

66
cd ~/optimism/op-node
7-
go run cmd/main.go genesis l2 \
8-
--deploy-config ../packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT/config.json \
7+
./bin/op-node genesis l2 \
8+
--deploy-config ../packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT/.deploy \
99
--l1-deployments ../packages/contracts-bedrock/deployments/$L1_CHAIN_ID-deploy.json \
1010
--outfile.l2 /config/genesis.json \
1111
--outfile.rollup /config/rollup.json \
1212
--l1-rpc $L1_RPC_URL \
13-
--l2-allocs ../packages/contracts-bedrock/state-dump-$DEPLOYMENT_CONTEXT-ecotone.json
13+
--l2-allocs ../packages/contracts-bedrock/state-dump-$DEPLOYMENT_CONTEXT-fjord.json
1414

1515
cp ../packages/contracts-bedrock/deployments/$L1_CHAIN_ID-deploy.json /config/deploy.json
1616

‎init/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
1515
RUN apt-get install -y nodejs && npm install -g pnpm
1616

1717
# install foundry
18-
ENV FOUNDRY_VERSION=${FOUNDRY_VERSION:-nightly}
18+
ENV FOUNDRY_VERSION=${FOUNDRY_VERSION:-nightly-ef62fdbab638a275fc19a2ff8fe8951c3bd1d9aa}
1919
RUN curl -L https://foundry.paradigm.xyz | sudo -E bash -
2020
RUN . ~/.bashrc && foundryup -v "$FOUNDRY_VERSION"
2121
ENV PATH="~/.foundry/bin:${PATH}"
2222

2323
# clone optimism repository
2424
ENV OP_REPO=https://github.com/ethereum-optimism/optimism.git
25-
ENV OP_VERSION=${OP_VERSION:-v1.7.7}
25+
ENV OP_VERSION=${OP_VERSION:-v1.8.0}
2626
RUN mkdir -p ~/optimism && cd ~/optimism && \
2727
git clone $OP_REPO --depth 1 --branch $OP_VERSION --single-branch . && \
2828
git switch -c $OP_VERSION && \
2929
git submodule update --init --recursive --depth 1 && \
30-
go mod download && go mod tidy
30+
go mod download && go mod tidy && \
31+
make -C op-node VERSION=$OP_VERSION op-node
3132

3233
COPY *.sh /script/
3334
RUN chmod +x /script/*.sh

‎run/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM golang:1.22 as op
33
WORKDIR /app
44

55
ENV OP_REPO=https://github.com/ethereum-optimism/optimism.git
6-
ENV OP_VERSION=${OP_VERSION:-v1.7.7}
6+
ENV OP_VERSION=${OP_VERSION:-v1.8.0}
77

88
RUN git clone $OP_REPO --depth 1 --branch op-node/$OP_VERSION --single-branch . && \
99
git switch -c branch-$OP_VERSION && \

0 commit comments

Comments
 (0)