Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

freeing up ports #16602

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+29 −71
Open

freeing up ports #16602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0ebbb9
freeing up ports
yashnevatia Feb 27, 2025
70f0847
forgot to delete
yashnevatia Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 28 additions & 71 deletions deployment/ccip/changeset/solana/cs_chain_contracts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,14 @@ func TestTokenAdminRegistry(t *testing.T) {
RegisterType: ccipChangesetSolana.ViaOwnerInstruction,
},
),
commonchangeset.Configure(
// add token pool lookup table
deployment.CreateLegacyChangeSet(ccipChangesetSolana.AddTokenPoolLookupTable),
ccipChangesetSolana.TokenPoolLookupTableConfig{
ChainSelector: solChain,
TokenPubKey: tokenAddress.String(),
},
),
)
require.NoError(t, err)

Expand All @@ -497,6 +505,15 @@ func TestTokenAdminRegistry(t *testing.T) {
require.NoError(t, err)
require.Equal(t, tokenAdminRegistryAdminPrivKey.PublicKey(), linkTokenAdminRegistryAccount.PendingAdministrator)

// lookup table test
state, err = ccipChangeset.LoadOnchainStateSolana(e)
require.NoError(t, err)
lookupTablePubKey := state.SolChains[solChain].TokenPoolLookupTable[tokenAddress]
lookupTableEntries0, err := solCommonUtil.GetAddressLookupTable(ctx, e.SolChains[solChain].Client, lookupTablePubKey)
require.NoError(t, err)
require.Equal(t, lookupTablePubKey, lookupTableEntries0[0])
require.Equal(t, tokenAddress, lookupTableEntries0[7])

e, err = commonchangeset.Apply(t, e, nil,
commonchangeset.Configure(
// accept admin role for tokenAddress
Expand All @@ -507,13 +524,24 @@ func TestTokenAdminRegistry(t *testing.T) {
NewRegistryAdminPrivateKey: tokenAdminRegistryAdminPrivKey.String(),
},
),
commonchangeset.Configure(
// set pool -> this updates tokenAdminRegistryPDA, hence above changeset is required
deployment.CreateLegacyChangeSet(ccipChangesetSolana.SetPool),
ccipChangesetSolana.SetPoolConfig{
ChainSelector: solChain,
TokenPubKey: tokenAddress.String(),
TokenAdminRegistryAdminPrivateKey: tokenAdminRegistryAdminPrivKey.String(),
WritableIndexes: []uint8{3, 4, 7},
},
),
)
require.NoError(t, err)
err = e.SolChains[solChain].GetAccountDataBorshInto(ctx, tokenAdminRegistryPDA, &tokenAdminRegistryAccount)
require.NoError(t, err)
// confirm that the administrator is the deployer key
require.Equal(t, tokenAdminRegistryAdminPrivKey.PublicKey(), tokenAdminRegistryAccount.Administrator)
require.Equal(t, solana.PublicKey{}, tokenAdminRegistryAccount.PendingAdministrator)
require.Equal(t, lookupTablePubKey, tokenAdminRegistryAccount.LookupTable)

newTokenAdminRegistryAdminPrivKey, _ := solana.NewRandomPrivateKey()
e, err = commonchangeset.Apply(t, e, nil,
Expand All @@ -533,74 +561,3 @@ func TestTokenAdminRegistry(t *testing.T) {
require.NoError(t, err)
require.Equal(t, newTokenAdminRegistryAdminPrivKey.PublicKey(), tokenAdminRegistryAccount.PendingAdministrator)
}

func TestPoolLookupTable(t *testing.T) {
t.Parallel()
ctx := testcontext.Get(t)
tenv, _ := testhelpers.NewMemoryEnvironment(t, testhelpers.WithSolChains(1))
solChain := tenv.Env.AllChainSelectorsSolana()[0]

e, tokenAddress, err := deployToken(t, tenv.Env, solChain)
require.NoError(t, err)
e, err = commonchangeset.Apply(t, e, nil,
commonchangeset.Configure(
// add token pool lookup table
deployment.CreateLegacyChangeSet(ccipChangesetSolana.AddTokenPoolLookupTable),
ccipChangesetSolana.TokenPoolLookupTableConfig{
ChainSelector: solChain,
TokenPubKey: tokenAddress.String(),
},
),
)
require.NoError(t, err)
state, err := ccipChangeset.LoadOnchainStateSolana(e)
require.NoError(t, err)
lookupTablePubKey := state.SolChains[solChain].TokenPoolLookupTable[tokenAddress]

lookupTableEntries0, err := solCommonUtil.GetAddressLookupTable(ctx, e.SolChains[solChain].Client, lookupTablePubKey)
require.NoError(t, err)
require.Equal(t, lookupTablePubKey, lookupTableEntries0[0])
require.Equal(t, tokenAddress, lookupTableEntries0[7])

tokenAdminRegistryAdminPrivKey, _ := solana.NewRandomPrivateKey()

e, err = commonchangeset.Apply(t, e, nil,
commonchangeset.Configure(
// register token admin registry for linkToken via owner instruction
deployment.CreateLegacyChangeSet(ccipChangesetSolana.RegisterTokenAdminRegistry),
ccipChangesetSolana.RegisterTokenAdminRegistryConfig{
ChainSelector: solChain,
TokenPubKey: tokenAddress.String(),
TokenAdminRegistryAdmin: tokenAdminRegistryAdminPrivKey.PublicKey().String(),
RegisterType: ccipChangesetSolana.ViaGetCcipAdminInstruction,
},
),
commonchangeset.Configure(
// accept admin role for tokenAddress
deployment.CreateLegacyChangeSet(ccipChangesetSolana.AcceptAdminRoleTokenAdminRegistry),
ccipChangesetSolana.AcceptAdminRoleTokenAdminRegistryConfig{
ChainSelector: solChain,
TokenPubKey: tokenAddress.String(),
NewRegistryAdminPrivateKey: tokenAdminRegistryAdminPrivKey.String(),
},
),
commonchangeset.Configure(
// set pool -> this updates tokenAdminRegistryPDA, hence above changeset is required
deployment.CreateLegacyChangeSet(ccipChangesetSolana.SetPool),
ccipChangesetSolana.SetPoolConfig{
ChainSelector: solChain,
TokenPubKey: tokenAddress.String(),
TokenAdminRegistryAdminPrivateKey: tokenAdminRegistryAdminPrivKey.String(),
WritableIndexes: []uint8{3, 4, 7},
},
),
)
require.NoError(t, err)
tokenAdminRegistry := solRouter.TokenAdminRegistry{}
tokenAdminRegistryPDA, _, _ := solState.FindTokenAdminRegistryPDA(tokenAddress, state.SolChains[solChain].Router)

err = e.SolChains[solChain].GetAccountDataBorshInto(ctx, tokenAdminRegistryPDA, &tokenAdminRegistry)
require.NoError(t, err)
require.Equal(t, tokenAdminRegistryAdminPrivKey.PublicKey(), tokenAdminRegistry.Administrator)
require.Equal(t, lookupTablePubKey, tokenAdminRegistry.LookupTable)
}
1 change: 1 addition & 0 deletions deployment/ccip/changeset/solana/cs_solana_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestSolanaTokenOps(t *testing.T) {
lggr := logger.TestLogger(t)
e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
SolChains: 1,
Chains: 1,
})
solChain1 := e.AllChainSelectorsSolana()[0]
e, err := commonchangeset.Apply(t, e, nil,
Expand Down
Loading