diff --git a/chainlink-tron b/chainlink-tron new file mode 100755 index 0000000..9e5c653 Binary files /dev/null and b/chainlink-tron differ diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a3ea13d..e3e3056 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -12,7 +12,7 @@ require ( github.com/rs/zerolog v1.33.0 github.com/smartcontractkit/chainlink-common v0.8.1-0.20250730004800-27955557aca6 github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.1 - github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250701132001-f8be142155b6 + github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250804130351-2a3614fc03cc github.com/smartcontractkit/chainlink/deployment v0.0.0-20250428183335-14ac746cbe81 github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250729150432-5ea4a324a49b github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358 @@ -251,10 +251,10 @@ require ( github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 // indirect github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250718143957-41236f9ef8b4 // indirect github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk/v2/pb v0.0.0-20250718160737-52367713623f // indirect - github.com/smartcontractkit/chainlink-evm v0.0.0-20250717140849-58bcb2816c08 // indirect + github.com/smartcontractkit/chainlink-evm v0.1.1-0.20250804133850-d8e2f43db387 // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 // indirect - github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e // indirect - github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a // indirect + github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 // indirect + github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect github.com/smartcontractkit/freeport v0.1.1 // indirect github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 6da0876..65f90d5 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -929,18 +929,18 @@ github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk/v2/pb v0.0.0-2025 github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk/v2/pb v0.0.0-20250718160737-52367713623f/go.mod h1:LEZQ/SbFHseQJrLKVm6ELB8gyI4G8rVEH3SQzzZqFDk= github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20ob5SijxQen51DhnqTLr2f7BEc= github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc= -github.com/smartcontractkit/chainlink-evm v0.0.0-20250717140849-58bcb2816c08 h1:CppYDovAiyJz+D14jtaci8wuHnumHTB2lQ68LamGbdg= -github.com/smartcontractkit/chainlink-evm v0.0.0-20250717140849-58bcb2816c08/go.mod h1:c+0Vwbh3whz8SUxRvsYiOkbuQUlK1ckyQ49HTNUjJcI= +github.com/smartcontractkit/chainlink-evm v0.1.1-0.20250804133850-d8e2f43db387 h1:tGOOqInwufJzE1Orbs5rTEPYv7KEiCDIMIrtuEi4QDo= +github.com/smartcontractkit/chainlink-evm v0.1.1-0.20250804133850-d8e2f43db387/go.mod h1:DAcHXKZjbLVrqAMCWUXWfULLLdu0KSF2R4LvdvY92q8= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI= github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU= github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250702183345-3f9ae622e391 h1:4dUBtClcoG6QHY2JYqkpZ3GLL6DUX6pVP52wb7qVY48= github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250702183345-3f9ae622e391/go.mod h1:GSz65mYV8hzb8LCRhbhoVn4i3el87nrXTBQE8KF1Qao= github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 h1:JU1JUrkzdAUHsOYdS9DENPkJfmrxweFRPRSztad6oPM= github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2/go.mod h1:+pRGfDej1r7cHMs1dYmuyPuOZzYB9Q+PKu0FvZOYlmw= -github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e h1:LRT+PltY99+hxZAJn+4nyTfqGVNEM1S6FJ675B9BtJo= -github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc= -github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a h1:O28vgyHM7QF1YLg1BwkQSIbOYA+t0RiH9+b+k90GPG8= -github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a/go.mod h1:zYqPBBRUXUQ/L+aD4Q7phnYsfVeC5rDBXtPt1VYwtws= +github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 h1:ysZjKH+BpWlQhF93kr/Lc668UlCvT9NjfcsGdZT19I8= +github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc= +github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d h1:pTYIcsWHTMG5fAcbRUA8Qk5yscXKdSpopQ0DUEOjPik= +github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d/go.mod h1:2JTBNp3FlRdO/nHc4dsc9bfxxMClMO1Qt8sLJgtreBY= github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722175102-6dcdf5122683 h1:Qjiw8yaKi42jjknW1+ox6+QHc4aJVm0uhVoKTlmZryU= github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722175102-6dcdf5122683/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA= github.com/smartcontractkit/chainlink-protos/orchestrator v0.8.1 h1:VcFo27MBPTMB1d1Tp3q3RzJNqwErKR+z9QLQZ6KBSXo= diff --git a/integration-tests/ocr2_local_test.go b/integration-tests/ocr2_local_test.go index 8a58796..ea03f4d 100644 --- a/integration-tests/ocr2_local_test.go +++ b/integration-tests/ocr2_local_test.go @@ -98,9 +98,11 @@ func runOCR2Test( require.NoError(t, err, "Could not create relay logger") testKeystore := testutils.NewTestKeystore(pubAddress.String(), privateKey) - txmgr := txm.New(clientLogger, testKeystore, combinedClient.FullNodeClient(), txm.TronTxmConfig{ + txmgr := txm.New(clientLogger, testKeystore, combinedClient, txm.TronTxmConfig{ BroadcastChanSize: 100, ConfirmPollSecs: 2, + RetentionPeriod: 8 * time.Minute, + ReapInterval: 10 * time.Second, }) err = txmgr.Start(context.Background()) require.NoError(t, err) @@ -149,10 +151,10 @@ func runOCR2Test( deployContract := func(contractName string, artifact *contract.Artifact, params []interface{}) address.Address { txHash := testutils.SignAndDeployContract(t, combinedClient, testKeystore, pubAddress, contractName, artifact.AbiJson, artifact.Bytecode, feeLimit, params) // use full node client for quicker feedback - txInfo := testutils.WaitForTransactionInfo(t, combinedClient.FullNodeClient(), txHash, txnWaitTime) + txInfo := testutils.WaitForTransactionInfo(t, combinedClient, txHash, txnWaitTime) contractAddress, err := address.StringToAddress(txInfo.ContractAddress) require.NoError(t, err) - contractDeployed := testutils.CheckContractDeployed(t, combinedClient.FullNodeClient(), contractAddress) + contractDeployed := testutils.CheckContractDeployed(t, combinedClient, contractAddress) require.True(t, contractDeployed, "Contract not deployed") return contractAddress } diff --git a/relayer/go.mod b/relayer/go.mod index 440876e..9ff9f35 100644 --- a/relayer/go.mod +++ b/relayer/go.mod @@ -12,6 +12,7 @@ require ( github.com/prometheus/client_golang v1.22.0 github.com/smartcontractkit/chain-selectors v1.0.62 github.com/smartcontractkit/chainlink-common v0.8.1-0.20250730004800-27955557aca6 + github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250729142306-508e798f6a5d github.com/smartcontractkit/libocr v0.0.0-20250408131511-c90716988ee0 github.com/stretchr/testify v1.10.0 go.uber.org/zap v1.27.0 diff --git a/relayer/go.sum b/relayer/go.sum index 2655237..5f51038 100644 --- a/relayer/go.sum +++ b/relayer/go.sum @@ -411,6 +411,8 @@ github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgn github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc= github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250718143957-41236f9ef8b4 h1:hPKEslzkVA2HUuqwGc6w594EWYnJFp5jXmAoBu3VryE= github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250718143957-41236f9ef8b4/go.mod h1:U1UAbPhy6D7Qz0wHKGPoQO+dpR0hsYjgUz8xwRrmKwI= +github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250729142306-508e798f6a5d h1:71BE5jqUDYq2WQLS7xobBE3NJGZp6s7ce4Q0qOo4WC8= +github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250729142306-508e798f6a5d/go.mod h1:6bevrO2YC6w9PDPJ+gUhwwjKZq0Tkc3jkEfHnCs7Xog= github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.4 h1:J4qtAo0ZmgX5pIr8Y5mdC+J2rj2e/6CTUC263t6mGOM= github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.4/go.mod h1:4WhGgCA0smBbBud5mK+jnDb2wwndMvoqaWBJ3OV/7Bw= github.com/smartcontractkit/freeport v0.1.1 h1:B5fhEtmgomdIhw03uPVbVTP6oPv27fBhZsoZZMSIS8I= diff --git a/relayer/writetarget/target_strategy.go b/relayer/writetarget/target_strategy.go new file mode 100644 index 0000000..e69de29 diff --git a/relayer/writetarget/write_target.go b/relayer/writetarget/write_target.go new file mode 100644 index 0000000..9c4751b --- /dev/null +++ b/relayer/writetarget/write_target.go @@ -0,0 +1,16 @@ +package writetarget + +import ( + "context" + + "github.com/smartcontractkit/chainlink-tron/relayer/plugin" + + "github.com/smartcontractkit/chainlink-common/pkg/capabilities" + "github.com/smartcontractkit/chainlink-common/pkg/logger" + "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget" +) + +func NewWriteTarget(ctx context.Context, relayer *plugin.TronRelayer, lggr logger.Logger) (capabilities.ExecutableCapability, error) { + writetarget.NewWriteTarget(writetarget.WriteTargetOpts{}) + return nil, nil +}