@@ -90,7 +90,7 @@ type UpgradeConfig struct {
9090 // SpillAddress and UpgradeAuthority must be set
9191 SpillAddress solana.PublicKey
9292 UpgradeAuthority solana.PublicKey
93- // MCMS config must be set for upgrades and offramp redploys (to configure the fee quoter after redeploy)
93+ // MCMS config must be set for upgrades and offramp redeploys (to configure the fee quoter after redeploy)
9494 MCMS * proposalutils.TimelockConfig
9595}
9696
@@ -281,7 +281,6 @@ func initializeRouter(
281281 }
282282 // addressing errcheck in the next PR
283283 routerConfigPDA , _ , _ := solState .FindConfigPDA (ccipRouterProgram )
284- externalTokenPoolsSignerPDA , _ , _ := solState .FindExternalTokenPoolsSignerPDA (ccipRouterProgram )
285284
286285 instruction , err := solRouter .NewInitializeInstruction (
287286 chain .Selector , // chain selector
@@ -295,7 +294,6 @@ func initializeRouter(
295294 solana .SystemProgramID ,
296295 ccipRouterProgram ,
297296 programData .Address ,
298- externalTokenPoolsSignerPDA ,
299297 ).ValidateAndBuild ()
300298
301299 if err != nil {
@@ -377,8 +375,6 @@ func initializeOffRamp(
377375 offRampConfigPDA , _ , _ := solState .FindOfframpConfigPDA (offRampAddress )
378376 offRampReferenceAddressesPDA , _ , _ := solState .FindOfframpReferenceAddressesPDA (offRampAddress )
379377 offRampStatePDA , _ , _ := solState .FindOfframpStatePDA (offRampAddress )
380- offRampExternalExecutionConfigPDA , _ , _ := solState .FindExternalExecutionConfigPDA (offRampAddress )
381- offRampTokenPoolsSignerPDA , _ , _ := solState .FindExternalTokenPoolsSignerPDA (offRampAddress )
382378
383379 initIx , err := solOffRamp .NewInitializeInstruction (
384380 offRampReferenceAddressesPDA ,
@@ -387,8 +383,6 @@ func initializeOffRamp(
387383 rmnRemoteAddress ,
388384 addressLookupTable ,
389385 offRampStatePDA ,
390- offRampExternalExecutionConfigPDA ,
391- offRampTokenPoolsSignerPDA ,
392386 chain .DeployerKey .PublicKey (),
393387 solana .SystemProgramID ,
394388 offRampAddress ,
@@ -757,7 +751,7 @@ func deployChainContractsSolana(
757751
758752 // LOOKUP TABLE
759753 if createLookupTable {
760- // fee quoter enteries
754+ // fee quoter entries
761755 linkFqBillingConfigPDA , _ , _ := solState .FindFqBillingTokenConfigPDA (chainState .LinkToken , feeQuoterAddress )
762756 wsolFqBillingConfigPDA , _ , _ := solState .FindFqBillingTokenConfigPDA (chainState .WSOL , feeQuoterAddress )
763757 feeQuoterConfigPDA , _ , _ := solState .FindFqConfigPDA (feeQuoterAddress )
@@ -770,15 +764,11 @@ func deployChainContractsSolana(
770764 }... )
771765
772766 // router entries
773- externalExecutionConfigPDA , _ , _ := solState .FindExternalExecutionConfigPDA (ccipRouterProgram )
774- externalTokenPoolsSignerPDA , _ , _ := solState .FindExternalTokenPoolsSignerPDA (ccipRouterProgram )
775767 routerConfigPDA , _ , _ := solState .FindConfigPDA (ccipRouterProgram )
776768 feeBillingSignerPDA , _ , _ := solState .FindFeeBillingSignerPDA (ccipRouterProgram )
777769 lookupTableKeys = append (lookupTableKeys , []solana.PublicKey {
778770 ccipRouterProgram ,
779771 routerConfigPDA ,
780- externalExecutionConfigPDA ,
781- externalTokenPoolsSignerPDA ,
782772 feeBillingSignerPDA ,
783773 }... )
784774
@@ -1157,7 +1147,7 @@ func DeployReceiverForTest(e deployment.Environment, cfg DeployForTestConfig) (d
11571147 }
11581148
11591149 solTestReceiver .SetProgramID (receiverAddress )
1160- externalExecutionConfigPDA , _ , _ := solState . FindExternalExecutionConfigPDA ( receiverAddress )
1150+ externalExecutionConfigPDA , _ , _ := solana . FindProgramAddress ([][] byte {[] byte ( "external_execution_config" )}, receiverAddress )
11611151 instruction , ixErr := solTestReceiver .NewInitializeInstruction (
11621152 chainState .Router ,
11631153 ccipChangeset .FindReceiverTargetAccount (receiverAddress ),
0 commit comments