Merge branch 'develop' into idl_add_accounts

sol-anchor/convo.go

@@ -68,6 +68,13 @@ func (c *Convo) Update(msg loop.Msg) loop.Cmd {
 				return loop.Quit(fmt.Errorf(`something went wrong, here's an error message to share with our devs (%s); we've notified them already`, err))
 			}
 
+			c.State.idl = &IDL{}
+			err := json.Unmarshal([]byte(c.State.IdlString), &c.State.idl)
+			if err != nil {
+				fmt.Println("Error unmarshaling JSON:", err)
+				return loop.Quit(fmt.Errorf("could not decode IDL"))
+			}
+
 			msgCmd = c.Msg().Message("Ok, I reloaded your state.").Cmd()
 		} else {
 			msgCmd = c.Msg().Message("Ok, let's start a new package.").Cmd()

sol-anchor/idl.go

@@ -39,6 +39,16 @@ func (i *IDL) IsTypeUsed(typeName string) bool {
 	return false
 }
 
+func (i *IDL) IsTypeEnum(typeName string) bool {
+	for _, typeObj := range i.Types {
+		if typeObj.Name == typeName {
+			return typeObj.Type.IsEnum()
+		}
+	}
+
+	return false
+}
+
 type Metadata struct {
 	Address string `json:"address"`
 	Name    string `json:"name"` // seen in the 'secret' program

sol-anchor/idl_test.go

@@ -48,6 +48,17 @@ func TestOrcaIDL(t *testing.T) {
 	assert.Equal(t, 12, len(result.Types))
 }
 
+func TestJupiterV4Swap(t *testing.T) {
+	idl := readFromFile("jupiter_v4_swap")
+
+	result := &IDL{}
+	err := json.Unmarshal(idl, &result)
+
+	assert.Nil(t, err)
+	assert.Equal(t, "JUP4Fb2cqiRUcaTHdrPC8h2gNsA2ETXiPDD33WcGuJB", result.Metadata.Address)
+	assert.True(t, result.IsTypeEnum("SwapLeg"))
+}
+
 func readFromFile(idlName string) []byte {
 	data, err := os.ReadFile("tests/" + idlName + ".json")
 	if err != nil {

sol-anchor/idl_types.go

@@ -19,6 +19,10 @@ func (t *Type) SnakeCaseName() string {
 	return toSnakeCase(t.Name, true)
 }
 
+func (t *Type) SnakeCaseNameUpperCase() string {
+	return strings.ToUpper(t.SnakeCaseName())
+}
+
 func (t *Type) PascalCaseName() string {
 	return textcase.PascalCase(t.Name)
 }

sol-anchor/templates/proto/program.proto.gotmpl

@@ -20,7 +20,7 @@ message {{$event.Name}} {
   {{- $counter := 1 }}
   {{- range $i, $field := $event.Fields }}
     {{- $counter = add $counter 1 }}
-    {{ if or $field.Type.IsArray $field.Type.IsVec }} repeated {{ end }} {{ if $field.Type.IsOption }} optional {{ end }} {{$field.Type.ResolveProtobufType}} {{$field.SnakeCaseName}} = {{ $counter }};
+    {{ if or $field.Type.IsArray $field.Type.IsVec }} repeated {{ end }} {{ if $field.Type.IsOption }} optional {{ end }} {{$field.Type.ResolveProtobufType}}{{ if $.Idl.IsTypeEnum $field.Type.ResolveProtobufType }}Enum{{end}} {{$field.SnakeCaseName}} = {{ $counter }};
   {{- end}}
 }
 {{- end}}
@@ -30,7 +30,7 @@ message {{$instruction.PascalCaseName}} {
   {{- $counter := 1 }}
   {{- range $i, $arg := $instruction.Args }}
     {{- $counter = add $counter 1 }}
-    {{ if or $arg.Type.IsArray $arg.Type.IsVec }}repeated {{ end }}{{ if $arg.Type.IsOption }}optional {{ end }}{{$arg.Type.ResolveProtobufType}} {{$arg.SnakeCaseName}} = {{ $counter }};
+    {{ if or $arg.Type.IsArray $arg.Type.IsVec }}repeated {{ end }}{{ if $arg.Type.IsOption }}optional {{ end }}{{$arg.Type.ResolveProtobufType}}{{ if $.Idl.IsTypeEnum $arg.Type.ResolveProtobufType }}Enum{{end}} {{$arg.SnakeCaseName}} = {{ $counter }};
   {{- end}}
   {{- range $i, $acc := $instruction.Accounts }}
     {{- if not $acc.Address }}
@@ -43,6 +43,13 @@ message {{$instruction.PascalCaseName}} {
 
 {{ range $i, $type := .Idl.Types }}
   {{- if $type.Type.IsStruct }}
+    message {{$type.Name}} {
+      {{- $counter := 0 }}
+      {{- range $i, $field := $type.Type.Struct.Fields }}
+        {{- $counter = add $counter 1 }}
+        {{ if or $field.Type.IsArray $field.Type.IsVec }} repeated {{ end }} {{ if $field.Type.IsOption }} optional {{ end }} {{$field.Type.ResolveProtobufType}}{{ if $.Idl.IsTypeEnum $field.Type.ResolveProtobufType }}Enum{{end}} {{$field.SnakeCaseName}} = {{ $counter }};
+      {{- end}}
+    }
 message {{$type.Name}} {
   {{- $counter := 0 }}
   {{- range $i, $field := $type.Type.Struct.Fields }}
@@ -51,9 +58,9 @@ message {{$type.Name}} {
     {{- end}}
 }
   {{- else }}
-enum {{$type.Name}} {
+enum {{$type.Name}}Enum {
     {{- range $i, $variant := $type.Type.Enum.Variants }}
-    {{ $variant.SnakeCaseName }} = {{ $i }};
+    {{ $type.SnakeCaseNameUpperCase }}_{{ $variant.SnakeCaseName }} = {{ $i }};
     {{- end}}
 }
   {{- end }}

sol-anchor/templates/src/lib.rs.gotmpl

@@ -15,7 +15,11 @@ use pb::substreams::v1::program::{{$instruction.PascalCaseName}};
 {{- end}}
 
 {{- range $i, $type := .Idl.Types }}
+{{ if $type.Type.IsEnum }}
+use pb::substreams::v1::program::{{$type.Name}}Enum;
+{{ else }}
 use pb::substreams::v1::program::{{$type.Name}};
+{{ end }}
 {{- end}}
 
 use sologger_log_context::programs_selector::ProgramsSelector;

sol-anchor/tests/integration/integration_test.go

@@ -0,0 +1,77 @@
+package solanchor
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"testing"
+)
+
+func TestIntegrationPumpFun(t *testing.T) {
+	err := runTest("pump-fun")
+	if err != nil {
+		t.Fail()
+	}
+}
+
+func TestIntegrationMeteora(t *testing.T) {
+	err := runTest("meteora")
+	if err != nil {
+		t.Fail()
+	}
+}
+
+func TestIntegrationOrca(t *testing.T) {
+	err := runTest("orca")
+	if err != nil {
+		t.Fail()
+	}
+}
+
+func runTest(generatorName string) error {
+	tempDir, err := os.MkdirTemp("", "temp")
+	if err != nil {
+		fmt.Printf("Error creating temporary directory: %v\n", err)
+		return err
+	}
+	fmt.Printf("Temporary directory created: %s\n", tempDir)
+
+	defer os.RemoveAll(tempDir)
+
+	// Move generator to temp directory
+	cpCmd := exec.Command("cp", fmt.Sprintf("generators/%s.json", generatorName), fmt.Sprintf("%s/%s.json", tempDir, generatorName))
+	output, err := cpCmd.CombinedOutput()
+	if err != nil {
+		fmt.Printf("Error moving files: %v\n", err)
+		return err
+	}
+	fmt.Printf("Output %s\n", output)
+
+	// Set the command to execute
+	cmd := exec.Command("substreams", "init", "--state-file", fmt.Sprintf("%s.json", generatorName))
+	cmd.Env = append(os.Environ(), "SUBSTREAMS_CODEGEN_ENDPOINT=https://localhost:9000")
+	cmd.Dir = tempDir
+
+	// Run the command and capture the output
+	output, err = cmd.CombinedOutput()
+	if err != nil {
+		fmt.Printf("Error running command: %v\n", err)
+		return err
+	}
+
+	fmt.Printf("Command output:\n%s\n", output)
+
+	// Execute build
+	cmd1 := exec.Command("substreams", "build")
+	cmd.Dir = tempDir
+
+	output1, err := cmd1.CombinedOutput()
+	if err != nil {
+		fmt.Printf("Error running command: %v\n", err)
+		return err
+	}
+
+	fmt.Printf("Command output:\n%s\n", output1)
+
+	return nil
+}