Switch goerli to holesky (#665)

golemfactory · Jan 12, 2024 · 32e2778 · 32e2778
1 parent 4a16c73
commit 32e2778
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -113,7 +113,7 @@ This path will depend either on the shell environment or the operating system on
     ├── runner.log                      # debug console logs from the entire test session
     ├── test_e2e_vm                     # directory with logs from a single test
     │   ├── ethereum-mainnet.log
-    │   ├── ethereum-goerli.log
+    │   ├── ethereum-holesky.log
     │   ├── ethereum-polygon.log
     │   ├── provider_1.log              # debug logs from a single yagna node
     │   ├── provider_1_ya-provider.log  # debug logs from an agent running in a yagna node
@@ -147,7 +147,7 @@ docker-compose:
 
   compose-log-patterns:                         # Log message patterns used for container ready checks
     ethereum-mainnet: ".*Wallets supplied."
-    ethereum-goerli: ".*Wallets supplied."
+    ethereum-holesky: ".*Wallets supplied."
     ethereum-polygon: ".*Wallets supplied."
     ...
 

diff --git a/goth/default-assets/docker/docker-compose.yml b/goth/default-assets/docker/docker-compose.yml
@@ -30,10 +30,10 @@ services:
         environment:
             - GANACHE_CHAIN_ID=1
 
-    ethereum-goerli:
+    ethereum-holesky:
         image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:eecb4791c0c6
         environment:
-            - GANACHE_CHAIN_ID=5
+            - GANACHE_CHAIN_ID=17000
 
     ethereum-polygon:
         image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:eecb4791c0c6

diff --git a/goth/default-assets/goth-config-testing.yml b/goth/default-assets/goth-config-testing.yml
@@ -23,7 +23,7 @@ docker-compose:
 
   compose-log-patterns:
     ethereum-mainnet: ".*Wallets supplied."
-    ethereum-goerli: ".*Wallets supplied."
+    ethereum-holesky: ".*Wallets supplied."
     ethereum-polygon: ".*Wallets supplied."
 
 key-dir: "keys"

diff --git a/goth/default-assets/goth-config.yml b/goth/default-assets/goth-config.yml
@@ -23,7 +23,7 @@ docker-compose:
 
   compose-log-patterns:
     ethereum-mainnet: ".*Wallets supplied."
-    ethereum-goerli: ".*Wallets supplied."
+    ethereum-holesky: ".*Wallets supplied."
     ethereum-polygon: ".*Wallets supplied."
 
 key-dir: "keys"

diff --git a/goth/payment_config.py b/goth/payment_config.py
@@ -25,16 +25,16 @@
     },
     "erc20": {
         "env": {
-            "ERC20NEXT_GOERLI_REQUIRED_CONFIRMATIONS": REQUIRED_CONFIRMATIONS_COUNT,
-            "GOERLI_GETH_ADDR": "http://ethereum-goerli:8545",
-            "GOERLI_MAX_FEE_PER_GAS": "1.0",
-            "GOERLI_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5",
-            "GOERLI_PRIORITY_FEE": "1.0",
-            "GOERLI_TGLM_CONTRACT_ADDRESS": GLM_CONTRACT_ADDRESS,
-            "YA_PAYMENT_NETWORK": "goerli",
+            "ERC20NEXT_HOLESKY_REQUIRED_CONFIRMATIONS": REQUIRED_CONFIRMATIONS_COUNT,
+            "HOLESKY_GETH_ADDR": "http://ethereum-holesky:8545",
+            "HOLESKY_MAX_FEE_PER_GAS": "1.0",
+            "HOLESKY_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5",
+            "HOLESKY_PRIORITY_FEE": "1.0",
+            "HOLESKY_TGLM_CONTRACT_ADDRESS": GLM_CONTRACT_ADDRESS,
+            "YA_PAYMENT_NETWORK": "holesky",
         },
         "driver": "erc20next",
-        "network": "goerli",
+        "network": "holesky",
         "token": "tGLM",
     },
     "polygon": {

diff --git a/test/integration/test_payment_platform.py b/test/integration/test_payment_platform.py
@@ -20,11 +20,11 @@
         "ERC20NEXT_MAINNET_REQUIRED_CONFIRMATIONS": 0,
     },
     "erc20": {
-        "YA_PAYMENT_NETWORK": "goerli",
-        "GOERLI_GETH_ADDR": "http://ethereum-goerli:8545",
-        "GOERLI_TGLM_CONTRACT_ADDRESS": "0xFDFEF9D10d929cB3905C71400ce6be1990EA0F34",
-        "GOERLI_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5",
-        "ERC20NEXT_GOERLI_REQUIRED_CONFIRMATIONS": 0,
+        "YA_PAYMENT_NETWORK": "holesky",
+        "HOLESKY_GETH_ADDR": "http://ethereum-holesky:8545",
+        "HOLESKY_TGLM_CONTRACT_ADDRESS": "0xFDFEF9D10d929cB3905C71400ce6be1990EA0F34",
+        "HOLESKY_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5",
+        "ERC20NEXT_HOLESKY_REQUIRED_CONFIRMATIONS": 0,
     },
 }
 

diff --git a/test/unit/configuration/test-assets/goth-config-artifacts-override.yml b/test/unit/configuration/test-assets/goth-config-artifacts-override.yml
@@ -10,7 +10,7 @@ docker-compose:
   docker-dir: "docker/"
   compose-log-patterns:
     ethereum-mainnet: ".*Wallets supplied."
-    ethereum-goerli: ".*Wallets supplied."
+    ethereum-holesky: ".*Wallets supplied."
     ethereum-polygon: ".*Wallets supplied."
 
   build-environment:

diff --git a/test/unit/configuration/test-assets/goth-config.yml b/test/unit/configuration/test-assets/goth-config.yml
@@ -23,7 +23,7 @@ docker-compose:
 
   compose-log-patterns:
     ethereum-mainnet: ".*Wallets supplied."
-    ethereum-goerli: ".*Wallets supplied."
+    ethereum-holesky: ".*Wallets supplied."
     ethereum-polygon: ".*Wallets supplied."