Merge branch 'develop' into chain-writer-solana

integration-tests/go.mod

@@ -14,11 +14,11 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/pelletier/go-toml/v2 v2.2.2
 	github.com/rs/zerolog v1.31.0
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625074419-c278d083facf
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240625075314-affd4529a8f5
-	github.com/smartcontractkit/chainlink-testing-framework v1.31.4
-	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240625105952-e5dc01e84406
-	github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240625105952-e5dc01e84406
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625145034-72dab520f468
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240625135745-60e0e43656f9
+	github.com/smartcontractkit/chainlink-testing-framework v1.31.5
+	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240627162800-7a3ba8ec4ab7
+	github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240627162800-7a3ba8ec4ab7
 	github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c
 	github.com/smartcontractkit/seth v1.0.12
 	github.com/stretchr/testify v1.9.0
@@ -358,7 +358,7 @@ require (
 	github.com/slack-go/slack v0.12.2 // indirect
 	github.com/smartcontractkit/chain-selectors v1.0.10 // indirect
 	github.com/smartcontractkit/chainlink-automation v1.0.4 // indirect
-	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d // indirect
+	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141 // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba // indirect

integration-tests/go.sum

@@ -1407,26 +1407,26 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq
 github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625074419-c278d083facf h1:d9AS/K8RSVG64USb20N/U7RaPOsYPcmuLGJq7iE+caM=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625074419-c278d083facf/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625145034-72dab520f468 h1:rhsUMdSrCerrUzzsOWaHkcb+qlB7knEAXYv/P29YUn8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625145034-72dab520f468/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141 h1:TMOoYaeSDkkI3jkCH7lKHOZaLkeDuxFTNC+XblD6M0M=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540/go.mod h1:sjAmX8K2kbQhvDarZE1ZZgDgmHJ50s0BBc/66vKY2ek=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917 h1:MD80ZRCTvxxJ8PBmhtrKoTnky8cVNYrCrIBLVRbrOM0=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917/go.mod h1:jwVxhctE6BgLOSSsVq9wbREpZ8Ev34H+UBxeUhESZRs=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.31.4 h1:5/zF5Z2w+/HTvUSSJNhWSiHvlQ2O2qxRw4e1fBbVraQ=
-github.com/smartcontractkit/chainlink-testing-framework v1.31.4/go.mod h1:E6uNEZhZZid9PHv6/Kq5Vn63GlO61ZcKB+/f0DKo3Q4=
+github.com/smartcontractkit/chainlink-testing-framework v1.31.5 h1:PemXseNS74zz1Oitm1MOCeJyQSIYCFck/QsnjM1y06c=
+github.com/smartcontractkit/chainlink-testing-framework v1.31.5/go.mod h1:E6uNEZhZZid9PHv6/Kq5Vn63GlO61ZcKB+/f0DKo3Q4=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772 h1:LQmRsrzzaYYN3wEU1l5tWiccznhvbyGnu2N+wHSXZAo=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
-github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240625105952-e5dc01e84406 h1:JmaZ+jWi+9mG1139A7aIV7qYMyV4ou9prjEyL9BTZY8=
-github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240625105952-e5dc01e84406/go.mod h1:XHicMAqX78kY/QtlAxm/K7xXlbSE60TKTJ1uiDvJcGs=
-github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240625105952-e5dc01e84406 h1:jdXYTzpa0sGyhmavILD62wT4zCFqvrJm8JJYtrk5Pfo=
-github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240625105952-e5dc01e84406/go.mod h1:Fbg3jQoeBRNOVZRh+RosKJpihFnHhIayaP0cjoZezzA=
+github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240627162800-7a3ba8ec4ab7 h1:Sb/WbQ9V/DSXo+JZNaMH501A0t5a0w/NVdHn64vEkAQ=
+github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240627162800-7a3ba8ec4ab7/go.mod h1:id7z7CaEAqgI6d10iXzFY0p1kzo/k3JIq6Pwl08mwao=
+github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240627162800-7a3ba8ec4ab7 h1:rhEqNz6nyETIwdUMbDWLahT4gTjKRh4wmcUJ53BIOU0=
+github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240627162800-7a3ba8ec4ab7/go.mod h1:Z7lmPpWkFcohrjRxO1UH0JAJChGMrtAw+4ivzIky6YY=
 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=

pkg/solana/transmitter.go

@@ -84,8 +84,10 @@ func (c *Transmitter) Transmit(
 
 	// pass transmit payload to tx manager queue
 	c.lggr.Debugf("Queuing transmit tx: state (%s) + transmissions (%s)", c.stateID.String(), c.transmissionsID.String())
-	err = c.txManager.Enqueue(c.stateID.String(), tx)
-	return fmt.Errorf("error on Transmit.txManager.Enqueue: %w", err)
+	if err = c.txManager.Enqueue(c.stateID.String(), tx); err != nil {
+		return fmt.Errorf("error on Transmit.txManager.Enqueue: %w", err)
+	}
+	return nil
 }
 
 func (c *Transmitter) LatestConfigDigestAndEpoch(