Several bug fixes and improvements

cli/main.go

@@ -85,6 +85,17 @@ func main() {
 				},
 			},
 		},
+		{
+			Name:   "inspect",
+			Usage:  "creates a user readable dump of the program instructions",
+			Action: inspect,
+			Flags: []cli.Flag{
+				cli.StringFlag{
+					Name:  "in, i",
+					Usage: "input file of the program",
+				},
+			},
+		},
 	}
 	ctl.Run(os.Args)
 }
@@ -158,7 +169,7 @@ func contractTestInvoke(ctx *cli.Context) error {
 	}
 
 	// FIXME: Make this configurable (probably in the general storm.yml file/config)
-	endpoint := "http://seed3.ngd.network:10332"
+	endpoint := "http://node1.ams2.bridgeprotocol.io:10332"
 	client, err := rpc.NewClient(context.TODO(), endpoint, rpc.ClientOptions{})
 	if err != nil {
 		return cli.NewExitError(err, 1)
@@ -234,3 +245,12 @@ func parseContractDetails() ContractDetails {
 
 	return details
 }
+
+func inspect(ctx *cli.Context) error {
+	src := ctx.String("in")
+	if len(src) == 0 {
+		return cli.NewExitError(errNoInput, 1)
+	}
+	compiler.CompileAndInspect(src)
+	return nil
+}

compiler/codegen.go

@@ -8,6 +8,7 @@ import (
 	"go/token"
 	"go/types"
 	"log"
+	"strconv"
 	"strings"
 
 	"github.com/CityOfZion/neo-go/pkg/crypto"
@@ -248,6 +249,21 @@ func (c *codegen) Visit(node ast.Node) ast.Visitor {
 				default:
 					log.Fatal("nested selector assigns not supported yet")
 				}
+
+			// Assignments to index expressions.
+			// slice[0] = 10
+			case *ast.IndexExpr:
+				ast.Walk(c, n.Rhs[i])
+				name := t.X.(*ast.Ident).Name
+				c.emitLoadLocal(name)
+				// For now storm only supports basic index operations. Hence we
+				// cast this to an *ast.BasicLit (1, 2 , 3)
+				indexStr := t.Index.(*ast.BasicLit).Value
+				index, err := strconv.Atoi(indexStr)
+				if err != nil {
+					log.Fatal("failed to convert slice index to integer")
+				}
+				c.emitStoreStructField(index)
 			}
 		}
 		return nil

compiler/compiler.go

@@ -15,6 +15,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/CityOfZion/neo-storm/vm"
 	"golang.org/x/tools/go/loader"
 )
 
@@ -89,16 +90,15 @@ func CompileAndSave(src string, o *Options) error {
 	if err != nil {
 		return fmt.Errorf("Error while trying to compile smart contract file: %v", err)
 	}
-	if o.Debug {
-		log.Println(hex.EncodeToString(b))
-	}
+
+	log.Println(hex.EncodeToString(b))
 
 	out := fmt.Sprintf("%s.%s", o.Outfile, o.Ext)
 	return ioutil.WriteFile(out, b, os.ModePerm)
 }
 
-// DumpOpcode compiles the program and dumps the opcode in a user friendly format.
-func DumpOpcode(src string) error {
+// CompileAndInspect compiles the program and dumps the opcode in a user friendly format.
+func CompileAndInspect(src string) error {
 	b, err := ioutil.ReadFile(src)
 	if err != nil {
 		return err
@@ -110,9 +110,19 @@ func DumpOpcode(src string) error {
 
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 4, ' ', 0)
 	fmt.Fprintln(w, "INDEX\tOPCODE\tDESC\t")
-	for i := 0; i < len(b); i++ {
-		// TODO: generate stringer for instruction.
-		// fmt.Fprintf(w, "%d\t0x%2x\t%s\t\n", i, b[i], vm.Instruction(b[i]))
+
+	for i := 0; i <= len(b)-1; {
+		instr := vm.Instruction(b[i])
+		if instr >= vm.PUSHBYTES1 && instr <= vm.PUSHBYTES75 {
+			fmt.Fprintf(w, "%d\t0x%x\t%s\t\n", i, b[i], fmt.Sprintf("PUSHBYTES%d", int(instr)))
+			for x := 0; x < int(instr); x++ {
+				fmt.Fprintf(w, "%d\t0x%x\t%s\t\n", i, b[i+1+x], string(b[i+1+x]))
+			}
+			i += int(instr) + 1
+			continue
+		}
+		fmt.Fprintf(w, "%d\t0x%x\t%s\t\n", i, b[i], instr)
+		i++
 	}
 	w.Flush()
 	return nil

compiler/syscall.go

@@ -43,6 +43,7 @@ var syscalls = map[string]map[string]string{
 		"GetTransaction":      "Neo.Block.GetTransaction",
 	},
 	"transaction": {
+		"GetHash":         "Neo.Transaction.GetHash",
 		"GetType":         "Neo.Transaction.GetType",
 		"GetAttributes":   "Neo.Transaction.GetAttributes",
 		"GetInputs":       "Neo.Transaction.GetInputs",

interop/transaction/transaction.go

@@ -29,8 +29,8 @@ func GetAttributes(t Transaction) []attribute.Attribute {
 
 // FIXME: What is the correct return type for this?
 // GetReferences returns a slice of references for the given transaction.
-func GetReferences(t Transaction) interface{} {
-	return 0
+func GetReferences(t Transaction) []interface{} {
+	return []interface{}{}
 }
 
 // FIXME: What is the correct return type for this?