isolation of contract execution

CMakeLists.txt

@@ -15,7 +15,7 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug")
     set(GFLAG -tags Debug)
 endif()
 
-add_custom_target(build ALL DEPENDS aergocli aergosvr aergoluac brick)
+add_custom_target(build ALL DEPENDS aergocli aergosvr aergovm aergoluac brick)
 
 add_custom_target(aergocli GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X github.com/aergoio/aergo/v2/cmd/aergocli/cmd.githash=`git describe --tags`\" ./cmd/aergocli/...
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
@@ -25,6 +25,12 @@ add_custom_target(aergosvr GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS}
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
     DEPENDS libtool)
 
+add_custom_target(aergovm
+    COMMAND GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X main.githash=`git describe --tags` -X main.gitRevision=`git rev-parse --short HEAD` -X main.gitBranch=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`\" ./contract/vm/...
+    COMMAND ${CMAKE_COMMAND} -E rename ${BIN_DIR}/vm ${BIN_DIR}/aergovm
+    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+    DEPENDS libtool)
+
 add_custom_target(polaris GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X main.githash=`git describe --tags`\" ./cmd/polaris/...
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
 
@@ -45,7 +51,8 @@ add_custom_target(mpdumpdiag GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAG
 
 add_custom_target(deps DEPENDS libtool)
 
-add_custom_target(check GO111MODULE=on go test -timeout 600s ./...
+add_custom_target(check
+    COMMAND ${CMAKE_COMMAND} -E env AERGOVM_PATH=${BIN_DIR}/aergovm GO111MODULE=on go test -timeout 600s ./...
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
     DEPENDS build)
 add_custom_target(cover-check GO111MODULE=on go test -timeout 600s -coverprofile c.out ./...

Makefile

@@ -18,7 +18,7 @@ endif
 
 BUILD_RULES := \
 	deps \
-	aergocli aergosvr aergoluac polaris colaris brick mpdumpdiag\
+	aergocli aergosvr aergovm aergoluac polaris colaris brick mpdumpdiag \
 	libtool libtool-clean \
 	libluajit liblmdb libgmp \
 	libluajit-clean liblmdb-clean libgmp-clean \

chain/chainservice.go

@@ -154,7 +154,7 @@ func (core *Core) GetGenesisInfo() *types.Genesis {
 	return core.cdb.GetGenesisInfo()
 }
 
-// Close closes chain & state DB.
+// Close closes chain, state and contracts DBs and the VM pool
 func (core *Core) Close() {
 	if core.sdb != nil {
 		core.sdb.Close()
@@ -163,6 +163,7 @@ func (core *Core) Close() {
 		core.cdb.Close()
 	}
 	contract.CloseDatabase()
+	contract.StopVMPool()
 }
 
 // InitGenesisBlock initialize chain database and generate specified genesis block if necessary
@@ -295,7 +296,7 @@ func NewChainService(cfg *cfg.Config) *ChainService {
 	contract.PubNet = pubNet
 	contract.TraceBlockNo = cfg.Blockchain.StateTrace
 	contract.SetStateSQLMaxDBSize(cfg.SQL.MaxDbSize)
-	contract.StartLStateFactory((cfg.Blockchain.NumWorkers+2)*(int(contract.MaxCallDepth(cfg.Hardfork.Version(math.MaxUint64)))+2), cfg.Blockchain.NumLStateClosers, cfg.Blockchain.CloseLimit)
+	contract.StartVMPool((cfg.Blockchain.NumWorkers + 2) * int(contract.MaxCallDepth(cfg.Hardfork.Version(math.MaxUint64))))
 	contract.InitContext(cfg.Blockchain.NumWorkers + 2)
 
 	// For a strict governance transaction validation.

cmd/aergoluac/util/compile.c → cmd/aergoluac/luac/compile.c

@@ -8,7 +8,7 @@
 #include "_cgo_export.h"
 
 lua_State *luac_vm_newstate() {
-	lua_State *L = luaL_newstate(3);
+	lua_State *L = luaL_newstate(5);
 	if (L == NULL) {
 		return NULL;
 	}

cmd/aergoluac/luac/luac.go

@@ -0,0 +1,131 @@
+package luac
+
+/*
+#cgo CFLAGS: -I${SRCDIR}/../../../libtool/include/luajit-2.1
+#cgo LDFLAGS: ${SRCDIR}/../../../libtool/lib/libluajit-5.1.a -lm
+
+#include <stdlib.h>
+#include <lualib.h>
+#include "compile.h"
+*/
+import "C"
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"runtime"
+	"unsafe"
+
+	"github.com/aergoio/aergo/v2/cmd/aergoluac/encoding"
+	"github.com/aergoio/aergo/v2/cmd/aergoluac/util"
+)
+
+func NewLState() *C.lua_State {
+	L := C.luac_vm_newstate()
+	if L == nil {
+		runtime.GC()
+		L = C.luac_vm_newstate()
+	}
+	return L
+}
+
+func CloseLState(L *C.lua_State) {
+	if L != nil {
+		C.luac_vm_close(L)
+	}
+}
+
+func Compile(L *C.lua_State, code string) (util.LuaCode, error) {
+	cStr := C.CString(code)
+	defer C.free(unsafe.Pointer(cStr))
+	if errMsg := C.vm_loadstring(L, cStr); errMsg != nil {
+		return nil, errors.New(C.GoString(errMsg))
+	}
+	if errMsg := C.vm_stringdump(L); errMsg != nil {
+		return nil, errors.New(C.GoString(errMsg))
+	}
+	return dumpToBytes(L), nil
+}
+
+func CompileFromFile(srcFileName, outFileName, abiFileName string) error {
+	cSrcFileName := C.CString(srcFileName)
+	cOutFileName := C.CString(outFileName)
+	cAbiFileName := C.CString(abiFileName)
+	L := C.luac_vm_newstate()
+	defer C.free(unsafe.Pointer(cSrcFileName))
+	defer C.free(unsafe.Pointer(cOutFileName))
+	defer C.free(unsafe.Pointer(cAbiFileName))
+	defer C.luac_vm_close(L)
+
+	if errMsg := C.vm_compile(L, cSrcFileName, cOutFileName, cAbiFileName); errMsg != nil {
+		return errors.New(C.GoString(errMsg))
+	}
+	return nil
+}
+
+func DumpFromFile(srcFileName string) error {
+	cSrcFileName := C.CString(srcFileName)
+	L := C.luac_vm_newstate()
+	defer C.free(unsafe.Pointer(cSrcFileName))
+	defer C.luac_vm_close(L)
+
+	if errMsg := C.vm_loadfile(L, cSrcFileName); errMsg != nil {
+		return errors.New(C.GoString(errMsg))
+	}
+	if errMsg := C.vm_stringdump(L); errMsg != nil {
+		return errors.New(C.GoString(errMsg))
+	}
+
+	fmt.Println(encoding.EncodeCode(dumpToBytes(L)))
+	return nil
+}
+
+func DumpFromStdin() error {
+	fi, err := os.Stdin.Stat()
+	if err != nil {
+		return err
+	}
+	var buf []byte
+	if (fi.Mode() & os.ModeCharDevice) == 0 {
+		buf, err = ioutil.ReadAll(os.Stdin)
+		if err != nil {
+			return err
+		}
+	} else {
+		var bBuf bytes.Buffer
+		scanner := bufio.NewScanner(os.Stdin)
+		for scanner.Scan() {
+			bBuf.WriteString(scanner.Text() + "\n")
+		}
+		if err = scanner.Err(); err != nil {
+			return err
+		}
+		buf = bBuf.Bytes()
+	}
+	srcCode := C.CString(string(buf))
+	L := C.luac_vm_newstate()
+	defer C.free(unsafe.Pointer(srcCode))
+	defer C.luac_vm_close(L)
+
+	if errMsg := C.vm_loadstring(L, srcCode); errMsg != nil {
+		return errors.New(C.GoString(errMsg))
+	}
+	if errMsg := C.vm_stringdump(L); errMsg != nil {
+		return errors.New(C.GoString(errMsg))
+	}
+	fmt.Println(encoding.EncodeCode(dumpToBytes(L)))
+	return nil
+}
+
+func dumpToBytes(L *C.lua_State) util.LuaCode {
+	var (
+		c, a   *C.char
+		lc, la C.size_t
+	)
+	c = C.lua_tolstring(L, -2, &lc)
+	a = C.lua_tolstring(L, -1, &la)
+	return util.NewLuaCode(C.GoBytes(unsafe.Pointer(c), C.int(lc)), C.GoBytes(unsafe.Pointer(a), C.int(la)))
+}

cmd/aergoluac/main.go

@@ -10,6 +10,7 @@ import (
 	"os"
 
 	"github.com/aergoio/aergo/v2/cmd/aergoluac/util"
+	"github.com/aergoio/aergo/v2/cmd/aergoluac/luac"
 	"github.com/spf13/cobra"
 )
 
@@ -44,15 +45,15 @@ func init() {
 				}
 			} else if payload {
 				if len(args) == 0 {
-					err = util.DumpFromStdin()
+					err = luac.DumpFromStdin()
 				} else {
-					err = util.DumpFromFile(args[0])
+					err = luac.DumpFromFile(args[0])
 				}
 			} else {
 				if len(args) < 2 {
 					return errors.New("2 arguments required: <srcfile> <bcfile>")
 				}
-				err = util.CompileFromFile(args[0], args[1], abiFile)
+				err = luac.CompileFromFile(args[0], args[1], abiFile)
 			}
 
 			return err

cmd/aergoluac/util/luac_util.go → cmd/aergoluac/util/util.go

@@ -1,137 +1,25 @@
 package util
 
-/*
-#cgo CFLAGS: -I${SRCDIR}/../../../libtool/include/luajit-2.1
-#cgo LDFLAGS: ${SRCDIR}/../../../libtool/lib/libluajit-5.1.a -lm
-
-#include <stdlib.h>
-#include <lualib.h>
-#include "compile.h"
-*/
-import "C"
 import (
 	"bufio"
 	"bytes"
 	"encoding/binary"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
-	"runtime"
-	"unsafe"
 
 	"github.com/aergoio/aergo/v2/internal/enc/hex"
 	"github.com/aergoio/aergo/v2/internal/enc/base58"
 	"github.com/aergoio/aergo/v2/cmd/aergoluac/encoding"
 )
 
-func NewLState() *C.lua_State {
-	L := C.luac_vm_newstate()
-	if L == nil {
-		runtime.GC()
-		L = C.luac_vm_newstate()
-	}
-	return L
-}
-
-func CloseLState(L *C.lua_State) {
-	if L != nil {
-		C.luac_vm_close(L)
-	}
-}
-
-func Compile(L *C.lua_State, code string) (LuaCode, error) {
-	cStr := C.CString(code)
-	defer C.free(unsafe.Pointer(cStr))
-	if errMsg := C.vm_loadstring(L, cStr); errMsg != nil {
-		return nil, errors.New(C.GoString(errMsg))
-	}
-	if errMsg := C.vm_stringdump(L); errMsg != nil {
-		return nil, errors.New(C.GoString(errMsg))
-	}
-	return dumpToBytes(L), nil
-}
-
-func CompileFromFile(srcFileName, outFileName, abiFileName string) error {
-	cSrcFileName := C.CString(srcFileName)
-	cOutFileName := C.CString(outFileName)
-	cAbiFileName := C.CString(abiFileName)
-	L := C.luac_vm_newstate()
-	defer C.free(unsafe.Pointer(cSrcFileName))
-	defer C.free(unsafe.Pointer(cOutFileName))
-	defer C.free(unsafe.Pointer(cAbiFileName))
-	defer C.luac_vm_close(L)
-
-	if errMsg := C.vm_compile(L, cSrcFileName, cOutFileName, cAbiFileName); errMsg != nil {
-		return errors.New(C.GoString(errMsg))
-	}
-	return nil
-}
 
-func DumpFromFile(srcFileName string) error {
-	cSrcFileName := C.CString(srcFileName)
-	L := C.luac_vm_newstate()
-	defer C.free(unsafe.Pointer(cSrcFileName))
-	defer C.luac_vm_close(L)
-
-	if errMsg := C.vm_loadfile(L, cSrcFileName); errMsg != nil {
-		return errors.New(C.GoString(errMsg))
-	}
-	if errMsg := C.vm_stringdump(L); errMsg != nil {
-		return errors.New(C.GoString(errMsg))
-	}
-
-	fmt.Println(encoding.EncodeCode(dumpToBytes(L)))
-	return nil
-}
-
-func DumpFromStdin() error {
-	fi, err := os.Stdin.Stat()
-	if err != nil {
-		return err
-	}
-	var buf []byte
-	if (fi.Mode() & os.ModeCharDevice) == 0 {
-		buf, err = ioutil.ReadAll(os.Stdin)
-		if err != nil {
-			return err
-		}
-	} else {
-		var bBuf bytes.Buffer
-		scanner := bufio.NewScanner(os.Stdin)
-		for scanner.Scan() {
-			bBuf.WriteString(scanner.Text() + "\n")
-		}
-		if err = scanner.Err(); err != nil {
-			return err
-		}
-		buf = bBuf.Bytes()
-	}
-	srcCode := C.CString(string(buf))
-	L := C.luac_vm_newstate()
-	defer C.free(unsafe.Pointer(srcCode))
-	defer C.luac_vm_close(L)
-
-	if errMsg := C.vm_loadstring(L, srcCode); errMsg != nil {
-		return errors.New(C.GoString(errMsg))
-	}
-	if errMsg := C.vm_stringdump(L); errMsg != nil {
-		return errors.New(C.GoString(errMsg))
-	}
-	fmt.Println(encoding.EncodeCode(dumpToBytes(L)))
-	return nil
-}
-
-func dumpToBytes(L *C.lua_State) LuaCode {
-	var (
-		c, a   *C.char
-		lc, la C.size_t
-	)
-	c = C.lua_tolstring(L, -2, &lc)
-	a = C.lua_tolstring(L, -1, &la)
-	return NewLuaCode(C.GoBytes(unsafe.Pointer(c), C.int(lc)), C.GoBytes(unsafe.Pointer(a), C.int(la)))
-}
+////////////////////////////////////////////////////////////////////////////////
+// Decode
+////////////////////////////////////////////////////////////////////////////////
 
+// Decode decodes the payload from a hex string or a base58 string or a JSON string
+// and writes the bytecode, abi and deploy arguments to files
 func Decode(srcFileName string, payload string) error {
 	var decoded []byte
 	var err error
@@ -223,6 +111,11 @@ func DecodeFromStdin() error {
 }
 
 
+////////////////////////////////////////////////////////////////////////////////
+// LuaCode and LuaCodePayload
+// used to store bytecode, abi and deploy arguments
+////////////////////////////////////////////////////////////////////////////////
+
 type LuaCode []byte
 
 const byteCodeLenLen = 4

cmd/brick/context/context.go

@@ -32,7 +32,7 @@ func Open(private bool) {
 		err   error
 	)
 	if privateNet {
-		chain, err = vm_dummy.LoadDummyChain()
+		chain, err = vm_dummy.LoadDummyChain(vm_dummy.SetPrivNet())
 	} else {
 		chain, err = vm_dummy.LoadDummyChain(vm_dummy.SetPubNet())
 	}