Skip to content

Commit 11d2f50

Browse files
committed
adjust pda
1 parent 9f2cd45 commit 11d2f50

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

deployment/solana/deploy_contracts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func DeployAndInitializeFiredrillContracts(env deployment.Environment, config sh
141141
var firedrillOfframpConfigAccount firedrill_offramp.Config
142142
firedrillOfframpPDA, _, _ := FindFiredrillOfframpPDA(firedrillOfframpAddress)
143143
firedrillOfframpReferenceAddressesPDA, _, _ := FindFiredrillOfframpReferenceAddressesPDA(firedrillOfframpAddress)
144-
firedrillOfframpSourceChainPDA, _, _ := FindFiredrillOfframpSourceChainPDA(firedrillOfframpAddress)
144+
firedrillOfframpSourceChainPDA, _, _ := FindFiredrillOfframpSourceChainPDA(config.ChainSelector, firedrillOfframpAddress)
145145
firedrillOfframpConfigPDA, _, _ := FindFiredrillOfframpConfigPDA(firedrillOfframpAddress)
146146
err = chain.GetAccountDataBorshInto(env.GetContext(), firedrillOfframpConfigPDA, &firedrillOfframpConfigAccount)
147147
if err != nil {

deployment/solana/pda.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package solana
22

3-
import "github.com/gagliardetto/solana-go"
3+
import (
4+
"github.com/gagliardetto/solana-go"
5+
"github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/common"
6+
)
47

58
func FindFiredrillCompoundPDA(firedrillCompoundProgram solana.PublicKey) (solana.PublicKey, uint8, error) {
69
return solana.FindProgramAddress([][]byte{[]byte("compound")}, firedrillCompoundProgram)
@@ -14,8 +17,9 @@ func FindFiredrillOfframpReferenceAddressesPDA(firedrillOfframpProgram solana.Pu
1417
return solana.FindProgramAddress([][]byte{[]byte("reference_addresses")}, firedrillOfframpProgram)
1518
}
1619

17-
func FindFiredrillOfframpSourceChainPDA(firedrillOfframpProgram solana.PublicKey) (solana.PublicKey, uint8, error) {
18-
return solana.FindProgramAddress([][]byte{[]byte("source_chain_state")}, firedrillOfframpProgram)
20+
func FindFiredrillOfframpSourceChainPDA(chainSelector uint64, offrampProgram solana.PublicKey) (solana.PublicKey, uint8, error) {
21+
chainSelectorLE := common.Uint64ToLE(chainSelector)
22+
return solana.FindProgramAddress([][]byte{[]byte("source_chain_state"), chainSelectorLE}, offrampProgram)
1923
}
2024

2125
func FindFiredrillOfframpConfigPDA(firedrillOfframpProgram solana.PublicKey) (solana.PublicKey, uint8, error) {

0 commit comments

Comments
 (0)