Skip to content

Commit

Permalink
linting
Browse files Browse the repository at this point in the history
  • Loading branch information
@yashnevatia
yashnevatia committed Jan 30, 2025
1 parent 8e77554 commit 458cf60
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 41 deletions.
4 changes: 1 addition & 3 deletions deployment/ccip/changeset/cs_deploy_chain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,7 @@ func initializeRouter(e deployment.Environment, chain deployment.SolChain, ccipR
if err != nil {
return fmt.Errorf("failed to build instruction: %w", err)
}
err = chain.Confirm([]solana.Instruction{instruction})

if err != nil {
if err := chain.Confirm([]solana.Instruction{instruction}); err != nil {
return fmt.Errorf("failed to confirm instructions: %w", err)
}
e.Logger.Infow("Initialized router", "chain", chain.String())
Expand Down
57 changes: 19 additions & 38 deletions deployment/ccip/changeset/solana/cs_chain_contracts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package solana

import (
"context"
"errors"
"fmt"

"github.com/gagliardetto/solana-go"
Expand Down Expand Up @@ -196,7 +197,7 @@ func doAddRemoteChainToSolana(e deployment.Environment, s cs.CCIPOnChainState, c
remoteChainFamily, _ := chainsel.GetSelectorFamily(remoteChainSel)
switch remoteChainFamily {
case chainsel.FamilySolana:
return deployment.ChangesetOutput{}, fmt.Errorf("cannot add solana chain as remote chain")
return deployment.ChangesetOutput{}, fmt.Errorf("support for solana chain as remote chain is not implemented yet %d", remoteChainSel)
case chainsel.FamilyEVM:
onRampAddress := s.Chains[remoteChainSel].OnRamp.Address().String()
if onRampAddress == "" {
Expand Down Expand Up @@ -529,12 +530,10 @@ type BillingTokenConfig struct {

func (cfg BillingTokenConfig) Validate(e deployment.Environment) error {
tokenPubKey := solana.MustPublicKeyFromBase58(cfg.TokenPubKey)
err := commonValidation(e, cfg.ChainSelector, tokenPubKey)
if err != nil {
if err := commonValidation(e, cfg.ChainSelector, tokenPubKey); err != nil {
return err
}
_, err = GetTokenProgramID(cfg.TokenProgramName)
if err != nil {
if _, err := GetTokenProgramID(cfg.TokenProgramName); err != nil {
return err
}

Expand All @@ -550,8 +549,7 @@ func (cfg BillingTokenConfig) Validate(e deployment.Environment) error {
return err
}
var token0ConfigAccount solRouter.BillingTokenConfigWrapper
err = chain.GetAccountDataBorshInto(context.Background(), billingConfigPDA, &token0ConfigAccount)
if err == nil {
if err := chain.GetAccountDataBorshInto(context.Background(), billingConfigPDA, &token0ConfigAccount); err == nil {
return fmt.Errorf("billing token config already exists for token %s", tokenPubKey.String())
}
return nil
Expand Down Expand Up @@ -597,8 +595,7 @@ func AddBillingToken(e deployment.Environment, cfg BillingTokenConfig) (deployme
}

instructions := []solana.Instruction{ixConfig}
err := chain.Confirm(instructions)
if err != nil {
if err := chain.Confirm(instructions); err != nil {
return deployment.ChangesetOutput{}, err
}
e.Logger.Infow("Billing token added", "chainSelector", cfg.ChainSelector, "tokenPubKey", tokenPubKey.String())
Expand All @@ -615,8 +612,7 @@ type BillingTokenForRemoteChainConfig struct {

func (cfg BillingTokenForRemoteChainConfig) Validate(e deployment.Environment) error {
tokenPubKey := solana.MustPublicKeyFromBase58(cfg.TokenPubKey)
err := commonValidation(e, cfg.ChainSelector, tokenPubKey)
if err != nil {
if err := commonValidation(e, cfg.ChainSelector, tokenPubKey); err != nil {
return err
}
state, _ := cs.LoadOnchainState(e)
Expand All @@ -631,8 +627,7 @@ func (cfg BillingTokenForRemoteChainConfig) Validate(e deployment.Environment) e
return err
}
var remoteBillingAccount solRouter.TokenBilling
err = chain.GetAccountDataBorshInto(context.Background(), remoteBillingPDA, &remoteBillingAccount)
if err == nil {
if err := chain.GetAccountDataBorshInto(context.Background(), remoteBillingPDA, &remoteBillingAccount); err == nil {
return fmt.Errorf("billing token config already exists for token %s", tokenPubKey.String())
}
return nil
Expand Down Expand Up @@ -664,8 +659,7 @@ func AddBillingTokenForRemoteChain(e deployment.Environment, cfg BillingTokenFor
return deployment.ChangesetOutput{}, err
}
instructions := []solana.Instruction{ix}
err = chain.Confirm(instructions)
if err != nil {
if err := chain.Confirm(instructions); err != nil {
return deployment.ChangesetOutput{}, err
}
e.Logger.Infow("Token billing set for remote chain", "chainSelector ", cfg.ChainSelector, "remoteChainSelector ", cfg.RemoteChainSelector, "tokenPubKey", tokenPubKey.String())
Expand Down Expand Up @@ -693,12 +687,11 @@ func (cfg RegisterTokenAdminRegistryConfig) Validate(e deployment.Environment) e
}

if cfg.RegisterType == ViaOwnerInstruction && cfg.TokenAdminRegistryAdmin != "" {
return fmt.Errorf("token admin registry should be empty for via owner instruction")
return errors.New("token admin registry should be empty for via owner instruction")
}

tokenPubKey := solana.MustPublicKeyFromBase58(cfg.TokenPubKey)
err := commonValidation(e, cfg.ChainSelector, tokenPubKey)
if err != nil {
if err := commonValidation(e, cfg.ChainSelector, tokenPubKey); err != nil {
return err
}
state, _ := cs.LoadOnchainState(e)
Expand All @@ -712,8 +705,7 @@ func (cfg RegisterTokenAdminRegistryConfig) Validate(e deployment.Environment) e
return err
}
var tokenAdminRegistryAccount solRouter.TokenAdminRegistry
err = chain.GetAccountDataBorshInto(context.Background(), tokenAdminRegistryPDA, &tokenAdminRegistryAccount)
if err == nil {
if err := chain.GetAccountDataBorshInto(context.Background(), tokenAdminRegistryPDA, &tokenAdminRegistryAccount); err == nil {
return fmt.Errorf("token admin registry already exists for token %s", tokenPubKey.String())
}
return nil
Expand Down Expand Up @@ -765,8 +757,7 @@ func RegisterTokenAdminRegistry(e deployment.Environment, cfg RegisterTokenAdmin
// if we want to have a different authority, we will need to add the corresponding singer here
// for now we are assuming both token owner and ccip admin will always be deployer key
instructions := []solana.Instruction{instruction}
err = chain.Confirm(instructions)
if err != nil {
if err := chain.Confirm(instructions); err != nil {
return deployment.ChangesetOutput{}, err
}
return deployment.ChangesetOutput{}, nil
Expand All @@ -782,8 +773,7 @@ type TransferAdminRoleTokenAdminRegistryConfig struct {

func (cfg TransferAdminRoleTokenAdminRegistryConfig) Validate(e deployment.Environment) error {
tokenPubKey := solana.MustPublicKeyFromBase58(cfg.TokenPubKey)
err := commonValidation(e, cfg.ChainSelector, tokenPubKey)
if err != nil {
if err := commonValidation(e, cfg.ChainSelector, tokenPubKey); err != nil {
return err
}

Expand All @@ -805,8 +795,7 @@ func (cfg TransferAdminRoleTokenAdminRegistryConfig) Validate(e deployment.Envir
return err
}
var tokenAdminRegistryAccount solRouter.TokenAdminRegistry
err = chain.GetAccountDataBorshInto(context.Background(), tokenAdminRegistryPDA, &tokenAdminRegistryAccount)
if err != nil {
if err := chain.GetAccountDataBorshInto(context.Background(), tokenAdminRegistryPDA, &tokenAdminRegistryAccount); err != nil {
return fmt.Errorf("token admin registry not found for token %s, cannot transfer admin role", tokenPubKey.String())
}
// check if passed admin is the current admin
Expand Down Expand Up @@ -844,8 +833,7 @@ func TransferAdminRoleTokenAdminRegistry(e deployment.Environment, cfg TransferA
}
instructions := []solana.Instruction{ix1}
// the existing authority will have to sign the transfer
err = chain.Confirm(instructions, solCommonUtil.AddSigners(currentRegistryAdminPrivateKey))
if err != nil {
if err := chain.Confirm(instructions, solCommonUtil.AddSigners(currentRegistryAdminPrivateKey)); err != nil {
return deployment.ChangesetOutput{}, err
}
return deployment.ChangesetOutput{}, nil
Expand All @@ -859,8 +847,7 @@ type AcceptAdminRoleTokenAdminRegistryConfig struct {

func (cfg AcceptAdminRoleTokenAdminRegistryConfig) Validate(e deployment.Environment) error {
tokenPubKey := solana.MustPublicKeyFromBase58(cfg.TokenPubKey)
err := commonValidation(e, cfg.ChainSelector, tokenPubKey)
if err != nil {
if err := commonValidation(e, cfg.ChainSelector, tokenPubKey); err != nil {
return err
}
state, _ := cs.LoadOnchainState(e)
Expand All @@ -874,8 +861,7 @@ func (cfg AcceptAdminRoleTokenAdminRegistryConfig) Validate(e deployment.Environ
return err
}
var tokenAdminRegistryAccount solRouter.TokenAdminRegistry
err = chain.GetAccountDataBorshInto(context.Background(), tokenAdminRegistryPDA, &tokenAdminRegistryAccount)
if err != nil {
if err := chain.GetAccountDataBorshInto(context.Background(), tokenAdminRegistryPDA, &tokenAdminRegistryAccount); err != nil {
return fmt.Errorf("token admin registry not found for token %s, cannot accept admin role", tokenPubKey.String())
}
// check if accepting admin is the pending admin
Expand Down Expand Up @@ -911,14 +897,9 @@ func AcceptAdminRoleTokenAdminRegistry(e deployment.Environment, cfg AcceptAdmin
return deployment.ChangesetOutput{}, err
}

if err != nil {
return deployment.ChangesetOutput{}, err
}

instructions := []solana.Instruction{ix1}
// the new authority will have to sign the acceptance
err = chain.Confirm(instructions, solCommonUtil.AddSigners(newRegistryAdminPrivateKey))
if err != nil {
if err := chain.Confirm(instructions, solCommonUtil.AddSigners(newRegistryAdminPrivateKey)); err != nil {
return deployment.ChangesetOutput{}, err
}
return deployment.ChangesetOutput{}, nil
Expand Down

0 comments on commit 458cf60

Please sign in to comment.