Fix nil idlType handling and update test IDL names

smartcontractkit · Dec 23, 2024 · 9ae0236 · 9ae0236
1 parent 22a3c5f
commit 9ae0236
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/pkg/solana/chainreader/batch.go b/pkg/solana/chainreader/batch.go
@@ -77,7 +77,6 @@ func doMethodBatchCall(ctx context.Context, client MultipleAccountGetter, bindin
 				results[idx].err,
 				binding.Decode(ctx, data[idx], results[idx].returnVal),
 			)
-
 			continue
 		}
 

diff --git a/pkg/solana/chainreader/chain_reader.go b/pkg/solana/chainreader/chain_reader.go
@@ -294,7 +294,12 @@ type accountIDLTypes struct {
 }
 
 func (s *SolanaChainReaderService) addAccountRead(namespace string, itemType string, idl codec.IDL, idlType codec.IdlTypeDef, readDefinition config.ReadDefinition) error {
-	if err := s.addCodecDef(true, namespace, itemType, codec.ChainConfigTypeAccountDef, idl, idlType, readDefinition.InputModifications); err != nil {
+	inputAccountIDLDef := codec.NilIdlTypeDefTy
+	// TODO:
+	//		if hasPDA{
+	//			inputAccountIDLDef = pdaType
+	//		}
+	if err := s.addCodecDef(true, namespace, itemType, codec.ChainConfigTypeAccountDef, idl, inputAccountIDLDef, readDefinition.InputModifications); err != nil {
 		return err
 	}
 

diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go
@@ -454,7 +454,7 @@ func (r *chainReaderInterfaceTester) Setup(t *testing.T) {
 						ReadType:          config.Account,
 						OutputModifications: codeccommon.ModifiersConfig{
 							&codeccommon.AddressBytesToStringModifierConfig{
-								Fields: []string{"Accountstruct.Accountstr"},
+								Fields: []string{"AccountStruct.AccountStr"},
 							},
 							&codeccommon.HardCodeModifierConfig{OffChainValues: map[string]any{"ExtraField": AnyExtraValue}},
 						},
@@ -810,20 +810,20 @@ const (
 				{"name": "nestedStaticStruct","type": {"defined": "MidLevelStaticStruct"}},
 				{"name": "oracleID","type": "u8"},
 				{"name": "oracleIDs","type": {"array": ["u8",32]}},
-				{"name": "accountstruct","type": {"defined": "accountstruct"}},
+				{"name": "accountStruct","type": {"defined": "accountStruct"}},
 				{"name": "accounts","type": {"vec": "bytes"}}
 
 			]
 		}
 	}`
 
 	accountStructIDL = `{
-		"name": "accountstruct",
+		"name": "accountStruct",
 		"type": {
 			"kind": "struct",
 			"fields": [
 				{"name": "account", "type": "bytes"},
-				{"name": "accountstr", "type": {"array": ["u8",32]}}
+				{"name": "accountStr", "type": {"array": ["u8",32]}}
 			]
 		}
 	}`

diff --git a/pkg/solana/codec/anchoridl.go b/pkg/solana/codec/anchoridl.go
@@ -312,6 +312,11 @@ type IdlTypeDefTyEnum struct {
 	Variants IdlEnumVariantSlice `json:"variants,omitempty"`
 }
 
+var NilIdlTypeDefTy = IdlTypeDef{Type: IdlTypeDefTy{
+	Kind:   "struct",
+	Fields: &IdlTypeDefStruct{},
+}}
+
 type IdlTypeDefTy struct {
 	Kind IdlTypeDefTyKind `json:"kind"`
-Original file line number
+Diff line change
@@ Expand Up @@
     				results[idx].err,
     				binding.Decode(ctx, data[idx], results[idx].returnVal),
     			)
     			continue
     		}
@@ Expand Down @@