Add new changeset + simplify tokenPool ops (#102)

* new build

* high tx timeout

* more logs

* more logs

* bump max conc req

* rate limit logs

* moew logs

* bump timeoutCtx

* no rate limit

* public convert mapkeys to cc

* register reciever cs

* nit cleanup

* updated bnm token pool

* added CCIPBurnMintTokenPoolOwnerId

* pool bytes, token 32byte

* possible semphore fix

* faisal fix

* more logs

* nb

* wip upgrade

* nit

* cleanups

* rebased

* fix go mod issue

* downgraded mcms package

* go mod nit

* revert mcms gomod

* rebased

* fix ci

* nit

* go mod tidy fix

* updated gomd

* debug log

* lint

* spelling nit

Author: stackman27

deployment/changesets/cd_deploy_tp_and_configure.go

@@ -1,6 +1,8 @@
 package changesets
 
 import (
+	"fmt"
+
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
 	"github.com/smartcontractkit/chainlink-sui/bindings/bind"
@@ -26,6 +28,7 @@ var _ cldf.ChangeSetV2[DeployTPAndConfigureConfig] = DeployTPAndConfigure{}
 
 // Apply implements deployment.ChangeSetV2.
 func (d DeployTPAndConfigure) Apply(e cldf.Environment, config DeployTPAndConfigureConfig) (cldf.ChangesetOutput, error) {
+	ab := cldf.NewMemoryAddressBook()
 	state, err := deployment.LoadOnchainStatesui(e)
 	if err != nil {
 		return cldf.ChangesetOutput{}, err
@@ -67,10 +70,31 @@ func (d DeployTPAndConfigure) Apply(e cldf.Environment, config DeployTPAndConfig
 			config.BurnMintTpInput.CCIPObjectRefObjectId = state[config.SuiChainSelector].CCIPObjectRef
 			config.BurnMintTpInput.TokenPoolAdministrator = deployerAddr // check with felix if this is fine
 
-			_, err = operations.ExecuteSequence(e.OperationsBundle, burnminttokenpoolops.DeployAndInitBurnMintTokenPoolSequence, deps, config.BurnMintTpInput)
+			BnMTokenPoolSeqReport, err := operations.ExecuteSequence(e.OperationsBundle, burnminttokenpoolops.DeployAndInitBurnMintTokenPoolSequence, deps, config.BurnMintTpInput)
 			if err != nil {
 				return cldf.ChangesetOutput{}, err
 			}
+
+			// save BnM Pool to the addressbook
+			typeAndVersionBurnMintTokenPool := cldf.NewTypeAndVersion(deployment.SuiBnMTokenPoolType, deployment.Version1_0_0)
+			err = ab.Save(config.SuiChainSelector, BnMTokenPoolSeqReport.Output.BurnMintTPPackageID, typeAndVersionBurnMintTokenPool)
+			if err != nil {
+				return cldf.ChangesetOutput{}, fmt.Errorf("failed to save BnMTokenPool address %s for Sui chain %d: %w", BnMTokenPoolSeqReport.Output.BurnMintTPPackageID, config.SuiChainSelector, err)
+			}
+
+			// save BnM Pool State to the addressBook
+			typeAndVersionBurnMintTokenPoolState := cldf.NewTypeAndVersion(deployment.SuiBnMTokenPoolStateType, deployment.Version1_0_0)
+			err = ab.Save(config.SuiChainSelector, BnMTokenPoolSeqReport.Output.Objects.StateObjectId, typeAndVersionBurnMintTokenPoolState)
+			if err != nil {
+				return cldf.ChangesetOutput{}, fmt.Errorf("failed to save BnMTokenPoolState address %s for Sui chain %d: %w", BnMTokenPoolSeqReport.Output.Objects.StateObjectId, config.SuiChainSelector, err)
+			}
+
+			// save BnM Pool OwnerId to the addressBook
+			typeAndVersionBurnMintTokenPoolOwnerId := cldf.NewTypeAndVersion(deployment.SuiBnMTokenPoolOwnerIDType, deployment.Version1_0_0)
+			err = ab.Save(config.SuiChainSelector, BnMTokenPoolSeqReport.Output.Objects.OwnerCapObjectId, typeAndVersionBurnMintTokenPoolOwnerId)
+			if err != nil {
+				return cldf.ChangesetOutput{}, fmt.Errorf("failed to save BnMTokenPoolOwnerCapId address %s for Sui chain %d: %w", BnMTokenPoolSeqReport.Output.Objects.OwnerCapObjectId, config.SuiChainSelector, err)
+			}
 		}
 
 		if tokenPoolType == "lnr" {
@@ -103,7 +127,8 @@ func (d DeployTPAndConfigure) Apply(e cldf.Environment, config DeployTPAndConfig
 	}
 
 	return cldf.ChangesetOutput{
-		Reports: seqReports,
+		AddressBook: ab,
+		Reports:     seqReports,
 	}, nil
 }
 

deployment/changesets/cs_add_remote_tp.go

@@ -50,7 +50,6 @@ func (d AddRemoteTP) Apply(e cldf.Environment, config AddRemoteTPConfig) (cldf.C
 	}
 
 	// Todo: validate that len of TokenpoolTypes == RemoteChainSelectors == RemotePoolAddressToAdd
-
 	for _, tokenPoolType := range config.TokenPoolTypes {
 		if tokenPoolType == "lnr" {
 			for i, chainSelector := range config.RemoteChainSelectors {

deployment/changesets/cs_deploy_dummy_receiver.go

@@ -11,18 +11,18 @@ import (
 	ccipops "github.com/smartcontractkit/chainlink-sui/deployment/ops/ccip"
 )
 
-type DeployDummyRecieverConfig struct {
+type DeployDummyReceiverConfig struct {
 	SuiChainSelector uint64
 	McmsOwner        string
 }
 
-var _ cldf.ChangeSetV2[DeployDummyRecieverConfig] = DeployDummyReciever{}
+var _ cldf.ChangeSetV2[DeployDummyReceiverConfig] = DeployDummyReceiver{}
 
 // DeployAptosChain deploys Aptos chain packages and modules
-type DeployDummyReciever struct{}
+type DeployDummyReceiver struct{}
 
 // Apply implements deployment.ChangeSetV2.
-func (d DeployDummyReciever) Apply(e cldf.Environment, config DeployDummyRecieverConfig) (cldf.ChangesetOutput, error) {
+func (d DeployDummyReceiver) Apply(e cldf.Environment, config DeployDummyReceiverConfig) (cldf.ChangesetOutput, error) {
 	state, err := deployment.LoadOnchainStatesui(e)
 	if err != nil {
 		return cldf.ChangesetOutput{}, err
@@ -45,7 +45,7 @@ func (d DeployDummyReciever) Apply(e cldf.Environment, config DeployDummyRecieve
 		},
 	}
 
-	// Run DummyReciever Operation
+	// Run DummyReceiver Operation
 	DeployDummyReceiverOp, err := operations.ExecuteOperation(e.OperationsBundle, ccipops.DeployCCIPDummyReceiverOp, deps, ccipops.DeployDummyReceiverInput{
 		CCIPPackageId: state[config.SuiChainSelector].CCIPAddress,
 		McmsPackageId: state[config.SuiChainSelector].MCMsAddress,
@@ -55,8 +55,7 @@ func (d DeployDummyReciever) Apply(e cldf.Environment, config DeployDummyRecieve
 		return cldf.ChangesetOutput{}, fmt.Errorf("failed to deploy LinkToken for Sui chain %d: %w", config.SuiChainSelector, err)
 	}
 
-	// register reciever
-
+	// register receiver
 	seqReports = append(seqReports, []operations.Report[any, any]{DeployDummyReceiverOp.ToGenericReport()}...)
 
 	return cldf.ChangesetOutput{
@@ -66,6 +65,6 @@ func (d DeployDummyReciever) Apply(e cldf.Environment, config DeployDummyRecieve
 }
 
 // VerifyPreconditions implements deployment.ChangeSetV2.
-func (d DeployDummyReciever) VerifyPreconditions(e cldf.Environment, config DeployDummyRecieverConfig) error {
+func (d DeployDummyReceiver) VerifyPreconditions(e cldf.Environment, config DeployDummyReceiverConfig) error {
 	return nil
 }

deployment/changesets/cs_deploy_sui_chain.go

@@ -186,10 +186,18 @@ func (d DeploySuiChain) Apply(e cldf.Environment, config DeploySuiChainConfig) (
 		return cldf.ChangesetOutput{}, fmt.Errorf("failed to save onRamp state object Id  %s for Sui chain %d: %w", ccipOnRampSeqReport.Output.Objects.StateObjectId, config.DestChainSelector, err)
 	}
 
+	// save OnRampOwnerCapObjectID to addressbook
 	typeAndVersionOnRampOwnerCapObjectId := cldf.NewTypeAndVersion(deployment.SuiOnRampOwnerCapObjectIDType, deployment.Version1_0_0)
 	err = ab.Save(config.SuiChainSelector, ccipOnRampSeqReport.Output.Objects.OwnerCapObjectId, typeAndVersionOnRampOwnerCapObjectId)
 	if err != nil {
-		return cldf.ChangesetOutput{}, fmt.Errorf("failed to save onRamp state object Id  %s for Sui chain %d: %w", ccipOnRampSeqReport.Output.Objects.StateObjectId, config.DestChainSelector, err)
+		return cldf.ChangesetOutput{}, fmt.Errorf("failed to save OnRampOwnerCapObjectID  %s for Sui chain %d: %w", ccipOnRampSeqReport.Output.Objects.StateObjectId, config.DestChainSelector, err)
+	}
+
+	// save OnRampUpgradeCapId to addressbook
+	typeAndVersionOnRampUpgradeCapId := cldf.NewTypeAndVersion(deployment.SuiOnRampUpgradeCapObjectIDType, deployment.Version1_0_0)
+	err = ab.Save(config.SuiChainSelector, ccipOnRampSeqReport.Output.Objects.UpgradeCapObjectId, typeAndVersionOnRampUpgradeCapId)
+	if err != nil {
+		return cldf.ChangesetOutput{}, fmt.Errorf("failed to save OnRampUpgradeCapId  %s for Sui chain %d: %w", ccipOnRampSeqReport.Output.Objects.StateObjectId, config.DestChainSelector, err)
 	}
 
 	// --------------------------

deployment/changesets/cs_mint_token.go

@@ -56,8 +56,6 @@ func (d MintLinkToken) Apply(e cldf.Environment, config MintLinkTokenConfig) (cl
 
 	seqReports = append(seqReports, mintLinkTokenReport.ToGenericReport())
 
-	fmt.Println("MINT TOKEN REPORT: ", seqReports)
-
 	return cldf.ChangesetOutput{
 		AddressBook: ab,
 		Reports:     seqReports,

deployment/changesets/cs_register_dummy_receiver.go

@@ -0,0 +1,62 @@
+package changesets
+
+import (
+	"fmt"
+
+	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
+	"github.com/smartcontractkit/chainlink-sui/bindings/bind"
+	sui_ops "github.com/smartcontractkit/chainlink-sui/deployment/ops"
+	ccipops "github.com/smartcontractkit/chainlink-sui/deployment/ops/ccip"
+)
+
+type RegisterDummyReceiverConfig struct {
+	SuiChainSelector       uint64
+	CCIPObjectRefObjectId  string
+	DummyReceiverPackageId string
+}
+
+var _ cldf.ChangeSetV2[RegisterDummyReceiverConfig] = RegisterDummyReceiver{}
+
+type RegisterDummyReceiver struct{}
+
+// Apply implements deployment.ChangeSetV2.
+func (d RegisterDummyReceiver) Apply(e cldf.Environment, config RegisterDummyReceiverConfig) (cldf.ChangesetOutput, error) {
+	ab := cldf.NewMemoryAddressBook()
+	seqReports := make([]operations.Report[any, any], 0)
+
+	suiChain := e.BlockChains.SuiChains()[config.SuiChainSelector]
+
+	deps := sui_ops.OpTxDeps{
+		Client: suiChain.Client,
+		Signer: suiChain.Signer,
+		GetCallOpts: func() *bind.CallOpts {
+			b := uint64(400_000_000)
+			return &bind.CallOpts{
+				WaitForExecution: true,
+				GasBudget:        &b,
+			}
+		},
+	}
+
+	// Run RegisterReceiver Operation
+	RegisterReceiverOp, err := operations.ExecuteOperation(e.OperationsBundle, ccipops.RegisterDummyReceiverOp, deps, ccipops.RegisterDummyReceiverInput{
+		CCIPObjectRefObjectId:  config.CCIPObjectRefObjectId,
+		DummyReceiverPackageId: config.DummyReceiverPackageId,
+	})
+	if err != nil {
+		return cldf.ChangesetOutput{}, fmt.Errorf("failed to register receiver for Sui chain %d: %w", config.SuiChainSelector, err)
+	}
+
+	seqReports = append(seqReports, []operations.Report[any, any]{RegisterReceiverOp.ToGenericReport()}...)
+
+	return cldf.ChangesetOutput{
+		AddressBook: ab,
+		Reports:     seqReports,
+	}, nil
+}
+
+// VerifyPreconditions implements deployment.ChangeSetV2.
+func (d RegisterDummyReceiver) VerifyPreconditions(e cldf.Environment, config RegisterDummyReceiverConfig) error {
+	return nil
+}

deployment/common.go

@@ -0,0 +1,28 @@
+package deployment
+
+import (
+	"encoding/hex"
+	"fmt"
+	"strings"
+)
+
+func StrToBytes(s string) ([]byte, error) {
+	raw, err := hex.DecodeString(strings.TrimSpace(strings.TrimPrefix(s, "0x")))
+	if err != nil {
+		return nil, err
+	}
+	return raw, nil
+}
+
+func StrTo32(s string) ([]byte, error) {
+	raw, err := hex.DecodeString(strings.TrimSpace(strings.TrimPrefix(s, "0x")))
+	if err != nil {
+		return nil, err
+	}
+	if len(raw) > 32 {
+		return nil, fmt.Errorf("address longer than 32 bytes: %d", len(raw))
+	}
+	out := make([]byte, 32)
+	copy(out[32-len(raw):], raw) // left-pad with zeros
+	return out, nil
+}

deployment/ops/ccip/op_register_dummy_receiver.go

@@ -15,7 +15,6 @@ import (
 type RegisterDummyReceiverInput struct {
 	CCIPObjectRefObjectId  string
 	DummyReceiverPackageId string
-	ReceiverStateParams    []string
 }
 
 type RegisterDummyReceiverObjects struct {
@@ -39,15 +38,13 @@ var registerDummyReceiverHandler = func(b cld_ops.Bundle, deps sui_ops.OpTxDeps,
 		b.GetContext(),
 		opts,
 		bind.Object{Id: input.CCIPObjectRefObjectId},
-		//input.ReceiverStateParams,
 	)
 	if err != nil {
 		return sui_ops.OpTxResult[RegisterDummyReceiverObjects]{}, fmt.Errorf("failed to execute dummy receiver registration: %w", err)
 	}
 
 	b.Logger.Infow("Dummy receiver registered",
 		"dummyReceiverPackageId", input.DummyReceiverPackageId,
-		"receiverStateParams", input.ReceiverStateParams,
 	)
 
 	return sui_ops.OpTxResult[RegisterDummyReceiverObjects]{

deployment/ops/ccip/seq_deploy_and_init_dummy_receiver.go

@@ -13,7 +13,6 @@ type DeployAndInitDummyReceiverInput struct {
 	DeployDummyReceiverInput
 	// For registration
 	CCIPObjectRefObjectId string
-	ReceiverStateParams   []string
 }
 
 type DeployDummyReceiverSeqObjects struct {
@@ -54,7 +53,6 @@ var DeployAndInitDummyReceiverSequence = cld_ops.NewSequence(
 			RegisterDummyReceiverInput{
 				CCIPObjectRefObjectId:  input.CCIPObjectRefObjectId,
 				DummyReceiverPackageId: deployReport.Output.PackageId,
-				ReceiverStateParams:    input.ReceiverStateParams,
 			},
 		)
 		if err != nil {

deployment/ops/ccip_burn_mint_token_pool/op_burn_mint_token_pool.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-sui/bindings/bind"
 	module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool"
+	"github.com/smartcontractkit/chainlink-sui/deployment"
 	sui_ops "github.com/smartcontractkit/chainlink-sui/deployment/ops"
 )
 
@@ -155,14 +156,22 @@ var applyChainUpdates = func(b cld_ops.Bundle, deps sui_ops.OpTxDeps, input Burn
 	for i, addresses := range input.RemotePoolAddressesToAdd {
 		remotePoolAddressesBytes[i] = make([][]byte, len(addresses))
 		for j, address := range addresses {
-			remotePoolAddressesBytes[i][j] = []byte(address)
+			b, err := deployment.StrToBytes(address)
+			if err != nil {
+				return sui_ops.OpTxResult[NoObjects]{}, fmt.Errorf("bad remote pool address [%d][%d]: %w", i, j, err)
+			}
+			remotePoolAddressesBytes[i][j] = b
 		}
 	}
 
 	// Convert []string to [][]byte for RemoteTokenAddressesToAdd
 	remoteTokenAddressesBytes := make([][]byte, len(input.RemoteTokenAddressesToAdd))
 	for i, address := range input.RemoteTokenAddressesToAdd {
-		remoteTokenAddressesBytes[i] = []byte(address)
+		b32, err := deployment.StrTo32(address)
+		if err != nil {
+			return sui_ops.OpTxResult[NoObjects]{}, fmt.Errorf("bad remote token address [%d]: %w", i, err)
+		}
+		remoteTokenAddressesBytes[i] = b32
 	}
 
 	opts := deps.GetCallOpts()