Merge branch 'develop' into feat/fault-detector-tag-service

.circleci/config.yml

@@ -248,6 +248,10 @@ jobs:
       docker_context:
         description: Docker build context
         type: string
+      docker_target:
+        description: "target build stage"
+        type: string
+        default: ""
       registry:
         description: Docker registry
         type: string
@@ -278,7 +282,7 @@ jobs:
             DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|-t ${IMAGE_BASE}:|")
             docker context create buildx-build
             docker buildx create --use buildx-build
-            docker buildx build --platform=<<parameters.platforms>> --push \
+            docker buildx build --platform=<<parameters.platforms>> --target "<<parameters.docker_target>>" --push \
               $(echo -ne $DOCKER_TAGS | tr '\n' ' ') \
               -f <<parameters.docker_file>> \
               <<parameters.docker_context>>
@@ -1484,6 +1488,14 @@ workflows:
           docker_target: wd-mon
           context:
             - oplabs-gcr
+      - docker-publish:
+          name: fault-detector-docker-publish
+          docker_file: ./ops/docker/Dockerfile.packages
+          docker_name: fault-detector
+          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
+          docker_target: fault-detector
+          context:
+            - oplabs-gcr
       - hive-test:
           name: hive-test-rpc
           version: <<pipeline.git.revision>>
@@ -1584,6 +1596,23 @@ workflows:
             - oplabs-gcr-release
           requires:
             - hold
+      - docker-release:
+          name: fault-detector-docker-release
+          filters:
+            tags:
+              only: /^fault-detector\/v.*/
+            branches:
+              ignore: /.*/
+          docker_file: ./ops/docker/Dockerfile.packages
+          docker_name: fault-detector
+          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
+          docker_target: fault-detector
+          docker_context: .
+          platforms: "linux/amd64,linux/arm64"
+          context:
+            - oplabs-gcr-release
+          requires:
+            - hold
       - docker-build:
           name: op-migrate-docker-release
           filters:

.github/workflows/tag-service.yml

@@ -23,6 +23,7 @@ on:
           - op-proposer
           - proxyd
           - indexer
+          - fault-detector
       prerelease:
         description: Increment major/minor/patch as prerelease?
         required: false

ops/scripts/ci-docker-tag-op-stack-release.sh

@@ -6,7 +6,7 @@ DOCKER_REPO=$1
 GIT_TAG=$2
 GIT_SHA=$3
 
-IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(proxyd|op-[a-z0-9\-]*)' || true)
+IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(fault-detector|proxyd|op-[a-z0-9\-]*)' || true)
 if [ -z "$IMAGE_NAME" ]; then
   echo "image name could not be parsed from git tag '$GIT_TAG'"
   exit 1

proxyd/rewriter.go

@@ -159,6 +159,13 @@ func rewriteTagMap(rctx RewriteContext, m map[string]interface{}, key string) (b
 }
 
 func rewriteTag(rctx RewriteContext, current string) (string, bool, error) {
+	// If a tag is the safe or finalized block number, don't rewrite it.
+	// We have a custom check here because the rpc.BlockNumberOrHash type
+	// doesn't support these custom tags yet.
+	if current == "safe" || current == "finalized" {
+		return current, false, nil
+	}
+
 	jv, err := json.Marshal(current)
 	if err != nil {
 		return "", false, err
@@ -177,5 +184,6 @@ func rewriteTag(rctx RewriteContext, current string) (string, bool, error) {
 			return "", false, ErrRewriteBlockOutOfRange
 		}
 	}
+
 	return current, false, nil
 }

proxyd/rewriter_test.go

@@ -308,6 +308,38 @@ func TestRewriteRequest(t *testing.T) {
 				require.Equal(t, hexutil.Uint64(100).String(), p[0])
 			},
 		},
+		{
+			name: "eth_getBlockByNumber finalized",
+			args: args{
+				rctx: RewriteContext{latest: hexutil.Uint64(100)},
+				req:  &RPCReq{Method: "eth_getBlockByNumber", Params: mustMarshalJSON([]string{"finalized"})},
+				res:  nil,
+			},
+			expected: RewriteNone,
+			check: func(t *testing.T, args args) {
+				var p []string
+				err := json.Unmarshal(args.req.Params, &p)
+				require.Nil(t, err)
+				require.Equal(t, 1, len(p))
+				require.Equal(t, "finalized", p[0])
+			},
+		},
+		{
+			name: "eth_getBlockByNumber safe",
+			args: args{
+				rctx: RewriteContext{latest: hexutil.Uint64(100)},
+				req:  &RPCReq{Method: "eth_getBlockByNumber", Params: mustMarshalJSON([]string{"safe"})},
+				res:  nil,
+			},
+			expected: RewriteNone,
+			check: func(t *testing.T, args args) {
+				var p []string
+				err := json.Unmarshal(args.req.Params, &p)
+				require.Nil(t, err)
+				require.Equal(t, 1, len(p))
+				require.Equal(t, "safe", p[0])
+			},
+		},
 		{
 			name: "eth_getBlockByNumber within range",
 			args: args{