From 2a84e55790d01e4a1baf9cc3da7837d89e1ad820 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Mon, 12 Feb 2024 11:17:18 +0100 Subject: [PATCH 1/3] engine: change default network to holesky --- README.md | 2 +- examples/cli_example.sh | 2 +- examples/managers/mid_agreement_payments.py | 2 +- golem/payload/defaults.py | 2 +- tests/integration/run-tests.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d66ea7fd..8bb4bfb3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ python -m golem find-node --runtime vm --timeout 1m # stops after 60 seconds python -m golem allocation list python -m golem allocation new 1 -python -m golem allocation new 2 --driver erc20 --network goerli +python -m golem allocation new 2 --driver erc20 --network holesky python -m golem allocation clean ``` diff --git a/examples/cli_example.sh b/examples/cli_example.sh index 9a909c34..2e82e6d4 100644 --- a/examples/cli_example.sh +++ b/examples/cli_example.sh @@ -13,7 +13,7 @@ printf "\n*** ALLOCATION NEW ***\n" python3 -m golem allocation new 1 printf "\n*** ALLOCATION NEW ***\n" -python3 -m golem allocation new 2 --driver erc20 --network goerli +python3 -m golem allocation new 2 --driver erc20 --network holesky printf "\n*** ALLOCATION LIST ***\n" python3 -m golem allocation list diff --git a/examples/managers/mid_agreement_payments.py b/examples/managers/mid_agreement_payments.py index b94320a9..c82c3295 100644 --- a/examples/managers/mid_agreement_payments.py +++ b/examples/managers/mid_agreement_payments.py @@ -23,7 +23,7 @@ WORK_RUN_TIME = timedelta(minutes=60) -async def print_yagna_payment_status(yagna_path="yagna", network="goerli"): +async def print_yagna_payment_status(yagna_path="yagna", network="holesky"): process = await asyncio.create_subprocess_exec( yagna_path, "payment", diff --git a/golem/payload/defaults.py b/golem/payload/defaults.py index 1bba0d49..0b232fdb 100644 --- a/golem/payload/defaults.py +++ b/golem/payload/defaults.py @@ -15,7 +15,7 @@ INF_STORAGE = "golem.inf.storage.gib" DEFAULT_PAYMENT_DRIVER: str = getenv("YAGNA_PAYMENT_DRIVER", "erc20").lower() -DEFAULT_PAYMENT_NETWORK: str = getenv("YAGNA_PAYMENT_NETWORK", "goerli").lower() +DEFAULT_PAYMENT_NETWORK: str = getenv("YAGNA_PAYMENT_NETWORK", "holesky").lower() DEFAULT_LIFETIME = timedelta(minutes=30) DEFAULT_SUBNET: str = getenv("YAGNA_SUBNET", "public") diff --git a/tests/integration/run-tests.sh b/tests/integration/run-tests.sh index b287dd57..ca3abadd 100755 --- a/tests/integration/run-tests.sh +++ b/tests/integration/run-tests.sh @@ -1,4 +1,4 @@ #!/bin/bash source /tmp/goth_interactive.env -YAGNA_PAYMENT_NETWORK=goerli pytest -sv tests/integration +YAGNA_PAYMENT_NETWORK=holesky pytest -sv tests/integration From 6e3a4b03cd86e98c434c3835ae87b8c9a8767de8 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Tue, 13 Feb 2024 10:04:29 +0100 Subject: [PATCH 2/3] goth: use version forcing 0.15.0-rc14 pre-release --- tests/integration/run-goth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/run-goth.sh b/tests/integration/run-goth.sh index f66e2649..4ba22eff 100755 --- a/tests/integration/run-goth.sh +++ b/tests/integration/run-goth.sh @@ -13,7 +13,7 @@ echo INSTALLING TOOLS .envs/goth/bin/python -m pip install --upgrade setuptools wheel echo INSTALLING DEPENDENCIES -.envs/goth/bin/python -m pip install goth==0.15.11 pytest pytest-asyncio pexpect +.envs/goth/bin/python -m pip install git+https://github.com/golemfactory/goth.git@kek/yagna-0.15.0-rc14 pytest pytest-asyncio pexpect echo CREATING ASSETS .envs/goth/bin/python -m goth create-assets .envs/goth/assets From 876260ca76374cbef906805b486fab17ea3c9503 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Wed, 24 Apr 2024 06:25:36 +0200 Subject: [PATCH 3/3] Revert "goth: use version forcing 0.15.0-rc14 pre-release" This reverts commit 6e3a4b03cd86e98c434c3835ae87b8c9a8767de8. --- tests/integration/run-goth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/run-goth.sh b/tests/integration/run-goth.sh index 4ba22eff..f66e2649 100755 --- a/tests/integration/run-goth.sh +++ b/tests/integration/run-goth.sh @@ -13,7 +13,7 @@ echo INSTALLING TOOLS .envs/goth/bin/python -m pip install --upgrade setuptools wheel echo INSTALLING DEPENDENCIES -.envs/goth/bin/python -m pip install git+https://github.com/golemfactory/goth.git@kek/yagna-0.15.0-rc14 pytest pytest-asyncio pexpect +.envs/goth/bin/python -m pip install goth==0.15.11 pytest pytest-asyncio pexpect echo CREATING ASSETS .envs/goth/bin/python -m goth create-assets .envs/goth/assets