From 809939745fae4ad76192fa4f281622c0922eb9e1 Mon Sep 17 00:00:00 2001
From: Gautam Botrel <gautam.botrel@gmail.com>
Date: Tue, 22 Aug 2023 14:59:50 -0500
Subject: [PATCH] build: update PR template and CI actions

---
 .github/pull_request_template.md |  3 +--
 .github/workflows/pr.yml         |  6 +++---
 .github/workflows/push.yml       | 17 ++++++++++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 02f542f8db..d8b5b98385 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,6 @@
 # Description
 
-<!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context.
-Note that in most cases the PR should be against the `develop` branch. -->
+<!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. -->
 
 Fixes # (issue)
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index c0e2c60046..b01bc44f4e 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     - name: install Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.20.x
+        go-version: 1.21.x
     - name: checkout code
       uses: actions/checkout@v3
       with:
@@ -47,7 +47,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     needs:
@@ -82,7 +82,7 @@ jobs:
         go test -v -short -tags=solccheck -timeout=30m ./...
     - name: Test race
       run: |
-        go test -v -short -race -timeout=30m
+        go test -v -short -race -timeout=50m
   
   slack-workflow-status-failed:
     if: failure()
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index d894abb043..05e6001070 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -11,7 +11,7 @@ jobs:
     - name: install Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.20.x
+        go-version: 1.21.x
     - name: checkout code
       uses: actions/checkout@v3
       with:
@@ -54,7 +54,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     needs:
@@ -76,15 +76,22 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
           ${{ runner.os }}-go-
+
     - name: install deps
-      run: go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest
+      run: |
+        go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest
+        go install github.com/ethereum/go-ethereum/cmd/abigen@v1.12.0
+        go install github.com/consensys/gnark-solidity-checker@latest
+        sudo add-apt-repository ppa:ethereum/ethereum
+        sudo apt-get update
+        sudo apt-get install solc
     - name: Test
       run: |
-        go test -v -timeout=30m ./...
+        go test -v -tags=solccheck -timeout=60m ./...
     - name: Test (race)
       if: matrix.os == 'ubuntu-latest'
       run: |
-        go test -v -timeout=50m -race -short ./...
+        go test -v -timeout=60m -race -short ./...
   
   slack-workflow-status-failed:
     if: failure()