From 8ec466f75d3198f20a60623f5e3cfb9f05fda6ed Mon Sep 17 00:00:00 2001
From: Afr Schoe <58883403+q9f@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:37:49 +0200
Subject: [PATCH] ci: unpatch geth

---
 .github/workflows/spec.yml   | 9 ++-------
 spec/eth/client_spec.rb      | 6 +++---
 spec/fixtures/ethereum/tests | 2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index 023d9547..c2db7b1d 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -37,15 +37,10 @@ jobs:
         sudo apt-get update
         sudo apt-get install ethereum solc libyaml-dev
       if: startsWith(matrix.os, 'Ubuntu')
-    - name: Patch Geth # https://github.com/ethereum/go-ethereum/pull/27360
-      run: |
-        git clone https://github.com/q9f/go-ethereum.git -b q9f/params/shanghai
-        pushd go-ethereum/
-        make geth
-        popd
     - name: Run Geth
       run: |
-        ./go-ethereum/build/bin/geth --dev --http --ipcpath /tmp/geth.ipc &
+        geth --dev --http --ipcpath /tmp/geth.ipc &
+        disown &
     - name: Gem Dependencies
       run: |
         git submodule update --init
diff --git a/spec/eth/client_spec.rb b/spec/eth/client_spec.rb
index f2861681..46439e07 100644
--- a/spec/eth/client_spec.rb
+++ b/spec/eth/client_spec.rb
@@ -112,7 +112,7 @@
       it "raises exception when nonce incorrect" do
         expect {
           geth_http.transfer(another_key.address, 69 * Unit::ETHER, legacy: true, nonce: 0)
-        }.to raise_error(IOError, "nonce too low")
+        }.to raise_error(IOError, /nonce too low: next nonce [0-9]+, tx nonce [0-9]+/)
       end
 
       it "funds account twice" do
@@ -178,7 +178,7 @@
       it "raises exception when nonce incorrect" do
         expect {
           geth_http.deploy_and_wait(contract, nonce: 0)
-        }.to raise_error(IOError, "nonce too low")
+        }.to raise_error(IOError, /nonce too low: next nonce [0-9]+, tx nonce [0-9]+/)
       end
 
       it "deploys the contract twice" do
@@ -340,7 +340,7 @@
       it "raises exception when nonce incorrect" do
         expect {
           geth_http.transact(contract, "set", 42, address: contract_address, nonce: 0)
-        }.to raise_error(IOError, "nonce too low")
+        }.to raise_error(IOError, /nonce too low: next nonce [0-9]+, tx nonce [0-9]+/)
       end
 
       it "transacts function twice" do
diff --git a/spec/fixtures/ethereum/tests b/spec/fixtures/ethereum/tests
index 0ec53d02..a33949df 160000
--- a/spec/fixtures/ethereum/tests
+++ b/spec/fixtures/ethereum/tests
@@ -1 +1 @@
-Subproject commit 0ec53d024c2b1f5175e70aba8f750cd4d37d9999
+Subproject commit a33949df17a1c382ffee5666e66d26bde7a089f9