From d03c54c7fa352cc3a6215ffc0e4698af28086570 Mon Sep 17 00:00:00 2001 From: Vladimir Shchukin Date: Sun, 4 May 2025 21:51:07 -0400 Subject: [PATCH 1/3] bump common --- chains/go.mod | 6 +++--- chains/go.sum | 8 ++++---- chains/txmgr/txmgr.go | 9 +++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/chains/go.mod b/chains/go.mod index 3b838d2..4f0d021 100644 --- a/chains/go.mod +++ b/chains/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink-framework/chains -go 1.24 +go 1.24.1 toolchain go1.24.2 @@ -9,7 +9,7 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/prometheus/client_golang v1.21.1 github.com/shopspring/decimal v1.4.0 - github.com/smartcontractkit/chainlink-common v0.7.1-0.20250421201900-888b361327e8 + github.com/smartcontractkit/chainlink-common v0.7.1-0.20250502204350-10d475f3a9a3 github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260 github.com/stretchr/testify v1.10.0 go.uber.org/multierr v1.11.0 @@ -68,7 +68,7 @@ require ( golang.org/x/crypto v0.36.0 // indirect golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect golang.org/x/net v0.38.0 // indirect - golang.org/x/sys v0.31.0 // indirect + golang.org/x/sys v0.32.0 // indirect golang.org/x/text v0.23.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect diff --git a/chains/go.sum b/chains/go.sum index ceba04b..f8db0a3 100644 --- a/chains/go.sum +++ b/chains/go.sum @@ -90,8 +90,8 @@ github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= -github.com/smartcontractkit/chainlink-common v0.7.1-0.20250421201900-888b361327e8 h1:eId0v+nd9DsDJHoHZ+P21/QUlDq8MrABFji6htEyu10= -github.com/smartcontractkit/chainlink-common v0.7.1-0.20250421201900-888b361327e8/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I= +github.com/smartcontractkit/chainlink-common v0.7.1-0.20250502204350-10d475f3a9a3 h1:jNA0YjZA8EinTUokzl1O5oCMiCG0Ks5hGlrgz12OPiM= +github.com/smartcontractkit/chainlink-common v0.7.1-0.20250502204350-10d475f3a9a3/go.mod h1:uNF6+noody47ZdmRwymDZAnQ7eKTXLzMKvl41LA63lo= github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260 h1:See2isL6KdrTJDlVKWv8qiyYqWhYUcubU2e5yKXV1oY= github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU= github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks= @@ -160,8 +160,8 @@ golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= diff --git a/chains/txmgr/txmgr.go b/chains/txmgr/txmgr.go index 91d1940..e044fb7 100644 --- a/chains/txmgr/txmgr.go +++ b/chains/txmgr/txmgr.go @@ -17,6 +17,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/services" commontypes "github.com/smartcontractkit/chainlink-common/pkg/types" + evmtypes "github.com/smartcontractkit/chainlink-common/pkg/types/chains/evm" "github.com/smartcontractkit/chainlink-common/pkg/utils" "github.com/smartcontractkit/chainlink-framework/chains" @@ -57,7 +58,7 @@ type TxManager[CID chains.ID, HEAD chains.Head[BHASH], ADDR chains.Hashable, THA FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (nullv4.Int, error) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (count uint32, err error) GetTransactionStatus(ctx context.Context, transactionID string) (state commontypes.TransactionStatus, err error) - GetTransactionFee(ctx context.Context, transactionID string) (fee *commontypes.TransactionFee, err error) + GetTransactionFee(ctx context.Context, transactionID string) (fee *evmtypes.TransactionFee, err error) } type TxmV2Wrapper[CID chains.ID, HEAD chains.Head[BHASH], ADDR chains.Hashable, THASH chains.Hashable, BHASH chains.Hashable, SEQ chains.Sequence, FEE fees.Fee] interface { @@ -731,7 +732,7 @@ func (b *Txm[CID, HEAD, ADDR, THASH, BHASH, R, SEQ, FEE]) GetTransactionStatus(c } } -func (b *Txm[CID, HEAD, ADDR, THASH, BHASH, R, SEQ, FEE]) GetTransactionFee(ctx context.Context, transactionID string) (fee *commontypes.TransactionFee, err error) { +func (b *Txm[CID, HEAD, ADDR, THASH, BHASH, R, SEQ, FEE]) GetTransactionFee(ctx context.Context, transactionID string) (fee *evmtypes.TransactionFee, err error) { receipt, err := b.txStore.FindReceiptWithIdempotencyKey(ctx, transactionID, b.chainID) if err != nil { return fee, fmt.Errorf("failed to find receipt with IdempotencyKey %s: %w", transactionID, err) @@ -755,7 +756,7 @@ func (b *Txm[CID, HEAD, ADDR, THASH, BHASH, R, SEQ, FEE]) GetTransactionFee(ctx return fee, fmt.Errorf("tx status is not finalized") } - fee = &commontypes.TransactionFee{ + fee = &evmtypes.TransactionFee{ TransactionFee: totalFee, } @@ -843,7 +844,7 @@ func (n *NullTxManager[CID, HEAD, ADDR, THASH, BHASH, SEQ, FEE]) GetTransactionS return } -func (n *NullTxManager[CID, HEAD, ADDR, THASH, BHASH, SEQ, FEE]) GetTransactionFee(ctx context.Context, transactionID string) (fee *commontypes.TransactionFee, err error) { +func (n *NullTxManager[CID, HEAD, ADDR, THASH, BHASH, SEQ, FEE]) GetTransactionFee(ctx context.Context, transactionID string) (fee *evmtypes.TransactionFee, err error) { return } From ced4a67d649149c152700ddf0554d5033fea4a54 Mon Sep 17 00:00:00 2001 From: Vladimir Shchukin Date: Fri, 9 May 2025 02:49:13 -0400 Subject: [PATCH 2/3] bump common --- chains/go.mod | 3 ++- chains/go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/chains/go.mod b/chains/go.mod index 4f0d021..7a5d04d 100644 --- a/chains/go.mod +++ b/chains/go.mod @@ -9,7 +9,7 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/prometheus/client_golang v1.21.1 github.com/shopspring/decimal v1.4.0 - github.com/smartcontractkit/chainlink-common v0.7.1-0.20250502204350-10d475f3a9a3 + github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509064637-63e517571940 github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260 github.com/stretchr/testify v1.10.0 go.uber.org/multierr v1.11.0 @@ -44,6 +44,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.63.0 // indirect github.com/prometheus/procfs v0.16.0 // indirect + github.com/smartcontractkit/freeport v0.1.0 // indirect github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/otel v1.35.0 // indirect diff --git a/chains/go.sum b/chains/go.sum index f8db0a3..037e44f 100644 --- a/chains/go.sum +++ b/chains/go.sum @@ -90,10 +90,12 @@ github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= -github.com/smartcontractkit/chainlink-common v0.7.1-0.20250502204350-10d475f3a9a3 h1:jNA0YjZA8EinTUokzl1O5oCMiCG0Ks5hGlrgz12OPiM= -github.com/smartcontractkit/chainlink-common v0.7.1-0.20250502204350-10d475f3a9a3/go.mod h1:uNF6+noody47ZdmRwymDZAnQ7eKTXLzMKvl41LA63lo= +github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509064637-63e517571940 h1:zQ+7KaQTZ3E+PT2Y7+2Jh0khEDZ81hCD0LUBLFUigBk= +github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509064637-63e517571940/go.mod h1:uNF6+noody47ZdmRwymDZAnQ7eKTXLzMKvl41LA63lo= github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260 h1:See2isL6KdrTJDlVKWv8qiyYqWhYUcubU2e5yKXV1oY= github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU= +github.com/smartcontractkit/freeport v0.1.0 h1:3MZHeti5m+tSTBCq5R8rhawFHxrnQZYBZVL+xgS1sPo= +github.com/smartcontractkit/freeport v0.1.0/go.mod h1:T4zH9R8R8lVWKfU7tUvYz2o2jMv1OpGCdpY2j2QZXzU= github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks= github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298/go.mod h1:Mb7+/LC4edz7HyHxX4QkE42pSuov4AV68+AxBXAap0o= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From cd69d19bc6e012c8ec9cf5d81e6ef5136ad66996 Mon Sep 17 00:00:00 2001 From: Vladimir Shchukin Date: Fri, 9 May 2025 11:56:51 -0400 Subject: [PATCH 3/3] bump common --- chains/go.mod | 2 +- chains/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chains/go.mod b/chains/go.mod index 7a5d04d..f99b3a3 100644 --- a/chains/go.mod +++ b/chains/go.mod @@ -9,7 +9,7 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/prometheus/client_golang v1.21.1 github.com/shopspring/decimal v1.4.0 - github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509064637-63e517571940 + github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509155341-2b5a5170a351 github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260 github.com/stretchr/testify v1.10.0 go.uber.org/multierr v1.11.0 diff --git a/chains/go.sum b/chains/go.sum index 037e44f..7ed6b96 100644 --- a/chains/go.sum +++ b/chains/go.sum @@ -90,8 +90,8 @@ github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= -github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509064637-63e517571940 h1:zQ+7KaQTZ3E+PT2Y7+2Jh0khEDZ81hCD0LUBLFUigBk= -github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509064637-63e517571940/go.mod h1:uNF6+noody47ZdmRwymDZAnQ7eKTXLzMKvl41LA63lo= +github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509155341-2b5a5170a351 h1:luR7oS01qzkw8anxnSYaXurzKzMdgl5ROKFm1/I6llY= +github.com/smartcontractkit/chainlink-common v0.7.1-0.20250509155341-2b5a5170a351/go.mod h1:uNF6+noody47ZdmRwymDZAnQ7eKTXLzMKvl41LA63lo= github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260 h1:See2isL6KdrTJDlVKWv8qiyYqWhYUcubU2e5yKXV1oY= github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250115203616-a2ea5e50b260/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU= github.com/smartcontractkit/freeport v0.1.0 h1:3MZHeti5m+tSTBCq5R8rhawFHxrnQZYBZVL+xgS1sPo=