Merge pull request #19 from astriaorg/bharath/rebase-with-astria-geth

chore: Rebase flame with astria-geth

cmd/geth/config.go

@@ -206,11 +206,11 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 
 	// Configure gRPC if requested.
 	if ctx.IsSet(utils.GRPCEnabledFlag.Name) {
-		serviceV1a2, err := execution.NewExecutionServiceServerV1Alpha2(eth)
+		serviceV1, err := execution.NewExecutionServiceServerV1(eth)
 		if err != nil {
 			utils.Fatalf("failed to create execution service: %v", err)
 		}
-		utils.RegisterGRPCExecutionService(stack, serviceV1a2, &cfg.Node)
+		utils.RegisterGRPCExecutionService(stack, serviceV1, &cfg.Node)
 	}
 
 	// Add the Ethereum Stats daemon if requested.

cmd/utils/flags.go

@@ -35,7 +35,7 @@ import (
 	"strings"
 	"time"
 
-	astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1alpha2/executionv1alpha2grpc"
+	astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1/executionv1grpc"
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	bparams "github.com/ethereum/go-ethereum/beacon/params"

fork.yaml

@@ -4,7 +4,7 @@ footer: |
 base:
   name: go-ethereum
   url: https://github.com/ethereum/go-ethereum
-  ref: refs/heads/go-ethereum/release/1.14.3
+  ref: refs/tags/v1.14.3
 fork:
   name: astria-geth
   url: https://github.com/astriaorg/astria-geth
@@ -30,35 +30,55 @@ def:
           globs:
             - "grpc/execution/*"
             - "grpc/*"
-        - title: "Tx-pool"
+        - title: "TX Pool"
           description: |
             Transactions ordering as set by the shared sequencer
           globs:
             - "core/txpool/blobpool/*"
             - "core/txpool/*"
             - "core/txpool/legacypool/*"
-        - title: "State-transition modifications"
-          description: ""
-          sub:
-            - title: "Deposit Transaction type"
-              description: |
-                `Deposit` transaction type enable changes to the rollup based on sequencer layer events
-              globs:
-                - "core/types/deposit_tx.go"
-                - "core/types/transaction.go"
-                - "core/state_transition.go"
-                - "core/types/receipt.go"
-
+            - "eth/catalyst/*_test.go"
+        - title: "Deposit Transaction type"
+          description: |
+            `Deposit` transaction type enable changes to the rollup based on sequencer layer events
+          globs:
+            - "core/types/deposit_tx.go"
+            - "core/types/transaction.go"
+            - "core/state_transition.go"
+            - "core/types/receipt.go"
+        - title: "ERC-20 Bridging"
+          description: |
+              ERC-20 bridging support for the shared sequencer.
+          globs:
+              - "contracts/*"
+        - title: "EIP-1559 modifications"
+          description: |
+            EIP-1559 modifications to allow configuration of the base fee and the maximum fee cap.
+          globs:
+            - "consensus/misc/eip1559/eip1559.go"
+            - "core/chain_makers.go"
+            - "cmd/evm/internal/t8ntool/transaction.go"
+            - "core/blockchain_test.go"
+            - "core/bench_test.go"
+            - "core/state_processor_test.go"
+            - "tests/transaction_test_util.go"
         - title: "Block-building modifications"
           description: |
             The block-building code implements changes to support shared sequencer transactions ordering.
-            Transactions are now being fethced from the `TxPool` based on the shared sequencer.
+            Transactions are now being fetched from the `TxPool` based on the shared sequencer.
           globs:
             - "miner/*"
+        - title: "TX Submission"
+          description: |
+            We don't accept blob transactions or deposit transactions from the user.
+          globs:
+            - "internal/ethapi/api.go"
     - title: "Node modifications"
       description: Changes to the node configuration and services.
       sub:
         - title: Node config
+          description: |
+            Node configuration changes to support grpc server.
           globs:
             - "node/config.go"
             - "node/defaults.go"
@@ -73,24 +93,42 @@ def:
             - "internal/flags/categories.go"
             - "cmd/geth/config.go"
     - title: "Chain Configuration"
-      sub:
-        - title: "Chain config"
-          description: |
-            Configuration changes for integrating the shared seuqnecer
-          globs:
-            - "params/config.go"
-            - "params/protocol_params.go"
-            - "core/genesis.go"
-            - "genesis.json"
-            - "core/blockchain.go"
-            - "eth/backend.go"
+      description: |
+        Configuration changes, and storage for integrating the shared sequencer
+      globs:
+        - "params/*"
+        - "core/genesis.go"
+        - "core/blockchain.go"
+        - "eth/backend.go"
+        - "core/rawdb/*"
+        - "core/blockchain_reader.go"
+    - title: "Miscellaneous Tests"
+      description: |
+        Some tests have been omitted from the fork (no support for beacon client), others have been edited due to changes
+        in the default configuration.
+      globs:
+        - "cmd/evm/testdata/**/*"
+        - "accounts/abi/bind/*_test.go"
+        - "consensus/clique/clique_test.go"
+        - "tests/state_test.go"
+        - "eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_failed.json"
+        - "eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_post_eip158.json"
+        - "ethclient/ethclient_test.go"
+        - "ethclient/simulated/backend_test.go"
+        - "tests/block_test.go"
+
 
 # ignored globally, does not count towards line count
 ignore:
+  - "Dockerfile"
+  - "Dockerfile.alltools"
+  - ".gitattributes"
+  - ".gitignore"
+  - ".gitmodules"
   - ".circleci/*"
   - "*.sum"
   - "go.mod"
   - "fork.yaml"
   - ".github/*"
   - ".github/workflows/*"
-
+  - "genesis.json"

genesis.json

@@ -30,6 +30,7 @@
             },
             {
                 "bridgeAddress": "astria1xnlvg0rle2u6auane79t4p27g8hxnj36ja960z",
+                "senderAddress": "0x0000000000000000000000000000000000000000",
                 "startHeight": 1,
                 "assetDenom": "transfer/channel-1/usdc",
                 "assetPrecision": 6,
@@ -39,7 +40,6 @@
                 }
             }
         ],
-        "astriaBridgeSenderAddress": "0x0000000000000000000000000000000000000000",
         "astriaFeeCollectors": {
             "1": "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
         },

go.mod

@@ -3,10 +3,10 @@ module github.com/ethereum/go-ethereum
 go 1.21
 
 require (
-	buf.build/gen/go/astria/execution-apis/grpc/go v1.4.0-20240725205400-4746841755df.1
-	buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.34.1-20240725205400-4746841755df.1
-	buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.2-20240911152449-eeebd3decdce.2
-	buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.34.2-20240911152449-b41cca615e35.2
+	buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-20241017141511-7e4bcc0ebba5.1
+	buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.35.1-20241017141511-7e4bcc0ebba5.1
+	buf.build/gen/go/astria/primitives/protocolbuffers/go v1.35.1-20240911152449-eeebd3decdce.1
+	buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.35.1-20241017141511-71aab1871615.1
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
 	github.com/Microsoft/go-winio v0.6.1
 	github.com/VictoriaMetrics/fastcache v1.12.1
@@ -79,16 +79,12 @@ require (
 	golang.org/x/time v0.5.0
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
 	google.golang.org/grpc v1.64.1
-	google.golang.org/protobuf v1.34.2
+	google.golang.org/protobuf v1.35.1
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	buf.build/gen/go/astria/primitives/grpc/go v1.5.1-20240911152449-eeebd3decdce.1 // indirect
-	buf.build/gen/go/astria/protocol-apis/grpc/go v1.3.0-20240829200558-cd9207200425.3 // indirect
-	buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.1-20240829200558-cd9207200425.1 // indirect
-	buf.build/gen/go/astria/sequencerblock-apis/grpc/go v1.5.1-20240911152449-b41cca615e35.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
 	github.com/DataDog/zstd v1.4.5 // indirect
@@ -154,6 +150,7 @@ require (
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect