From 7b2c1eca74ebfd1fc6bf25322ad26a0b4b7467c6 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Thu, 5 Oct 2023 18:05:44 +0200 Subject: [PATCH] Multi payment fixes (#652) Added multi contract address --- goth/payment_config.py | 3 +++ pyproject.toml | 2 +- test/integration/test_payment_platform.py | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/goth/payment_config.py b/goth/payment_config.py index 9f2a4823..bf3b054a 100644 --- a/goth/payment_config.py +++ b/goth/payment_config.py @@ -14,6 +14,7 @@ "ERC20_MAINNET_REQUIRED_CONFIRMATIONS": REQUIRED_CONFIRMATIONS_COUNT, "MAINNET_GETH_ADDR": "http://ethereum-mainnet:8545", "MAINNET_MAX_FEE_PER_GAS": "1.0", + "MAINNET_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5", "MAINNET_PRIORITY_FEE": "1.0", "MAINNET_GLM_CONTRACT_ADDRESS": GLM_CONTRACT_ADDRESS, "YA_PAYMENT_NETWORK": "mainnet", @@ -27,6 +28,7 @@ "ERC20_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", @@ -40,6 +42,7 @@ "ERC20_POLYGON_REQUIRED_CONFIRMATIONS": REQUIRED_CONFIRMATIONS_COUNT, "POLYGON_GETH_ADDR": "http://ethereum-polygon:8545", "POLYGON_MAX_FEE_PER_GAS": "30.0", + "POLYGON_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5", "POLYGON_PRIORITY_FEE": "30.0", "POLYGON_GLM_CONTRACT_ADDRESS": GLM_CONTRACT_ADDRESS, "YA_PAYMENT_NETWORK": "polygon", diff --git a/pyproject.toml b/pyproject.toml index e0dec673..c662eaf0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ exclude = '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|venv|\.svn|_build [tool.poetry] name = "goth" -version = "0.15.7" +version = "0.15.8" description = "Golem Test Harness - integration testing framework" authors = ["Golem Factory "] license = "GPL-3.0" diff --git a/test/integration/test_payment_platform.py b/test/integration/test_payment_platform.py index 0916ad12..1e479fef 100644 --- a/test/integration/test_payment_platform.py +++ b/test/integration/test_payment_platform.py @@ -9,17 +9,21 @@ "YA_PAYMENT_NETWORK": "polygon", "POLYGON_GETH_ADDR": "http://ethereum-polygon:8545", "POLYGON_GLM_CONTRACT_ADDRESS": "0xFDFEF9D10d929cB3905C71400ce6be1990EA0F34", + "POLYGON_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5", + "ERC20_POLYGON_REQUIRED_CONFIRMATIONS": 0, }, "erc20_mainnet": { "YA_PAYMENT_NETWORK": "mainnet", "MAINNET_GETH_ADDR": "http://ethereum-mainnet:8545", "MAINNET_GLM_CONTRACT_ADDRESS": "0xFDFEF9D10d929cB3905C71400ce6be1990EA0F34", + "MAINNET_MULTI_PAYMENT_CONTRACT_ADDRESS": "0xFf807885934003A35b1284d7445fc83Fd23417e5", "ERC20_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", "ERC20_GOERLI_REQUIRED_CONFIRMATIONS": 0, }, }