From a588f9f67b5e962d023facb5e6456c25ca8ba491 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Thu, 20 Jul 2023 10:37:27 +0800
Subject: [PATCH] Fix CI workflow & update ipld-eth-db

Check out tests before running stack
Update ipld-eth-db
Update plugeth
---
 .gitea/workflows/test.yml | 15 ++++++++-------
 go.mod                    |  2 +-
 go.sum                    |  4 ++--
 test/stack-refs.txt       |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index f0f4a35..48eafd0 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           repository: cerc-io/plugeth
-          ref: statediff-wip
+          ref: statediff
           path: ./plugeth
       - name: "Run dockerd"
         run: dockerd -H $DOCKER_HOST --userland-proxy=false &
@@ -66,21 +66,22 @@ jobs:
       - name: "Install stack-orchestrator"
         uses: actions/checkout@v3
         with:
-          repository: roysc/stack-orchestrator
-          ref: plugeth-testing
+          repository: cerc-io/stack-orchestrator
+          ref: v1.1.0-e856616-202308032031
           path: ./stack-orchestrator
       - run: |
           apt-get update && apt-get install -y python3-pip
           pip install ./stack-orchestrator
-      - name: "Run testnet stack"
-        working-directory: ./plugeth-statediff
-        run: ./scripts/integration-setup.sh
       - name: "Clone system-tests"
         uses: actions/checkout@v3
         with:
           repository: cerc-io/system-tests
-          ref: main
+          ref: roy/plugeth-fixes
           path: ./system-tests
+          token: ${{ secrets.CICD_REPO_TOKEN }}
+      - name: "Run testnet stack"
+        working-directory: ./plugeth-statediff
+        run: ./scripts/integration-setup.sh
       - name: "Run tests"
         working-directory: ./system-tests
         run: |
diff --git a/go.mod b/go.mod
index f62d7fd..4b667ca 100644
--- a/go.mod
+++ b/go.mod
@@ -122,6 +122,6 @@ require (
 )
 
 replace (
-	github.com/ethereum/go-ethereum => git.vdb.to/cerc-io/plugeth v0.0.0-20230710223804-34971d65a36a
+	github.com/ethereum/go-ethereum => git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1
 	github.com/openrelayxyz/plugeth-utils => git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230706160122-cd41de354c46
 )
diff --git a/go.sum b/go.sum
index 75c1adc..2ebf04f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-git.vdb.to/cerc-io/plugeth v0.0.0-20230710223804-34971d65a36a h1:R3DoXSTTXc0xc3M/hOFppVitj1lk1cn2VWTsZloYZ/8=
-git.vdb.to/cerc-io/plugeth v0.0.0-20230710223804-34971d65a36a/go.mod h1:odpOaIpK01aVThIoAuw9YryLBJeHYOsDn9Mxm4LhB5s=
+git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1 h1:KLjxHwp9Zp7xhECccmJS00RiL+VwTuUGLU7qeIctg8g=
+git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1/go.mod h1:cYXZu70+6xmDgIgrTD81GPasv16piiAFJnKyAbwVPMU=
 git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230706160122-cd41de354c46 h1:KYcbbne/RXd7AuxbUd/3hgk1jPN+33k2CKiNsUsMCC0=
 git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230706160122-cd41de354c46/go.mod h1:VpDN61dxy64zGff05F0adujR5enD/JEdXBkTQ+PaIsQ=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
diff --git a/test/stack-refs.txt b/test/stack-refs.txt
index bb2c2d0..8ebe23e 100644
--- a/test/stack-refs.txt
+++ b/test/stack-refs.txt
@@ -1 +1 @@
-github.com/cerc-io/ipld-eth-db v5.0.2-alpha
+github.com/cerc-io/ipld-eth-db v5.0.5-alpha
-- 
2.45.2