From 68b702e9741b0f5b8cc2896eb1cc6d580756d680 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 20 Nov 2023 11:00:58 +0100 Subject: [PATCH 1/6] Enable Kava --- integration-tests/contracts/contract_deployer.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integration-tests/contracts/contract_deployer.go b/integration-tests/contracts/contract_deployer.go index 528f07ec68e..d04c40eefba 100644 --- a/integration-tests/contracts/contract_deployer.go +++ b/integration-tests/contracts/contract_deployer.go @@ -181,6 +181,8 @@ func NewContractDeployer(bcClient blockchain.EVMClient, logger zerolog.Logger) ( return &KromaContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil case *blockchain.WeMixClient: return &WeMixContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil + case *blockchain.KavaClient: + return &KavaContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil } return nil, errors.New("unknown blockchain client implementation for contract deployer, register blockchain client in NewContractDeployer") } @@ -256,6 +258,10 @@ type WeMixContractDeployer struct { *EthereumContractDeployer } +type KavaContractDeployer struct { + *EthereumContractDeployer +} + // NewEthereumContractDeployer returns an instantiated instance of the ETH contract deployer func NewEthereumContractDeployer(ethClient blockchain.EVMClient, logger zerolog.Logger) *EthereumContractDeployer { return &EthereumContractDeployer{ From e4ad8ab7bced3e183476e997d36f31963f5a09dd Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 20 Nov 2023 14:24:26 +0100 Subject: [PATCH 2/6] add testnet config --- .../config/toml/defaults/Kava_Testnet.toml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 core/chains/evm/config/toml/defaults/Kava_Testnet.toml diff --git a/core/chains/evm/config/toml/defaults/Kava_Testnet.toml b/core/chains/evm/config/toml/defaults/Kava_Testnet.toml new file mode 100644 index 00000000000..eb51ef77d16 --- /dev/null +++ b/core/chains/evm/config/toml/defaults/Kava_Testnet.toml @@ -0,0 +1,26 @@ +ChainID = '2221' +ChainType = 'kava' +FinalityDepth = 1 +LogPollInterval = '6s' +NoNewHeadsThreshold = '40s' +MinIncomingConfirmations = 1 + +[GasEstimator] +EIP1559DynamicFees = false +PriceMin = '1 wei' +BumpMin = '100 wei' + +[GasEstimator.BlockHistory] +BlockHistorySize = 24 + +[Transactions] +ResendAfterThreshold = '30s' + +[HeadTracker] +HistoryDepth = 400 + +[NodePool] +SyncThreshold = 10 + +[OCR] +ContractConfirmations = 1 \ No newline at end of file From 0a2cfe95c82e1b681045ac8f6d38c4d0e0d8b737 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Fri, 24 Nov 2023 13:43:29 +0100 Subject: [PATCH 3/6] Remove ChainType --- core/chains/evm/config/toml/defaults/Kava_Testnet.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/core/chains/evm/config/toml/defaults/Kava_Testnet.toml b/core/chains/evm/config/toml/defaults/Kava_Testnet.toml index eb51ef77d16..419b1c6cbd3 100644 --- a/core/chains/evm/config/toml/defaults/Kava_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Kava_Testnet.toml @@ -1,5 +1,4 @@ ChainID = '2221' -ChainType = 'kava' FinalityDepth = 1 LogPollInterval = '6s' NoNewHeadsThreshold = '40s' From b4679bac110b2fbac451167a748987e442edd887 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 5 Dec 2023 11:06:06 +0100 Subject: [PATCH 4/6] Update Kava config --- core/chains/evm/config/toml/defaults/Kava_Testnet.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/chains/evm/config/toml/defaults/Kava_Testnet.toml b/core/chains/evm/config/toml/defaults/Kava_Testnet.toml index 419b1c6cbd3..f7e7775edf2 100644 --- a/core/chains/evm/config/toml/defaults/Kava_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Kava_Testnet.toml @@ -1,7 +1,7 @@ ChainID = '2221' FinalityDepth = 1 LogPollInterval = '6s' -NoNewHeadsThreshold = '40s' +NoNewHeadsThreshold = '1m' MinIncomingConfirmations = 1 [GasEstimator] @@ -15,9 +15,6 @@ BlockHistorySize = 24 [Transactions] ResendAfterThreshold = '30s' -[HeadTracker] -HistoryDepth = 400 - [NodePool] SyncThreshold = 10 From aa4109fff9db522094f7c23a466627eac268ecf1 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 5 Dec 2023 14:05:00 +0100 Subject: [PATCH 5/6] Update testing branch --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a161e67941d..a89a2397820 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.1 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c - github.com/smartcontractkit/chainlink-testing-framework v1.20.0 + github.com/smartcontractkit/chainlink-testing-framework v1.20.2-0.20231205125534-fc89bb68034c github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 0392afe287a..03b48324c5f 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1517,8 +1517,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34= -github.com/smartcontractkit/chainlink-testing-framework v1.20.0 h1:gQPQRKJuMh6QTAIMkqZ7v5WkjEmbcoMIX/V6WPVrvuI= -github.com/smartcontractkit/chainlink-testing-framework v1.20.0/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ= +github.com/smartcontractkit/chainlink-testing-framework v1.20.2-0.20231205125534-fc89bb68034c h1:qs4tCjz3uT0NJLXkZsqRSu0Lq48CDRwKXVWIeBWr3y4= +github.com/smartcontractkit/chainlink-testing-framework v1.20.2-0.20231205125534-fc89bb68034c/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= From 3d85a942061eb25734b8938fd54fbebc5173651f Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 5 Dec 2023 14:08:02 +0100 Subject: [PATCH 6/6] Enable on demand soak option --- .github/workflows/on-demand-ocr-soak-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/on-demand-ocr-soak-test.yml b/.github/workflows/on-demand-ocr-soak-test.yml index 567d9510de9..3a76265bf8b 100644 --- a/.github/workflows/on-demand-ocr-soak-test.yml +++ b/.github/workflows/on-demand-ocr-soak-test.yml @@ -30,6 +30,7 @@ on: - "KROMA_SEPOLIA" - "WEMIX_TESTNET" - "WEMIX_MAINNET" + - "KAVA_TESTNET" fundingPrivateKey: description: Private funding key (Skip for Simulated) required: false