From 4a02a6a970dc73124d8738f0da817993583724a8 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Wed, 31 Jan 2024 09:35:00 +0100 Subject: [PATCH 1/9] Fixing E2E --- integration-tests/go.mod | 17 ++++++----- integration-tests/go.sum | 28 +++++++++++-------- integration-tests/smoke/ocr2_test.go | 2 +- integration-tests/soak/ocr2_test.go | 2 +- .../networks/.env.testnet | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 05a1e70b8..4db40d632 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -10,10 +10,10 @@ require ( github.com/rs/zerolog v1.30.0 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240205180946-df826cb540ce github.com/smartcontractkit/chainlink-starknet/ops v0.0.0-20231205180940-ea2e3e916725 - github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea - github.com/smartcontractkit/chainlink-testing-framework v1.22.4 - github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240119021513-7acd8a5ce4cb - github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240119021513-7acd8a5ce4cb + github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240119162652-3a7274645007 + github.com/smartcontractkit/chainlink-testing-framework v1.23.2 + github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240126190200-9635b276b3b6 + github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240126190200-9635b276b3b6 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.26.0 gopkg.in/guregu/null.v4 v4.0.0 @@ -65,6 +65,7 @@ require ( github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect github.com/aws/jsii-runtime-go v1.75.0 // indirect github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect + github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/blendle/zapdriver v1.3.1 // indirect @@ -220,8 +221,10 @@ require ( github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/consul/api v1.25.1 // indirect + github.com/hashicorp/consul/sdk v0.14.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-envparse v0.1.0 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect @@ -346,15 +349,15 @@ require ( github.com/slack-go/slack v0.12.2 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240120192246-4bb04c997ca0 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8 // indirect - github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect + github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240122152632-38444d2ad8ba // indirect github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 // indirect github.com/smartcontractkit/libocr v0.0.0-20240112202000-6359502d2ff1 // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect - github.com/smartcontractkit/wasp v0.4.0 // indirect + github.com/smartcontractkit/wasp v0.4.1 // indirect github.com/smartcontractkit/wsrpc v0.7.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/sony/gobreaker v0.5.0 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e8a1d0432..8565ea8ce 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -199,6 +199,8 @@ github.com/aws/jsii-runtime-go v1.75.0 h1:NhpUfyiL7/wsRuUekFsz8FFBCYLfPD/l61kKg9 github.com/aws/jsii-runtime-go v1.75.0/go.mod h1:TKCyrtM0pygEPo4rDZzbMSDNCDNTSYSN6/mGyHI6O3I= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 h1:WWB576BN5zNSZc/M9d/10pqEx5VHNhaQ/yOVAkmj5Yo= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= +github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df h1:GSoSVRLoBaFpOOds6QyY1L8AX7uoY+Ln3BHc22W40X0= +github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df/go.mod h1:hiVxq5OP2bUGBRNS3Z/bt/reCLFNbdcST6gISi1fiOM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -847,6 +849,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-envparse v0.1.0 h1:bE++6bhIsNCPLvgDZkYqo3nA+/PFI51pkrHdmPSDFPY= +github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= @@ -1403,16 +1407,16 @@ github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8 h1:1BcjXuviSAKttOX7BZoVHRZZGfxqoA2+AL8tykmkdoc= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8/go.mod h1:vy1L7NybTy2F/Yv7BOh+oZBa1MACD6gzd1+DkcSkfp8= -github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= -github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= -github.com/smartcontractkit/chainlink-testing-framework v1.22.4 h1:617FyrN/wQNFLsGDofqKAQ5/P+swmIPo8sIJZqBPvsQ= -github.com/smartcontractkit/chainlink-testing-framework v1.22.4/go.mod h1:FBRC6elqaqO8jiMZMfa3UKrvwzZhMGUtYqVTGYmfFrA= +github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240122152632-38444d2ad8ba h1:6rnQrD8NaLfLOPHszW1hbpviqpU8011gzdZk6wKP1xY= +github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240122152632-38444d2ad8ba/go.mod h1:OZfzyayUdwsVBqxvbEMqwUntQT8HbFbgyqoudvwfVN0= +github.com/smartcontractkit/chainlink-testing-framework v1.23.2 h1:haXPd9Pg++Zs5/QIZnhFd9RElmz/d0+4nNeletUg9ZM= +github.com/smartcontractkit/chainlink-testing-framework v1.23.2/go.mod h1:StIOdxvwd8AMO6xuBtmD6FQfJXktEn/mJJEr7728BTc= 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/chainlink/integration-tests v0.0.0-20240119021513-7acd8a5ce4cb h1:Y/tBuPVFQtOc3JbHmxsG0McGmbb1JVzdcfwP6WPxtxo= -github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240119021513-7acd8a5ce4cb/go.mod h1:imtCUoCwM4wvcFtm/sScfqL4TrOSFtmL2h6ri4MtM5k= -github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240119021513-7acd8a5ce4cb h1:6sV6/nt9XQrcW5lnnu08gaJkftakf1C80bKBrnrZM34= -github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240119021513-7acd8a5ce4cb/go.mod h1:rOElv51j/0ZcDXirOb7hWe+fotGmr2hW01kPbqU3Xlk= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240126190200-9635b276b3b6 h1:jLCF4fqokEuFHzQAvrs+sprr8DfVNuzWoRSR5Ph4Xx4= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240126190200-9635b276b3b6/go.mod h1:opo0lTT7joRRpM9kE6q+4TtBzPusErprtpe2gIoQldg= +github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240126190200-9635b276b3b6 h1:TxMVPHPnEkzAqCakE2sKWYbKdmjjy4hSQKpqLSx8SZ8= +github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240126190200-9635b276b3b6/go.mod h1:cZe78YxYBI4dHLw8M02dibdNgWeunw9wAnpJnC/NYO0= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= @@ -1423,8 +1427,8 @@ github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235- github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:G5Sd/yzHWf26rQ+X0nG9E0buKPqRGPMJAfk2gwCzOOw= -github.com/smartcontractkit/wasp v0.4.0 h1:N8yPxlBvoJiyE6HaDkTkwRbuOHkGgQFGEHbw36oh4jA= -github.com/smartcontractkit/wasp v0.4.0/go.mod h1:3qiofyI3pkbrc48a3CVshbMfgl74SiuPL/tm30d9Wb4= +github.com/smartcontractkit/wasp v0.4.1 h1:qgIx2s+eCwH0OaBKaHEAHUQ1Z47bAgDu+ICS9IOqvGQ= +github.com/smartcontractkit/wasp v0.4.1/go.mod h1:3qiofyI3pkbrc48a3CVshbMfgl74SiuPL/tm30d9Wb4= github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb6vPbtRQ= github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgqMipTvJVSssT9i0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -2071,8 +2075,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc= -google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go index b0b04060b..ca08ac32b 100644 --- a/integration-tests/smoke/ocr2_test.go +++ b/integration-tests/smoke/ocr2_test.go @@ -58,7 +58,7 @@ func TestOCRBasic(t *testing.T) { require.NoError(t, err, "Validating round should not fail") t.Cleanup(func() { - err = actions.TeardownSuite(t, testState.Common.Env, testState.Cc.ChainlinkNodes, nil, zapcore.ErrorLevel) + err = actions.TeardownSuite(t, testState.Common.Env, testState.Cc.ChainlinkNodes, nil, zapcore.ErrorLevel, nil, nil) require.NoError(t, err, "Error tearing down environment") }) } diff --git a/integration-tests/soak/ocr2_test.go b/integration-tests/soak/ocr2_test.go index 605faddef..16dbc0f98 100644 --- a/integration-tests/soak/ocr2_test.go +++ b/integration-tests/soak/ocr2_test.go @@ -49,7 +49,7 @@ func TestOCRSoak(t *testing.T) { err = testState.ValidateRounds(99999999, true) require.NoError(t, err, "Validating round should not fail") t.Cleanup(func() { - err = actions.TeardownSuite(t, testState.Common.Env, testState.Cc.ChainlinkNodes, nil, zapcore.ErrorLevel) + err = actions.TeardownSuite(t, testState.Common.Env, testState.Cc.ChainlinkNodes, nil, zapcore.ErrorLevel, nil, nil) require.NoError(t, err, "Error tearing down environment") }) } diff --git a/packages-ts/starknet-gauntlet-cli/networks/.env.testnet b/packages-ts/starknet-gauntlet-cli/networks/.env.testnet index c845be4b6..d54200173 100644 --- a/packages-ts/starknet-gauntlet-cli/networks/.env.testnet +++ b/packages-ts/starknet-gauntlet-cli/networks/.env.testnet @@ -1 +1 @@ -NODE_URL=https://alpha4.starknet.io +NODE_URL=https://starknet-testnet.public.blastapi.io \ No newline at end of file From a43cce05210083dfaf349d59dd8e722b545e80a3 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Mon, 5 Feb 2024 08:05:17 +0100 Subject: [PATCH 2/9] Removed improper escape chars --- integration-tests/common/common.go | 8 ++++---- ops/devnet/environment.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-tests/common/common.go b/integration-tests/common/common.go index 477574ece..05f9ef0a4 100644 --- a/integration-tests/common/common.go +++ b/integration-tests/common/common.go @@ -167,9 +167,9 @@ func (c *Common) CreateJobsForContract(cc *ChainlinkClient, observationSource st // Defining relay config bootstrapRelayConfig := job.JSONConfig{ - "nodeName": fmt.Sprintf("\"starknet-OCRv2-%s-%s\"", "node", uuid.New().String()), - "accountAddress": fmt.Sprintf("\"%s\"", accountAddresses[0]), - "chainID": fmt.Sprintf("\"%s\"", c.ChainId), + "nodeName": fmt.Sprintf("starknet-OCRv2-%s-%s", "node", uuid.New().String()), + "accountAddress": fmt.Sprintf("%s", accountAddresses[0]), + "chainID": fmt.Sprintf("%s", c.ChainId), } oracleSpec := job.OCR2OracleSpec{ @@ -207,7 +207,7 @@ func (c *Common) CreateJobsForContract(cc *ChainlinkClient, observationSource st } relayConfig := job.JSONConfig{ "nodeName": bootstrapRelayConfig["nodeName"], - "accountAddress": fmt.Sprintf("\"%s\"", accountAddresses[nIdx]), + "accountAddress": fmt.Sprintf("%s", accountAddresses[nIdx]), "chainID": bootstrapRelayConfig["chainID"], } diff --git a/ops/devnet/environment.go b/ops/devnet/environment.go index 24389ac5d..c1ef5aa6c 100644 --- a/ops/devnet/environment.go +++ b/ops/devnet/environment.go @@ -73,7 +73,7 @@ func defaultProps() map[string]any { "starknet-dev": map[string]any{ "image": map[string]any{ "image": "shardlabs/starknet-devnet-rs", - "version": "5d2536a99852b1a61bbbfdcaa6755cb4275bffddm", + "version": "latest", }, "resources": map[string]any{ "requests": map[string]any{ From 6cc63cb3ac6189cf6dadf4a678a13a5d849855e6 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Mon, 5 Feb 2024 12:50:44 +0100 Subject: [PATCH 3/9] Trying devnet max fee fix --- integration-tests/go.mod | 2 +- ops/devnet/devnet.go | 2 +- ops/go.mod | 2 +- relayer/pkg/chainlink/txm/txm.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 4db40d632..4035df5a4 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -10,7 +10,7 @@ require ( github.com/rs/zerolog v1.30.0 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240205180946-df826cb540ce github.com/smartcontractkit/chainlink-starknet/ops v0.0.0-20231205180940-ea2e3e916725 - github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240119162652-3a7274645007 + github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240122062216-46e109a03936 github.com/smartcontractkit/chainlink-testing-framework v1.23.2 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240126190200-9635b276b3b6 github.com/smartcontractkit/chainlink/v2 v2.8.0-beta0.0.20240126190200-9635b276b3b6 diff --git a/ops/devnet/devnet.go b/ops/devnet/devnet.go index 13f40540d..e6ef8a2fd 100644 --- a/ops/devnet/devnet.go +++ b/ops/devnet/devnet.go @@ -105,7 +105,7 @@ func (devnet *StarknetDevnetClient) FundAccounts(l2AccList []string) error { for _, key := range l2AccList { res, err := devnet.client.R().SetBody(map[string]any{ "address": key, - "amount": 1e21, + "amount": 9000000000000000000000.0, }).Post("/mint") if err != nil { return err diff --git a/ops/go.mod b/ops/go.mod index 255502a56..5d720271c 100644 --- a/ops/go.mod +++ b/ops/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-resty/resty/v2 v2.7.0 github.com/rs/zerolog v1.30.0 github.com/smartcontractkit/chainlink-env v0.3.29 - github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230530233948-90c8af98011e + github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240122062216-46e109a03936 github.com/smartcontractkit/chainlink-testing-framework v1.19.1 ) diff --git a/relayer/pkg/chainlink/txm/txm.go b/relayer/pkg/chainlink/txm/txm.go index 627fd9a3b..b2507ba09 100644 --- a/relayer/pkg/chainlink/txm/txm.go +++ b/relayer/pkg/chainlink/txm/txm.go @@ -165,8 +165,8 @@ func (txm *starktxm) broadcast(ctx context.Context, publicKey *felt.Felt, accoun Nonce: nonce, ResourceBounds: starknetrpc.ResourceBoundsMapping{ // TODO: use proper values L1Gas: starknetrpc.ResourceBounds{ - MaxAmount: "0x186a0", - MaxPricePerUnit: "0x5af3107a4000", + MaxAmount: "0x64", + MaxPricePerUnit: "0x174876e800", }, L2Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x0", From 718c7c4ee23d0f5e73ccc2760c0038d447f61a84 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Mon, 5 Feb 2024 13:15:02 +0100 Subject: [PATCH 4/9] Changed min gas fee --- relayer/pkg/chainlink/txm/txm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/pkg/chainlink/txm/txm.go b/relayer/pkg/chainlink/txm/txm.go index b2507ba09..cffc9828c 100644 --- a/relayer/pkg/chainlink/txm/txm.go +++ b/relayer/pkg/chainlink/txm/txm.go @@ -165,7 +165,7 @@ func (txm *starktxm) broadcast(ctx context.Context, publicKey *felt.Felt, accoun Nonce: nonce, ResourceBounds: starknetrpc.ResourceBoundsMapping{ // TODO: use proper values L1Gas: starknetrpc.ResourceBounds{ - MaxAmount: "0x64", + MaxAmount: "0x9472", MaxPricePerUnit: "0x174876e800", }, L2Gas: starknetrpc.ResourceBounds{ From 68bc6f253daa7b6889658abaea7473401c048b28 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Mon, 5 Feb 2024 13:49:13 +0100 Subject: [PATCH 5/9] Changed min gas fee --- relayer/pkg/chainlink/txm/txm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/pkg/chainlink/txm/txm.go b/relayer/pkg/chainlink/txm/txm.go index cffc9828c..3caeaf53b 100644 --- a/relayer/pkg/chainlink/txm/txm.go +++ b/relayer/pkg/chainlink/txm/txm.go @@ -166,7 +166,7 @@ func (txm *starktxm) broadcast(ctx context.Context, publicKey *felt.Felt, accoun ResourceBounds: starknetrpc.ResourceBoundsMapping{ // TODO: use proper values L1Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x9472", - MaxPricePerUnit: "0x174876e800", + MaxPricePerUnit: "0xf4240", }, L2Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x0", From 90ea7b2a7062d2cbe2a26c73984abc8b3c2acbe9 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Tue, 6 Feb 2024 07:54:29 +0100 Subject: [PATCH 6/9] Yet another gas bump --- relayer/pkg/chainlink/txm/txm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/pkg/chainlink/txm/txm.go b/relayer/pkg/chainlink/txm/txm.go index 3caeaf53b..bc520bf72 100644 --- a/relayer/pkg/chainlink/txm/txm.go +++ b/relayer/pkg/chainlink/txm/txm.go @@ -166,7 +166,7 @@ func (txm *starktxm) broadcast(ctx context.Context, publicKey *felt.Felt, accoun ResourceBounds: starknetrpc.ResourceBoundsMapping{ // TODO: use proper values L1Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x9472", - MaxPricePerUnit: "0xf4240", + MaxPricePerUnit: "0x174876E800", }, L2Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x0", From 0da2f6d3712592333b4583604924a40b1d0a64f0 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Tue, 6 Feb 2024 08:54:09 +0100 Subject: [PATCH 7/9] Gas bump --- relayer/pkg/chainlink/txm/txm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/pkg/chainlink/txm/txm.go b/relayer/pkg/chainlink/txm/txm.go index bc520bf72..03f4ecd6c 100644 --- a/relayer/pkg/chainlink/txm/txm.go +++ b/relayer/pkg/chainlink/txm/txm.go @@ -166,7 +166,7 @@ func (txm *starktxm) broadcast(ctx context.Context, publicKey *felt.Felt, accoun ResourceBounds: starknetrpc.ResourceBoundsMapping{ // TODO: use proper values L1Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x9472", - MaxPricePerUnit: "0x174876E800", + MaxPricePerUnit: "0x186a0", }, L2Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x0", From 765271defa2c3a9ba589c9c181bad578c1918d26 Mon Sep 17 00:00:00 2001 From: Damjan Smickovski Date: Tue, 6 Feb 2024 09:55:50 +0100 Subject: [PATCH 8/9] Bump --- relayer/pkg/chainlink/txm/txm.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/relayer/pkg/chainlink/txm/txm.go b/relayer/pkg/chainlink/txm/txm.go index 03f4ecd6c..c3a8ecbef 100644 --- a/relayer/pkg/chainlink/txm/txm.go +++ b/relayer/pkg/chainlink/txm/txm.go @@ -165,8 +165,8 @@ func (txm *starktxm) broadcast(ctx context.Context, publicKey *felt.Felt, accoun Nonce: nonce, ResourceBounds: starknetrpc.ResourceBoundsMapping{ // TODO: use proper values L1Gas: starknetrpc.ResourceBounds{ - MaxAmount: "0x9472", - MaxPricePerUnit: "0x186a0", + MaxAmount: "0x186a0", + MaxPricePerUnit: "0x1388", }, L2Gas: starknetrpc.ResourceBounds{ MaxAmount: "0x0", From f3d37823ac23013fdf4e182b627f8a77fcb544ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Wed, 7 Feb 2024 00:24:15 +0900 Subject: [PATCH 9/9] go mod tidy --- integration-tests/go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 8565ea8ce..f5496d116 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1401,8 +1401,8 @@ github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429/go.mod h1:wJmVvDf4XSjsahWtfUq3wvIAYEAuhr7oxmxYnEL/LGQ= github.com/smartcontractkit/chainlink-common v0.1.7-0.20240205180946-df826cb540ce h1:+6MzHiHMPBddiR9tnkXA7pjgd2mNaboPck8cNsSfYrs= github.com/smartcontractkit/chainlink-common v0.1.7-0.20240205180946-df826cb540ce/go.mod h1:05rRF84QKlIOF5LfTBPkHdw4UpBI2G3zxRcuZ65bPjk= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240120192246-4bb04c997ca0 h1:NALwENz6vQ972DuD9AZjqRjyNSxH9ptNapizQGLI+2s= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240120192246-4bb04c997ca0/go.mod h1:NcVAT/GETDBvIoAej5K6OYqAtDOkF6vO5pYw/hLuYVU= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8 h1:1BcjXuviSAKttOX7BZoVHRZZGfxqoA2+AL8tykmkdoc=