Ride vm and compiler.

.github/workflows/go.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up Go 1.15
+      - name: Set up Go 1.16
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16
         id: go
 
       - name: Set up GolangCI-Lint

Makefile

@@ -11,7 +11,7 @@ export GO111MODULE=on
 
 .PHONY: vendor vetcheck fmtcheck clean build gotest
 
-all: vendor vetcheck fmtcheck build gotest mod-clean
+all: vendor vetcheck build gotest mod-clean
 
 ver:
 	@echo Building version: $(VERSION)

go.mod

@@ -1,6 +1,6 @@
 module github.com/wavesplatform/gowaves
 
-go 1.15
+go 1.16
 
 require (
 	github.com/OneOfOne/xxhash v1.2.5 // indirect
@@ -11,6 +11,7 @@ require (
 	github.com/coocood/freecache v1.1.0
 	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
 	github.com/ericlagergren/decimal v0.0.0-20190912144844-2c3e3e1ef942
+	github.com/frozen/immutable_map v0.1.0
 	github.com/fxamacker/cbor/v2 v2.2.0
 	github.com/go-chi/chi v4.0.3+incompatible
 	github.com/golang/mock v1.4.3
@@ -35,7 +36,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/starius/emsort v0.0.0-20191221202443-6f2fbdee4781
 	github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d
 	github.com/valyala/bytebufferpool v1.0.0
 	github.com/xenolf/lego v2.7.2+incompatible

go.sum

@@ -81,6 +81,8 @@ github.com/ericlagergren/decimal v0.0.0-20190912144844-2c3e3e1ef942/go.mod h1:ZW
 github.com/ethereum/go-ethereum v1.9.15/go.mod h1:slT8bPPRhXsyNTwHQxrOnjuTZ1sDXRajW11EkJ84QJ0=
 github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
+github.com/frozen/immutable_map v0.1.0 h1:JvDI2+lE4+5UJ8QJwxesBl4RuAEOmCJCZDXiAQXXIcY=
+github.com/frozen/immutable_map v0.1.0/go.mod h1:wIufmkixG0KtX1l5NNbSwlp/GIHJ0tUnMO/uXKUs9LU=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fxamacker/cbor/v2 v2.2.0 h1:6eXqdDDe588rSYAi1HfZKbx6YYQO4mxQ9eC6xYpU/JQ=
@@ -252,8 +254,9 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d h1:gZZadD8H+fF+n9CmNhYL1Y0dJB+kLOmKd7FbPJLeGHs=
 github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=

pkg/proto/proto_test.go

@@ -558,6 +558,7 @@ func TestGetBlockMessage_MarshalBinary(t *testing.T) {
 		}
 
 		rs, err := b.MarshalBinary()
+		t.Log(rs)
 		require.NoError(t, err)
 
 		b2 := GetBlockMessage{}
@@ -616,3 +617,13 @@ func TestTCPAddr_ToUint64(t *testing.T) {
 
 	require.True(t, a.Equal(b))
 }
+
+func TestGetPeersMessage_MarshalBinary(t *testing.T) {
+	m := GetPeersMessage{}
+	bts, err := m.MarshalBinary()
+	require.NoError(t, err)
+	t.Log(bts)
+
+	err = m.UnmarshalBinary(bts)
+	require.NoError(t, err)
+}

pkg/proto/scripting.go

@@ -1,6 +1,7 @@
 package proto
 
 import (
+	"bytes"
 	"encoding/binary"
 	"unicode/utf16"
 
@@ -10,9 +11,25 @@ import (
 	g "github.com/wavesplatform/gowaves/pkg/grpc/generated/waves"
 )
 
+type ScriptActions []ScriptAction
+
+func (a ScriptActions) Eq(b ScriptActions) bool {
+	if len(a) != len(b) {
+		return false
+	}
+
+	for i := range a {
+		if !a[i].Eq(b[i]) {
+			return false
+		}
+	}
+	return true
+}
+
 // ScriptAction common interface of script invocation actions.
 type ScriptAction interface {
 	scriptAction()
+	Eq(ScriptAction) bool
 }
 
 // DataEntryScriptAction is an action to manipulate account data state.
@@ -22,6 +39,14 @@ type DataEntryScriptAction struct {
 
 func (a DataEntryScriptAction) scriptAction() {}
 
+func (a DataEntryScriptAction) Eq(another ScriptAction) bool {
+	b, ok := another.(*DataEntryScriptAction)
+	if !ok {
+		return false
+	}
+	return a.Entry.Eq(b.Entry)
+}
+
 func (a *DataEntryScriptAction) ToProtobuf() *g.DataTransactionData_DataEntry {
 	return a.Entry.ToProtobuf()
 }
@@ -35,6 +60,14 @@ type TransferScriptAction struct {
 
 func (a TransferScriptAction) scriptAction() {}
 
+func (a TransferScriptAction) Eq(other ScriptAction) bool {
+	b, ok := other.(*TransferScriptAction)
+	if !ok {
+		return false
+	}
+	return a.Amount == b.Amount && a.Asset == b.Asset && a.Recipient.Eq(b.Recipient)
+}
+
 func (a *TransferScriptAction) ToProtobuf() (*g.InvokeScriptResult_Payment, error) {
 	amount := &g.Amount{
 		AssetId: a.Asset.ToID(),
@@ -61,6 +94,21 @@ type IssueScriptAction struct {
 
 func (a IssueScriptAction) scriptAction() {}
 
+func (a IssueScriptAction) Eq(other ScriptAction) bool {
+	b, ok := other.(*IssueScriptAction)
+	if !ok {
+		return false
+	}
+	return a.ID == b.ID &&
+		a.Name == b.Name &&
+		a.Description == b.Description &&
+		a.Quantity == b.Quantity &&
+		a.Decimals == b.Decimals &&
+		a.Reissuable == b.Reissuable &&
+		bytes.Equal(a.Script, b.Script) &&
+		a.Nonce == b.Nonce
+}
+
 func (a *IssueScriptAction) ToProtobuf() *g.InvokeScriptResult_Issue {
 	return &g.InvokeScriptResult_Issue{
 		AssetId:     a.ID.Bytes(),
@@ -109,6 +157,14 @@ type ReissueScriptAction struct {
 
 func (a ReissueScriptAction) scriptAction() {}
 
+func (a ReissueScriptAction) Eq(other ScriptAction) bool {
+	b, ok := other.(*ReissueScriptAction)
+	if !ok {
+		return false
+	}
+	return a.Reissuable == b.Reissuable && a.AssetID == b.AssetID && a.Quantity == b.Quantity
+}
+
 func (a *ReissueScriptAction) ToProtobuf() *g.InvokeScriptResult_Reissue {
 	return &g.InvokeScriptResult_Reissue{
 		AssetId:      a.AssetID.Bytes(),
@@ -125,6 +181,14 @@ type BurnScriptAction struct {
 
 func (a BurnScriptAction) scriptAction() {}
 
+func (a BurnScriptAction) Eq(other ScriptAction) bool {
+	b, ok := other.(*BurnScriptAction)
+	if !ok {
+		return false
+	}
+	return a.AssetID == b.AssetID && a.Quantity == b.Quantity
+}
+
 func (a *BurnScriptAction) ToProtobuf() *g.InvokeScriptResult_Burn {
 	return &g.InvokeScriptResult_Burn{
 		AssetId: a.AssetID.Bytes(),
@@ -140,6 +204,14 @@ type SponsorshipScriptAction struct {
 
 func (a SponsorshipScriptAction) scriptAction() {}
 
+func (a SponsorshipScriptAction) Eq(other ScriptAction) bool {
+	b, ok := other.(*SponsorshipScriptAction)
+	if !ok {
+		return false
+	}
+	return a.AssetID == b.AssetID && a.MinFee == b.MinFee
+}
+
 func (a *SponsorshipScriptAction) ToProtobuf() *g.InvokeScriptResult_SponsorFee {
 	return &g.InvokeScriptResult_SponsorFee{
 		MinFee: &g.Amount{

pkg/proto/types.go

@@ -1731,6 +1731,8 @@ type DataEntry interface {
 	BinarySize() int
 
 	ToProtobuf() *g.DataTransactionData_DataEntry
+
+	Eq(DataEntry) bool
 }
 
 var bytesToDataEntry = map[DataValueType]reflect.Type{
@@ -1786,6 +1788,13 @@ type IntegerDataEntry struct {
 	Value int64
 }
 
+func (e IntegerDataEntry) Eq(other DataEntry) bool {
+	if b, ok := other.(*IntegerDataEntry); ok {
+		return e.Key == b.Key && e.Value == b.Value
+	}
+	return false
+}
+
 func (e IntegerDataEntry) ToProtobuf() *g.DataTransactionData_DataEntry {
 	return &g.DataTransactionData_DataEntry{
 		Key:   e.Key,
@@ -1914,6 +1923,13 @@ type BooleanDataEntry struct {
 	Value bool
 }
 
+func (e BooleanDataEntry) Eq(other DataEntry) bool {
+	if b, ok := other.(*BooleanDataEntry); ok {
+		return e.Key == b.Key && e.Value == b.Value
+	}
+	return false
+}
+
 func (e BooleanDataEntry) ToProtobuf() *g.DataTransactionData_DataEntry {
 	return &g.DataTransactionData_DataEntry{
 		Key:   e.Key,
@@ -2046,6 +2062,13 @@ type BinaryDataEntry struct {
 	Value []byte
 }
 
+func (e BinaryDataEntry) Eq(other DataEntry) bool {
+	if b, ok := other.(*BinaryDataEntry); ok {
+		return e.Key == b.Key && bytes.Equal(e.Value, b.Value)
+	}
+	return false
+}
+
 func (e BinaryDataEntry) ToProtobuf() *g.DataTransactionData_DataEntry {
 	return &g.DataTransactionData_DataEntry{
 		Key:   e.Key,
@@ -2181,6 +2204,13 @@ type StringDataEntry struct {
 	Value string
 }
 
+func (e StringDataEntry) Eq(other DataEntry) bool {
+	if b, ok := other.(*StringDataEntry); ok {
+		return e.Key == b.Key && e.Value == b.Value
+	}
+	return false
+}
+
 func (e StringDataEntry) ToProtobuf() *g.DataTransactionData_DataEntry {
 	return &g.DataTransactionData_DataEntry{
 		Key:   e.Key,
@@ -2315,6 +2345,13 @@ type DeleteDataEntry struct {
 	Key string
 }
 
+func (e DeleteDataEntry) Eq(other DataEntry) bool {
+	if b, ok := other.(*DeleteDataEntry); ok {
+		return e.Key == b.Key
+	}
+	return false
+}
+
 func (e DeleteDataEntry) ToProtobuf() *g.DataTransactionData_DataEntry {
 	return &g.DataTransactionData_DataEntry{
 		Key:   e.Key,

pkg/ride/code_samples.go

@@ -0,0 +1,35 @@
+package ride
+
+const fcall1 = `
+func getInt(key: String) = {
+    match getInteger(this, key) {
+        case x : Int => x
+        case _ => 0
+    }
+}
+
+let a = getInt("5")
+let b = getInt("6")
+a == b
+`
+
+const finf = `
+func abc() = {
+    func in() = {
+        true
+    }
+    in()
+}
+abc()
+`
+
+const intersectNames = `
+{-# STDLIB_VERSION 3 #-}
+{-# SCRIPT_TYPE ACCOUNT #-}
+{-# CONTENT_TYPE EXPRESSION #-}
+func inc(v: Int) = v + 1
+func call(inc: Int) = {
+    inc(inc)
+}
+call(2) == 3
+`