Merge hotfix release/2.19.0-dual-transmission to develop #15835
+5,871
−361
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: bwest981 <3317895+Bwest981@users.noreply.github.com>
* [Keystone] Disable remote calls to RegisterToWorkflow * Remove failing test --------- Co-authored-by: Cedric Cordenier <cedric.cordenier@smartcontract.com>
Keystone hotfixes (2.19)
* Consume latest changeset and update changelog * Update CHANGELOG.md
* Txmv2_from_2.18 * Refactor secondary transmission * Add dual transmission ABI * Update dual transmission ABI * Update ABI Add forwarder for secondary transmission * Refactor dual transmitter Add tests * Add missing test file * Add missing file * Fix lint * Fix lint Fix test * Pass txManagerOCR2 to ocr2FeedsDualTransmission * Add dualTransmission meta validation * Implement feedback * Add ContractTransmitter helper function * Add debug logging * Update chain selector * Update chain selector go.mod and go.sum * Fix config tests * Fix integration test go.mod lint * Fix integration test load go.sum lint * Revert "Fix integration test load go.sum lint" This reverts commit 4b08b01. * Revert "Fix integration test go.mod lint" This reverts commit 840e84d. * Revert "Update chain selector go.mod and go.sum" This reverts commit e56459b. * Revert "Update chain selector" This reverts commit 2d900c0. * Add Abandon support * Latest TXMv2 updates * Fix CI * Add hint and refund validation --------- Co-authored-by: Dimitris <dimitris.grigoriou@smartcontract.com>
* Improvements * Disable Solana tests * Add support for beholder events * Add log for url
…l-transmission-to-develop
|
AER Report: CI Coreaer_workflow , commit , Clean Go Tidy & Generate , Detect Changes , Scheduled Run Frequency , Core Tests (go_core_tests) , Core Tests (go_core_tests_integration) , Core Tests (go_core_ccip_deployment_tests) , Core Tests (go_core_fuzz) , GolangCI Lint (.) , Core Tests (go_core_race_tests) , test-scripts , SonarQube Scan , lint 1. Too many return values:[go_core_race_tests]Source of Error:# github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm
core/chains/legacyevm/evm_txm.go:59:30: too many return values
have ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], gas.EvmFeeEstimator, error)
want ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], error)Suggested fix: Adjust the function to return the correct number of values as specified in the function signature. 2. Too many return values:[go_core_tests_integration]Source of Error:# github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm
core/chains/legacyevm/evm_txm.go:59:30: too many return values
have ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], gas.EvmFeeEstimator, error)
want ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], error)Suggested fix: Adjust the function to return the correct number of values as specified in the function signature. 3. Too many return values:[go_core_ccip_deployment_tests]Source of Error:# github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm
core/chains/legacyevm/evm_txm.go:59:30: too many return values
have ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], gas.EvmFeeEstimator, error)
want ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], error)Suggested fix: Adjust the function to return the correct number of values as specified in the function signature. 4. Too many return values:[go_core_fuzz]Source of Error:# github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm
core/chains/legacyevm/evm_txm.go:59:30: too many return values
have ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], gas.EvmFeeEstimator, error)
want ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], error)Suggested fix: Adjust the function to return the correct number of values as specified in the function signature. 5. Too many return values:[go_core_tests]Source of Error:# github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm
core/chains/legacyevm/evm_txm.go:59:30: too many return values
have ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], gas.EvmFeeEstimator, error)
want ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], error)Suggested fix: Adjust the function to return the correct number of values as specified in the function signature. 6. Too many return values:[Golang Lint (.)]Source of Error:# github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm
core/chains/legacyevm/evm_txm.go:59:30: too many return values
have ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], gas.EvmFeeEstimator, error)
want ("github.com/smartcontractkit/chainlink/v2/common/txmgr".TxManager[*"math/big".Int, *"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Head, "github.com/ethereum/go-ethereum/common".Address, "github.com/ethereum/go-ethereum/common".Hash, "github.com/ethereum/go-ethereum/common".Hash, "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types".Nonce, gas.EvmFee], error)Suggested fix: Adjust the function to return the correct number of values as specified in the function signature. 7. Undefined fields or methods:[Golang Lint (.)]Source of Error:core/services/gateway/gateway.go:110:23: g.connMgr.Start undefined (type ConnectionManager has no field or method Start) (typecheck)
if err := g.connMgr.Start(ctx); err != nil {
^
core/services/gateway/gateway.go:121:41: g.connMgr.Close undefined (type ConnectionManager has no field or method Close) (typecheck)
err = multierr.Combine(err, g.connMgr.Close())
^
core/services/webhook/delegate.go:161:17: spec.ID undefined (type registeredJob has no field or method ID) (typecheck)
"jobID", spec.ID,
^
core/services/webhook/delegate.go:162:16: spec.ExternalJobID undefined (type registeredJob has no field or method ExternalJobID) (typecheck)
"uuid", spec.ExternalJobID,
^
core/services/webhook/delegate.go:170:26: spec.ID undefined (type registeredJob has no field or method ID) (typecheck)
"databaseID": spec.ID,
^
core/services/webhook/delegate.go:171:26: spec.ExternalJobID undefined (type registeredJob has no field or method ExternalJobID) (typecheck)
"externalJobID": spec.ExternalJobID,
^
core/services/webhook/delegate.go:172:26: spec.Name undefined (type registeredJob has no field or method Name) (typecheck)
"name": spec.Name.ValueOrZero(),
^
core/services/webhook/delegate.go:180:31: spec.PipelineSpec undefined (type registeredJob has no field or method PipelineSpec) (typecheck)
run := pipeline.NewRun(*spec.PipelineSpec, vars)
^
core/internal/cltest/cltest.go:263:38: app.KeyStore undefined (type *TestApplication has no field or method KeyStore) (typecheck)
k, _ := MustInsertRandomKey(t, app.KeyStore.Eth(), chainID)
^
core/internal/cltest/cltest.go:266:34: app.KeyStore undefined (type *TestApplication has no field or method KeyStore) (typecheck)
id, ks := chainID.ToInt(), app.KeyStore.Eth()
^
core/internal/cltest/cltest.go:279:25: app.KeyStore undefined (type *TestApplication has no field or method KeyStore) (typecheck)
require.NoError(t, app.KeyStore.Unlock(ctx, Password))
^
core/internal/cltest/cltest.go:286:27: app.GetKeyStore undefined (type *TestApplication has no field or method GetKeyStore) (typecheck)
require.NoError(t, app.GetKeyStore().P2P().Add(ctx, v))
^
core/internal/cltest/cltest.go:288:27: app.GetKeyStore undefined (type *TestApplication has no field or method GetKeyStore) (typecheck)
require.NoError(t, app.GetKeyStore().CSA().Add(ctx, v))
^
core/internal/cltest/cltest.go:290:27: app.GetKeyStore undefined (type *TestApplication has no field or method GetKeyStore) (typecheck)
require.NoError(t, app.GetKeyStore().OCR2().Add(ctx, v))
^
core/internal/cltest/cltest.go:641:12: ta.GetDB undefined (type *TestApplication has no field or method GetDB) (typecheck)
err := ta.GetDB().GetContext(ctx, &id, `INSERT INTO sessions (id, email, last_used, created_at) VALUES ($1, $2, $3, NOW()) RETURNING id`, session.ID, email, session.LastUsed)
^
core/internal/cltest/cltest.go:648:27: ta.KeyStore undefined (type *TestApplication has no field or method KeyStore) (typecheck)
require.NoError(ta.t, ta.KeyStore.Unlock(ctx, Password))
^
core/internal/cltest/cltest.go:649:15: ta.KeyStore undefined (type *TestApplication has no field or method KeyStore) (typecheck)
_, err := ta.KeyStore.Eth().Import(ctx, []byte(content), Password, &FixtureChainID)
^
core/internal/cltest/cltest.go:677:11: ta.BasicAdminUsersORM undefined (type *TestApplication has no field or method BasicAdminUsersORM) (typecheck)
err = ta.BasicAdminUsersORM().CreateUser(ctx, &u)
^
core/internal/cltest/cltest.go:699:38: ta.GetConfig undefined (type *TestApplication has no field or method GetConfig) (typecheck)
Config: ta.GetConfig(),
^
core/internal/cltest/cltest.go:718:38: ta.GetConfig undefined (type *TestApplication has no field or method GetConfig) (typecheck)
Config: ta.GetConfig(),
^
core/internal/cltest/cltest.go:1310:95: app.GetConfig undefined (type *TestApplication has no field or method GetConfig) (typecheck)
ethClient.On("ConfiguredChainID", mock.Anything).Return(evmtest.MustGetDefaultChainID(t, app.GetConfig().EVMConfigs()), nil)
^
core/capabilities/integration_tests/framework/don.go:260:18: node.Stop undefined (type *capabilityNode has no field or method Stop) (typecheck)
if err := node.Stop(); err != nil {
^
core/capabilities/integration_tests/framework/don.go:337:15: node.AddJobV2 undefined (type *capabilityNode has no field or method AddJobV2) (typecheck)
err := node.AddJobV2(ctx, j)
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:181:90: ccipContracts.Dest undefined (type CCIPIntegrationTestHarness has no field or method Dest) (typecheck)
c, err := node.App.GetRelayers().LegacyEVMChains().Get(strconv.FormatUint(ccipContracts.Dest.ChainID, 10))
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:198:131: ccipContracts.Dest undefined (type CCIPIntegrationTestHarness has no field or method Dest) (typecheck)
}, testutils.WaitTimeout(t), 1*time.Second).Should(gomega.BeTrue(), "node is not using updated price registry %s", ccipContracts.Dest.PriceRegistry.Address().Hex())
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:185:17: ccipContracts.Source undefined (type CCIPIntegrationTestHarness has no field or method Source) (typecheck)
ccipContracts.Source.Chain.Commit()
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:186:17: ccipContracts.Dest undefined (type CCIPIntegrationTestHarness has no field or method Dest) (typecheck)
ccipContracts.Dest.Chain.Commit()
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:207:17: ccipContracts.Source undefined (type CCIPIntegrationTestHarness has no field or method Source) (typecheck)
ccipContracts.Source.Chain.Commit()
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:232:17: ccipContracts.Source undefined (type CCIPIntegrationTestHarness has no field or method Source) (typecheck)
ccipContracts.Source.Chain.Commit()
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:253:90: ccipContracts.Source undefined (type *CCIPIntegrationTestHarness has no field or method Source) (typecheck)
c, err := node.App.GetRelayers().LegacyEVMChains().Get(strconv.FormatUint(ccipContracts.Source.ChainID, 10))
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:257:17: ccipContracts.Source undefined (type *CCIPIntegrationTestHarness has no field or method Source) (typecheck)
ccipContracts.Source.Chain.Commit()
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:258:17: ccipContracts.Dest undefined (type *CCIPIntegrationTestHarness has no field or method Dest) (typecheck)
ccipContracts.Dest.Chain.Commit()
^
core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go:280:90: ccipContracts.Dest undefined (type *CCIPIntegrationTestHarness has no field or method Dest) (typecheck)
c, err
</cicore> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch was cut off of latest release/2.19.0-dual-transmission - commit 480a3e5. This PR is to merge the v2.19.0-dual-transmission hotfix back into develop branch.