Skip to content

Commit e189155

Browse files
Merge pull request #118 from OffchainLabs/fix_cancun_support
Fixes: blobSchedule for cancun, --allow=fs=/tmp in docker buildx bake
2 parents 1a01f93 + 8e71878 commit e189155

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ services:
9898
- --output-ssz=/consensus/genesis.ssz
9999
- --chain-config-file=/config/prysm.yaml
100100
- --geth-genesis-json-in=/config/geth_genesis.json
101-
- --geth-genesis-json-out=/config/geth_genesis.json
102101
volumes:
103102
- "consensus:/consensus"
104103
- "config:/config"

scripts/config.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,14 @@ function writeGethGenesisConfig(argv: any) {
7272
"shanghaiTime": 0,
7373
"cancunTime": 1706778826,
7474
"terminalTotalDifficulty": 0,
75-
"terminalTotalDifficultyPassed": true
75+
"terminalTotalDifficultyPassed": true,
76+
"blobSchedule": {
77+
"cancun": {
78+
"target": 3,
79+
"max": 6,
80+
"baseFeeUpdateFraction": 3338477
81+
}
82+
}
7683
},
7784
"difficulty": "0",
7885
"extradata": "0x00000000000000000000000000000000000000000000000000000000000000003f1Eae7D46d88F08fc2F8ed27FCb2AB183EB2d0E0B0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",

test-node.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ if $build_utils; then
375375

376376
if [ "$ci" == true ]; then
377377
# workaround to cache docker layers and keep using docker-compose in CI
378-
docker buildx bake --file docker-compose.yaml --file docker-compose-ci-cache.json $LOCAL_BUILD_NODES
378+
docker buildx bake --allow=fs=/tmp --file docker-compose.yaml --file docker-compose-ci-cache.json $LOCAL_BUILD_NODES
379379
else
380380
UTILS_NOCACHE=""
381381
if $force_build_utils; then

0 commit comments

Comments
 (0)