[TT-1007] VRFV1 smoke tests migrated to Seth

integration-tests/actions/seth/actions.go

@@ -177,10 +177,10 @@ func SendFunds(logger zerolog.Logger, client *seth.Client, payload FundsToSendPa
 func DeployForwarderContracts(
 	t *testing.T,
 	seth *seth.Client,
-	linkTokenData seth.DeploymentData,
+	linkTokenAddress common.Address,
 	numberOfOperatorForwarderPairs int,
 ) (operators []common.Address, authorizedForwarders []common.Address, operatorFactoryInstance contracts.OperatorFactory) {
-	instance, err := contracts.DeployEthereumOperatorFactory(seth, linkTokenData.Address)
+	instance, err := contracts.DeployEthereumOperatorFactory(seth, linkTokenAddress)
 	require.NoError(t, err, "failed to create new instance of operator factory")
 	operatorFactoryInstance = &instance
 

integration-tests/actions/vrf/vrfv1/actions.go

@@ -3,7 +3,8 @@ package vrfv1
 import (
 	"fmt"
 
-	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
+	"github.com/smartcontractkit/seth"
+
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 )
 
@@ -19,21 +20,18 @@ type Contracts struct {
 	Consumer    contracts.VRFConsumer
 }
 
-func DeployVRFContracts(cd contracts.ContractDeployer, bc blockchain.EVMClient, lt contracts.LinkToken) (*Contracts, error) {
-	bhs, err := cd.DeployBlockhashStore()
+func DeployVRFContracts(client *seth.Client, linkTokenAddress string) (*Contracts, error) {
+	bhs, err := contracts.DeployBlockhashStore(client)
 	if err != nil {
 		return nil, fmt.Errorf("%s, err %w", ErrDeployBHSV1, err)
 	}
-	coordinator, err := cd.DeployVRFCoordinator(lt.Address(), bhs.Address())
+	coordinator, err := contracts.DeployVRFCoordinator(client, linkTokenAddress, bhs.Address())
 	if err != nil {
 		return nil, fmt.Errorf("%s, err %w", ErrDeployVRFCootrinatorV1, err)
 	}
-	consumer, err := cd.DeployVRFConsumer(lt.Address(), coordinator.Address())
+	consumer, err := contracts.DeployVRFConsumer(client, linkTokenAddress, coordinator.Address())
 	if err != nil {
 		return nil, fmt.Errorf("%s, err %w", ErrDeployVRFConsumerV1, err)
 	}
-	if err := bc.WaitForEvents(); err != nil {
-		return nil, err
-	}
 	return &Contracts{bhs, coordinator, consumer}, nil
 }

integration-tests/chaos/ocr_chaos_test.go

@@ -5,6 +5,7 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/onsi/gomega"
 	"github.com/smartcontractkit/seth"
 	"github.com/stretchr/testify/require"
@@ -187,13 +188,13 @@ func TestOCRChaos(t *testing.T) {
 			ms, err := ctfClient.ConnectMockServer(testEnvironment)
 			require.NoError(t, err, "Creating mockserver clients shouldn't fail")
 
-			linkDeploymentData, err := contracts.DeployLinkTokenContract(seth)
+			linkContract, err := contracts.DeployLinkTokenContract(l, seth)
 			require.NoError(t, err, "Error deploying link token contract")
 
 			err = actions_seth.FundChainlinkNodesFromRootAddress(l, seth, contracts.ChainlinkK8sClientToChainlinkNodeWithKeysAndAddress(chainlinkNodes), big.NewFloat(10))
 			require.NoError(t, err)
 
-			ocrInstances, err := actions_seth.DeployOCRv1Contracts(l, seth, 1, linkDeploymentData.Address, contracts.ChainlinkK8sClientToChainlinkNodeWithKeysAndAddress(workerNodes))
+			ocrInstances, err := actions_seth.DeployOCRv1Contracts(l, seth, 1, common.HexToAddress(linkContract.Address()), contracts.ChainlinkK8sClientToChainlinkNodeWithKeysAndAddress(workerNodes))
 			require.NoError(t, err)
 			err = actions.CreateOCRJobs(ocrInstances, bootstrapNode, workerNodes, 5, ms, fmt.Sprint(seth.ChainID))
 			require.NoError(t, err)

integration-tests/contracts/contract_deployer.go

@@ -539,7 +539,7 @@ func (e *EthereumContractDeployer) DeployLinkTokenContract() (LinkToken, error)
 		return nil, err
 	}
 
-	return &EthereumLinkToken{
+	return &LegacyEthereumLinkToken{
 		client:   e.client,
 		instance: instance.(*link_token_interface.LinkToken),
 		address:  *linkTokenAddress,
@@ -558,7 +558,7 @@ func (e *EthereumContractDeployer) LoadLinkToken(address common.Address) (LinkTo
 	if err != nil {
 		return nil, err
 	}
-	return &EthereumLinkToken{
+	return &LegacyEthereumLinkToken{
 		address:  address,
 		client:   e.client,
 		instance: instance.(*link_token_interface.LinkToken),

integration-tests/contracts/contract_loader.go

@@ -181,7 +181,7 @@ func (e *EthereumContractLoader) LoadLINKToken(addr string) (LinkToken, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &EthereumLinkToken{
+	return &LegacyEthereumLinkToken{
 		client:   e.client,
 		instance: instance.(*link_token_interface.LinkToken),
 		address:  common.HexToAddress(addr),

integration-tests/contracts/ethereum_contracts.go

@@ -1192,16 +1192,16 @@ func (f *FluxAggregatorRoundConfirmer) Complete() bool {
 	return f.complete
 }
 
-// EthereumLinkToken represents a LinkToken address
-type EthereumLinkToken struct {
+// LegacyEthereumLinkToken represents a LinkToken address
+type LegacyEthereumLinkToken struct {
 	client   blockchain.EVMClient
 	instance *link_token_interface.LinkToken
 	address  common.Address
 	l        zerolog.Logger
 }
 
 // Fund the LINK Token contract with ETH to distribute the token
-func (l *EthereumLinkToken) Fund(ethAmount *big.Float) error {
+func (l *LegacyEthereumLinkToken) Fund(ethAmount *big.Float) error {
 	gasEstimates, err := l.client.EstimateGas(ethereum.CallMsg{
 		To: &l.address,
 	})
@@ -1211,7 +1211,7 @@ func (l *EthereumLinkToken) Fund(ethAmount *big.Float) error {
 	return l.client.Fund(l.address.Hex(), ethAmount, gasEstimates)
 }
 
-func (l *EthereumLinkToken) BalanceOf(ctx context.Context, addr string) (*big.Int, error) {
+func (l *LegacyEthereumLinkToken) BalanceOf(ctx context.Context, addr string) (*big.Int, error) {
 	opts := &bind.CallOpts{
 		From:    common.HexToAddress(l.client.GetDefaultWallet().Address()),
 		Context: ctx,
@@ -1224,19 +1224,19 @@ func (l *EthereumLinkToken) BalanceOf(ctx context.Context, addr string) (*big.In
 }
 
 // Name returns the name of the link token
-func (l *EthereumLinkToken) Name(ctxt context.Context) (string, error) {
+func (l *LegacyEthereumLinkToken) Name(ctxt context.Context) (string, error) {
 	opts := &bind.CallOpts{
 		From:    common.HexToAddress(l.client.GetDefaultWallet().Address()),
 		Context: ctxt,
 	}
 	return l.instance.Name(opts)
 }
 
-func (l *EthereumLinkToken) Address() string {
+func (l *LegacyEthereumLinkToken) Address() string {
 	return l.address.Hex()
 }
 
-func (l *EthereumLinkToken) Approve(to string, amount *big.Int) error {
+func (l *LegacyEthereumLinkToken) Approve(to string, amount *big.Int) error {
 	opts, err := l.client.TransactionOpts(l.client.GetDefaultWallet())
 	if err != nil {
 		return err
@@ -1254,7 +1254,7 @@ func (l *EthereumLinkToken) Approve(to string, amount *big.Int) error {
 	return l.client.ProcessTransaction(tx)
 }
 
-func (l *EthereumLinkToken) Transfer(to string, amount *big.Int) error {
+func (l *LegacyEthereumLinkToken) Transfer(to string, amount *big.Int) error {
 	opts, err := l.client.TransactionOpts(l.client.GetDefaultWallet())
 	if err != nil {
 		return err
@@ -1272,7 +1272,7 @@ func (l *EthereumLinkToken) Transfer(to string, amount *big.Int) error {
 	return l.client.ProcessTransaction(tx)
 }
 
-func (l *EthereumLinkToken) TransferAndCall(to string, amount *big.Int, data []byte) (*types.Transaction, error) {
+func (l *LegacyEthereumLinkToken) TransferAndCall(to string, amount *big.Int, data []byte) (*types.Transaction, error) {
 	opts, err := l.client.TransactionOpts(l.client.GetDefaultWallet())
 	if err != nil {
 		return nil, err

integration-tests/contracts/ethereum_contracts_seth.go

@@ -20,9 +20,9 @@ import (
 
 	"github.com/smartcontractkit/chainlink/integration-tests/wrappers"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/operator_factory"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/operator_wrapper"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/link_token"
 )
 
 // EthereumOffchainAggregator represents the offchain aggregation contract
@@ -568,15 +568,91 @@ func (e *EthereumOffchainAggregatorV2) ParseEventAnswerUpdated(log types.Log) (*
 	return e.contract.ParseAnswerUpdated(log)
 }
 
-func DeployLinkTokenContract(client *seth.Client) (seth.DeploymentData, error) {
-	linkTokenAbi, err := link_token.LinkTokenMetaData.GetAbi()
+// EthereumLinkToken represents a LinkToken address
+type EthereumLinkToken struct {
+	client   *seth.Client
+	instance *link_token_interface.LinkToken
+	address  common.Address
+	l        zerolog.Logger
+}
+
+func DeployLinkTokenContract(l zerolog.Logger, client *seth.Client) (*EthereumLinkToken, error) {
+	linkTokenAbi, err := link_token_interface.LinkTokenMetaData.GetAbi()
 	if err != nil {
-		return seth.DeploymentData{}, fmt.Errorf("failed to get LinkToken ABI: %w", err)
+		return &EthereumLinkToken{}, fmt.Errorf("failed to get LinkToken ABI: %w", err)
 	}
-	linkDeploymentData, err := client.DeployContract(client.NewTXOpts(), "LinkToken", *linkTokenAbi, common.FromHex(link_token.LinkTokenMetaData.Bin))
+	linkDeploymentData, err := client.DeployContract(client.NewTXOpts(), "LinkToken", *linkTokenAbi, common.FromHex(link_token_interface.LinkTokenMetaData.Bin))
 	if err != nil {
-		return seth.DeploymentData{}, fmt.Errorf("LinkToken instance deployment have failed: %w", err)
+		return &EthereumLinkToken{}, fmt.Errorf("LinkToken instance deployment have failed: %w", err)
 	}
 
-	return linkDeploymentData, nil
+	linkToken, err := link_token_interface.NewLinkToken(linkDeploymentData.Address, wrappers.MustNewWrappedContractBackend(nil, client))
+	if err != nil {
+		return &EthereumLinkToken{}, fmt.Errorf("failed to instantiate LinkToken instance: %w", err)
+	}
+
+	return &EthereumLinkToken{
+		client:   client,
+		instance: linkToken,
+		address:  linkDeploymentData.Address,
+		l:        l,
+	}, nil
+}
+
+// Fund the LINK Token contract with ETH to distribute the token
+func (l *EthereumLinkToken) Fund(_ *big.Float) error {
+	panic("do not use this function, use actions_seth.SendFunds instead")
+}
+
+func (l *EthereumLinkToken) BalanceOf(ctx context.Context, addr string) (*big.Int, error) {
+	return l.instance.BalanceOf(&bind.CallOpts{
+		From:    l.client.Addresses[0],
+		Context: ctx,
+	}, common.HexToAddress(addr))
+
+}
+
+// Name returns the name of the link token
+func (l *EthereumLinkToken) Name(ctx context.Context) (string, error) {
+	return l.instance.Name(&bind.CallOpts{
+		From:    l.client.Addresses[0],
+		Context: ctx,
+	})
+}
+
+func (l *EthereumLinkToken) Address() string {
+	return l.address.Hex()
+}
+
+func (l *EthereumLinkToken) Approve(to string, amount *big.Int) error {
+	l.l.Info().
+		Str("From", l.client.Addresses[0].Hex()).
+		Str("To", to).
+		Str("Amount", amount.String()).
+		Msg("Approving LINK Transfer")
+	_, err := l.client.Decode(l.instance.Approve(l.client.NewTXOpts(), common.HexToAddress(to), amount))
+	return err
+}
+
+func (l *EthereumLinkToken) Transfer(to string, amount *big.Int) error {
+	l.l.Info().
+		Str("From", l.client.Addresses[0].Hex()).
+		Str("To", to).
+		Str("Amount", amount.String()).
+		Msg("Transferring LINK")
+	_, err := l.client.Decode(l.instance.Transfer(l.client.NewTXOpts(), common.HexToAddress(to), amount))
+	return err
+}
+
+func (l *EthereumLinkToken) TransferAndCall(to string, amount *big.Int, data []byte) (*types.Transaction, error) {
+	l.l.Info().
+		Str("From", l.client.Addresses[0].Hex()).
+		Str("To", to).
+		Str("Amount", amount.String()).
+		Msg("Transferring and Calling LINK")
+	decodedTx, err := l.client.Decode(l.instance.TransferAndCall(l.client.NewTXOpts(), common.HexToAddress(to), amount, data))
+	if err != nil {
+		return nil, err
+	}
+	return decodedTx.Transaction, nil
 }

integration-tests/contracts/ethereum_ocr2vrf_contracts.go

@@ -49,8 +49,8 @@ type EthereumVRFBeaconConsumer struct {
 	vrfBeaconConsumer *vrf_beacon_consumer.BeaconVRFConsumer
 }
 
-// EthereumVRFCoordinator represents VRF coordinator contract
-type EthereumVRFCoordinator struct {
+// LegacyEthereumVRFCoordinator represents VRF coordinator contract
+type LegacyEthereumVRFCoordinator struct {
 	address     *common.Address
 	client      blockchain.EVMClient
 	coordinator *solidity_vrf_coordinator_interface.VRFCoordinator
@@ -125,7 +125,7 @@ func (e *EthereumContractDeployer) DeployBatchBlockhashStore(blockhashStoreAddr
 	if err != nil {
 		return nil, err
 	}
-	return &EthereumBatchBlockhashStore{
+	return &LegacyEthereumBatchBlockhashStore{
 		client:              e.client,
 		batchBlockhashStore: instance.(*batch_blockhash_store.BatchBlockhashStore),
 		address:             address,