Bharath/upgrade 1.14.13 cherry pick

.gitattributes

@@ -1,3 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 *.sol linguist-language=Solidity
+
+contracts/astria_bridgeable_erc20.go linguist-generated=true

.github/CODEOWNERS

@@ -1,25 +1,4 @@
 # 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
-eth/tracers/                    @s1na
-core/tracing/                   @s1na
-graphql/                        @s1na
-internal/ethapi                 @lightclient
-internal/era                    @lightclient
-les/                            @zsfelfoldi @rjl493456442
-light/                          @zsfelfoldi @rjl493456442
-node/                           @fjl
-p2p/                            @fjl @zsfelfoldi
-params/                         @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
-rpc/                            @fjl @holiman
-signer/                         @holiman
+*      @joroshiba @mycodecrafting @noot

.github/workflows/astria-build-and-publish-image.yml

@@ -0,0 +1,75 @@
+name: Build and Publish Docker image
+
+# Trigger on pushes to astria branch, new semantic version tags, and pull request updates
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+  # trigger on pull request updates when target is `astria` branch
+  pull_request:
+    branches:
+      - "main"
+
+jobs:
+  build-and-publish-latest:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      packages: write
+    steps:
+      # Checking out the repo
+      - uses: actions/checkout@v4
+      - uses: depot/setup-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      # Setting up Go
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "^1.21.x" # The Go version to download (if necessary) and use.
+      - run: go version
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      # Generate correct tabs and labels
+      - name: Docker metadata
+        id: metadata
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ghcr.io/astriaorg/flame
+          tags: |
+            type=ref,event=pr
+            type=match,pattern=v(.*),group=1
+            type=sha
+            # set latest tag for `astria` branch
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+      - name: Build and push
+        uses: depot/build-push-action@v1
+        with:
+          # this gets rid of the unknown/unknown image that is created without this setting
+          # https://github.com/docker/build-push-action/issues/820#issuecomment-1455687416
+          provenance: false
+          context: .
+          # It takes a long time to build the arm image right now, so we only build it on tags which is what we use for releases, or on merges to the default branch.
+          platforms: ${{ (contains(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+          push: true
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          project: w2d6w0spqz

.github/workflows/pages.yaml

@@ -0,0 +1,41 @@
+name: Build and publish forkdiff github-pages
+permissions:
+  contents: write
+on:
+  push:
+    branches:
+      - main
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch all history for all tags and branches
+
+      - name: Build forkdiff
+        uses: "docker://protolambda/forkdiff:latest"
+        with:
+          args: -repo=./ -fork=./fork.yaml -out=./index.html
+
+      - name: Build pages
+        run: |
+          mkdir -p ./tmp/pages
+          mv ./index.html ./tmp/pages/index.html
+          touch ./tmp/pages/.nojekyll
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          # Build output to publish to the `gh-pages` branch:
+          publish_dir: ./tmp/pages
+          # The following lines assign commit authorship to the official
+          # GH-Actions bot for deploys to `gh-pages` branch:
+          # https://github.com/actions/checkout/issues/13#issuecomment-724415212
+          # The GH actions bot is used by default if you didn't specify the two fields.
+          # You can swap them out with your own user credentials.
+          user_name: github-actions[bot]
+          user_email: 41898282+github-actions[bot]@users.noreply.github.com
+

.github/workflows/project.yaml

@@ -0,0 +1,14 @@
+name: Project
+on:
+  issues:
+    types:
+      - opened
+jobs:
+  add-to-project:
+    name: Add new issues
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          project-url: https://github.com/orgs/astriaorg/projects/1
+          github-token: ${{ secrets.ASTRIA_PROJECT_TOKEN }}

.github/workflows/run-tests.yml

@@ -0,0 +1,25 @@
+name: Run tests
+
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+  pull_request:
+    branches:
+      - "main"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21.4
+      - name: Run tests
+        run: go run build/ci.go test
+        env:
+          GOOS: linux

.gitignore

@@ -42,3 +42,9 @@ profile.cov
 .vscode
 
 tests/spec-tests/
+
+contracts/abi
+contracts/bin
+
+precompile/bindings
+precompile/out

.gitmodules

@@ -6,3 +6,6 @@
 	path = tests/evm-benchmarks
 	url = https://github.com/ipsilon/evm-benchmarks
 	shallow = true
+[submodule "contracts/astria-bridge-contracts"]
+	path = contracts/astria-bridge-contracts
+	url = https://github.com/astriaorg/astria-bridge-contracts.git

.travis.yml

@@ -135,4 +135,4 @@ jobs:
       env:
         - racetests
       script:
-        - travis_wait 60 go run build/ci.go test -race $TEST_PACKAGES
+        - travis_wait 60 go run build/ci.go test -race $TEST_PACKAGES

Dockerfile

@@ -13,16 +13,24 @@ COPY go.mod /go-ethereum/
 COPY go.sum /go-ethereum/
 RUN cd /go-ethereum && go mod download
 
+ARG TARGETOS
+ARG TARGETARCH
 ADD . /go-ethereum
-RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
+RUN --mount=type=cache,target=/root/.cache/go-build \
+GOOS=${TARGETOS} GOARCH=${TARGETARCH} cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
 
 # Pull Geth into a second stage deploy alpine container
 FROM alpine:latest
 
 RUN apk add --no-cache ca-certificates
+# Astria - add bash and jq to support start-geth.sh in conductor
+RUN apk add bash jq
+# Astria - copy genesis.json so it can be used in start-geth.sh
+COPY genesis.json /genesis.json
 COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
 
-EXPOSE 8545 8546 30303 30303/udp
+# Astria - add 50051 for GRPC
+EXPOSE 8545 8546 30303 30303/udp 50051
 ENTRYPOINT ["geth"]
 
 # Add some metadata labels to help programmatic image consumption

Dockerfile.alltools

@@ -29,7 +29,8 @@ FROM alpine:latest
 RUN apk add --no-cache ca-certificates
 COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
 
-EXPOSE 8545 8546 30303 30303/udp
+# Astria - add 50051 for GRPC
+EXPOSE 8545 8546 30303 30303/udp 50051
 
 # Add some metadata labels to help programmatic image consumption
 ARG COMMIT=""

accounts/abi/abi_test.go

@@ -1199,6 +1199,7 @@ func TestUnpackRevert(t *testing.T) {
 		{"4e487b7100000000000000000000000000000000000000000000000000000000000000ff", "unknown panic code: 0xff", nil},
 	}
 	for index, c := range cases {
+		index, c := index, c
 		t.Run(fmt.Sprintf("case %d", index), func(t *testing.T) {
 			t.Parallel()
 			got, err := UnpackRevert(common.Hex2Bytes(c.input))