Develop -> Master

.github/workflows/publish-canary.yml

@@ -17,7 +17,6 @@ jobs:
     outputs:
       builder: ${{ steps.packages.outputs.builder }}
       l2geth: ${{ steps.packages.outputs.l2geth }}
-      batch-submitter: ${{ steps.packages.outputs.batch-submitter }}
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
@@ -180,7 +179,6 @@ jobs:
     runs-on: ubuntu-latest
     # we re-output the variables so that the child jobs can access them
     outputs:
-      batch-submitter: ${{ needs.canary-publish.outputs.batch-submitter }}
       message-relayer: ${{ needs.canary-publish.outputs.message-relayer }}
       data-transport-layer: ${{ needs.canary-publish.outputs.data-transport-layer }}
       contracts: ${{ needs.canary-publish.outputs.contracts }}
@@ -236,33 +234,6 @@ jobs:
           tags: ethereumoptimism/message-relayer:${{ needs.builder.outputs.canary-docker-tag }}
           build-args: BUILDER_TAG=${{ needs.builder.outputs.canary-docker-tag }}
 
-  batch-submitter:
-    name: Publish Batch Submitter Version ${{ needs.builder.outputs.canary-docker-tag }}
-    needs: builder
-    if: needs.builder.outputs.batch-submitter != ''
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./ops/docker/Dockerfile.batch-submitter
-          push: true
-          tags: ethereumoptimism/batch-submitter:${{ needs.builder.outputs.canary-docker-tag }}
-          build-args: BUILDER_TAG=${{ needs.builder.outputs.canary-docker-tag }}
-
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.builder.outputs.canary-docker-tag }}
     needs: builder

.github/workflows/release.yml

@@ -14,7 +14,6 @@ jobs:
       use_builder: ${{ steps.packages.outputs.use_builder }}
       builder: ${{ steps.packages.outputs.builder }}
       l2geth: ${{ steps.packages.outputs.l2geth }}
-      batch-submitter: ${{ steps.packages.outputs.batch-submitter }}
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
@@ -307,7 +306,6 @@ jobs:
     # we re-output the variables so that the child jobs can access them
     outputs:
       builder: ${{ needs.release.outputs.builder || 'latest' }}
-      batch-submitter: ${{ needs.release.outputs.batch-submitter }}
       message-relayer: ${{ needs.release.outputs.message-relayer }}
       data-transport-layer: ${{ needs.release.outputs.data-transport-layer }}
       contracts: ${{ needs.release.outputs.contracts }}
@@ -361,33 +359,6 @@ jobs:
           tags: ethereumoptimism/message-relayer:${{ needs.builder.outputs.message-relayer }},ethereumoptimism/message-relayer:latest
           build-args: BUILDER_TAG=${{ needs.builder.outputs.builder }}
 
-  batch-submitter:
-    name: Publish Batch Submitter Version ${{ needs.builder.outputs.batch-submitter }}
-    needs: builder
-    if: needs.builder.outputs.batch-submitter != ''
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./ops/docker/Dockerfile.batch-submitter
-          push: true
-          tags: ethereumoptimism/batch-submitter:${{ needs.builder.outputs.batch-submitter }},ethereumoptimism/batch-submitter:latest
-          build-args: BUILDER_TAG=${{ needs.builder.outputs.builder }}
-
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.builder.outputs.data-transport-layer }}
     needs: builder

go/indexer/Makefile

@@ -0,0 +1,135 @@
+GITCOMMIT := $(shell git rev-parse HEAD)
+GITDATE := $(shell git show -s --format='%ct')
+GITVERSION := $(shell cat package.json | jq .version)
+
+LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
+LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
+LDFLAGSSTRING +=-X main.GitVersion=$(GITVERSION)
+LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
+
+L1BRIDGE_ABI_ARTIFACT = ../../packages/contracts/artifacts/contracts/L1/messaging/L1StandardBridge.sol/L1StandardBridge.json
+L2BRIDGE_ABI_ARTIFACT = ../../packages/contracts/artifacts/contracts/L2/messaging/L2StandardBridge.sol/L2StandardBridge.json
+
+ERC20_ABI_ARTIFACT = ./contracts/ERC20.sol/ERC20.json
+
+SCC_ABI_ARTIFACT = ../../packages/contracts/artifacts/contracts/L1/rollup/StateCommitmentChain.sol/StateCommitmentChain.json
+
+indexer:
+	env GO111MODULE=on go build -v $(LDFLAGS) ./cmd/indexer
+
+clean:
+	rm indexer
+
+test:
+	go test -v ./...
+
+lint:
+	golangci-lint run ./...
+
+bindings: bindings-l1bridge bindings-l2bridge bindings-l1erc20 bindings-l2erc20 bindings-scc
+
+bindings-l1bridge:
+	$(eval temp := $(shell mktemp))
+
+	cat $(L1BRIDGE_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(L1BRIDGE_ABI_ARTIFACT) \
+		| jq .abi \
+		| abigen --pkg l1bridge \
+		--abi - \
+		--out bindings/l1bridge/l1_standard_bridge.go \
+		--type L1StandardBridge \
+		--bin $(temp)
+
+	rm $(temp)
+
+bindings-l2bridge:
+	$(eval temp := $(shell mktemp))
+
+	cat $(L2BRIDGE_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(L2BRIDGE_ABI_ARTIFACT) \
+		| jq .abi \
+		| ../../l2geth/build/bin/abigen --pkg l2bridge \
+		--abi - \
+		--out bindings/l2bridge/l2_standard_bridge.go \
+		--type L2StandardBridge \
+		--bin $(temp)
+
+	rm $(temp)
+
+bindings-l1erc20:
+	$(eval temp := $(shell mktemp))
+
+	cat $(ERC20_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(ERC20_ABI_ARTIFACT) \
+		| jq .abi \
+		| abigen --pkg l1erc20 \
+		--abi - \
+		--out bindings/l1erc20/l1erc20.go \
+		--type L1ERC20 \
+		--bin $(temp)
+
+	rm $(temp)
+
+bindings-l2erc20:
+	$(eval temp := $(shell mktemp))
+
+	cat $(ERC20_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(ERC20_ABI_ARTIFACT) \
+		| jq .abi \
+		| ../../l2geth/build/bin/abigen --pkg l2erc20 \
+		--abi - \
+		--out bindings/l2erc20/l2erc20.go \
+		--type L2ERC20 \
+		--bin $(temp)
+
+	rm $(temp)
+
+bindings-scc:
+	$(eval temp := $(shell mktemp))
+
+	cat $(SCC_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(SCC_ABI_ARTIFACT) \
+		| jq .abi \
+		| abigen --pkg scc \
+		--abi - \
+		--out bindings/scc/statecommitmentchain.go \
+		--type StateCommitmentChain \
+		--bin $(temp)
+
+	rm $(temp)
+
+bindings-address-manager:
+	$(eval temp := $(shell mktemp))
+
+	cat $(ADDRESS_MANAGER_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(ADDRESS_MANAGER_ABI_ARTIFACT) \
+		| jq .abi \
+		| abigen --pkg address_manager \
+		--abi - \
+		--out ./bindings/address_manager/address_manager.go \
+		--type AddressManager \
+		--bin $(temp)
+
+.PHONY: \
+	indexer \
+	bindings \
+	bindings-l1bridge \
+	bindings-l2bridge \
+	bindings-l1erc20 \
+	bindings-l2erc20 \
+	bindings-scc \
+	clean \
+	test \
+	lint