Merge Geth [v1.15.0...v1.15.11]

.docker/docker-compose-four.yml

@@ -20,6 +20,9 @@ services:
       - ../privnet:/privnet
     ports:
       - 30304:30304
+    networks:
+      default:
+        ipv4_address: 172.200.0.1
   miner0:
     image: neox_node
     container_name: miner0
@@ -32,7 +35,7 @@ services:
         geth init --datadir ${FOUR_NODE0_DIR} ${FOUR_DIR}/genesis_privnet.json
         geth --datadir ${FOUR_NODE0_DIR} \
         --port 30305 \
-        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${FOUR_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${FOUR_NODE0_DIR}/node_address.txt)" \
         --authrpc.port 8551 \
@@ -73,7 +76,7 @@ services:
         geth init --datadir ${FOUR_NODE1_DIR} ${FOUR_DIR}/genesis_privnet.json
         geth --datadir ${FOUR_NODE1_DIR} \
         --port 30306 \
-        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${FOUR_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${FOUR_NODE1_DIR}/node_address.txt)" \
         --authrpc.port 8552 \
@@ -114,7 +117,7 @@ services:
         geth init --datadir ${FOUR_NODE2_DIR} ${FOUR_DIR}/genesis_privnet.json
         geth --datadir ${FOUR_NODE2_DIR} \
         --port 30307 \
-        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${FOUR_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${FOUR_NODE2_DIR}/node_address.txt)" \
         --authrpc.port 8553 \
@@ -155,7 +158,7 @@ services:
         geth init --datadir ${FOUR_NODE3_DIR} ${FOUR_DIR}/genesis_privnet.json
         geth --datadir ${FOUR_NODE3_DIR} \
         --port 30308 \
-        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${FOUR_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${FOUR_NODE3_DIR}/node_address.txt)" \
         --authrpc.port 8554 \
@@ -196,7 +199,7 @@ services:
         geth init --datadir ${FOUR_NODE4_DIR} ${FOUR_DIR}/genesis_privnet.json
         geth --datadir ${FOUR_NODE4_DIR} \
         --port 30309 \
-        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${FOUR_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${FOUR_NODE4_DIR}/node_address.txt)" \
         --authrpc.port 8555 \
@@ -237,7 +240,7 @@ services:
         geth init --datadir ${FOUR_NODE5_DIR} ${FOUR_DIR}/genesis_privnet.json
         geth --datadir ${FOUR_NODE5_DIR} \
         --port 30310 \
-        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${FOUR_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${FOUR_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${FOUR_NODE5_DIR}/node_address.txt)" \
         --authrpc.port 8556 \

.docker/docker-compose-seven.yml

@@ -20,6 +20,9 @@ services:
       - ../privnet:/privnet
     ports:
       - 30304:30304
+    networks:
+      default:
+        ipv4_address: 172.200.0.1
   miner0:
     image: neox_node
     container_name: miner0
@@ -32,7 +35,7 @@ services:
         geth init --datadir ${SEVEN_NODE0_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE0_DIR} \
         --port 30305 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE0_DIR}/node_address.txt)" \
         --authrpc.port 8551 \
@@ -73,7 +76,7 @@ services:
         geth init --datadir ${SEVEN_NODE1_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE1_DIR} \
         --port 30306 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE1_DIR}/node_address.txt)" \
         --authrpc.port 8552 \
@@ -114,7 +117,7 @@ services:
         geth init --datadir ${SEVEN_NODE2_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE2_DIR} \
         --port 30307 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE2_DIR}/node_address.txt)" \
         --authrpc.port 8553 \
@@ -155,7 +158,7 @@ services:
         geth init --datadir ${SEVEN_NODE3_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE3_DIR} \
         --port 30308 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE3_DIR}/node_address.txt)" \
         --authrpc.port 8554 \
@@ -196,7 +199,7 @@ services:
         geth init --datadir ${SEVEN_NODE4_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE4_DIR} \
         --port 30309 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE4_DIR}/node_address.txt)" \
         --authrpc.port 8555 \
@@ -237,7 +240,7 @@ services:
         geth init --datadir ${SEVEN_NODE5_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE5_DIR} \
         --port 30310 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE5_DIR}/node_address.txt)" \
         --authrpc.port 8556 \
@@ -278,7 +281,7 @@ services:
         geth init --datadir ${SEVEN_NODE6_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE6_DIR} \
         --port 30311 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE6_DIR}/node_address.txt)" \
         --authrpc.port 8557 \
@@ -319,7 +322,7 @@ services:
         geth init --datadir ${SEVEN_NODE7_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE7_DIR} \
         --port 30312 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE7_DIR}/node_address.txt)" \
         --authrpc.port 8558 \
@@ -360,7 +363,7 @@ services:
         geth init --datadir ${SEVEN_NODE8_DIR} ${SEVEN_DIR}/genesis_privnet.json
         geth --datadir ${SEVEN_NODE8_DIR} \
         --port 30313 \
-        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SEVEN_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SEVEN_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SEVEN_NODE8_DIR}/node_address.txt)" \
         --authrpc.port 8559 \

.docker/docker-compose.yml

@@ -20,6 +20,9 @@ services:
       - ../privnet:/privnet
     ports:
       - 30304:30304
+    networks:
+      default:
+        ipv4_address: 172.200.0.1
   miner0:
     image: neox_node
     container_name: miner0
@@ -32,7 +35,7 @@ services:
         geth init --datadir ${SINGLE_NODE0_DIR} ${SINGLE_DIR}/genesis_privnet.json
         geth --datadir ${SINGLE_NODE0_DIR} \
         --port 30305 \
-        --bootnodes "enode://$$(cat ${SINGLE_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SINGLE_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SINGLE_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SINGLE_NODE0_DIR}/node_address.txt)" \
         --authrpc.port 8551 \
@@ -73,7 +76,7 @@ services:
         geth init --datadir ${SINGLE_NODE1_DIR} ${SINGLE_DIR}/genesis_privnet.json
         geth --datadir ${SINGLE_NODE1_DIR} \
         --port 30306 \
-        --bootnodes "enode://$$(cat ${SINGLE_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SINGLE_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SINGLE_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SINGLE_NODE1_DIR}/node_address.txt)" \
         --authrpc.port 8552 \
@@ -114,7 +117,7 @@ services:
         geth init --datadir ${SINGLE_NODE2_DIR} ${SINGLE_DIR}/genesis_privnet.json
         geth --datadir ${SINGLE_NODE2_DIR} \
         --port 30307 \
-        --bootnodes "enode://$$(cat ${SINGLE_DIR}/bootnode/bootnode_address.txt)@bootnode:0?discport=30304" \
+        --bootnodes "enode://$$(cat ${SINGLE_DIR}/bootnode/bootnode_address.txt)@172.200.0.1:0?discport=30304" \
         --networkid "$$(cat ${SINGLE_DIR}/networkid.txt)" \
         --unlock 0x"$$(cat ${SINGLE_NODE2_DIR}/node_address.txt)" \
         --authrpc.port 8553 \

.github/CODEOWNERS

@@ -1,25 +1,33 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-accounts/usbwallet              @karalabe
-accounts/scwallet               @gballet
-accounts/abi                    @gballet @MariusVanDerWijden
-beacon/engine                   @lightclient
-cmd/clef                        @holiman
-cmd/evm                         @holiman @MariusVanDerWijden @lightclient
-consensus                       @karalabe
-core/                           @karalabe @holiman @rjl493456442
-eth/                            @karalabe @holiman @rjl493456442
-eth/catalyst/                   @gballet @lightclient
+accounts/usbwallet/             @gballet
+accounts/scwallet/              @gballet
+accounts/abi/                   @gballet @MariusVanDerWijden
+beacon/engine/                  @MariusVanDerWijden @lightclient @fjl
+beacon/light/                   @zsfelfoldi
+beacon/merkle/                  @zsfelfoldi 
+beacon/types/                   @zsfelfoldi @fjl
+beacon/params/                  @zsfelfoldi @fjl
+cmd/evm/                        @MariusVanDerWijden @lightclient
+core/state/                     @rjl493456442
+crypto/                         @gballet @jwasinger @fjl
+core/                           @rjl493456442
+eth/                            @rjl493456442
+eth/catalyst/                   @MariusVanDerWijden @lightclient @fjl @jwasinger
 eth/tracers/                    @s1na
+ethclient/                      @fjl
+ethdb/                          @rjl493456442
+event/                          @fjl
+trie/                           @rjl493456442
+triedb/                         @rjl493456442
 core/tracing/                   @s1na
 graphql/                        @s1na
-internal/ethapi                 @lightclient
-internal/era                    @lightclient
-les/                            @zsfelfoldi @rjl493456442
-light/                          @zsfelfoldi @rjl493456442
+internal/ethapi/                @fjl @s1na @lightclient
+internal/era/                   @lightclient
+miner/                          @MariusVanDerWijden @fjl @rjl493456442
 node/                           @fjl
 p2p/                            @fjl @zsfelfoldi
-params/                         @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
-rpc/                            @fjl @holiman
-signer/                         @holiman
+rlp/                            @fjl
+params/                         @fjl @karalabe @gballet @rjl493456442 @zsfelfoldi
+rpc/                            @fjl

.github/workflows/go.yml

@@ -8,14 +8,38 @@ on:
   workflow_dispatch:
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v4
+
+    # Cache build tools to avoid downloading them each time
+    - uses: actions/cache@v4
+      with:
+        path: build/cache
+        key: ${{ runner.os }}-build-tools-cache-${{ hashFiles('build/checksums.txt') }}
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 1.23.0
+        cache: false
+
+    - name: Run linters
+      run: |
+        go run build/ci.go lint
+        go run build/ci.go check_generate
+        go run build/ci.go check_baddeps
+
   build:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.0
+          go-version: 1.24.0
           cache: false
       - name: Run tests
         run: go test -short ./...

.gitignore

@@ -37,6 +37,7 @@ profile.cov
 
 # IdeaIDE
 .idea
+*.iml
 
 # VS Code
 .vscode
@@ -58,3 +59,16 @@ node_modules
 /contracts/coverage.json
 /contracts/ignition
 /contracts/package-lock.json
+
+# binaries
+cmd/abidump/abidump
+cmd/abigen/abigen
+cmd/blsync/blsync
+cmd/clef/clef
+cmd/devp2p/devp2p
+cmd/era/era
+cmd/ethkey/ethkey
+cmd/evm/evm
+cmd/geth/geth
+cmd/rlpdump/rlpdump
+cmd/workload/workload