From 23027baf30e93f2060cec3aff5582c7533918865 Mon Sep 17 00:00:00 2001
From: Barnabas Busa <barnabas.busa@ethereum.org>
Date: Thu, 13 Jun 2024 16:03:19 +0200
Subject: [PATCH] fix: migration of ethereum-package to ethpandaops (#2348)

* fix: migration of ethereum-package to ethpandaops

* add hidden files too
---
 .github/workflows/kurtosis.yml          | 12 ++++++------
 nimbus/core/tx_pool/tx_tasks/tx_add.nim |  2 +-
 nimbus/rpc/rpc_utils.nim                |  4 ++--
 run-kurtosis-check.sh                   |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/kurtosis.yml b/.github/workflows/kurtosis.yml
index ad09af91e..46fdc81f3 100644
--- a/.github/workflows/kurtosis.yml
+++ b/.github/workflows/kurtosis.yml
@@ -45,7 +45,7 @@ jobs:
     - name: Build Docker image
       shell: bash
       run: docker build . -t localtestnet
-        
+
 
     - name: Set up Kurtosis
       shell: bash
@@ -60,12 +60,12 @@ jobs:
       id: services
       run: |
         export github_sha=${{ github.sha }}
-        export github_repository=${{ github.repository }} 
+        export github_repository=${{ github.repository }}
 
         cat kurtosis-network-params.yml | envsubst > assertoor.yaml
         sed -i "s/el_image: .*/el_image: localtestnet/" assertoor.yaml
 
-        kurtosis run github.com/kurtosis-tech/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file assertoor.yaml
+        kurtosis run github.com/ethpandaops/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file assertoor.yaml
 
         enclave_dump=$(kurtosis enclave inspect assertoor-${{ github.run_id }})
 
@@ -124,7 +124,7 @@ jobs:
             elif [ "$task_result" == "failure" ]; then
               task_result="${RED}failure${NC}"
             fi
-            
+
             printf " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title \n"
           done <<< $(echo "$tasks")
         }
@@ -185,7 +185,7 @@ jobs:
             echo "$task_lines"
           fi
 
-          if [ $failed_tests -gt 0 ]; then 
+          if [ $failed_tests -gt 0 ]; then
             final_test_result="failure"
             break
           fi
@@ -229,7 +229,7 @@ jobs:
       with:
         name: "kurtosis-enclave-dump-${{ github.run_id }}"
         path: ./temp/dump
-    
+
     - name: Return test result
       shell: bash
       run: |
diff --git a/nimbus/core/tx_pool/tx_tasks/tx_add.nim b/nimbus/core/tx_pool/tx_tasks/tx_add.nim
index b37fb814d..195a8c2f0 100644
--- a/nimbus/core/tx_pool/tx_tasks/tx_add.nim
+++ b/nimbus/core/tx_pool/tx_tasks/tx_add.nim
@@ -77,7 +77,7 @@ proc supersede(xp: TxPoolRef; item: TxItemRef): Result[void,TxInfo]
       return err(txInfoErrUnspecified)
     current = rc.value.data
 
-  # TODO: To unblock `kurtosis-tech/ethereum-package` based testing,
+  # TODO: To unblock `ethpandaops/ethereum-package` based testing,
   # we have to accept superseding transactions temporarily until `rpc_utils.nim`
   # supports the 'pending' tag by incorporating pending transactions from the
   # mempool when returning the current account nonce. Until that is fixed,
diff --git a/nimbus/rpc/rpc_utils.nim b/nimbus/rpc/rpc_utils.nim
index 3e10de849..7293649d4 100644
--- a/nimbus/rpc/rpc_utils.nim
+++ b/nimbus/rpc/rpc_utils.nim
@@ -48,7 +48,7 @@ proc headerFromTag*(chain: CoreDbRef, blockId: BlockTag): BlockHeader
     of "pending":
       #TODO: Implement get pending block
       # We currently fall back to `latest` so that the `tx-spammer` in
-      # `kurtosis-tech/ethereum-package` can make progress. A real
+      # `ethpandaops/ethereum-package` can make progress. A real
       # implementation is still required that takes into account any
       # pending transactions that have not yet been bundled into a block.
       result = chain.getCanonicalHead()
@@ -84,7 +84,7 @@ proc calculateMedianGasPrice*(chain: CoreDbRef): GasInt
   # TODO: This should properly incorporate the base fee in the block data,
   # and recommend a gas fee that likely gets the block to confirm.
   # This also has to work on Genesis where no prior transaction data exists.
-  # For compatibility with `kurtosis-tech/ethereum-package`, set this to a
+  # For compatibility with `ethpandaops/ethereum-package`, set this to a
   # sane minimum for compatibility to unblock testing.
   # Note: When this is fixed, update `tests/graphql/queries.toml` and
   # re-enable the "query.gasPrice" test case (remove `skip = true`).
diff --git a/run-kurtosis-check.sh b/run-kurtosis-check.sh
index b0bc7fe12..b262554dd 100755
--- a/run-kurtosis-check.sh
+++ b/run-kurtosis-check.sh
@@ -45,7 +45,7 @@ else
 fi
 
 # Install jq if not installed already
-if [ "$(which jq)" != "" ]; 
+if [ "$(which jq)" != "" ];
 then
   echo "jq is already installed"
 else
@@ -87,7 +87,7 @@ sed -i "s/el_image: .*/el_image: $new_el_image/" assertoor.yaml
 
 sudo kurtosis run \
   --enclave nimbus-localtestnet \
-  github.com/kurtosis-tech/ethereum-package \
+  github.com/ethpandaops/ethereum-package \
   --args-file assertoor.yaml
 
 enclave_dump=$(kurtosis enclave inspect nimbus-localtestnet)
@@ -156,7 +156,7 @@ else
       elif [ "$task_result" == "failure" ]; then
         task_result="${RED}failure${NC}"
       fi
-      
+
       echo -e " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title"
     done <<< $(echo "$tasks")
   }
@@ -217,7 +217,7 @@ else
       echo "$task_lines"
     fi
 
-    if [ "$failed_tests" -gt 0 ]; then 
+    if [ "$failed_tests" -gt 0 ]; then
       final_test_result="failure"
       break
     fi