99 "github.com/gagliardetto/solana-go"
1010 "github.com/gagliardetto/solana-go/rpc"
1111
12+ types "github.com/smartcontractkit/chainlink-common/pkg/types/solana"
1213 "github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
1314 "github.com/smartcontractkit/chainlink-solana/pkg/solana/codec"
1415)
1920 ErrGettingSeedAtLocation = fmt .Errorf ("error getting address seed for location" )
2021)
2122
23+ var _ = Lookup (types.Lookup {})
24+
25+ // Lookup is not an alias like the others, because it has a widely used method with solana types that cannot be imported
26+ // in to chainlink-common. However, it can be directly converted from [types.Lookup].
2227type Lookup struct {
2328 Optional bool
2429 AccountConstant * AccountConstant `json:"accountConstant,omitempty"`
@@ -27,83 +32,35 @@ type Lookup struct {
2732 AccountsFromLookupTable * AccountsFromLookupTable `json:"accountsFromLookupTable,omitempty"`
2833}
2934
30- // AccountConstant represents a fixed address, provided in Base58 format, converted into a `solana.PublicKey`.
31- type AccountConstant struct {
32- Name string `json:"name,omitempty"`
33- Address string `json:"address"`
34- IsSigner bool `json:"isSigner,omitempty"`
35- IsWritable bool `json:"isWritable,omitempty"`
36- }
35+ // Deprecated
36+ type AccountConstant = types.AccountConstant
3737
38- // AccountLookup dynamically derives an account address from args using a specified location path.
39- type AccountLookup struct {
40- Name string `json:"name,omitempty"`
41- Location string `json:"location"`
42- // IsSigner and IsWritable can either be a constant bool or a location to a bitmap which decides the bools
43- IsSigner MetaBool `json:"isSigner,omitempty"`
44- IsWritable MetaBool `json:"isWritable,omitempty"`
45- }
38+ // Deprecated
39+ type AccountLookup = types.AccountLookup
4640
47- type MetaBool struct {
48- Value bool `json:"value,omitempty"` // bool value
49- BitmapLocation string `json:"bitmapLocation,omitempty"` // dot separated location of the bitmap
50- }
41+ // Deprecated
42+ type MetaBool = types.MetaBool
5143
52- type Seed struct {
53- Static []byte `json:"static,omitempty"` // Static seed value
54- Dynamic Lookup `json:"dynamic,omitempty"` // Dynamic lookup for seed
55- }
44+ // Deprecated
45+ type Seed = types.Seed
5646
57- // PDALookups generates Program Derived Addresses (PDA) by combining a derived public key with one or more seeds.
58- type PDALookups struct {
59- Name string `json:"name,omitempty"`
60- // The public key of the PDA to be combined with seeds. If there are multiple PublicKeys
61- // there will be multiple PDAs generated by combining each PublicKey with the seeds.
62- PublicKey Lookup `json:"publicKey"`
63- // Seeds to be derived from an additional lookup
64- Seeds []Seed `json:"seeds"`
65- IsSigner bool `json:"isSigner,omitempty"`
66- IsWritable bool `json:"isWritable,omitempty"`
67- // OPTIONAL: On-chain location and type of desired data from PDA (e.g. a sub-account of the data account)
68- InternalField InternalField `json:"internalField,omitempty"`
69- }
47+ // Deprecated
48+ type PDALookups = types.PDALookups
7049
71- type InternalField struct {
72- // must map directly to IDL type
73- TypeName string `json:"typeName"`
74- Location string `json:"location"`
75- IDL string `json:"idl"`
76- }
50+ // Deprecated
51+ type InternalField = types.InternalField
7752
78- // LookupTables represents a list of lookup tables that are used to derive addresses for a program.
79- type LookupTables struct {
80- DerivedLookupTables []DerivedLookupTable `json:"derivedLookupTables,omitempty"`
81- StaticLookupTables []solana.PublicKey `json:"staticLookupTables,omitempty"`
82- }
53+ // Deprecated
54+ type LookupTables = types.LookupTables
8355
84- // DerivedLookupTable represents a lookup table that is used to derive addresses for a program.
85- type DerivedLookupTable struct {
86- Name string `json:"name,omitempty"`
87- Accounts Lookup `json:"accounts"`
88- Optional bool `json:"optional"`
89- }
56+ // Deprecated
57+ type DerivedLookupTable = types.DerivedLookupTable
9058
91- // AccountsFromLookupTable extracts accounts from a lookup table that was previously read and stored in memory.
92- type AccountsFromLookupTable struct {
93- LookupTableName string `json:"lookupTableName"`
94- IncludeIndexes []int `json:"includeIndexes"`
95- }
59+ // Deprecated
60+ type AccountsFromLookupTable = types.AccountsFromLookupTable
9661
97- type ATALookup struct {
98- // Field that determines whether the ATA lookup is necessary. Basically
99- // just need to check this field exists. Dot separated location.
100- Location string
101- // If the field exists, initialize a ATA account using the Wallet, Token Program, and Mint addresses below
102- WalletAddress Lookup
103- TokenProgram Lookup
104- MintAddress Lookup
105- Optional bool
106- }
62+ // Deprecated
63+ type ATALookup = types.ATALookup
10764
10865func (l Lookup ) validate () error {
10966 count := 0
@@ -125,18 +82,18 @@ func (l Lookup) Resolve(ctx context.Context, args any, derivedTableMap map[strin
12582 return nil , err
12683 }
12784 if l .AccountConstant != nil {
128- return l .AccountConstant . Resolve ( )
85+ return ResolveAccountConstant ( l .AccountConstant )
12986 } else if l .AccountLookup != nil {
130- return l .AccountLookup . Resolve ( args )
87+ return ResolveAccountLookup ( l .AccountLookup , args )
13188 } else if l .PDALookups != nil {
132- return l .PDALookups . Resolve ( ctx , args , derivedTableMap , client )
89+ return ResolvePDALookups ( ctx , l .PDALookups , args , derivedTableMap , client )
13390 } else if l .AccountsFromLookupTable != nil {
134- return l .AccountsFromLookupTable . Resolve ( derivedTableMap )
91+ return ResolveAccountsFromLookupTable ( l .AccountsFromLookupTable , derivedTableMap )
13592 }
13693 return nil , fmt .Errorf ("no lookup type specified" )
13794}
13895
139- func (ac AccountConstant ) Resolve ( ) ([]* solana.AccountMeta , error ) {
96+ func ResolveAccountConstant (ac * AccountConstant ) ([]* solana.AccountMeta , error ) {
14097 address , err := solana .PublicKeyFromBase58 (ac .Address )
14198 if err != nil {
14299 return nil , lookupErrWithName (ac .Name , fmt .Errorf ("error getting account from constant: %w" , err ))
@@ -150,7 +107,7 @@ func (ac AccountConstant) Resolve() ([]*solana.AccountMeta, error) {
150107 }, nil
151108}
152109
153- func (al AccountLookup ) Resolve ( args any ) ([]* solana.AccountMeta , error ) {
110+ func ResolveAccountLookup (al * AccountLookup , args any ) ([]* solana.AccountMeta , error ) {
154111 derivedValues , err := GetValuesAtLocation (args , al .Location )
155112 if err != nil {
156113 return nil , lookupErrWithName (al .Name , fmt .Errorf ("%w: %v" , ErrLookupNotFoundAtLocation , err ))
@@ -222,7 +179,7 @@ func resolveBitMap(mb MetaBool, args any, length int) ([]bool, error) {
222179 return result , nil
223180}
224181
225- func (alt AccountsFromLookupTable ) Resolve ( derivedTableMap map [string ]map [string ][]* solana.AccountMeta ) ([]* solana.AccountMeta , error ) {
182+ func ResolveAccountsFromLookupTable (alt * AccountsFromLookupTable , derivedTableMap map [string ]map [string ][]* solana.AccountMeta ) ([]* solana.AccountMeta , error ) {
226183 // Fetch the inner map for the specified lookup table name
227184 innerMap , ok := derivedTableMap [alt .LookupTableName ]
228185 if ! ok {
@@ -252,8 +209,8 @@ func (alt AccountsFromLookupTable) Resolve(derivedTableMap map[string]map[string
252209 return result , nil
253210}
254211
255- func ( pda PDALookups ) Resolve ( ctx context.Context , args any , derivedTableMap map [string ]map [string ][]* solana.AccountMeta , client client.MultiClient ) ([]* solana.AccountMeta , error ) {
256- publicKeys , err := GetAddresses (ctx , args , []Lookup {pda .PublicKey }, derivedTableMap , client )
212+ func ResolvePDALookups ( ctx context.Context , pda * PDALookups , args any , derivedTableMap map [string ]map [string ][]* solana.AccountMeta , client client.MultiClient ) ([]* solana.AccountMeta , error ) {
213+ publicKeys , err := GetAddresses (ctx , args , []Lookup {Lookup ( pda .PublicKey ) }, derivedTableMap , client )
257214 if err != nil {
258215 return nil , lookupErrWithName (pda .Name , fmt .Errorf ("error getting public key for PDALookups: %w" , err ))
259216 }
@@ -329,7 +286,7 @@ func (pda PDALookups) Resolve(ctx context.Context, args any, derivedTableMap map
329286// to multiple addresses, multiplying the combinations accordingly.
330287func getSeedBytesCombinations (
331288 ctx context.Context ,
332- lookup PDALookups ,
289+ lookup * PDALookups ,
333290 args any ,
334291 derivedTableMap map [string ]map [string ][]* solana.AccountMeta ,
335292 client client.MultiClient ,
@@ -364,7 +321,7 @@ func getSeedBytesCombinations(
364321 }
365322 } else {
366323 // Get address seeds from the lookup
367- seedAddresses , err := GetAddresses (ctx , args , []Lookup {dynamicSeed }, derivedTableMap , client )
324+ seedAddresses , err := GetAddresses (ctx , args , []Lookup {Lookup ( dynamicSeed ) }, derivedTableMap , client )
368325 if err != nil {
369326 return nil , fmt .Errorf ("error getting address seed: %w" , err )
370327 }
@@ -397,17 +354,13 @@ func getSeedBytesCombinations(
397354 return allCombinations , nil
398355}
399356
400- func (l Lookup ) IsNil () bool {
401- return l .AccountConstant == nil && l .AccountLookup == nil && l .PDALookups == nil && l .AccountsFromLookupTable == nil
402- }
403-
404357// generatePDAs generates program-derived addresses (PDAs) from public keys and seeds.
405358// it will result in a list of PDAs whose length is the product of the number of public keys
406359// and the number of seed combinations.
407360func generatePDAs (
408361 publicKeys []* solana.AccountMeta ,
409362 seedCombos [][][]byte ,
410- lookup PDALookups ,
363+ lookup * PDALookups ,
411364) ([]* solana.AccountMeta , error ) {
412365 var results []* solana.AccountMeta
413366 for _ , publicKeyMeta := range publicKeys {
0 commit comments