diff --git a/Docker/Dockerfile.builder b/Docker/Dockerfile.builder
index 88e23b2aa..ba38f13e6 100644
--- a/Docker/Dockerfile.builder
+++ b/Docker/Dockerfile.builder
@@ -4,4 +4,3 @@ RUN apt-get -y update && apt-get -y install build-essential git cmake binutils m
 RUN git clone --branch ${GIT_TAG} --recursive https://github.com/aergoio/aergo.git \
     && cd aergo \
     && make aergosvr polaris colaris aergocli aergoluac brick
-
diff --git a/Docker/Dockerfile.local b/Docker/Dockerfile.local
new file mode 100644
index 000000000..b2a6e8f16
--- /dev/null
+++ b/Docker/Dockerfile.local
@@ -0,0 +1,4 @@
+FROM golang:1.19.0-bullseye as builder
+RUN apt-get -y update && apt-get -y install build-essential git cmake binutils m4 file
+COPY . aergo
+RUN cd aergo && make aergosvr polaris colaris aergocli aergoluac brick
diff --git a/Docker/build-local.sh b/Docker/build-local.sh
new file mode 100755
index 000000000..f18a3c406
--- /dev/null
+++ b/Docker/build-local.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+
+# This script can be used to build the Docker images manually (outside of CI)
+
+set -e
+
+MAIN_TAG=$1
+SECOND_TAG=$2
+THIRD_TAG=$3
+
+if [[ -z "$MAIN_TAG" ]]
+then
+    echo "Usage:"
+    echo "  build-local.sh tag [second-tag] [third-tag]"
+    echo "Example:"
+    echo "  build-local.sh 0.12.0-rc"
+    echo "  build-local.sh 0.12.0 0.12 latest"
+    exit 1
+fi
+
+
+echo "Preparing local folder for build"
+
+cd ..
+git submodule update --init --recursive
+make clean || true
+rm -rf build
+go clean --cache
+
+
+if [[ -z "$THIRD_TAG" ]]
+then
+    if [[ -z "$SECOND_TAG" ]]
+    then
+        declare -a tags=("$MAIN_TAG")
+    else
+        declare -a tags=("$MAIN_TAG" "$SECOND_TAG")
+    fi
+else
+    declare -a tags=("$MAIN_TAG" "$SECOND_TAG" "$THIRD_TAG")
+fi
+
+echo "Building Docker images for ${tags[*]} using local folder"
+sleep 1
+
+BUILDER_TAG="aergo/local-builder"
+echo "Building ${BUILDER_TAG}"
+
+docker build --no-cache --file Docker/Dockerfile.local -t ${BUILDER_TAG} .
+cd -
+docker create --name extract ${BUILDER_TAG}
+docker cp extract:/go/aergo/bin/ .
+docker cp extract:/go/aergo/cmd/brick/arglog.toml bin/brick-arglog.toml
+docker cp extract:/go/aergo/libtool/lib/ .
+docker rm -f extract
+
+declare -a names=("node" "tools" "polaris")
+for name in "${names[@]}"
+do
+    tagsExpanded=()
+    for tag in "${tags[@]}"; do
+        tagsExpanded+=("-t aergo/$name:$tag")
+    done
+    echo "[aergo/$name:${tags[*]}]"
+    DOCKERFILE="Dockerfile.$name"
+    echo docker build -q ${tagsExpanded[@]} --file $DOCKERFILE .
+    imageid=`docker build -q ${tagsExpanded[@]} --file $DOCKERFILE .`
+    docker images --format "Done: \t{{.Repository}}:{{.Tag}} \t{{.ID}} ({{.Size}})" | grep "${imageid:7:12}"
+done
+
+rm -rf bin lib
+
+echo -e "\nREPOSITORY          TAG                 IMAGE ID            CREATED             SIZE"
+for name in "${names[@]}"
+do
+    for tag in "${tags[@]}"
+    do
+        docker images aergo/$name:$tag | tail -1
+    done
+done
+
+echo -e "\nYou can now push these to Docker Hub."
+echo "For example:"
+
+declare -a names=("node" "tools" "polaris")
+for name in "${names[@]}"
+do
+    for tag in "${tags[@]}"
+    do
+        echo "  docker push aergo/$name:$tag"
+    done
+done
diff --git a/aergo-protobuf b/aergo-protobuf
index 0c3579cd4..f0b2b8a6a 160000
--- a/aergo-protobuf
+++ b/aergo-protobuf
@@ -1 +1 @@
-Subproject commit 0c3579cd42f830eb787715a78895d971b8ee5fce
+Subproject commit f0b2b8a6a9347c5b9c44c5bb9e2a30f13a47235b
diff --git a/chain/chainhandle.go b/chain/chainhandle.go
index 0a35e7082..d28e4e742 100644
--- a/chain/chainhandle.go
+++ b/chain/chainhandle.go
@@ -979,12 +979,19 @@ func executeTx(execCtx context.Context, ccc consensus.ChainConsensusCluster, cdb
 		return err
 	}
 
-	if recipient, err = name.Resolve(bs, txBody.Recipient, isQuirkTx); err != nil {
-		return err
+	isMultiCall := (txBody.Type == types.TxType_MULTICALL)
+
+	if !isMultiCall {
+		if recipient, err = name.Resolve(bs, txBody.Recipient, isQuirkTx); err != nil {
+			return err
+		}
 	}
+
 	var receiver *state.AccountState
 	status := "SUCCESS"
-	if len(recipient) > 0 {
+	if isMultiCall {
+		receiver = sender
+	} else if len(recipient) > 0 {
 		receiver, err = state.GetAccountState(recipient, bs.StateDB)
 		if receiver != nil && txBody.Type == types.TxType_REDEPLOY {
 			status = "RECREATED"
@@ -1001,8 +1008,9 @@ func executeTx(execCtx context.Context, ccc consensus.ChainConsensusCluster, cdb
 	var txFee *big.Int
 	var rv string
 	var events []*types.Event
+
 	switch txBody.Type {
-	case types.TxType_NORMAL, types.TxType_REDEPLOY, types.TxType_TRANSFER, types.TxType_CALL, types.TxType_DEPLOY:
+	case types.TxType_NORMAL, types.TxType_TRANSFER, types.TxType_CALL, types.TxType_MULTICALL, types.TxType_DEPLOY, types.TxType_REDEPLOY:
 		rv, events, txFee, err = contract.Execute(execCtx, bs, cdb, tx.GetTx(), sender, receiver, bi, executionMode, false)
 		sender.SubBalance(txFee)
 	case types.TxType_GOVERNANCE:
diff --git a/cmd/aergocli/cmd/contract.go b/cmd/aergocli/cmd/contract.go
index 9d0b6f4cb..fb949583f 100644
--- a/cmd/aergocli/cmd/contract.go
+++ b/cmd/aergocli/cmd/contract.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"bytes"
 	"context"
+	"math/big"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -70,17 +71,17 @@ func init() {
 	contractCmd.PersistentFlags().Uint64VarP(&gas, "gaslimit", "g", 0, "Gas limit")
 
 	deployCmd := &cobra.Command{
-		Use: `deploy [flags] --payload 'payload string' <creatorAddress> [args]
-  aergocli contract deploy [flags] <creatorAddress> <bcfile> <abifile> [args]
+		Use: `deploy [flags] <creatorAddress> <path-to-lua-file> [args]
+  aergocli contract deploy [flags] <creatorAddress> --payload 'payload string' [args]
   
-  You can pass constructor arguments by passing a JSON string as the optional final parameter, e.g. "[1, 2, 3]".`,
-		Short:                 "Deploy a compiled contract to the server",
-		Args:                  nArgs([]int{1, 2, 3, 4}),
+  You can pass arguments to the constructor() function by passing a JSON string as the optional final parameter, e.g. '[1, "test"]'`,
+		Short:                 "Deploy a contract to the server",
+		Args:                  nArgs([]int{1, 2, 3}),
 		RunE:                  runDeployCmd,
 		DisableFlagsInUseLine: true,
 	}
 	deployCmd.PersistentFlags().Uint64Var(&nonce, "nonce", 0, "manually set a nonce (default: set nonce automatically)")
-	deployCmd.PersistentFlags().StringVar(&data, "payload", "", "result of compiling a contract")
+	deployCmd.PersistentFlags().StringVar(&data, "payload", "", "result of compiling a contract with aergoluac")
 	deployCmd.PersistentFlags().StringVar(&amount, "amount", "0", "amount of token to send with deployment, in aer")
 	deployCmd.PersistentFlags().StringVarP(&contractID, "redeploy", "r", "", "redeploy the contract")
 	deployCmd.Flags().StringVar(&pw, "password", "", "password (optional, will be asked on the terminal if not given)")
@@ -101,6 +102,19 @@ func init() {
 	callCmd.PersistentFlags().BoolVar(&feeDelegation, "delegation", false, "request fee delegation to contract")
 	callCmd.Flags().StringVar(&pw, "password", "", "password (optional, will be asked on the terminal if not given)")
 
+	multicallCmd := &cobra.Command{
+		Use: `multicall [flags] <sender> <script>
+
+  The script is a JSON array of arrays, enclosed as a string, containing the commands`,
+		Short: "Calls multiple contracts / functions",
+		Args:  nArgs([]int{2}),
+		RunE:  runMulticallCmd,
+	}
+	multicallCmd.PersistentFlags().Uint64Var(&nonce, "nonce", 0, "manually set a nonce (default: set nonce automatically)")
+	multicallCmd.PersistentFlags().StringVar(&chainIdHash, "chainidhash", "", "chain id hash value encoded by base58")
+	multicallCmd.PersistentFlags().BoolVar(&toJSON, "tojson", false, "display json transaction instead of sending to blockchain")
+	multicallCmd.Flags().StringVar(&pw, "password", "", "password (optional, will be asked on the terminal if not given)")
+
 	stateQueryCmd := &cobra.Command{
 		Use:   "statequery [flags] <contractAddress> <varname> [varindex]",
 		Short: "query the state of a contract with variable name and optional index",
@@ -113,6 +127,7 @@ func init() {
 	contractCmd.AddCommand(
 		deployCmd,
 		callCmd,
+		multicallCmd,
 		&cobra.Command{
 			Use:   "abi [flags] <contractAddress>",
 			Short: "Get ABI of the contract",
@@ -130,20 +145,6 @@ func init() {
 	rootCmd.AddCommand(contractCmd)
 }
 
-func isHexString(s string) bool {
-	// check is the input has even number of characters
-	if len(s)%2 != 0 {
-		return false
-	}
-	// check if the input contains only hex characters
-	for _, c := range s {
-		if !((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) {
-			return false
-		}
-	}
-	return true
-}
-
 func runDeployCmd(cmd *cobra.Command, args []string) error {
 	var err error
 	var code []byte
@@ -164,9 +165,18 @@ func runDeployCmd(cmd *cobra.Command, args []string) error {
 		nonce = state.GetNonce() + 1
 	}
 
+	chainInfo, err := client.GetChainInfo(context.Background(), &types.Empty{})
+	if err != nil {
+		return fmt.Errorf("could not retrieve chain info: %v", err.Error())
+	}
+
 	var payload []byte
 	if len(data) == 0 {
-		if len(args) < 3 {
+		if chainInfo.Id.Version < 4 {
+			cmd.SilenceUsage = false
+			return errors.New("for old hardforks use aergoluac and --payload method instead")
+		}
+		if len(args) < 2 {
 			cmd.SilenceUsage = false
 			return errors.New("not enough arguments")
 		}
@@ -174,21 +184,20 @@ func runDeployCmd(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return fmt.Errorf("failed to read code file: %v", err.Error())
 		}
-		var abi []byte
-		abi, err = os.ReadFile(args[2])
-		if err != nil {
-			return fmt.Errorf("failed to read abi file: %v", err.Error())
-		}
-		if len(args) == 4 {
+		if len(args) == 3 {
 			var ci types.CallInfo
-			err = json.Unmarshal([]byte(args[3]), &ci.Args)
+			err = json.Unmarshal([]byte(args[2]), &ci.Args)
 			if err != nil {
-				return fmt.Errorf("failed to parse JSON: %v", err.Error())
+				return fmt.Errorf("failed to parse arguments (JSON): %v", err.Error())
 			}
-			deployArgs = []byte(args[3])
+			deployArgs = []byte(args[2])
 		}
-		payload = luac.NewLuaCodePayload(luac.NewLuaCode(code, abi), deployArgs)
+		payload = luac.NewLuaCodePayload(luac.LuaCode(code), deployArgs)
 	} else {
+		if chainInfo.Id.Version >= 4 {
+			cmd.SilenceUsage = false
+			return errors.New("this chain only accepts deploy in plain source code\nuse the other method instead")
+		}
 		if len(args) == 2 {
 			var ci types.CallInfo
 			err = json.Unmarshal([]byte(args[1]), &ci.Args)
@@ -198,7 +207,11 @@ func runDeployCmd(cmd *cobra.Command, args []string) error {
 			deployArgs = []byte(args[1])
 		}
 		// check if the data is in hex format
-		if isHexString(data) {
+		if hex.IsHexString(data) {
+			if deployArgs != nil {
+				cmd.SilenceUsage = false
+				return errors.New("the call arguments are expected to be already on the hex data")
+			}
 			// the data is expected to be copied from aergoscan view of
 			// the transaction that deployed the contract
 			payload, err = hex.Decode(data)
@@ -249,13 +262,7 @@ func runCallCmd(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return fmt.Errorf("could not decode sender address: %v", err.Error())
 	}
-	if nonce == 0 {
-		state, err := client.GetState(context.Background(), &types.SingleBytes{Value: caller})
-		if err != nil {
-			return fmt.Errorf("failed to get creator account's state: %v", err.Error())
-		}
-		nonce = state.GetNonce() + 1
-	}
+
 	contract, err := types.DecodeAddress(args[1])
 	if err != nil {
 		return fmt.Errorf("could not decode contract address: %v", err.Error())
@@ -310,6 +317,45 @@ func runCallCmd(cmd *cobra.Command, args []string) error {
 		},
 	}
 
+	return sendCallTx(cmd, tx, caller)
+}
+
+func runMulticallCmd(cmd *cobra.Command, args []string) error {
+	cmd.SilenceUsage = true
+
+	caller, err := types.DecodeAddress(args[0])
+	if err != nil {
+		return fmt.Errorf("could not decode sender address: %v", err.Error())
+	}
+
+	script := args[1]
+
+	tx := &types.Tx{
+		Body: &types.TxBody{
+			Nonce:     nonce,
+			Account:   caller,
+			Recipient: []byte{},
+			Payload:   []byte(script),
+			Amount:    big.NewInt(0).Bytes(),
+			GasLimit:  gas,
+			Type:      types.TxType_MULTICALL,
+		},
+	}
+
+	return sendCallTx(cmd, tx, caller)
+}
+
+func sendCallTx(cmd *cobra.Command, tx *types.Tx, sender []byte) error {
+	var err error
+
+	if tx.GetBody().GetNonce() == 0 {
+		state, err := client.GetState(context.Background(), &types.SingleBytes{Value: sender})
+		if err != nil {
+			return fmt.Errorf("failed to get sender account's state: %v", err.Error())
+		}
+		tx.GetBody().Nonce = state.GetNonce() + 1
+	}
+
 	if chainIdHash != "" {
 		rawCidHash, err := base58.Decode(chainIdHash)
 		if err != nil {
@@ -330,7 +376,7 @@ func runCallCmd(cmd *cobra.Command, args []string) error {
 	}
 
 	if rootConfig.KeyStorePath != "" {
-		if errStr := fillSign(tx, rootConfig.KeyStorePath, pw, caller); errStr != "" {
+		if errStr := fillSign(tx, rootConfig.KeyStorePath, pw, sender); errStr != "" {
 			return errors.New(errStr)
 		}
 	} else {
diff --git a/cmd/aergoluac/main.go b/cmd/aergoluac/main.go
index d305fd093..1c4c120b3 100644
--- a/cmd/aergoluac/main.go
+++ b/cmd/aergoluac/main.go
@@ -17,6 +17,7 @@ var (
 	rootCmd *cobra.Command
 	abiFile string
 	payload bool
+	decode  bool
 	version bool
 )
 
@@ -24,7 +25,7 @@ var githash = "No git hash provided"
 
 func init() {
 	rootCmd = &cobra.Command{
-		Use:   "aergoluac --payload srcfile\n  aergoluac --abi abifile srcfile bcfile",
+		Use:   "aergoluac --payload srcfile\n  aergoluac srcfile bcfile\n  aergoluac --abi abifile srcfile bcfile\n  aergoluac --decode payloadfile",
 		Short: "Compile a lua contract",
 		Long:  "Compile a lua contract. This command makes a bytecode file and a ABI file or prints a payload data.",
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -34,7 +35,14 @@ func init() {
 				cmd.Printf("Aergoluac %s\n", githash)
 				return nil
 			}
-			if payload {
+
+			if decode {
+				if len(args) == 0 {
+					err = util.DecodeFromStdin()
+				} else {
+					err = util.DecodeFromFile(args[0])
+				}
+			} else if payload {
 				if len(args) == 0 {
 					err = util.DumpFromStdin()
 				} else {
@@ -46,11 +54,13 @@ func init() {
 				}
 				err = util.CompileFromFile(args[0], args[1], abiFile)
 			}
+
 			return err
 		},
 	}
 	rootCmd.PersistentFlags().StringVarP(&abiFile, "abi", "a", "", "abi filename")
 	rootCmd.PersistentFlags().BoolVar(&payload, "payload", false, "print the compilation result consisting of bytecode and abi")
+	rootCmd.PersistentFlags().BoolVar(&decode, "decode", false, "extract raw bytecode and abi from payload (hex or base58)")
 	rootCmd.PersistentFlags().BoolVar(&version, "version", false, "print the version number of aergoluac")
 }
 
diff --git a/cmd/aergoluac/util/luac_util.go b/cmd/aergoluac/util/luac_util.go
index 20b038260..9fc9daa89 100644
--- a/cmd/aergoluac/util/luac_util.go
+++ b/cmd/aergoluac/util/luac_util.go
@@ -20,6 +20,8 @@ import (
 	"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"
 )
 
@@ -130,6 +132,97 @@ func dumpToBytes(L *C.lua_State) LuaCode {
 	return NewLuaCode(C.GoBytes(unsafe.Pointer(c), C.int(lc)), C.GoBytes(unsafe.Pointer(a), C.int(la)))
 }
 
+func Decode(srcFileName string, payload string) error {
+	var decoded []byte
+	var err error
+
+	// check if the payload is in hex format
+	if hex.IsHexString(payload) {
+		// the data is expected to be copied from aergoscan view of
+		// the transaction that deployed the contract
+		decoded, err = hex.Decode(payload)
+	} else {
+		// the data is the output of aergoluac
+		decoded, err = encoding.DecodeCode(payload)
+		if err != nil {
+			// the data is extracted from JSON transaction from aergocli
+			decoded, err = base58.Decode(payload)
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("failed to decode payload 1: %v", err.Error())
+	}
+
+	data := LuaCodePayload(decoded)
+	_, err = data.IsValidFormat()
+	if err != nil {
+		return fmt.Errorf("failed to decode payload 2: %v", err.Error())
+	}
+
+	contract := data.Code()
+	if !contract.IsValidFormat() {
+		// the data is the output of aergoluac, so it does not contain deploy arguments
+		contract = LuaCode(decoded)
+		data = NewLuaCodePayload(contract, []byte{})
+	}
+
+	err = os.WriteFile(srcFileName + "-bytecode", contract.ByteCode(), 0644);
+	if err != nil {
+		return fmt.Errorf("failed to write bytecode file: %v", err.Error())
+	}
+
+	err = os.WriteFile(srcFileName + "-abi", contract.ABI(), 0644);
+	if err != nil {
+		return fmt.Errorf("failed to write ABI file: %v", err.Error())
+	}
+
+	var deployArgs []byte
+	if data.HasArgs() {
+		deployArgs = data.Args()
+	}
+	err = os.WriteFile(srcFileName + "-deploy-arguments", deployArgs, 0644);
+	if err != nil {
+		return fmt.Errorf("failed to write deploy-arguments file: %v", err.Error())
+	}
+
+	fmt.Println("done.")
+	return nil
+}
+
+func DecodeFromFile(srcFileName string) error {
+	payload, err := os.ReadFile(srcFileName)
+	if err != nil {
+		return fmt.Errorf("failed to read payload file: %v", err.Error())
+	}
+	return Decode(srcFileName, string(payload))
+}
+
+func DecodeFromStdin() 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()
+	}
+	return Decode("contract", string(buf))
+}
+
+
 type LuaCode []byte
 
 const byteCodeLenLen = 4
diff --git a/cmd/brick/context/symbol.go b/cmd/brick/context/symbol.go
index 4682b3b08..722c8ce6c 100644
--- a/cmd/brick/context/symbol.go
+++ b/cmd/brick/context/symbol.go
@@ -7,6 +7,7 @@ var (
 	AccountSymbol      = "<account>"
 	AmountSymbol       = "<amount>"
 	ContractArgsSymbol = "<contract_args>"
+	MulticallSymbol    = "<commands>"
 	ExpectedSymbol     = "<expected>"
 	ExpectedErrSymbol  = "<expected_err>"
 	FunctionSymbol     = "<function>"
@@ -23,6 +24,7 @@ func init() {
 	Symbols[ContractSymbol] = "contract address"
 	Symbols[AccountSymbol] = "account address"
 	Symbols[ContractArgsSymbol] = "an array of argments to call a contract"
+	Symbols[MulticallSymbol] = "a list of commands in JSON"
 	Symbols[AmountSymbol] = "amount of aergo to send"
 	Symbols[ExpectedSymbol] = "expected result"
 	Symbols[ExpectedErrSymbol] = "expected error"
diff --git a/cmd/brick/context/util.go b/cmd/brick/context/util.go
index dc48b9827..badf16266 100644
--- a/cmd/brick/context/util.go
+++ b/cmd/brick/context/util.go
@@ -18,6 +18,55 @@ func ParseFirstWord(input string) (string, string) {
 	return strings.ToLower(splitedStr[0]), strings.Join(splitedStr[1:], " ")
 }
 
+func ParseDecimalAmount(str string, digits int) string {
+
+	// if there is no 'aergo' unit, just return the amount str
+	if !strings.HasSuffix(strings.ToLower(str), "aergo") {
+		return str
+	}
+
+	// remove the 'aergo' unit
+	str = str[:len(str)-5]
+	// trim trailing spaces
+	str = strings.TrimRight(str, " ")
+
+	// get the position of the decimal point
+	idx := strings.Index(str, ".")
+
+	// if not found, just add the leading zeros
+	if idx == -1 {
+		return str + strings.Repeat("0", digits)
+	}
+
+	// Get the integer and decimal parts
+	p1 := str[0:idx]
+	p2 := str[idx+1:]
+
+	// Check for another decimal point
+	if strings.Index(p2, ".") != -1 {
+		return "error"
+	}
+
+	// Compute the amount of zero digits to add
+	to_add := digits - len(p2)
+	if to_add > 0 {
+		p2 = p2 + strings.Repeat("0", to_add)
+	} else if to_add < 0 {
+		// Do not truncate decimal amounts
+		return "error"
+	}
+
+	// Join the integer and decimal parts
+	str = p1 + p2
+
+	// Remove leading zeros
+	str = strings.TrimLeft(str, "0")
+	if str == "" {
+		str = "0"
+	}
+	return str
+}
+
 type Chunk struct {
 	Accent bool
 	Text   string
diff --git a/cmd/brick/exec/callContract.go b/cmd/brick/exec/callContract.go
index b44ce1ee3..b6efd92e1 100644
--- a/cmd/brick/exec/callContract.go
+++ b/cmd/brick/exec/callContract.go
@@ -53,7 +53,8 @@ func (c *callContract) parse(args string) (string, *big.Int, string, string, str
 		return "", nil, "", "", "", "", "", fmt.Errorf("need at least 4 arguments. usage: %s", c.Usage())
 	}
 
-	amount, success := new(big.Int).SetString(splitArgs[1].Text, 10)
+	amountStr := context.ParseDecimalAmount(splitArgs[1].Text, 18)
+	amount, success := new(big.Int).SetString(amountStr, 10)
 	if success == false {
 		return "", nil, "", "", "", "", "", fmt.Errorf("fail to parse number %s", splitArgs[1].Text)
 	}
diff --git a/cmd/brick/exec/debug.go b/cmd/brick/exec/debug.go
index b7b9c2537..a88d00be3 100644
--- a/cmd/brick/exec/debug.go
+++ b/cmd/brick/exec/debug.go
@@ -61,7 +61,7 @@ func (c *setb) parse(args string) (uint64, string, error) {
 
 	line, err := strconv.ParseUint(splitArgs[0].Text, 10, 64)
 	if err != nil {
-		return 0, "", fmt.Errorf("fail to parse number %s: %s", splitArgs[1].Text, err.Error())
+		return 0, "", fmt.Errorf("fail to parse number %s: %s", splitArgs[0].Text, err.Error())
 	}
 
 	contractIDHex := contract.PlainStrToHexAddr(splitArgs[1].Text)
@@ -119,7 +119,7 @@ func (c *delb) parse(args string) (uint64, string, error) {
 
 	line, err := strconv.ParseUint(splitArgs[0].Text, 10, 64)
 	if err != nil {
-		return 0, "", fmt.Errorf("fail to parse number %s: %s", splitArgs[1].Text, err.Error())
+		return 0, "", fmt.Errorf("fail to parse number %s: %s", splitArgs[0].Text, err.Error())
 	}
 
 	contractIDHex := contract.PlainStrToHexAddr(splitArgs[1].Text)
diff --git a/cmd/brick/exec/deployContract.go b/cmd/brick/exec/deployContract.go
index 014f2a73e..52bf9bf71 100644
--- a/cmd/brick/exec/deployContract.go
+++ b/cmd/brick/exec/deployContract.go
@@ -86,7 +86,8 @@ func (c *deployContract) parse(args string) (string, *big.Int, string, string, s
 		return "", nil, "", "", "", fmt.Errorf("need 4 arguments. usage: %s", c.Usage())
 	}
 
-	amount, success := new(big.Int).SetString(splitArgs[1].Text, 10)
+	amountStr := context.ParseDecimalAmount(splitArgs[1].Text, 18)
+	amount, success := new(big.Int).SetString(amountStr, 10)
 	if success == false {
 		return "", nil, "", "", "", fmt.Errorf("fail to parse number %s", splitArgs[1].Text)
 	}
diff --git a/cmd/brick/exec/getstateAccount.go b/cmd/brick/exec/getstateAccount.go
index bf9a6caf5..81bdc8f98 100644
--- a/cmd/brick/exec/getstateAccount.go
+++ b/cmd/brick/exec/getstateAccount.go
@@ -2,6 +2,7 @@ package exec
 
 import (
 	"fmt"
+	"math/big"
 
 	"github.com/aergoio/aergo/v2/cmd/brick/context"
 	"github.com/aergoio/aergo/v2/contract/vm_dummy"
@@ -48,7 +49,11 @@ func (c *getStateAccount) parse(args string) (string, string, error) {
 
 	expectedResult := ""
 	if len(splitArgs) == 2 {
-		expectedResult = splitArgs[1].Text
+		expectedResult = context.ParseDecimalAmount(splitArgs[1].Text, 18)
+		_, success := new(big.Int).SetString(expectedResult, 10)
+		if expectedResult == "error" || success == false {
+			return "", "", fmt.Errorf("fail to parse number: %s", splitArgs[1].Text)
+		}
 	} else if len(splitArgs) > 2 {
 		return "", "", fmt.Errorf("too many arguments. usage: %s", c.Usage())
 	}
diff --git a/cmd/brick/exec/injectAccount.go b/cmd/brick/exec/injectAccount.go
index f5938341f..9c605c2e9 100644
--- a/cmd/brick/exec/injectAccount.go
+++ b/cmd/brick/exec/injectAccount.go
@@ -49,7 +49,8 @@ func (c *injectAccount) parse(args string) (string, *big.Int, error) {
 		return "", nil, fmt.Errorf("need 2 arguments. usage: %s", c.Usage())
 	}
 
-	amount, success := new(big.Int).SetString(splitArgs[1].Text, 10)
+	amountStr := context.ParseDecimalAmount(splitArgs[1].Text, 18)
+	amount, success := new(big.Int).SetString(amountStr, 10)
 	if success == false {
 		return "", nil, fmt.Errorf("fail to parse number %s", splitArgs[1].Text)
 	}
diff --git a/cmd/brick/exec/multicall.go b/cmd/brick/exec/multicall.go
new file mode 100644
index 000000000..bd7a626e9
--- /dev/null
+++ b/cmd/brick/exec/multicall.go
@@ -0,0 +1,114 @@
+package exec
+
+import (
+	"fmt"
+
+	"github.com/rs/zerolog"
+
+	"github.com/aergoio/aergo/v2/cmd/brick/context"
+	"github.com/aergoio/aergo/v2/contract/vm_dummy"
+	"github.com/aergoio/aergo/v2/types"
+)
+
+func init() {
+	registerExec(&multicall{})
+}
+
+type multicall struct{}
+
+func (c *multicall) Command() string {
+	return "multicall"
+}
+
+func (c *multicall) Syntax() string {
+	return fmt.Sprintf("%s %s %s %s", context.AccountSymbol,
+		context.MulticallSymbol,
+		context.ExpectedErrSymbol, context.ExpectedSymbol)
+}
+
+func (c *multicall) Usage() string {
+	return fmt.Sprintf("multicall <sender> `[commands_json_str]` `[expected_error_str]` `[expected_result_str]`")
+}
+
+func (c *multicall) Describe() string {
+	return "composable call to multiple smart contracts"
+}
+
+func (c *multicall) Validate(args string) error {
+
+	// is chain is loaded?
+	if context.Get() == nil {
+		return fmt.Errorf("load chain first")
+	}
+
+	_, _, _, _, err := c.parse(args)
+
+	return err
+}
+
+func (c *multicall) parse(args string) (string, string, string, string, error) {
+	splitArgs := context.SplitSpaceAndAccent(args, false)
+	if len(splitArgs) < 2 {
+		return "", "", "", "", fmt.Errorf("need at least 2 arguments. usage: %s", c.Usage())
+	}
+
+	callCode := splitArgs[1].Text
+	expectedError := ""
+	expectedRes := ""
+
+	if len(splitArgs) >= 3 {
+		expectedError = splitArgs[2].Text
+	}
+	if len(splitArgs) == 4 {
+		expectedRes = splitArgs[3].Text
+	} else if len(splitArgs) > 4 {
+		return "", "", "", "", fmt.Errorf("too many arguments. usage: %s", c.Usage())
+	}
+
+	return splitArgs[0].Text, //accountName
+		callCode,
+		expectedError,
+		expectedRes,
+		nil
+}
+
+func (c *multicall) Run(args string) (string, uint64, []*types.Event, error) {
+
+	accountName, payload, expectedError, expectedRes, _ := c.parse(args)
+
+	multicallTx := vm_dummy.NewLuaTxMultiCall(accountName, payload)
+
+	logLevel := zerolog.GlobalLevel()
+
+	if expectedError != "" {
+		multicallTx.Fail(expectedError)
+		zerolog.SetGlobalLevel(zerolog.ErrorLevel) // turn off log
+	}
+	err := context.Get().ConnectBlock(multicallTx)
+
+	if expectedError != "" {
+		zerolog.SetGlobalLevel(logLevel) // restore log level
+	}
+	if err != nil {
+		return "", 0, nil, err
+	}
+
+	if expectedError != "" {
+		Index(context.ExpectedErrSymbol, expectedError)
+		return "call a smart contract successfully", 0, nil, nil
+	}
+
+	receipt := context.Get().GetReceipt(multicallTx.Hash())
+
+	if expectedRes != "" && expectedRes != receipt.Ret {
+		err = fmt.Errorf("expected: %s, but got: %s", expectedRes, receipt.Ret)
+		return "", 0, nil, err
+	}
+
+	result := "success"
+	if expectedRes == "" && len(receipt.Ret) > 0 {
+		result += ": " + receipt.Ret
+	}
+	return result, receipt.GasUsed, context.Get().GetEvents(multicallTx.Hash()), nil
+
+}
diff --git a/cmd/brick/exec/sendCoin.go b/cmd/brick/exec/sendCoin.go
index e7c93dc5a..6f49f3b51 100644
--- a/cmd/brick/exec/sendCoin.go
+++ b/cmd/brick/exec/sendCoin.go
@@ -51,9 +51,10 @@ func (c *sendCoin) parse(args string) (string, string, *big.Int, error) {
 		return "", "", nil, fmt.Errorf("need 3 arguments. usage: %s", c.Usage())
 	}
 
-	amount, success := new(big.Int).SetString(splitArgs[2].Text, 10)
+	amountStr := context.ParseDecimalAmount(splitArgs[2].Text, 18)
+	amount, success := new(big.Int).SetString(amountStr, 10)
 	if success == false {
-		return "", "", nil, fmt.Errorf("fail to parse number %s", splitArgs[1].Text)
+		return "", "", nil, fmt.Errorf("fail to parse number %s", splitArgs[2].Text)
 	}
 
 	return splitArgs[0].Text,
diff --git a/config/hardfork.json b/config/hardfork.json
index f9c27f34f..a1ab454e9 100644
--- a/config/hardfork.json
+++ b/config/hardfork.json
@@ -8,5 +8,10 @@
         "Version": 3,
         "MainNetHeight": 111499715,
         "TestNetHeight": 100360545
+    },
+    {
+        "Version": 4,
+        "MainNetHeight": 1000000000,
+        "TestNetHeight": 1000000000
     }
 ]
diff --git a/config/hardfork_gen.go b/config/hardfork_gen.go
index c3c96bf6d..fc2a4a13d 100644
--- a/config/hardfork_gen.go
+++ b/config/hardfork_gen.go
@@ -13,25 +13,30 @@ var (
 	MainNetHardforkConfig = &HardforkConfig{
 		V2: types.BlockNo(19611555),
 		V3: types.BlockNo(111499715),
+		V4: types.BlockNo(1000000000),
 	}
 	TestNetHardforkConfig = &HardforkConfig{
 		V2: types.BlockNo(18714241),
 		V3: types.BlockNo(100360545),
+		V4: types.BlockNo(1000000000),
 	}
 	AllEnabledHardforkConfig = &HardforkConfig{
 		V2: types.BlockNo(0),
 		V3: types.BlockNo(0),
+		V4: types.BlockNo(0),
 	}
 )
 
 const hardforkConfigTmpl = `[hardfork]
 v2 = "{{.Hardfork.V2}}"
 v3 = "{{.Hardfork.V3}}"
+v4 = "{{.Hardfork.V4}}"
 `
 
 type HardforkConfig struct {
 	V2 types.BlockNo `mapstructure:"v2" description:"a block number of the hardfork version 2"`
 	V3 types.BlockNo `mapstructure:"v3" description:"a block number of the hardfork version 3"`
+	V4 types.BlockNo `mapstructure:"v4" description:"a block number of the hardfork version 4"`
 }
 
 type HardforkDbConfig map[string]types.BlockNo
@@ -55,6 +60,10 @@ func (c *HardforkConfig) IsV3Fork(h types.BlockNo) bool {
 	return isFork(c.V3, h)
 }
 
+func (c *HardforkConfig) IsV4Fork(h types.BlockNo) bool {
+	return isFork(c.V4, h)
+}
+
 func (c *HardforkConfig) CheckCompatibility(dbCfg HardforkDbConfig, h types.BlockNo) error {
 	if err := c.validate(); err != nil {
 		return err
@@ -65,7 +74,10 @@ func (c *HardforkConfig) CheckCompatibility(dbCfg HardforkDbConfig, h types.Bloc
 	if (isFork(c.V3, h) || isFork(dbCfg["V3"], h)) && c.V3 != dbCfg["V3"] {
 		return newForkError("V3", h, c.V3, dbCfg["V3"])
 	}
-	return checkOlderNode(3, h, dbCfg)
+	if (isFork(c.V4, h) || isFork(dbCfg["V4"], h)) && c.V4 != dbCfg["V4"] {
+		return newForkError("V4", h, c.V4, dbCfg["V4"])
+	}
+	return checkOlderNode(4, h, dbCfg)
 }
 
 func (c *HardforkConfig) Version(h types.BlockNo) int32 {
diff --git a/config/hardfork_test.go b/config/hardfork_test.go
index 90eb6cc05..47ca19adb 100644
--- a/config/hardfork_test.go
+++ b/config/hardfork_test.go
@@ -62,23 +62,34 @@ func TestConfigFromToml(t *testing.T) {
 	cfg := readConfig(`
 [hardfork]
 v2 = "9223"
+v3 = "13000"
+v4 = "14000"
 `,
 	)
 	if cfg.V2 != 9223 {
 		t.Errorf("V2 = %d, want %d", cfg.V2, 9223)
 	}
+	if cfg.V3 != 13000 {
+		t.Errorf("V3 = %d, want %d", cfg.V3, 13000)
+	}
+	if cfg.V4 != 14000 {
+		t.Errorf("V4 = %d, want %d", cfg.V4, 14000)
+	}
 }
 
 func TestCompatibility(t *testing.T) {
 	cfg := readConfig(`
 [hardfork]
 v2 = "9223"
-v3 = "11000"`,
+v3 = "11000"
+v4 = "14000"
+`,
 	)
 	dbCfg, _ := readDbConfig(`
 {
-	"V2": 18446744073709551515,
-	"V3": 18446744073709551615
+	"V2": 18446744073709551415,
+	"V3": 18446744073709551515,
+	"V4": 18446744073709551615
 }`,
 	)
 	err := cfg.CheckCompatibility(dbCfg, 10)
@@ -89,7 +100,8 @@ v3 = "11000"`,
 	dbCfg, _ = readDbConfig(`
 {
 	"V2": 9223,
-	"V3": 10000
+	"V3": 10000,
+	"V4": 14000
 }`,
 	)
 	err = cfg.CheckCompatibility(dbCfg, 10)
@@ -100,7 +112,8 @@ v3 = "11000"`,
 	dbCfg, _ = readDbConfig(`
 {
 	"V2": 9223,
-	"V3": 10000
+	"V3": 10000,
+	"V4": 14000
 }`,
 	)
 	err = cfg.CheckCompatibility(dbCfg, 9500)
@@ -111,7 +124,8 @@ v3 = "11000"`,
 	dbCfg, _ = readDbConfig(`
 {
 	"V2": 9221,
-	"V3": 10000
+	"V3": 10000,
+	"V4": 14000
 }`,
 	)
 	err = cfg.CheckCompatibility(dbCfg, 9500)
@@ -145,7 +159,8 @@ v3 = "11000"`,
 {
 	"V2": 9223,
 	"VV": 10000,
-	"V3": 11000
+	"V3": 11000,
+	"V4": 12000
 }`,
 	)
 	err = cfg.CheckCompatibility(dbCfg, 9000)
@@ -161,7 +176,9 @@ func TestVersion(t *testing.T) {
 	cfg := readConfig(`
 [hardfork]
 v2 = "9223"
-v3 = "10000"`,
+v3 = "10000"
+v4 = "14000"
+`,
 	)
 	tests := []struct {
 		name string
@@ -188,13 +205,36 @@ v3 = "10000"`,
 			9322,
 			2,
 		},
-		/*
-			{
-				"greater v3",
-				19322,
-				3,
-			},
-		*/
+		{
+			"before v3",
+			9999,
+			2,
+		},
+		{
+			"equal v3",
+			10000,
+			3,
+		},
+		{
+			"greater v3",
+			10001,
+			3,
+		},
+		{
+			"before v4",
+			13999,
+			3,
+		},
+		{
+			"equal v4",
+			14000,
+			4,
+		},
+		{
+			"greater v4",
+			21001,
+			4,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -209,7 +249,9 @@ func TestFixDbConfig(t *testing.T) {
 	cfg := readConfig(`
 [hardfork]
 v2 = "9223"
-v3 = "10000"`,
+v3 = "10000"
+v4 = "14000"
+`,
 	)
 	dbConfig, _ := readDbConfig(`
 {
diff --git a/contract/bignum_module.c b/contract/bignum_module.c
index a9b07e953..b1b5cb42f 100644
--- a/contract/bignum_module.c
+++ b/contract/bignum_module.c
@@ -67,7 +67,15 @@ const char *lua_set_bignum(lua_State *L, char *s) {
 	if (x == NULL) {
 		return mp_num_memory_error;
 	}
-	if (vm_is_hardfork(L, 3)) {
+	if (vm_is_hardfork(L, 4)) {
+		// remove support for octal format and
+		// keep support for hex (0x) and binary (0b) formats
+		if (s && s[0]=='0' && s[1]!=0 && s[1]!='x' && s[1]!='b') {
+			// convert "0123" -> "123"
+			while (s && s[0]=='0' && s[1]!=0) s++;
+		}
+	} else if (vm_is_hardfork(L, 3)) {
+		// previous code remove support for octal, hex and binary formats
 		while (s && s[0]=='0' && s[1]!=0) s++;
 	}
 	if (mpz_init_set_str(x->mpptr, s, 0) != 0) {
@@ -119,7 +127,15 @@ static mp_num Bget(lua_State *L, int i) {
 		if (x == NULL) {
 			luaL_error(L, mp_num_memory_error);
 		}
-		if (vm_is_hardfork(L, 3)) {
+		if (vm_is_hardfork(L, 4)) {
+			// remove support for octal format and
+			// keep support for hex (0x) and binary (0b) formats
+			if (s && s[0]=='0' && s[1]!=0 && s[1]!='x' && s[1]!='b') {
+				// convert "0123" -> "123"
+				while (s && s[0]=='0' && s[1]!=0) s++;
+			}
+		} else if (vm_is_hardfork(L, 3)) {
+			// previous code remove support for octal, hex and binary formats
 			while (s && s[0]=='0' && s[1]!=0) s++;
 		}
 		if (mpz_init_set_str(x->mpptr, s, 0) != 0) {
@@ -255,6 +271,13 @@ static int Bisneg(lua_State *L) {
 	return 1;
 }
 
+static int Bispos(lua_State *L) {
+	mp_num a = Bget(L, 1);
+	lua_gasuse(L, 10);
+	lua_pushboolean(L, (mpz_sgn(MPZ(a)) > 0));
+	return 1;
+}
+
 static int Bnumber(lua_State *L) {
 	lua_gasuse(L, 50);
 	Bget(L, 1);
@@ -498,7 +521,7 @@ const char *init_bignum() {
 	return NULL;
 }
 
-static const luaL_Reg R[] = {
+static const luaL_Reg bignum_lib_v2[] = {
 	{ "__add",      Badd    },              /* __add(x,y) */
 	{ "__div",      Bdiv    },              /* __div(x,y) */
 	{ "__eq",       Beq     },              /* __eq(x,y) */
@@ -532,19 +555,60 @@ static const luaL_Reg R[] = {
 	{ NULL,         NULL    }
 };
 
+static const luaL_Reg bignum_lib_v4[] = {
+	{ "__add",      Badd    },              /* __add(x,y) */
+	{ "__div",      Bdiv    },              /* __div(x,y) */
+	{ "__eq",       Beq     },              /* __eq(x,y) */
+	{ "__gc",       Bgc     },
+	{ "__lt",       Blt     },              /* __lt(x,y) */
+	{ "__mod",      Bmod    },              /* __mod(x,y) */
+	{ "__mul",      Bmul    },              /* __mul(x,y) */
+	{ "__pow",      Bpow    },              /* __pow(x,y) */
+	{ "__sub",      Bsub    },              /* __sub(x,y) */
+	{ "__tostring", Btostring},             /* __tostring(x) */
+	{ "__unm",      Bneg    },              /* __unm(x) */
+	{ "add",        Badd    },
+	{ "compare",    Bcompare},
+	{ "div",        Bdiv    },
+	{ "divmod",     Bdivmod },
+	{ "isneg",      Bisneg  },
+	{ "isnegative", Bisneg  },
+	{ "iszero",     Biszero },
+	{ "ispositive", Bispos  },
+	{ "mod",        Bmod    },
+	{ "mul",        Bmul    },
+	{ "neg",        Bneg    },
+	{ "number",     Bnumber },
+	{ "pow",        Bpow    },
+	{ "powmod",     Bpowmod },
+	{ "sqrt",       Bsqrt   },
+	{ "sub",        Bsub    },
+	{ "tonumber",   Btonumber},
+	{ "tostring",   Btostring},
+	{ "isbignum",   Bis     },
+	{ "tobyte",     Btobyte },
+	{ "frombyte", Bfrombyte },
+	{ NULL,         NULL    }
+};
+
 LUALIB_API int luaopen_bignum(lua_State *L) {
 
-	luaL_newmetatable(L,MYTYPE);
-	lua_setglobal(L,MYNAME);
-	luaL_register(L,MYNAME,R);
+	luaL_newmetatable(L, MYTYPE);
+	lua_setglobal(L, MYNAME);
+
+	if (vm_is_hardfork(L, 4)) {
+		luaL_register(L, MYNAME, bignum_lib_v4);
+	} else {
+		luaL_register(L, MYNAME, bignum_lib_v2);
+	}
 
-	lua_pushliteral(L,"version");                   /* version */
-	lua_pushliteral(L,MYVERSION);
-	lua_settable(L,-3);
+	lua_pushliteral(L, "version");                   /* version */
+	lua_pushliteral(L, MYVERSION);
+	lua_settable(L, -3);
 
-	lua_pushliteral(L,"__index");
-	lua_pushvalue(L,-2);
-	lua_settable(L,-3);
+	lua_pushliteral(L, "__index");
+	lua_pushvalue(L, -2);
+	lua_settable(L, -3);
 
 	lua_pop(L, 1);
 	return 1;
diff --git a/contract/contract.go b/contract/contract.go
index d87af2a40..0002018f4 100644
--- a/contract/contract.go
+++ b/contract/contract.go
@@ -38,7 +38,16 @@ func init() {
 }
 
 // Execute executes a normal transaction which is possibly executing smart contract.
-func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, tx *types.Tx, sender, receiver *state.AccountState, bi *types.BlockHeaderInfo, executionMode int, isFeeDelegation bool) (rv string, events []*types.Event, usedFee *big.Int, err error) {
+func Execute(
+	execCtx context.Context,
+	bs *state.BlockState,
+	cdb ChainAccessor,
+	tx *types.Tx,
+	sender, receiver *state.AccountState,
+	bi *types.BlockHeaderInfo,
+	executionMode int,
+	isFeeDelegation bool,
+) (rv string, events []*types.Event, usedFee *big.Int, err error) {
 
 	var (
 		txBody     = tx.GetBody()
@@ -46,13 +55,14 @@ func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, t
 		txPayload  = txBody.GetPayload()
 		txAmount   = txBody.GetAmountBigInt()
 		txGasLimit = txBody.GetGasLimit()
+		isMultiCall= (txType == types.TxType_MULTICALL)
 	)
 
 	// compute the base fee
 	usedFee = fee.TxBaseFee(bi.ForkVersion, bs.GasPrice, len(txPayload))
 
 	// transfer the amount from the sender to the receiver
-	if err = state.SendBalance(sender, receiver, txBody.GetAmountBigInt()); err != nil {
+	if err = state.SendBalance(sender, receiver, txAmount); err != nil {
 		return
 	}
 
@@ -70,7 +80,12 @@ func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, t
 	}
 
 	// open the contract state
-	contractState, err := statedb.OpenContractState(receiver.ID(), receiver.State(), bs.StateDB)
+	var contractState *statedb.ContractState
+	if isMultiCall {
+		contractState = statedb.GetMultiCallState(sender.ID(), sender.State())
+	} else {
+		contractState, err = statedb.OpenContractState(receiver.ID(), receiver.State(), bs.StateDB)
+	}
 	if err != nil {
 		return
 	}
@@ -87,13 +102,13 @@ func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, t
 	var ctrFee *big.Int
 
 	// create a new context
-	ctx := NewVmContext(execCtx, bs, cdb, sender, receiver, contractState, sender.ID(), tx.GetHash(), bi, "", true, false, receiver.RP(), executionMode, txBody.GetAmountBigInt(), gasLimit, isFeeDelegation)
+	ctx := NewVmContext(execCtx, bs, cdb, sender, receiver, contractState, sender.ID(), tx.GetHash(), bi, "", true, false, receiver.RP(), executionMode, txAmount, gasLimit, isFeeDelegation, isMultiCall)
 
 	// execute the transaction
 	if receiver.IsDeploy() {
-		rv, events, ctrFee, err = Create(contractState, txBody.Payload, receiver.ID(), ctx)
+		rv, events, ctrFee, err = Create(contractState, txPayload, receiver.ID(), ctx)
 	} else {
-		rv, events, ctrFee, err = Call(contractState, txBody.Payload, receiver.ID(), ctx)
+		rv, events, ctrFee, err = Call(contractState, txPayload, receiver.ID(), ctx)
 	}
 
 	// close the trace file
@@ -127,10 +142,12 @@ func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, t
 		}
 	}
 
-	// save the contract state
-	err = statedb.StageContractState(contractState, bs.StateDB)
-	if err != nil {
-		return "", events, usedFee, err
+	if !isMultiCall {
+		// save the contract state
+		err = statedb.StageContractState(contractState, bs.StateDB)
+		if err != nil {
+			return "", events, usedFee, err
+		}
 	}
 
 	// return the result
@@ -140,6 +157,21 @@ func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, t
 // check if the tx is valid and if the code should be executed
 func checkExecution(txType types.TxType, amount *big.Int, payloadSize int, version int32, isDeploy, isContract bool) (do_execute bool, err error) {
 
+	if txType == types.TxType_MULTICALL {
+		return true, nil
+	}
+
+	// transactions with type NORMAL should not call smart contracts
+	// transactions with type TRANSFER can only call smart contracts when:
+	//  * the amount is greater than 0
+	//  * the payload is empty (only transfer to "default" function)
+	if version >= 4 && isContract {
+		if txType == types.TxType_NORMAL || (txType == types.TxType_TRANSFER && (payloadSize > 0 || types.IsZeroAmount(amount))) {
+			// emit an error
+			return false, newVmError(types.ErrTxNotAllowedRecipient)
+		}
+	}
+
 	// check if the receiver is a not contract
 	if !isDeploy && !isContract {
 		// before the hardfork version 3, all transactions in which the recipient
@@ -160,14 +192,6 @@ func checkExecution(txType types.TxType, amount *big.Int, payloadSize int, versi
 	return true, nil
 }
 
-func CreateContractID(account []byte, nonce uint64) []byte {
-	h := sha256.New()
-	h.Write(account)
-	h.Write([]byte(strconv.FormatUint(nonce, 10)))
-	recipientHash := h.Sum(nil)                   // byte array with length 32
-	return append([]byte{0x0C}, recipientHash...) // prepend 0x0C to make it same length as account addresses
-}
-
 func checkRedeploy(sender, receiver *state.AccountState, contractState *statedb.ContractState) error {
 	// check if the contract exists
 	if !receiver.IsContract() || receiver.IsNew() {
@@ -188,6 +212,14 @@ func checkRedeploy(sender, receiver *state.AccountState, contractState *statedb.
 	return nil
 }
 
+func CreateContractID(account []byte, nonce uint64) []byte {
+	h := sha256.New()
+	h.Write(account)
+	h.Write([]byte(strconv.FormatUint(nonce, 10)))
+	recipientHash := h.Sum(nil)                   // byte array with length 32
+	return append([]byte{0x0C}, recipientHash...) // prepend 0x0C to make it same length as account addresses
+}
+
 func SetStateSQLMaxDBSize(size uint64) {
 	if size > stateSQLMaxDBSize {
 		maxSQLDBSize = stateSQLMaxDBSize
diff --git a/contract/contract_module.c b/contract/contract_module.c
index da9b259be..c022a0a9c 100644
--- a/contract/contract_module.c
+++ b/contract/contract_module.c
@@ -27,10 +27,12 @@ static void reset_amount_info (lua_State *L) {
 }
 
 static int set_value(lua_State *L, const char *str) {
+
 	set_call_obj(L, str);
 	if (lua_isnil(L, 1)) {
 		return 1;
 	}
+
 	switch(lua_type(L, 1)) {
 	case LUA_TNUMBER: {
 		const char *str = lua_tostring(L, 1);
@@ -52,6 +54,7 @@ static int set_value(lua_State *L, const char *str) {
 	default:
 		luaL_error(L, "invalid input");
 	}
+
 	lua_setfield(L, -2, amount_str);
 
 	return 1;
@@ -283,6 +286,7 @@ static int moduleBalance(lua_State *L) {
 static int modulePcall(lua_State *L) {
 	int argc = lua_gettop(L) - 1;
 	int service = getLuaExecContext(L);
+	int num_events = luaGetEventCount(L, service);
 	struct luaSetRecoveryPoint_return start_seq;
 	int ret;
 
@@ -295,11 +299,18 @@ static int modulePcall(lua_State *L) {
 	}
 
 	if ((ret = lua_pcall(L, argc, LUA_MULTRET, 0)) != 0) {
+		// if out of memory, throw error
 		if (ret == LUA_ERRMEM) {
 			luaL_throwerror(L);
 		}
+		// add 'success = false' as the first returned value
 		lua_pushboolean(L, false);
 		lua_insert(L, 1);
+		// drop the events
+		if (vm_is_hardfork(L, 4)) {
+			luaDropEvent(L, service, num_events);
+		}
+		// revert the contract state
 		if (start_seq.r0 > 0) {
 			char *errStr = luaClearRecovery(L, service, start_seq.r0, true);
 			if (errStr != NULL) {
@@ -309,15 +320,24 @@ static int modulePcall(lua_State *L) {
 		}
 		return 2;
 	}
+
+	// add 'success = true' as the first returned value
 	lua_pushboolean(L, true);
 	lua_insert(L, 1);
+
+	// release the recovery point
 	if (start_seq.r0 == 1) {
 		char *errStr = luaClearRecovery(L, service, start_seq.r0, false);
 		if (errStr != NULL) {
+			if (vm_is_hardfork(L, 4)) {
+				luaDropEvent(L, service, num_events);
+			}
 			strPushAndRelease(L, errStr);
 			luaL_throwerror(L);
 		}
 	}
+
+	// return the number of items in the stack
 	return lua_gettop(L);
 }
 
@@ -335,6 +355,7 @@ static int moduleDeploy(lua_State *L) {
 
 	lua_gasuse(L, 5000);
 
+	// get the amount to transfer to the new contract
 	lua_getfield(L, 1, amount_str);
 	if (lua_isnil(L, -1)) {
 		amount = NULL;
@@ -342,7 +363,9 @@ static int moduleDeploy(lua_State *L) {
 		amount = (char *) luaL_checkstring(L, -1);
 	}
 	lua_pop(L, 1);
+	// get the contract source code or the address to an existing contract
 	contract = (char *) luaL_checkstring(L, 2);
+	// get the deploy arguments to the constructor function
 	json_args = lua_util_get_json_from_stack(L, 3, lua_gettop(L), false);
 	if (json_args == NULL) {
 		reset_amount_info(L);
@@ -356,13 +379,13 @@ static int moduleDeploy(lua_State *L) {
 		strPushAndRelease(L, ret.r1);
 		luaL_throwerror(L);
 	}
+
 	free(json_args);
 	reset_amount_info(L);
 	strPushAndRelease(L, ret.r1);
 	if (ret.r0 > 1) {
 		lua_insert(L, -ret.r0);
 	}
-
 	return ret.r0;
 }
 
diff --git a/contract/contract_test.go b/contract/contract_test.go
index eaa254eea..1696420cd 100644
--- a/contract/contract_test.go
+++ b/contract/contract_test.go
@@ -32,30 +32,57 @@ func TestCheckExecution(t *testing.T) {
 		expectExec bool
 	}{
 		// deploy
-		{version: 2, txType: types.TxType_NORMAL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
-		{version: 2, txType: types.TxType_DEPLOY, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
-		{version: 2, txType: types.TxType_REDEPLOY, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_NORMAL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_DEPLOY, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_REDEPLOY, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_DEPLOY, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_REDEPLOY, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_DEPLOY, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_REDEPLOY, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_DEPLOY, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_REDEPLOY, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: true, isContract: false, expectErr: nil, expectExec: true},
 		// recipient is contract
-		{version: 2, txType: types.TxType_NORMAL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 2, txType: types.TxType_TRANSFER, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 2, txType: types.TxType_CALL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 2, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_NORMAL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_TRANSFER, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_CALL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 2, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(0,types.Aergo), payloadSize: 0, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(0,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(0,types.Aergo), payloadSize: 0, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(0,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: newVmError(types.ErrTxNotAllowedRecipient), expectExec: false},
+		{version: 4, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: true, expectErr: nil, expectExec: true},
 		// recipient is not a contract
-		{version: 2, txType: types.TxType_NORMAL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
-		{version: 2, txType: types.TxType_TRANSFER, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
-		{version: 2, txType: types.TxType_CALL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
-		{version: 2, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
-		{version: 3, txType: types.TxType_NORMAL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
-		{version: 3, txType: types.TxType_TRANSFER, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
-		{version: 3, txType: types.TxType_CALL, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: true},
-		{version: 3, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1, types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 2, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 2, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 2, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 2, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 3, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 3, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 3, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: true},
+		{version: 3, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(0,types.Aergo), payloadSize: 0, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(0,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_NORMAL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(0,types.Aergo), payloadSize: 0, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_TRANSFER, amount: types.NewAmount(0,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_CALL, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: false, expectErr: nil, expectExec: true},
+		{version: 4, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 1000, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
+		{version: 4, txType: types.TxType_FEEDELEGATION, amount: types.NewAmount(1,types.Aergo), payloadSize: 0, isDeploy: false, isContract: false, expectErr: nil, expectExec: false},
 	} {
 		do_execute, err := checkExecution(test.txType, test.amount, test.payloadSize, test.version, test.isDeploy, test.isContract)
 		assert.Equal(t, test.expectErr, err, "checkExecution(version:%d, txType:%d, amount:%s, payloadSize:%d)", test.version, test.txType, test.amount, test.payloadSize)
diff --git a/contract/measure/aef.lua b/contract/measure/aef.lua
index 7931e25e3..c27022c79 100644
--- a/contract/measure/aef.lua
+++ b/contract/measure/aef.lua
@@ -152,6 +152,25 @@ function bignum_fns()
     local b_b = bignum.number(b)
     local pi_b = bignum.number(pi)
     local pi1_b = bignum.number(pi1)
+  --if system.version() >= 4 then
+  if type(bignum.ispositive) == "function" then
+    print("bignum.ispositive")
+    m1k(bignum.ispositive, nines_b)
+    m1k(bignum.ispositive, nines1_b)
+    m1k(bignum.ispositive, nines2_b)
+    m1k(bignum.ispositive, one_b)
+    m1k(bignum.ispositive, b_b)
+    m1k(bignum.ispositive, pi_b)
+    m1k(bignum.ispositive, pi1_b)
+    print("bignum.isnegative")
+    m1k(bignum.isnegative, nines_b)
+    m1k(bignum.isnegative, nines1_b)
+    m1k(bignum.isnegative, nines2_b)
+    m1k(bignum.isnegative, one_b)
+    m1k(bignum.isnegative, b_b)
+    m1k(bignum.isnegative, pi_b)
+    m1k(bignum.isnegative, pi1_b)
+  end
     print("bignum.isneg")
     m1k(bignum.isneg, nines_b)
     m1k(bignum.isneg, nines1_b)
diff --git a/contract/name_module.c b/contract/name_module.c
new file mode 100644
index 000000000..457b77d87
--- /dev/null
+++ b/contract/name_module.c
@@ -0,0 +1,42 @@
+#include <string.h>
+#include <stdlib.h>
+#include "vm.h"
+#include "util.h"
+#include "_cgo_export.h"
+
+extern int getLuaExecContext(lua_State *L);
+
+static int resolve(lua_State *L) {
+	char *name, *ret;
+	int service = getLuaExecContext(L);
+
+	lua_gasuse(L, 100);
+
+	name = (char *)luaL_checkstring(L, 1);
+	ret = luaNameResolve(L, service, name);
+
+	if (ret == NULL) {
+		lua_pushnil(L);
+	} else {
+		// if the returned string starts with `[`, it's an error
+		if (ret[0] == '[') {
+			strPushAndRelease(L, ret);
+			luaL_throwerror(L);
+		} else {
+			strPushAndRelease(L, ret);
+		}
+	}
+
+	return 1;
+}
+
+static const luaL_Reg name_service_lib[] = {
+	{"resolve", resolve},
+	{NULL, NULL}
+};
+
+int luaopen_name(lua_State *L) {
+	luaL_register(L, "name_service", name_service_lib);
+	lua_pop(L, 1);
+	return 1;
+}
diff --git a/contract/name_module.h b/contract/name_module.h
new file mode 100644
index 000000000..9099f9ceb
--- /dev/null
+++ b/contract/name_module.h
@@ -0,0 +1,8 @@
+#ifndef _NAME_MODULE_H
+#define _NAME_MODULE_H
+
+#include "lua.h"
+
+extern int luaopen_name(lua_State *L);
+
+#endif /* _NAME_MODULE_H */
\ No newline at end of file
diff --git a/contract/system_module.c b/contract/system_module.c
index dc5d82613..45f2b480f 100644
--- a/contract/system_module.c
+++ b/contract/system_module.c
@@ -15,7 +15,7 @@ static int systemPrint(lua_State *L) {
 	int service = getLuaExecContext(L);
 
 	lua_gasuse(L, 100);
-	jsonValue = lua_util_get_json_from_stack (L, 1, lua_gettop(L), true);
+	jsonValue = lua_util_get_json_from_stack(L, 1, lua_gettop(L), true);
 	if (jsonValue == NULL) {
 		luaL_throwerror(L);
 	}
@@ -50,7 +50,7 @@ int setItemWithPrefix(lua_State *L) {
 
 	dbKey = getDbKey(L, &keylen);
 
-	jsonValue = lua_util_get_json (L, 2, false);
+	jsonValue = lua_util_get_json(L, 2, false);
 	if (jsonValue == NULL) {
 		luaL_throwerror(L);
 	}
@@ -423,6 +423,56 @@ static int lua_random(lua_State *L) {
 	return 1;
 }
 
+static int toPubkey(lua_State *L) {
+	char *address, *ret;
+
+	lua_gasuse(L, 100);
+
+	// get the function argument
+	address = (char *)luaL_checkstring(L, 1);
+	// convert the address to public key
+	ret = luaToPubkey(L, address);
+
+	if (ret == NULL) {
+		lua_pushnil(L);
+	} else {
+		// if the returned string starts with `[`, it's an error
+		if (ret[0] == '[') {
+			strPushAndRelease(L, ret);
+			luaL_throwerror(L);
+		} else {
+			strPushAndRelease(L, ret);
+		}
+	}
+
+	return 1;
+}
+
+static int toAddress(lua_State *L) {
+	char *pubkey, *ret;
+
+	lua_gasuse(L, 100);
+
+	// get the function argument
+	pubkey = (char *)luaL_checkstring(L, 1);
+	// convert the public key to an address
+	ret = luaToAddress(L, pubkey);
+
+	if (ret == NULL) {
+		lua_pushnil(L);
+	} else {
+		// if the returned string starts with `[`, it's an error
+		if (ret[0] == '[') {
+			strPushAndRelease(L, ret);
+			luaL_throwerror(L);
+		} else {
+			strPushAndRelease(L, ret);
+		}
+	}
+
+	return 1;
+}
+
 static int is_contract(lua_State *L) {
 	char *contract;
 	int service = getLuaExecContext(L);
@@ -461,7 +511,13 @@ static int is_fee_delegation(lua_State *L) {
 	return 1;
 }
 
-static const luaL_Reg sys_lib[] = {
+static int system_version(lua_State *L) {
+	lua_gasuse(L, 100);
+	lua_pushinteger(L, luaL_hardforkversion(L));
+	return 1;
+}
+
+static const luaL_Reg system_lib_v1[] = {
 	{"print", systemPrint},
 	{"setItem", setItem},
 	{"getItem", getItem},
@@ -483,8 +539,37 @@ static const luaL_Reg sys_lib[] = {
 	{NULL, NULL}
 };
 
+static const luaL_Reg system_lib_v4[] = {
+	{"print", systemPrint},
+	{"setItem", setItem},
+	{"getItem", getItem},
+	{"getSender", getSender},
+	{"getCreator", getCreator},
+	{"getTxhash", getTxhash},
+	{"getBlockheight", getBlockHeight},
+	{"getTimestamp", getTimestamp},
+	{"getContractID", getContractID},
+	{"getOrigin", getOrigin},
+	{"getAmount", getAmount},
+	{"getPrevBlockHash", getPrevBlockHash},
+	{"date", os_date},
+	{"time", os_time},
+	{"difftime", os_difftime},
+	{"random", lua_random},
+	{"toPubKey", toPubkey},
+	{"toAddress", toAddress},
+	{"isContract", is_contract},
+	{"isFeeDelegation", is_fee_delegation},
+	{"version", system_version},
+	{NULL, NULL}
+};
+
 int luaopen_system(lua_State *L) {
-	luaL_register(L, "system", sys_lib);
+	if (vm_is_hardfork(L, 4)) {
+		luaL_register(L, "system", system_lib_v4);
+	} else {
+		luaL_register(L, "system", system_lib_v1);
+	}
 	lua_pop(L, 1);
 	return 1;
 }
diff --git a/contract/vm.c b/contract/vm.c
index 1f3ea6c69..bbdc1aa9b 100644
--- a/contract/vm.c
+++ b/contract/vm.c
@@ -4,6 +4,7 @@
 #include "vm.h"
 #include "system_module.h"
 #include "contract_module.h"
+#include "name_module.h"
 #include "db_module.h"
 #include "state_module.h"
 #include "crypto_module.h"
@@ -23,6 +24,13 @@ extern void (*lj_internal_view_end)(lua_State *);
 void vm_internal_view_start(lua_State *L);
 void vm_internal_view_end(lua_State *L);
 
+int getLuaExecContext(lua_State *L) {
+	int service = luaL_service(L);
+	if (service < 0)
+		luaL_error(L, "not permitted state referencing at global scope");
+	return service;
+}
+
 #ifdef MEASURE
 static int nsec(lua_State *L) {
 	lua_pushnumber(L, luaL_nanosecond(L));
@@ -41,10 +49,39 @@ static void preloadModules(lua_State *L) {
 	luaopen_bignum(L);
 	luaopen_utf8(L);
 
+	if (vm_is_hardfork(L, 4)) {
+		luaopen_name(L);
+	}
+
 	if (!isPublic()) {
 		luaopen_db(L);
 	}
 
+	if (vm_is_hardfork(L, 4)) {
+		lua_getglobal(L, "_G");
+		// disable getmetatable
+		lua_pushnil(L);
+		lua_setfield(L, -2, "getmetatable");
+		// disable setmetatable
+		lua_pushnil(L);
+		lua_setfield(L, -2, "setmetatable");
+		// disable rawget
+		lua_pushnil(L);
+		lua_setfield(L, -2, "rawget");
+		// disable rawset
+		lua_pushnil(L);
+		lua_setfield(L, -2, "rawset");
+		// disable rawequal
+		lua_pushnil(L);
+		lua_setfield(L, -2, "rawequal");
+		lua_pop(L, 1);
+		// disable string.dump
+		lua_getglobal(L, "string");
+		lua_pushnil(L);
+		lua_setfield(L, -2, "dump");
+		lua_pop(L, 1);
+	}
+
 #ifdef MEASURE
 	lua_register(L, "nsec", nsec);
 	luaopen_jit(L);
@@ -61,18 +98,181 @@ static void preloadModules(lua_State *L) {
 #endif
 }
 
+// overridden version of pcall
+// used to rollback state and drop events upon error
+static int pcall(lua_State *L) {
+	int argc = lua_gettop(L);
+	int service = getLuaExecContext(L);
+	int num_events = luaGetEventCount(L, service);
+	struct luaSetRecoveryPoint_return start_seq;
+	int ret;
+
+	if (argc < 1) {
+		return luaL_error(L, "pcall: not enough arguments");
+	}
+
+	lua_gasuse(L, 300);
+
+	start_seq = luaSetRecoveryPoint(L, service);
+	if (start_seq.r0 < 0) {
+		strPushAndRelease(L, start_seq.r1);
+		luaL_throwerror(L);
+	}
+
+	// the stack is like this:
+	//   func arg1 arg2 ... argn
+
+	// call the function
+	ret = lua_pcall(L, argc - 1, LUA_MULTRET, 0);
+
+	// if failed, drop the events
+	if (ret != 0) {
+		if (vm_is_hardfork(L, 4)) {
+			luaDropEvent(L, service, num_events);
+		}
+	}
+
+	// throw the error if out of memory
+	if (ret == LUA_ERRMEM) {
+		luaL_throwerror(L);
+	}
+
+	// insert the status at the bottom of the stack
+	lua_pushboolean(L, ret == 0);
+	lua_insert(L, 1);
+
+	// release the recovery point or revert the contract state
+	if (start_seq.r0 > 0) {
+		bool is_error = (ret != 0);
+		char *errStr = luaClearRecovery(L, service, start_seq.r0, is_error);
+		if (errStr != NULL) {
+			if (vm_is_hardfork(L, 4)) {
+				luaDropEvent(L, service, num_events);
+			}
+			strPushAndRelease(L, errStr);
+			luaL_throwerror(L);
+		}
+	}
+
+	// return the number of items in the stack
+	return lua_gettop(L);
+}
+
+// overridden version of xpcall
+// used to rollback state and drop events upon error
+static int xpcall(lua_State *L) {
+	int argc = lua_gettop(L);
+	int service = getLuaExecContext(L);
+	int num_events = luaGetEventCount(L, service);
+	struct luaSetRecoveryPoint_return start_seq;
+	int ret, errfunc;
+
+	if (argc < 2) {
+		return luaL_error(L, "xpcall: not enough arguments");
+	}
+
+	lua_gasuse(L, 300);
+
+	start_seq = luaSetRecoveryPoint(L, service);
+	if (start_seq.r0 < 0) {
+		strPushAndRelease(L, start_seq.r1);
+		luaL_throwerror(L);
+	}
+
+	// the stack is like this:
+	//   func errfunc arg1 arg2 ... argn
+
+	// check the error handler
+	errfunc = 2;
+	if (!lua_isfunction(L, errfunc)) {
+		return luaL_error(L, "xpcall: error handler is not a function");
+	}
+
+	// move the error handler to the first position
+	lua_pushvalue(L, 1);  // function
+	lua_pushvalue(L, 2);  // error handler
+	lua_replace(L, 1);    // 1: error handler
+	lua_replace(L, 2);    // 2: function
+
+	// now the stack is like this:
+	//   errfunc func arg1 arg2 ... argn
+
+	// update the error handler position
+	errfunc = 1;
+
+	// call the function
+	ret = lua_pcall(L, argc - 2, LUA_MULTRET, errfunc);
+
+	// if failed, drop the events
+	if (ret != 0) {
+		if (vm_is_hardfork(L, 4)) {
+			luaDropEvent(L, service, num_events);
+		}
+	}
+
+	// throw the error if out of memory
+	if (ret == LUA_ERRMEM) {
+		luaL_throwerror(L);
+	}
+
+	// ensure the stack has 1 free slot
+	if (!lua_checkstack(L, 1)) {
+		// return: false, "stack overflow"
+		lua_settop(L, 0);
+		lua_pushboolean(L, 0);
+		lua_pushliteral(L, "stack overflow");
+		return 2;
+	}
+
+	// store the status at the bottom of the stack, replacing the error handler
+	lua_pushboolean(L, ret == 0);
+	lua_replace(L, 1);
+
+	// release the recovery point or revert the contract state
+	if (start_seq.r0 > 0) {
+		bool is_error = (ret != 0);
+		char *errStr = luaClearRecovery(L, service, start_seq.r0, is_error);
+		if (errStr != NULL) {
+			if (vm_is_hardfork(L, 4)) {
+				luaDropEvent(L, service, num_events);
+			}
+			strPushAndRelease(L, errStr);
+			luaL_throwerror(L);
+		}
+	}
+
+	// return the number of items in the stack
+	return lua_gettop(L);
+}
+
+static const struct luaL_Reg _basefuncs[] = {
+	{"pcall", pcall},
+	{"xpcall", xpcall},
+	{NULL, NULL}};
+
+static void override_basefuncs(lua_State *L) {
+	// override Lua builtin functions
+	lua_getglobal(L, "_G");
+	luaL_register(L, NULL, _basefuncs);
+	lua_pop(L, 1);
+}
+
 static int loadLibs(lua_State *L) {
 	luaL_openlibs(L);
 	preloadModules(L);
+	if (vm_is_hardfork(L, 4)) {
+		// override pcall to drop events upon error
+		override_basefuncs(L);
+	}
 	return 0;
 }
 
 lua_State *vm_newstate(int hardfork_version) {
-	int status;
 	lua_State *L = luaL_newstate(hardfork_version);
 	if (L == NULL)
 		return NULL;
-	status = lua_cpcall(L, loadLibs, NULL);
+	// hardfork version set before loading modules
+	int status = lua_cpcall(L, loadLibs, NULL);
 	if (status != 0)
 		return NULL;
 	return L;
@@ -91,14 +291,6 @@ void initViewFunction() {
 	lj_internal_view_end = vm_internal_view_end;
 }
 
-int getLuaExecContext(lua_State *L) {
-	int service = luaL_service(L);
-	if (service < 0) {
-		luaL_error(L, "not permitted state referencing at global scope");
-	}
-	return service;
-}
-
 bool vm_is_hardfork(lua_State *L, int version) {
 	int v = luaL_hardforkversion(L);
 	return v >= version;
diff --git a/contract/vm.go b/contract/vm.go
index bb340eaf5..11d5985a5 100644
--- a/contract/vm.go
+++ b/contract/vm.go
@@ -89,6 +89,7 @@ type vmContext struct {
 	isQuery           bool
 	nestedView        int32 // indicates which parent called the contract in view (read-only mode)
 	isFeeDelegation   bool
+	isMultiCall       bool
 	service           C.int
 	callState         map[types.AccountID]*callState
 	lastRecoveryEntry *recoveryEntry
@@ -134,9 +135,23 @@ func InitContext(numCtx int) {
 	contexts = make([]*vmContext, maxContext)
 }
 
-func NewVmContext(execCtx context.Context, blockState *state.BlockState, cdb ChainAccessor, sender, receiver *state.AccountState,
-	contractState *statedb.ContractState, senderID, txHash []byte, bi *types.BlockHeaderInfo, node string, confirmed,
-	query bool, rp uint64, executionMode int, amount *big.Int, gasLimit uint64, feeDelegation bool) *vmContext {
+func NewVmContext(
+	execCtx context.Context,
+	blockState *state.BlockState,
+	cdb ChainAccessor,
+	sender, receiver *state.AccountState,
+	contractState *statedb.ContractState,
+	senderID,
+	txHash []byte,
+	bi *types.BlockHeaderInfo,
+	node string,
+	confirmed, query bool,
+	rp uint64,
+	executionMode int,
+	amount *big.Int,
+	gasLimit uint64,
+	feeDelegation, isMultiCall bool,
+) *vmContext {
 
 	csReceiver := &callState{ctrState: contractState, accState: receiver}
 	csSender := &callState{accState: sender}
@@ -155,13 +170,14 @@ func NewVmContext(execCtx context.Context, blockState *state.BlockState, cdb Cha
 		gasLimit:        gasLimit,
 		remainedGas:     gasLimit,
 		isFeeDelegation: feeDelegation,
+		isMultiCall:     isMultiCall,
 		execCtx:         execCtx,
 	}
 
 	// init call state
 	ctx.callState = make(map[types.AccountID]*callState)
 	ctx.callState[receiver.AccountID()] = csReceiver
-	if sender != nil {
+	if sender != nil && sender != receiver {
 		ctx.callState[sender.AccountID()] = csSender
 	}
 	if TraceBlockNo != 0 && TraceBlockNo == ctx.blockInfo.No {
@@ -202,6 +218,10 @@ func NewVmContextQuery(
 	return ctx, nil
 }
 
+func (ctx *vmContext) IsMultiCall() bool {
+	return ctx.isMultiCall
+}
+
 func (ctx *vmContext) IsGasSystem() bool {
 	return fee.GasEnabled(ctx.blockInfo.ForkVersion) && !ctx.isQuery
 }
@@ -780,6 +800,13 @@ func (ce *executor) vmLoadCall() {
 	C.luaL_set_service(ce.L, ce.ctx.service)
 }
 
+func getMultiCallInfo(ci *types.CallInfo, payload []byte) error {
+	payload = append([]byte{'['}, payload...)
+	payload = append(payload, ']')
+	ci.Name = "execute"
+	return getCallInfo(&ci.Args, payload, []byte("multicall"))
+}
+
 func getCallInfo(ci interface{}, args []byte, contractAddress []byte) error {
 	d := json.NewDecoder(bytes.NewReader(args))
 	d.UseNumber()
@@ -802,12 +829,19 @@ func Call(
 
 	var err error
 	var ci types.CallInfo
+	var bytecode []byte
 
 	// get contract
-	contract := getContract(contractState, ctx.bs)
-	if contract != nil {
-		if len(payload) > 0 {
-			// get call arguments
+	if ctx.isMultiCall {
+		bytecode = getMultiCallContractCode(contractState)
+	} else {
+		bytecode = getContractCode(contractState, ctx.bs)
+	}
+	if bytecode != nil {
+		// get call arguments
+		if ctx.isMultiCall {
+			err = getMultiCallInfo(&ci, payload)
+		} else if len(payload) > 0 {
 			err = getCallInfo(&ci, payload, contractAddress)
 		}
 	} else {
@@ -825,7 +859,7 @@ func Call(
 
 	// create a new executor
 	contexts[ctx.service] = ctx
-	ce := newExecutor(contract, contractAddress, ctx, &ci, ctx.curContract.amount, false, false, contractState)
+	ce := newExecutor(bytecode, contractAddress, ctx, &ci, ctx.curContract.amount, false, false, contractState)
 	defer ce.close()
 
 	if ce.err == nil {
@@ -904,19 +938,47 @@ func setRandomSeed(ctx *vmContext) {
 	ctx.seed = rand.New(randSrc)
 }
 
-func setContract(contractState *statedb.ContractState, contractAddress, payload []byte) ([]byte, []byte, error) {
+func setContract(contractState *statedb.ContractState, contractAddress, payload []byte, ctx *vmContext) ([]byte, []byte, error) {
+	// the payload contains:
+	// on V3: bytecode + ABI + constructor arguments
+	// on V4: lua code + constructor arguments
 	codePayload := luacUtil.LuaCodePayload(payload)
 	if _, err := codePayload.IsValidFormat(); err != nil {
 		ctrLgr.Warn().Err(err).Str("contract", types.EncodeAddress(contractAddress)).Msg("deploy")
 		return nil, nil, err
 	}
-	code := codePayload.Code()
-	err := contractState.SetCode(code.Bytes())
+	code := codePayload.Code()  // type: LuaCode
+
+	var sourceCode []byte
+	var bytecodeABI []byte
+	var err error
+
+	// if hardfork version 4
+	if ctx.blockInfo.ForkVersion >= 4 {
+		// the payload must be lua code. compile it to bytecode
+		sourceCode = code
+		bytecodeABI, err = Compile(string(sourceCode), nil)
+		if err != nil {
+			ctrLgr.Warn().Err(err).Str("contract", types.EncodeAddress(contractAddress)).Msg("deploy")
+			return nil, nil, err
+		}
+	} else {
+		// on previous hardfork versions the payload is bytecode
+		bytecodeABI = code
+	}
+
+	// save the bytecode to the contract state
+	err = contractState.SetCode(sourceCode, bytecodeABI)
 	if err != nil {
 		return nil, nil, err
 	}
-	contract := getContract(contractState, nil)
-	if contract == nil {
+
+	// extract the bytecode
+	bytecode := luacUtil.LuaCode(bytecodeABI).ByteCode()
+
+	// check if it was properly stored
+	savedBytecode := getContractCode(contractState, nil)
+	if savedBytecode == nil || !bytes.Equal(savedBytecode, bytecode) {
 		err = fmt.Errorf("cannot deploy contract %s", types.EncodeAddress(contractAddress))
 		ctrLgr.Warn().Str("error", "cannot load contract").Str(
 			"contract",
@@ -925,16 +987,16 @@ func setContract(contractState *statedb.ContractState, contractAddress, payload
 		return nil, nil, err
 	}
 
-	return contract, codePayload.Args(), nil
+	return bytecode, codePayload.Args(), nil
 }
 
 func Create(
 	contractState *statedb.ContractState,
-	code, contractAddress []byte,
+	payload, contractAddress []byte,
 	ctx *vmContext,
 ) (string, []*types.Event, *big.Int, error) {
 
-	if len(code) == 0 {
+	if len(payload) == 0 {
 		return "", nil, ctx.usedFee(), errors.New("contract code is required")
 	}
 
@@ -943,7 +1005,7 @@ func Create(
 	}
 
 	// save the contract code
-	contract, args, err := setContract(contractState, contractAddress, code)
+	bytecode, args, err := setContract(contractState, contractAddress, payload, ctx)
 	if err != nil {
 		return "", nil, ctx.usedFee(), err
 	}
@@ -974,7 +1036,7 @@ func Create(
 	}
 
 	// create a new executor for the constructor
-	ce := newExecutor(contract, contractAddress, ctx, &ci, ctx.curContract.amount, true, false, contractState)
+	ce := newExecutor(bytecode, contractAddress, ctx, &ci, ctx.curContract.amount, true, false, contractState)
 	defer ce.close()
 
 	if err == nil {
@@ -1072,8 +1134,8 @@ func freeContextSlot(ctx *vmContext) {
 func Query(contractAddress []byte, bs *state.BlockState, cdb ChainAccessor, contractState *statedb.ContractState, queryInfo []byte) (res []byte, err error) {
 	var ci types.CallInfo
 
-	contract := getContract(contractState, bs)
-	if contract != nil {
+	bytecode := getContractCode(contractState, bs)
+	if bytecode != nil {
 		err = getCallInfo(&ci, queryInfo, contractAddress)
 	} else {
 		addr := types.EncodeAddress(contractAddress)
@@ -1099,7 +1161,7 @@ func Query(contractAddress []byte, bs *state.BlockState, cdb ChainAccessor, cont
 		ctrLgr.Debug().Str("abi", string(queryInfo)).Str("contract", types.EncodeAddress(contractAddress)).Msg("query")
 	}
 
-	ce := newExecutor(contract, contractAddress, ctx, &ci, ctx.curContract.amount, false, false, contractState)
+	ce := newExecutor(bytecode, contractAddress, ctx, &ci, ctx.curContract.amount, false, false, contractState)
 	defer ce.close()
 	defer func() {
 		if dbErr := ce.closeQuerySql(); dbErr != nil {
@@ -1142,8 +1204,8 @@ func CheckFeeDelegation(contractAddress []byte, bs *state.BlockState, bi *types.
 		return fmt.Errorf("%s function is not declared of fee delegation", ci.Name)
 	}
 
-	contract := getContract(contractState, bs)
-	if contract == nil {
+	bytecode := getContractCode(contractState, bs)
+	if bytecode == nil {
 		addr := types.EncodeAddress(contractAddress)
 		ctrLgr.Warn().Str("error", "not found contract").Str("contract", addr).Msg("checkFeeDelegation")
 		err = fmt.Errorf("not found contract %s", addr)
@@ -1175,7 +1237,7 @@ func CheckFeeDelegation(contractAddress []byte, bs *state.BlockState, bi *types.
 	ci.Args = append([]interface{}{ci.Name}, ci.Args...)
 	ci.Name = checkFeeDelegationFn
 
-	ce := newExecutor(contract, contractAddress, ctx, &ci, ctx.curContract.amount, false, true, contractState)
+	ce := newExecutor(bytecode, contractAddress, ctx, &ci, ctx.curContract.amount, false, true, contractState)
 	defer ce.close()
 	defer func() {
 		if dbErr := ce.rollbackToSavepoint(); dbErr != nil {
@@ -1200,20 +1262,33 @@ func getCode(contractState *statedb.ContractState, bs *state.BlockState) ([]byte
 	var code []byte
 	var err error
 
+	if contractState.IsMultiCall() {
+		return getMultiCallCode(contractState), nil
+	}
+
+	// try to get the code from the blockstate cache
 	code = bs.GetCode(contractState.GetAccountID())
 	if code != nil {
 		return code, nil
 	}
+
+	// get the code from the contract state
 	code, err = contractState.GetCode()
 	if err != nil {
 		return nil, err
 	}
+
+	// add the code to the blockstate cache
 	bs.AddCode(contractState.GetAccountID(), code)
 
 	return code, nil
 }
 
-func getContract(contractState *statedb.ContractState, bs *state.BlockState) []byte {
+func getContractCode(contractState *statedb.ContractState, bs *state.BlockState) []byte {
+	// the code from multicall is not loaded, because there is no code hash
+	if len(contractState.GetCodeHash()) == 0 {
+		return nil
+	}
 	code, err := getCode(contractState, bs)
 	if err != nil {
 		return nil
@@ -1221,13 +1296,41 @@ func getContract(contractState *statedb.ContractState, bs *state.BlockState) []b
 	return luacUtil.LuaCode(code).ByteCode()
 }
 
+func getMultiCallContractCode(contractState *statedb.ContractState) []byte {
+	code := getMultiCallCode(contractState)
+	if code == nil {
+		return nil
+	}
+	return luacUtil.LuaCode(code).ByteCode()
+}
+
+func getMultiCallCode(contractState *statedb.ContractState) []byte {
+	if multicall_compiled == nil {
+		// compile the Lua code used to execute multicall txns
+		var err error
+		multicall_compiled, err = Compile(multicall_code, nil)
+		if err != nil {
+			ctrLgr.Error().Err(err).Msg("multicall compile")
+			return nil
+		}
+	}
+	// set and return the compiled code
+	contractState.SetMultiCallCode(multicall_compiled)
+	return multicall_compiled
+}
+
 func GetABI(contractState *statedb.ContractState, bs *state.BlockState) (*types.ABI, error) {
 	var abi *types.ABI
 
-	abi = bs.GetABI(contractState.GetAccountID())
-	if abi != nil {
-		return abi, nil
+	if !contractState.IsMultiCall() {  // or IsBuiltinContract()
+		// try to get the ABI from the blockstate cache
+		abi = bs.GetABI(contractState.GetAccountID())
+		if abi != nil {
+			return abi, nil
+		}
 	}
+
+	// get the ABI from the contract state
 	code, err := getCode(contractState, bs)
 	if err != nil {
 		return nil, err
@@ -1245,7 +1348,12 @@ func GetABI(contractState *statedb.ContractState, bs *state.BlockState) (*types.
 	if err = jsonIter.Unmarshal(rawAbi, abi); err != nil {
 		return nil, err
 	}
-	bs.AddABI(contractState.GetAccountID(), abi)
+
+	if !contractState.IsMultiCall() {  // or IsBuiltinContract()
+		// add the ABI to the blockstate cache
+		bs.AddABI(contractState.GetAccountID(), abi)
+	}
+
 	return abi, nil
 }
 
diff --git a/contract/vm_callback.go b/contract/vm_callback.go
index b46e38e3b..943ce6024 100644
--- a/contract/vm_callback.go
+++ b/contract/vm_callback.go
@@ -54,7 +54,8 @@ var (
 )
 
 const (
-	maxEventCnt       = 50
+	maxEventCntV2     = 50
+	maxEventCntV4     = 128
 	maxEventNameSize  = 64
 	maxEventArgSize   = 4096
 	luaCallCountDeduc = 1000
@@ -66,6 +67,14 @@ func init() {
 	zeroBig = types.NewZeroAmount()
 }
 
+func maxEventCnt(ctx *vmContext) int32 {
+	if ctx.blockInfo.ForkVersion >= 4 {
+		return maxEventCntV4
+	} else {
+		return maxEventCntV2
+	}
+}
+
 //export luaSetDB
 func luaSetDB(L *LState, service C.int, key unsafe.Pointer, keyLen C.int, value *C.char) *C.char {
 	ctx := contexts[service]
@@ -217,7 +226,7 @@ func luaCallContract(L *LState, service C.int, contractId *C.char, fname *C.char
 	aid := types.ToAccountID(cid)
 
 	// read the amount for the contract call
-	amountBig, err := transformAmount(C.GoString(amount))
+	amountBig, err := transformAmount(C.GoString(amount), ctx.blockInfo.ForkVersion)
 	if err != nil {
 		return -1, C.CString("[Contract.LuaCallContract] invalid amount: " + err.Error())
 	}
@@ -229,8 +238,8 @@ func luaCallContract(L *LState, service C.int, contractId *C.char, fname *C.char
 	}
 
 	// check if the contract exists
-	callee := getContract(cs.ctrState, ctx.bs)
-	if callee == nil {
+	bytecode := getContractCode(cs.ctrState, ctx.bs)
+	if bytecode == nil {
 		return -1, C.CString("[Contract.LuaCallContract] cannot find contract " + C.GoString(contractId))
 	}
 
@@ -247,7 +256,7 @@ func luaCallContract(L *LState, service C.int, contractId *C.char, fname *C.char
 	// get the remaining gas from the parent LState
 	ctx.refreshRemainingGas(L)
 	// create a new executor with the remaining gas on the child LState
-	ce := newExecutor(callee, cid, ctx, &ci, amountBig, false, false, cs.ctrState)
+	ce := newExecutor(bytecode, cid, ctx, &ci, amountBig, false, false, cs.ctrState)
 	defer func() {
 		// close the executor, closes also the child LState
 		ce.close()
@@ -335,29 +344,54 @@ func luaDelegateCallContract(L *LState, service C.int, contractId *C.char,
 		return -1, C.CString("[Contract.LuaDelegateCallContract] contract state not found")
 	}
 
+	var isMultiCall bool
+	var cid []byte
+	var err error
+
 	// get the contract address
-	cid, err := getAddressNameResolved(contractIdStr, ctx.bs)
-	if err != nil {
-		return -1, C.CString("[Contract.LuaDelegateCallContract] invalid contractId: " + err.Error())
+	if contractIdStr == "multicall" {
+		isMultiCall = true
+		argsStr = fnameStr
+		fnameStr = "execute"
+		cid = ctx.curContract.contractId
+	} else {
+		cid, err = getAddressNameResolved(contractIdStr, ctx.bs)
+		if err != nil {
+			return -1, C.CString("[Contract.LuaDelegateCallContract] invalid contractId: " + err.Error())
+		}
 	}
 	aid := types.ToAccountID(cid)
 
 	// get the contract state
-	contractState, err := getOnlyContractState(ctx, cid)
+	var contractState *statedb.ContractState
+	if isMultiCall {
+		contractState = statedb.GetMultiCallState(cid, ctx.curContract.callState.ctrState.State)
+	} else {
+		contractState, err = getOnlyContractState(ctx, cid)
+	}
 	if err != nil {
 		return -1, C.CString("[Contract.LuaDelegateCallContract]getContractState error" + err.Error())
 	}
 
-	// check if the contract exists
-	contract := getContract(contractState, ctx.bs)
-	if contract == nil {
+	// get the contract code
+	var bytecode []byte
+	if isMultiCall {
+		bytecode = getMultiCallContractCode(contractState)
+	} else {
+		bytecode = getContractCode(contractState, ctx.bs)
+	}
+	if bytecode == nil {
 		return -1, C.CString("[Contract.LuaDelegateCallContract] cannot find contract " + contractIdStr)
 	}
 
 	// read the arguments for the contract call
 	var ci types.CallInfo
-	ci.Name = fnameStr
-	err = getCallInfo(&ci.Args, []byte(argsStr), cid)
+	if isMultiCall {
+		err = getMultiCallInfo(&ci, []byte(argsStr))
+	} else {
+		ci.Name = fnameStr
+		err = getCallInfo(&ci.Args, []byte(argsStr), cid)
+	}
 	if err != nil {
 		return -1, C.CString("[Contract.LuaDelegateCallContract] invalid arguments: " + err.Error())
 	}
@@ -365,7 +399,7 @@ func luaDelegateCallContract(L *LState, service C.int, contractId *C.char,
 	// get the remaining gas from the parent LState
 	ctx.refreshRemainingGas(L)
 	// create a new executor with the remaining gas on the child LState
-	ce := newExecutor(contract, cid, ctx, &ci, zeroBig, false, false, contractState)
+	ce := newExecutor(bytecode, cid, ctx, &ci, zeroBig, false, false, contractState)
 	defer func() {
 		// close the executor, closes also the child LState
 		ce.close()
@@ -443,7 +477,7 @@ func luaSendAmount(L *LState, service C.int, contractId *C.char, amount *C.char)
 	}
 
 	// read the amount to be sent
-	amountBig, err := transformAmount(C.GoString(amount))
+	amountBig, err := transformAmount(C.GoString(amount), ctx.blockInfo.ForkVersion)
 	if err != nil {
 		return C.CString("[Contract.LuaSendAmount] invalid amount: " + err.Error())
 	}
@@ -486,15 +520,15 @@ func luaSendAmount(L *LState, service C.int, contractId *C.char, amount *C.char)
 		ci.Name = "default"
 
 		// get the contract code
-		code := getContract(cs.ctrState, ctx.bs)
-		if code == nil {
+		bytecode := getContractCode(cs.ctrState, ctx.bs)
+		if bytecode == nil {
 			return C.CString("[Contract.LuaSendAmount] cannot find contract:" + C.GoString(contractId))
 		}
 
 		// get the remaining gas from the parent LState
 		ctx.refreshRemainingGas(L)
 		// create a new executor with the remaining gas on the child LState
-		ce := newExecutor(code, cid, ctx, &ci, amountBig, false, false, cs.ctrState)
+		ce := newExecutor(bytecode, cid, ctx, &ci, amountBig, false, false, cs.ctrState)
 		defer func() {
 			// close the executor, closes also the child LState
 			ce.close()
@@ -611,6 +645,10 @@ func luaSetRecoveryPoint(L *LState, service C.int) (C.int, *C.char) {
 		return 0, nil
 	}
 	curContract := ctx.curContract
+	// if it is the multicall code, ignore
+	if curContract.callState.ctrState.IsMultiCall() {
+		return 0, nil
+	}
 	seq, err := setRecoveryPoint(types.ToAccountID(curContract.contractId), ctx, nil,
 		curContract.callState, zeroBig, false, false)
 	if err != nil {
@@ -622,16 +660,16 @@ func luaSetRecoveryPoint(L *LState, service C.int) (C.int, *C.char) {
 	return C.int(seq), nil
 }
 
-func clearRecovery(L *LState, ctx *vmContext, start int, error bool) error {
+func clearRecovery(L *LState, ctx *vmContext, start int, isError bool) error {
 	item := ctx.lastRecoveryEntry
 	for {
-		if error {
+		if isError {
 			if item.recovery(ctx.bs) != nil {
 				return errors.New("database error")
 			}
 		}
 		if item.seq == start {
-			if error || item.prev == nil {
+			if isError || item.prev == nil {
 				ctx.lastRecoveryEntry = item.prev
 			}
 			return nil
@@ -644,16 +682,16 @@ func clearRecovery(L *LState, ctx *vmContext, start int, error bool) error {
 }
 
 //export luaClearRecovery
-func luaClearRecovery(L *LState, service C.int, start int, error bool) *C.char {
+func luaClearRecovery(L *LState, service C.int, start int, isError bool) *C.char {
 	ctx := contexts[service]
 	if ctx == nil {
 		return C.CString("[Contract.pcall] contract state not found")
 	}
-	err := clearRecovery(L, ctx, start, error)
+	err := clearRecovery(L, ctx, start, isError)
 	if err != nil {
 		return C.CString(err.Error())
 	}
-	if ctx.traceFile != nil && error == true {
+	if ctx.traceFile != nil && isError == true {
 		_, _ = ctx.traceFile.WriteString(fmt.Sprintf("pcall recovery snapshot : %d\n", start))
 	}
 	return nil
@@ -673,7 +711,6 @@ func luaGetBalance(L *LState, service C.int, contractId *C.char) (*C.char, *C.ch
 	cs := ctx.callState[aid]
 	if cs == nil {
 		bs := ctx.bs
-
 		as, err := bs.GetAccountState(aid)
 		if err != nil {
 			return nil, C.CString("[Contract.LuaGetBalance] getAccount error: " + err.Error())
@@ -940,11 +977,30 @@ func luaCryptoKeccak256(data unsafe.Pointer, dataLen C.int) (unsafe.Pointer, int
 
 // transformAmount processes the input string to calculate the total amount,
 // taking into account the different units ("aergo", "gaer", "aer")
-func transformAmount(amountStr string) (*big.Int, error) {
+func transformAmount(amountStr string, forkVersion int32) (*big.Int, error) {
 	if len(amountStr) == 0 {
 		return zeroBig, nil
 	}
 
+	if forkVersion >= 4 {
+		// Check for amount in decimal format
+		if strings.Contains(amountStr,".") && strings.HasSuffix(strings.ToLower(amountStr),"aergo") {
+			// Extract the part before the unit
+			decimalAmount := amountStr[:len(amountStr)-5]
+			decimalAmount = strings.TrimRight(decimalAmount, " ")
+			// Parse the decimal amount
+			decimalAmount = parseDecimalAmount(decimalAmount, 18)
+			if decimalAmount == "error" {
+				return nil, errors.New("converting error for BigNum: " + amountStr)
+			}
+			amount, valid := new(big.Int).SetString(decimalAmount, 10)
+			if !valid {
+				return nil, errors.New("converting error for BigNum: " + amountStr)
+			}
+			return amount, nil
+		}
+	}
+
 	totalAmount := new(big.Int)
 	remainingStr := amountStr
 
@@ -990,18 +1046,53 @@ func transformAmount(amountStr string) (*big.Int, error) {
 	return totalAmount, nil
 }
 
+// convert decimal amount into big integer string
+func parseDecimalAmount(str string, num_decimals int) string {
+	// Get the integer and decimal parts
+	idx := strings.Index(str, ".")
+	if idx == -1 {
+		return str
+	}
+	p1 := str[0:idx]
+	p2 := str[idx+1:]
+
+	// Check for another decimal point
+	if strings.Index(p2, ".") != -1 {
+		return "error"
+	}
+
+	// Compute the amount of zero digits to add
+	to_add := num_decimals - len(p2)
+	if to_add > 0 {
+		p2 = p2 + strings.Repeat("0", to_add)
+	} else if to_add < 0 {
+		// Do not truncate decimal amounts
+		return "error"
+	}
+
+	// Join the integer and decimal parts
+	str = p1 + p2
+
+	// Remove leading zeros
+	str = strings.TrimLeft(str, "0")
+	if str == "" {
+		str = "0"
+	}
+	return str
+}
+
 // parseAndConvert is a helper function to parse the substring as a big integer
 // and apply the necessary multiplier based on the unit.
-func parseAndConvert(subStr, unit string, mulUnit *big.Int, amountStr string) (*big.Int, error) {
-	trimmedStr := strings.TrimSpace(subStr)
+func parseAndConvert(subStr, unit string, mulUnit *big.Int, fullStr string) (*big.Int, error) {
+	subStr = strings.TrimSpace(subStr)
 
-	// Convert the trimmed string to a big integer
-	amountBig, valid := new(big.Int).SetString(trimmedStr, 10)
+	// Convert the string to a big integer
+	amountBig, valid := new(big.Int).SetString(subStr, 10)
 	if !valid {
 		// Emits a backwards compatible error message
 		// the same as: dataType := len(unit) > 0 ? "BigNum" : "Integer"
 		dataType := map[bool]string{true: "BigNum", false: "Integer"}[len(unit) > 0]
-		return nil, errors.New("converting error for " + dataType + ": " + strings.TrimSpace(amountStr))
+		return nil, errors.New("converting error for " + dataType + ": " + strings.TrimSpace(fullStr))
 	}
 
 	// Check for negative amounts
@@ -1039,7 +1130,8 @@ func luaDeployContract(
 	bs := ctx.bs
 
 	// contract code
-	var code []byte
+	var codeABI []byte
+	var sourceCode []byte
 
 	// check if contract name or address is given
 	cid, err := getAddressNameResolved(contractStr, bs)
@@ -1050,20 +1142,23 @@ func luaDeployContract(
 			return -1, C.CString("[Contract.LuaDeployContract]" + err.Error())
 		}
 		// read the contract code
-		code, err = contractState.GetCode()
+		codeABI, err = contractState.GetCode()
 		if err != nil {
 			return -1, C.CString("[Contract.LuaDeployContract]" + err.Error())
-		} else if len(code) == 0 {
+		} else if len(codeABI) == 0 {
 			return -1, C.CString("[Contract.LuaDeployContract]: not found code")
 		}
+		if ctx.blockInfo.ForkVersion >= 4 {
+			sourceCode = contractState.GetSourceCode()
+		}
 	}
 
 	// compile contract code if not found
-	if len(code) == 0 {
+	if len(codeABI) == 0 {
 		if ctx.blockInfo.ForkVersion >= 2 {
-			code, err = Compile(contractStr, L)
+			codeABI, err = Compile(contractStr, L)
 		} else {
-			code, err = Compile(contractStr, nil)
+			codeABI, err = Compile(contractStr, nil)
 		}
 		if err != nil {
 			if C.luaL_hasuncatchablerror(L) != C.int(0) &&
@@ -1072,12 +1167,14 @@ func luaDeployContract(
 			} else if err == ErrVmStart {
 				return -1, C.CString("[Contract.LuaDeployContract] get luaState error")
 			}
-
 			return -1, C.CString("[Contract.LuaDeployContract]compile error:" + err.Error())
 		}
+		if ctx.blockInfo.ForkVersion >= 4 {
+			sourceCode = []byte(contractStr)
+		}
 	}
 
-	err = ctx.addUpdateSize(int64(len(code)))
+	err = ctx.addUpdateSize(int64(len(codeABI) + len(sourceCode)))
 	if err != nil {
 		return -1, C.CString("[Contract.LuaDeployContract]:" + err.Error())
 	}
@@ -1098,7 +1195,7 @@ func luaDeployContract(
 	ctx.callState[newContract.AccountID()] = cs
 
 	// read the amount transferred to the contract
-	amountBig, err := transformAmount(C.GoString(amount))
+	amountBig, err := transformAmount(C.GoString(amount), ctx.blockInfo.ForkVersion)
 	if err != nil {
 		return -1, C.CString("[Contract.LuaDeployContract]value not proper format:" + err.Error())
 	}
@@ -1142,10 +1239,10 @@ func luaDeployContract(
 		ctx.curContract = prevContractInfo
 	}()
 
-	runCode := util.LuaCode(code).ByteCode()
+	bytecode := util.LuaCode(codeABI).ByteCode()
 
 	// save the contract code
-	err = contractState.SetCode(code)
+	err = contractState.SetCode(sourceCode, codeABI)
 	if err != nil {
 		return -1, C.CString("[Contract.LuaDeployContract]:" + err.Error())
 	}
@@ -1159,7 +1256,7 @@ func luaDeployContract(
 	// get the remaining gas from the parent LState
 	ctx.refreshRemainingGas(L)
 	// create a new executor with the remaining gas on the child LState
-	ce := newExecutor(runCode, newContract.ID(), ctx, &ci, amountBig, true, false, contractState)
+	ce := newExecutor(bytecode, newContract.ID(), ctx, &ci, amountBig, true, false, contractState)
 	defer func() {
 		// close the executor, which will close the child LState
 		ce.close()
@@ -1239,8 +1336,8 @@ func luaEvent(L *LState, service C.int, eventName *C.char, args *C.char) *C.char
 	if ctx.isQuery == true || ctx.nestedView > 0 {
 		return C.CString("[Contract.Event] event not permitted in query")
 	}
-	if ctx.eventCount >= maxEventCnt {
-		return C.CString(fmt.Sprintf("[Contract.Event] exceeded the maximum number of events(%d)", maxEventCnt))
+	if ctx.eventCount >= maxEventCnt(ctx) {
+		return C.CString(fmt.Sprintf("[Contract.Event] exceeded the maximum number of events(%d)", maxEventCnt(ctx)))
 	}
 	if len(C.GoString(eventName)) > maxEventNameSize {
 		return C.CString(fmt.Sprintf("[Contract.Event] exceeded the maximum length of event name(%d)", maxEventNameSize))
@@ -1261,6 +1358,61 @@ func luaEvent(L *LState, service C.int, eventName *C.char, args *C.char) *C.char
 	return nil
 }
 
+//export luaGetEventCount
+func luaGetEventCount(L *LState, service C.int) C.int {
+	eventCount := contexts[service].eventCount
+	if ctrLgr.IsDebugEnabled() {
+		ctrLgr.Debug().Int32("eventCount", eventCount).Msg("get event count")
+	}
+	return C.int(eventCount)
+}
+
+//export luaDropEvent
+func luaDropEvent(L *LState, service C.int, from C.int) {
+	// Drop all the events after the given index.
+	ctx := contexts[service]
+	if ctrLgr.IsDebugEnabled() {
+		ctrLgr.Debug().Int32("from", int32(from)).Int("len", len(ctx.events)).Msg("drop events")
+	}
+	if from >= 0 {
+		ctx.events = ctx.events[:from]
+		ctx.eventCount = int32(len(ctx.events))
+	}
+}
+
+//export luaToPubkey
+func luaToPubkey(L *LState, address *C.char) *C.char {
+	// check the length of address
+	if len(C.GoString(address)) != types.EncodedAddressLength {
+		return C.CString("[Contract.LuaToPubkey] invalid address length")
+	}
+	// decode the address in string format to bytes (public key)
+	pubkey, err := types.DecodeAddress(C.GoString(address))
+	if err != nil {
+		return C.CString("[Contract.LuaToPubkey] invalid address")
+	}
+	// return the public key in hex format
+	return C.CString("0x" + hex.Encode(pubkey))
+}
+
+//export luaToAddress
+func luaToAddress(L *LState, pubkey *C.char) *C.char {
+	// decode the pubkey in hex format to bytes
+	pubkeyBytes, err := decodeHex(C.GoString(pubkey))
+	if err != nil {
+		return C.CString("[Contract.LuaToAddress] invalid public key")
+	}
+	// check the length of pubkey
+	if len(pubkeyBytes) != types.AddressLength {
+		return C.CString("[Contract.LuaToAddress] invalid public key length")
+		// or convert the pubkey to compact format - SerializeCompressed()
+	}
+	// encode the pubkey in bytes to an address in string format
+	address := types.EncodeAddress(pubkeyBytes)
+	// return the address
+	return C.CString(address)
+}
+
 //export luaIsContract
 func luaIsContract(L *LState, service C.int, contractId *C.char) (C.int, *C.char) {
 
@@ -1282,6 +1434,27 @@ func luaIsContract(L *LState, service C.int, contractId *C.char) (C.int, *C.char
 	return C.int(len(cs.accState.CodeHash())), nil
 }
 
+//export luaNameResolve
+func luaNameResolve(L *LState, service C.int, name_or_address *C.char) *C.char {
+	ctx := contexts[service]
+	if ctx == nil {
+		return C.CString("[Contract.LuaNameResolve] contract state not found")
+	}
+	var addr []byte
+	var err error
+	account := C.GoString(name_or_address)
+	if len(account) == types.EncodedAddressLength {
+		// also checks if valid address
+		addr, err = types.DecodeAddress(account)
+	} else {
+		addr, err = name.Resolve(ctx.bs, []byte(account), false)
+	}
+	if err != nil {
+		return C.CString("[Contract.LuaNameResolve] " + err.Error())
+	}
+	return C.CString(types.EncodeAddress(addr))
+}
+
 //export luaGovernance
 func luaGovernance(L *LState, service C.int, gType C.char, arg *C.char) *C.char {
 
@@ -1300,7 +1473,7 @@ func luaGovernance(L *LState, service C.int, gType C.char, arg *C.char) *C.char
 	switch gType {
 	case 'S', 'U':
 		var err error
-		amountBig, err = transformAmount(C.GoString(arg))
+		amountBig, err = transformAmount(C.GoString(arg), ctx.blockInfo.ForkVersion)
 		if err != nil {
 			return C.CString("[Contract.LuaGovernance] invalid amount: " + err.Error())
 		}
diff --git a/contract/vm_callback_test.go b/contract/vm_callback_test.go
index 5f5b9d84f..ceeec753e 100644
--- a/contract/vm_callback_test.go
+++ b/contract/vm_callback_test.go
@@ -3,12 +3,16 @@ package contract
 import (
 	"errors"
 	"math/big"
+	"strings"
 	"testing"
 
 	"github.com/aergoio/aergo/v2/types"
 	"github.com/stretchr/testify/assert"
 )
 
+const min_version int32 = 2
+const max_version int32 = 4
+
 func bigIntFromString(str string) *big.Int {
 	bigInt, success := new(big.Int).SetString(str, 10)
 	if !success {
@@ -98,13 +102,6 @@ func TestTransformAmount(t *testing.T) {
 		{"100 invalid 200", nil, errors.New("converting error for Integer: 100 invalid 200")},
 		{"invalid 200", nil, errors.New("converting error for Integer: invalid 200")},
 		{"100 invalid", nil, errors.New("converting error for Integer: 100 invalid")},
-		// Non-Integer Values
-		{"123.456", nil, errors.New("converting error for Integer: 123.456")},
-		{"123.456 aergo", nil, errors.New("converting error for BigNum: 123.456 aergo")},
-		{".1", nil, errors.New("converting error for Integer: .1")},
-		{".1aergo", nil, errors.New("converting error for BigNum: .1aergo")},
-		{".1 aergo", nil, errors.New("converting error for BigNum: .1 aergo")},
-		{".10", nil, errors.New("converting error for Integer: .10")},
 		// Exponents
 		{"1e+18", nil, errors.New("converting error for Integer: 1e+18")},
 		{"2e18", nil, errors.New("converting error for Integer: 2e18")},
@@ -121,16 +118,128 @@ func TestTransformAmount(t *testing.T) {
 		{"5e+3aergo", nil, errors.New("converting error for BigNum: 5e+3aergo")},
 	}
 
-	for _, tt := range tests {
-		result, err := transformAmount(tt.amountStr)
+	for version := min_version; version <= max_version; version++ {
+		for _, tt := range tests {
+			result, err := transformAmount(tt.amountStr, version)
+
+			if tt.expectedError != nil {
+				if assert.Error(t, err, "Expected error: %s", tt.expectedError.Error()) {
+					assert.Equal(t, tt.expectedError.Error(), err.Error())
+				}
+			} else {
+				if assert.NoError(t, err) && tt.expectedAmount != nil {
+					assert.Equal(t, tt.expectedAmount, result)
+				}
+			}
+
+			// now in uppercase
+			result, err = transformAmount(strings.ToUpper(tt.amountStr), version)
+
+			if tt.expectedError != nil {
+				if assert.Error(t, err, "Expected error: %s", tt.expectedError.Error()) {
+					assert.Equal(t, strings.ToUpper(tt.expectedError.Error()), strings.ToUpper(err.Error()))
+				}
+			} else {
+				if assert.NoError(t, err) && tt.expectedAmount != nil {
+					assert.Equal(t, tt.expectedAmount, result)
+				}
+			}
+		}
+	}
+
+	// Define the test cases for amounts in decimal format
+	decimal_tests := []struct {
+		forkVersion    int32
+		amountStr      string
+		expectedAmount *big.Int
+		expectedError  error
+	}{
+		// V3 - decimal amounts not supported
+		{3, "123.456", nil, errors.New("converting error for Integer: 123.456")},
+		{3, "123.456 aergo", nil, errors.New("converting error for BigNum: 123.456 aergo")},
+		{3, ".1", nil, errors.New("converting error for Integer: .1")},
+		{3, ".1aergo", nil, errors.New("converting error for BigNum: .1aergo")},
+		{3, ".1 aergo", nil, errors.New("converting error for BigNum: .1 aergo")},
+		{3, ".10", nil, errors.New("converting error for Integer: .10")},
+		// V4 - decimal amounts supported
+		{4, "123.456aergo", bigIntFromString("123456000000000000000"), nil},
+		{4, "123.4aergo", bigIntFromString("123400000000000000000"), nil},
+		{4, "123.aergo", bigIntFromString("123000000000000000000"), nil},
+		{4, "100.aergo", bigIntFromString("100000000000000000000"), nil},
+		{4, "10.aergo", bigIntFromString("10000000000000000000"), nil},
+		{4, "1.aergo", bigIntFromString("1000000000000000000"), nil},
+		{4, "100.0aergo", bigIntFromString("100000000000000000000"), nil},
+		{4, "10.0aergo", bigIntFromString("10000000000000000000"), nil},
+		{4, "1.0aergo", bigIntFromString("1000000000000000000"), nil},
+		{4, ".1aergo", bigIntFromString("100000000000000000"), nil},
+		{4, "0.1aergo", bigIntFromString("100000000000000000"), nil},
+		{4, ".01aergo", bigIntFromString("10000000000000000"), nil},
+		{4, "0.01aergo", bigIntFromString("10000000000000000"), nil},
+		{4, "0.0000000001aergo", bigIntFromString("100000000"), nil},
+		{4, "0.000000000000000001aergo", bigIntFromString("1"), nil},
+		{4, "0.000000000000000123aergo", bigIntFromString("123"), nil},
+		{4, "0.000000000000000000aergo", bigIntFromString("0"), nil},
+		{4, "0.000000000000123000aergo", bigIntFromString("123000"), nil},
+		{4, "0.100000000000000123aergo", bigIntFromString("100000000000000123"), nil},
+		{4, "1.000000000000000123aergo", bigIntFromString("1000000000000000123"), nil},
+		{4, "123.456000000000000789aergo", bigIntFromString("123456000000000000789"), nil},
+
+		{4, "123.456 aergo", bigIntFromString("123456000000000000000"), nil},
+		{4, "123.4 aergo", bigIntFromString("123400000000000000000"), nil},
+		{4, "123. aergo", bigIntFromString("123000000000000000000"), nil},
+		{4, "100. aergo", bigIntFromString("100000000000000000000"), nil},
+		{4, "10. aergo", bigIntFromString("10000000000000000000"), nil},
+		{4, "1. aergo", bigIntFromString("1000000000000000000"), nil},
+		{4, "100.0 aergo", bigIntFromString("100000000000000000000"), nil},
+		{4, "10.0 aergo", bigIntFromString("10000000000000000000"), nil},
+		{4, "1.0 aergo", bigIntFromString("1000000000000000000"), nil},
+		{4, ".1 aergo", bigIntFromString("100000000000000000"), nil},
+		{4, "0.1 aergo", bigIntFromString("100000000000000000"), nil},
+		{4, ".01 aergo", bigIntFromString("10000000000000000"), nil},
+		{4, "0.01 aergo", bigIntFromString("10000000000000000"), nil},
+		{4, "0.0000000001 aergo", bigIntFromString("100000000"), nil},
+		{4, "0.000000000000000001 aergo", bigIntFromString("1"), nil},
+		{4, "0.000000000000000123 aergo", bigIntFromString("123"), nil},
+		{4, "0.000000000000000000 aergo", bigIntFromString("0"), nil},
+		{4, "0.000000000000123000 aergo", bigIntFromString("123000"), nil},
+		{4, "0.100000000000000123 aergo", bigIntFromString("100000000000000123"), nil},
+		{4, "1.000000000000000123 aergo", bigIntFromString("1000000000000000123"), nil},
+		{4, "123.456000000000000789 aergo", bigIntFromString("123456000000000000789"), nil},
+
+		{4, "0.0000000000000000001aergo", nil, errors.New("converting error for BigNum: 0.0000000000000000001aergo")},
+		{4, "0.000000000000000000000000001aergo", nil, errors.New("converting error for BigNum: 0.000000000000000000000000001aergo")},
+		{4, "0.000000000000000123000aergo", nil, errors.New("converting error for BigNum: 0.000000000000000123000aergo")},
+		{4, "0.0000000000000000000000aergo", nil, errors.New("converting error for BigNum: 0.0000000000000000000000aergo")},
+
+		{4, "0.0000000000000000001 aergo", nil, errors.New("converting error for BigNum: 0.0000000000000000001 aergo")},
+		{4, "0.000000000000000000000000001 aergo", nil, errors.New("converting error for BigNum: 0.000000000000000000000000001 aergo")},
+		{4, "0.000000000000000123000 aergo", nil, errors.New("converting error for BigNum: 0.000000000000000123000 aergo")},
+		{4, "0.0000000000000000000000 aergo", nil, errors.New("converting error for BigNum: 0.0000000000000000000000 aergo")},
+	}
+
+	for _, tt := range decimal_tests {
+		result, err := transformAmount(tt.amountStr, tt.forkVersion)
+
+		if tt.expectedError != nil {
+			if assert.Error(t, err, "Expected error: %s", tt.expectedError.Error()) {
+				assert.Equal(t, tt.expectedError.Error(), err.Error(), tt.amountStr)
+			}
+		} else {
+			if assert.NoError(t, err) && tt.expectedAmount != nil {
+				assert.Equal(t, tt.expectedAmount, result, tt.amountStr)
+			}
+		}
+
+		// now in uppercase
+		result, err = transformAmount(strings.ToUpper(tt.amountStr), tt.forkVersion)
 
 		if tt.expectedError != nil {
 			if assert.Error(t, err, "Expected error: %s", tt.expectedError.Error()) {
-				assert.Equal(t, tt.expectedError.Error(), err.Error())
+				assert.Equal(t, strings.ToUpper(tt.expectedError.Error()), strings.ToUpper(err.Error()), tt.amountStr)
 			}
 		} else {
 			if assert.NoError(t, err) && tt.expectedAmount != nil {
-				assert.Equal(t, tt.expectedAmount, result)
+				assert.Equal(t, tt.expectedAmount, result, tt.amountStr)
 			}
 		}
 	}
diff --git a/contract/vm_dummy/test_files/bignum_values.lua b/contract/vm_dummy/test_files/bignum_values.lua
new file mode 100644
index 000000000..7c31db65a
--- /dev/null
+++ b/contract/vm_dummy/test_files/bignum_values.lua
@@ -0,0 +1,7 @@
+
+function parse_bignum(value)
+  local val = bignum.number(value)
+  return bignum.tostring(val)
+end
+
+abi.register(parse_bignum)
diff --git a/contract/vm_dummy/test_files/contract_system.lua b/contract/vm_dummy/test_files/contract_system.lua
index 88383efc7..b5577ef67 100644
--- a/contract/vm_dummy/test_files/contract_system.lua
+++ b/contract/vm_dummy/test_files/contract_system.lua
@@ -1,7 +1,20 @@
 function testState()
     system.setItem("key1", 999)
-    return system.getSender(), system.getTxhash(), system.getContractID(), system.getTimestamp(), system.getBlockheight(),
-        system.getItem("key1")
+    return system.getSender(), system.getTxhash(), system.getContractID(), system.getTimestamp(), system.getBlockheight(), system.getItem("key1")
 end
 
 abi.register(testState)
+
+function get_version()
+	return system.version()
+end
+
+function to_address(pubkey)
+  return system.toAddress(pubkey)
+end
+
+function to_pubkey(address)
+  return system.toPubKey(address)
+end
+
+abi.register_view(get_version, to_address, to_pubkey)
diff --git a/contract/vm_dummy/test_files/disabled-functions.lua b/contract/vm_dummy/test_files/disabled-functions.lua
new file mode 100644
index 000000000..9f57b6c14
--- /dev/null
+++ b/contract/vm_dummy/test_files/disabled-functions.lua
@@ -0,0 +1,46 @@
+
+function check_disabled_functions()
+
+  -- check the disabled modules
+  assert(os == nil, "os is available")
+  assert(io == nil, "io is available")
+  assert(debug == nil, "debug is available")
+  assert(jit == nil, "jit is available")
+  assert(ffi == nil, "ffi is available")
+  assert(coroutine == nil, "coroutine is available")
+  assert(package == nil, "package is available")
+
+  -- check the disabled functions
+  assert(collectgarbage == nil, "collectgarbage is available")
+  assert(gcinfo == nil, "gcinfo is available")
+  assert(module == nil, "module is available")
+  assert(require == nil, "require is available")
+  assert(dofile == nil, "dofile is available")
+  assert(load == nil, "load is available")
+  assert(loadlib == nil, "loadlib is available")
+  assert(loadfile == nil, "loadfile is available")
+  assert(loadstring == nil, "loadstring is available")
+  assert(print == nil, "print is available")
+  assert(getmetatable == nil, "getmetatable is available")
+  assert(setmetatable == nil, "setmetatable is available")
+  assert(rawget == nil, "rawget is available")
+  assert(rawset == nil, "rawset is available")
+  assert(rawequal == nil, "rawequal is available")
+  assert(string.dump == nil, "string.dump is available")
+
+  local success, result = pcall(function() newproxy() end)
+  assert(success == false and result:match(".* 'newproxy' not supported"), "newproxy is available")
+  local success, result = pcall(function() setfenv() end)
+  assert(success == false and result:match(".* 'setfenv' not supported"), "setfenv is available")
+  local success, result = pcall(function() getfenv() end)
+  assert(success == false and result:match(".* 'getfenv' not supported"), "getfenv is available")
+
+  -- make sure the tostring does not return a pointer
+  local tab = {}
+  assert(not tostring(type):match("0x[%x]+"), "tostring returns a pointer for function")
+  assert(not tostring(system):match("0x[%x]+"), "tostring returns a pointer for internal table")
+  assert(not tostring(tab):match("0x[%x]+"), "tostring returns a pointer for table")
+
+end
+
+abi.register(check_disabled_functions)
diff --git a/contract/vm_dummy/test_files/feature_isolation.lua b/contract/vm_dummy/test_files/feature_isolation.lua
index 84fd6abb6..2244a9a61 100644
--- a/contract/vm_dummy/test_files/feature_isolation.lua
+++ b/contract/vm_dummy/test_files/feature_isolation.lua
@@ -22,8 +22,10 @@ function override_functions()
     -- override contract.balance
     contract.balance = function() return "123" end
 
-    -- override the __add metamethod on bignum module
-    getmetatable(bignum.number(0)).__add = function(x,y) return x-y end
+    if getmetatable ~= nil then
+      -- override the __add metamethod on bignum module
+      getmetatable(bignum.number(0)).__add = function(x,y) return x-y end
+    end
 
 end
 
@@ -37,7 +39,9 @@ function check_local_overridden_functions()
     assert2(test_sender() == "overridden", "system.getSender() override failed")
     assert2(test_origin() == "overridden", "system.getOrigin() override failed")
     assert2(test_balance() == "123", "contract.balance() override failed")
-    assert2(test_bignum() == bignum.number(3), "metamethod override failed")
+    if getmetatable ~= nil then
+      assert2(test_bignum() == bignum.number(3), "metamethod override failed")
+    end
 
 end
 
diff --git a/contract/vm_dummy/test_files/feature_multicall.lua b/contract/vm_dummy/test_files/feature_multicall.lua
new file mode 100644
index 000000000..c65928a5c
--- /dev/null
+++ b/contract/vm_dummy/test_files/feature_multicall.lua
@@ -0,0 +1,122 @@
+state.var {
+  name = state.value(),
+  last = state.value(),
+  dict = state.map()
+}
+
+function get_dict()
+  return {one = 1, two = 2, three = 3}
+end
+
+function get_list()
+  return {'first', 'second', 'third', 123, 12.5, true}
+end
+
+function get_table()
+  return { name = "Test", second = 'Te"st', number = 123, bool = true, array = {11,22,33} }
+end
+
+function works()
+  return 123
+end
+
+function fails()
+  assert(false, "this call should fail")
+end
+
+function hello(name)
+  return 'hello ' .. name
+end
+
+function set_name(val)
+  name:set(val)
+  assert(type(val)=='string', "must be string")
+end
+
+function get_name()
+  return name:get()
+end
+
+function set(key, value)
+  dict[key] = value
+end
+
+function inc(key)
+  dict[key] = (dict[key] or 0) + 1
+  contract.event("new_value", dict[key])
+end
+
+function add(value)
+  local key = (last:get() or 0) + 1
+  dict[tostring(key)] = value
+  last:set(key)
+end
+
+function get(key)
+  return dict[key]
+end
+
+function sort(list)
+  table.sort(list)
+  return list
+end
+
+abi.register(add, set, inc, set_name)
+abi.register_view(get_dict, get_list, get_table, works, fails, get, get_name, sort, hello)
+
+function call(...)
+  return contract.call(...)
+end
+
+function is_contract(address)
+  return system.isContract(address)
+end
+
+function sender()
+  return system.getSender()
+end
+
+function origin()
+  return system.getOrigin()
+end
+
+abi.register(call)
+abi.register_view(is_contract, sender, origin)
+
+function recv_aergo()
+  -- does nothing
+end
+
+function default()
+  -- does nothing
+end
+
+function resend_to(address)
+  local amount = system.getAmount()
+  contract.send(address, amount)
+  return amount
+end
+
+function resend_and_fail(address)
+  local amount = system.getAmount()
+  contract.send(address, amount)
+  assert(false, "this call should fail")
+  return amount
+end
+
+function send_to(address, amount)
+  contract.send(address, amount)
+end
+
+function send_and_fail(address, amount)
+  contract.send(address, amount)
+  assert(false, "this call should fail")
+end
+
+function get_aergo_balance()
+  return contract.balance()
+end
+
+abi.payable(recv_aergo, default, resend_to, resend_and_fail)
+abi.register(send_to, send_and_fail)
+abi.register_view(get_aergo_balance)
diff --git a/contract/vm_dummy/test_files/feature_multicall_contract.lua b/contract/vm_dummy/test_files/feature_multicall_contract.lua
new file mode 100644
index 000000000..26a580920
--- /dev/null
+++ b/contract/vm_dummy/test_files/feature_multicall_contract.lua
@@ -0,0 +1,55 @@
+state.var {
+  dict = state.map()
+}
+
+function set_value(key, value)
+  dict[key] = value
+end
+
+function get_value(key)
+  return dict[key]
+end
+
+abi.register(set_value)
+abi.register_view(get_value)
+
+function call(...)
+  return contract.call(...)
+end
+
+function delegate_call(...)
+  return contract.delegatecall(...)
+end
+
+function multicall(script)
+  return contract.delegatecall("multicall", script)
+end
+
+function multicall_and_check(script)
+  local result1, result2 = contract.delegatecall("multicall", script)
+  assert(contract.balance() == "875000000000000000")
+  assert(contract.balance("AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9") == "125000000000000000")
+  return result1, result2
+end
+
+abi.register(call, delegate_call, multicall, multicall_and_check)
+
+function recv_aergo()
+  -- does nothing
+end
+
+function default()
+  -- does nothing
+end
+
+function send_to(address, amount)
+  contract.send(address, amount)
+end
+
+function get_balance()
+  return contract.balance()
+end
+
+abi.payable(recv_aergo, default)
+abi.register(send_to)
+abi.register_view(get_balance)
diff --git a/contract/vm_dummy/test_files/feature_pcall_rollback_4.lua b/contract/vm_dummy/test_files/feature_pcall_rollback_4a.lua
similarity index 100%
rename from contract/vm_dummy/test_files/feature_pcall_rollback_4.lua
rename to contract/vm_dummy/test_files/feature_pcall_rollback_4a.lua
diff --git a/contract/vm_dummy/test_files/feature_pcall_rollback_4b.lua b/contract/vm_dummy/test_files/feature_pcall_rollback_4b.lua
new file mode 100644
index 000000000..bc1c40929
--- /dev/null
+++ b/contract/vm_dummy/test_files/feature_pcall_rollback_4b.lua
@@ -0,0 +1,128 @@
+state.var {
+    resolver = state.value(),
+    name = state.value(),
+    values = state.map()
+}
+
+function constructor(resolver_address, contract_name)
+    -- initialize state variables
+    resolver:set(resolver_address)
+    name:set(contract_name)
+    -- initialize db
+    db.exec("create table config (value integer primary key) without rowid")
+    db.exec("insert into config values (0)")
+    db.exec([[create table products (
+        id integer primary key,
+        name text not null,
+        price real)
+    ]])
+    db.exec("insert into products (name,price) values ('first', 1234.56)")
+end
+
+function resolve(name)
+    return contract.call(resolver:get(), "resolve", name)
+end
+
+--[[
+  ['set','x',111],
+  ['pcall','A']
+],[
+  ['set','x',222],
+  ['pcall','A'],
+  ['fail']
+],[
+  ['set','x',333]
+]]
+
+function test(script)
+    -- get the commands for this function to execute
+    local commands = table.remove(script, 1)
+
+    -- execute each command
+    for i, cmd in ipairs(commands) do
+        local action = cmd[1]
+        if action == "set" then
+            contract.event(name:get() .. ".set", cmd[2], cmd[3])
+            values[cmd[2]] = cmd[3]
+        elseif action == "pcall" then
+            local to_call = cmd[2]
+            local amount = cmd[3]
+            if to_call == name:get() then
+                pcall(test, script)
+            elseif amount ~= nil then
+                contract.event(name:get() .. " send " .. to_call, amount)
+                local address = resolve(to_call)
+                success, ret = pcall(function()
+                    return contract.call.value(amount)(address, "test", script)
+                end)
+            else
+                local address = resolve(to_call)
+                success, ret = pcall(contract.call, address, "test", script)
+            end
+            --contract.event("result", success, ret)
+        elseif action == "send" then
+            local to = cmd[2]
+            contract.event(name:get() .. " send " .. to, amount)
+            contract.send(resolve(to), cmd[3])
+        elseif action == "deploy" then
+            local code_or_address = resolve_deploy(cmd[2])
+            pcall(contract.deploy, code_or_address, unpack(cmd,3))
+        elseif action == "deploy.send" then
+            contract.event(name:get() .. ".deploy.send", amount)
+            local code_or_address = resolve_deploy(cmd[3])
+            pcall(function()
+                contract.deploy.value(cmd[2])(code_or_address, unpack(cmd,4))
+            end)
+        elseif action == "db.set" then
+            db.exec("update config set value = " .. cmd[2])
+        elseif action == "db.insert" then
+            db.exec("insert into products (name,price) values ('another',1234.56)")
+        elseif action == "fail" then
+            assert(1 == 0, "failed")
+        end
+    end
+
+end
+
+function set(key, value)
+    values[key] = value
+end
+
+function get(key)
+    return values[key]
+end
+
+function db_reset()
+    db.exec("update config set value = 0")
+    db.exec("delete from products where id > 1")
+end
+
+function db_get()
+    local rs = db.query("select value from config")
+    if rs:next() then
+        return rs:get()
+    else
+        return "error"
+    end
+end
+
+function db_count()
+    local rs = db.query("select count(*) from products")
+    if rs:next() then
+        return rs:get()
+    else
+        return "error"
+    end
+end
+
+function default()
+    -- only receive
+end
+
+function send_back(to)
+    contract.send(resolve(to), contract.balance())
+end
+
+abi.payable(constructor, test, default)
+abi.register(set, send_back, db_reset)
+abi.register_view(get, db_get, db_count)
diff --git a/contract/vm_dummy/test_files/feature_pcall_rollback_4c.lua b/contract/vm_dummy/test_files/feature_pcall_rollback_4c.lua
new file mode 100644
index 000000000..4e0ed37f2
--- /dev/null
+++ b/contract/vm_dummy/test_files/feature_pcall_rollback_4c.lua
@@ -0,0 +1,132 @@
+state.var {
+    resolver = state.value(),
+    name = state.value(),
+    values = state.map()
+}
+
+function constructor(resolver_address, contract_name)
+    -- initialize state variables
+    resolver:set(resolver_address)
+    name:set(contract_name)
+    -- initialize db
+    db.exec("create table config (value integer primary key) without rowid")
+    db.exec("insert into config values (0)")
+    db.exec([[create table products (
+        id integer primary key,
+        name text not null,
+        price real)
+    ]])
+    db.exec("insert into products (name,price) values ('first', 1234.56)")
+end
+
+function resolve(name)
+    return contract.call(resolver:get(), "resolve", name)
+end
+
+function error_handler(err_msg)
+    return "oh no! " .. err_msg
+end
+
+--[[
+  ['set','x',111],
+  ['pcall','A']
+],[
+  ['set','x',222],
+  ['pcall','A'],
+  ['fail']
+],[
+  ['set','x',333]
+]]
+
+function test(script)
+    -- get the commands for this function to execute
+    local commands = table.remove(script, 1)
+
+    -- execute each command
+    for i, cmd in ipairs(commands) do
+        local action = cmd[1]
+        if action == "set" then
+            contract.event(name:get() .. ".set", cmd[2], cmd[3])
+            values[cmd[2]] = cmd[3]
+        elseif action == "pcall" then
+            local to_call = cmd[2]
+            local amount = cmd[3]
+            if to_call == name:get() then
+                xpcall(test, error_handler, script)
+            elseif amount ~= nil then
+                contract.event(name:get() .. " send " .. to_call, amount)
+                local address = resolve(to_call)
+                success, ret = xpcall(function()
+                    return contract.call.value(amount)(address, "test", script)
+                end, error_handler)
+            else
+                local address = resolve(to_call)
+                success, ret = xpcall(contract.call, error_handler, address, "test", script)
+            end
+            --contract.event("result", success, ret)
+        elseif action == "send" then
+            local to = cmd[2]
+            contract.event(name:get() .. " send " .. to, amount)
+            contract.send(resolve(to), cmd[3])
+        elseif action == "deploy" then
+            local code_or_address = resolve_deploy(cmd[2])
+            xpcall(contract.deploy, error_handler, code_or_address, unpack(cmd,3))
+        elseif action == "deploy.send" then
+            contract.event(name:get() .. ".deploy.send", amount)
+            local code_or_address = resolve_deploy(cmd[3])
+            xpcall(function()
+                contract.deploy.value(cmd[2])(code_or_address, unpack(cmd,4))
+            end, error_handler)
+        elseif action == "db.set" then
+            db.exec("update config set value = " .. cmd[2])
+        elseif action == "db.insert" then
+            db.exec("insert into products (name,price) values ('another',1234.56)")
+        elseif action == "fail" then
+            assert(1 == 0, "failed")
+        end
+    end
+
+end
+
+function set(key, value)
+    values[key] = value
+end
+
+function get(key)
+    return values[key]
+end
+
+function db_reset()
+    db.exec("update config set value = 0")
+    db.exec("delete from products where id > 1")
+end
+
+function db_get()
+    local rs = db.query("select value from config")
+    if rs:next() then
+        return rs:get()
+    else
+        return "error"
+    end
+end
+
+function db_count()
+    local rs = db.query("select count(*) from products")
+    if rs:next() then
+        return rs:get()
+    else
+        return "error"
+    end
+end
+
+function default()
+    -- only receive
+end
+
+function send_back(to)
+    contract.send(resolve(to), contract.balance())
+end
+
+abi.payable(constructor, test, default)
+abi.register(set, send_back, db_reset)
+abi.register_view(get, db_get, db_count)
diff --git a/contract/vm_dummy/test_files/gas_bf.lua b/contract/vm_dummy/test_files/gas_bf_v2.lua
similarity index 100%
rename from contract/vm_dummy/test_files/gas_bf.lua
rename to contract/vm_dummy/test_files/gas_bf_v2.lua
diff --git a/contract/vm_dummy/test_files/gas_bf_v4.lua b/contract/vm_dummy/test_files/gas_bf_v4.lua
new file mode 100644
index 000000000..16deb499e
--- /dev/null
+++ b/contract/vm_dummy/test_files/gas_bf_v4.lua
@@ -0,0 +1,330 @@
+loop_cnt = 1000
+arr = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 }
+tbl = { name = "user2", year = 1981, age = 41 }
+long_str =
+[[Looks for the first match of pattern in the string s. If it finds a match, then find returns the indices of s where this occurrence starts and ends; otherwise, it returns nil. A third, optional numerical argument init specifies where to start the search; its default value is 1 and can be negative. A value of true as a fourth, optional argument plain turns off the pattern matching facilities, so the function does a plain "find substring" operation, with no characters in pattern being considered "magic". Note that if plain is given, then init must be given as well.
+]]
+long_str1 =
+[[Looks for the first match of pattern in the string s. If it finds a match, then find returns the indices of s where this occurrence starts and ends; otherwise, it returns nil. A third, optional numerical argument init specifies where to start the search; its default value is 1 and can be negative. A value of true as a fourth, optional argument plain turns off the pattern matching facilities, so the function does a plain "find substring" operation, with no characters in pattern being considered "magic". Note that if plain is given, then init must be given as werr.
+]]
+
+function copy_arr(arr)
+    local a = {}
+    for i, v in ipairs(arr) do
+        a[i] = v
+    end
+    return a
+end
+
+function m1k(fn, ...)
+    for i = 1, loop_cnt do
+        fn(...)
+    end
+end
+
+function basic_fns()
+    m1k(assert, true, 'true')
+    m1k(assert, 1 == 1, 'true')
+    m1k(assert, 1 ~= 2, 'true')
+    m1k(assert, long_str == long_str, 'true')
+    m1k(assert, long_str ~= long_str1, 'true')
+    local x = { value = 5 }
+    m1k(ipairs, arr)
+    m1k(next, tbl)
+    m1k(next, tbl, "year")
+    m1k(next, tbl, "name")
+    m1k(pairs, tbl)
+    m1k(select, '#', 'a', 'b', 'c', 'd')
+    m1k(select, '#', arr)
+    m1k(select, '2', 'a', 'b', 'c', 'd')
+    m1k(select, '2', arr)
+    m1k(select, '6', arr)
+    m1k(select, '9', arr)
+    m1k(tonumber, 0x10, 16)
+    m1k(tonumber, '112134', 16)
+    m1k(tonumber, '112134')
+    m1k(tonumber, 112134)
+    m1k(tostring, 'i am a string')
+    m1k(tostring, 1)
+    m1k(tostring, 112134)
+    m1k(tostring, true)
+    m1k(tostring, nil)
+    m1k(tostring, 3.14)
+    m1k(tostring, 3.14159267)
+    m1k(tostring, x)
+    m1k(type, '112134')
+    m1k(type, 112134)
+    m1k(type, {})
+    m1k(type, type)
+    m1k(unpack, { 1, 2, 3, 4, 5 }, 2, 4)
+    m1k(unpack, arr, 2, 4)
+    m1k(unpack, { 1, 2, 3, 4, 5 })
+    m1k(unpack, arr)
+    local a = {}
+    for i = 1, 100 do
+        a[i] = i * i
+    end
+    m1k(unpack, a, 2, 4)
+    m1k(unpack, a, 10, 40)
+    m1k(unpack, a)
+end
+
+function string_fns()
+    m1k(string.byte, "hello string", 3, 7)
+    m1k(string.byte, long_str, 3, 7)
+    m1k(string.byte, long_str, 1, #long_str)
+    m1k(string.char, 72, 101, 108, 108, 111)
+    m1k(string.char, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100)
+    m1k(string.char, string.byte(long_str, 1, #long_str))
+    m1k(string.find, long_str, "nume.....")
+    m1k(string.find, long_str, "we..")
+    m1k(string.find, long_str, "wi..")
+    m1k(string.find, long_str, "pattern")
+    m1k(string.find, long_str, "pattern", 200)
+    m1k(string.find, "hello world hellow", "hello")
+    m1k(string.find, "hello world hellow", "hello", 3)
+    m1k(string.find, long_str, "head")
+    m1k(string.format, "string.format %d, %.9f, %e, %g: %s", 1, 1.999999999, 10e9, 3.14, "end of string")
+    m1k(string.format, "string.format %d, %.9f, %e", 1, 1.999999999, 10e9)
+    s = "hello world from Lua"
+    m1k(string.gmatch, s, "%a+")
+    m1k(function()
+        for w in string.gmatch(s, "%a+") do
+        end
+    end)
+    m1k(string.gsub, s, "(%w+)", "%1 %1")
+    s2 = s .. ' ' .. s
+    m1k(string.gsub, s2, "(%w+)", "%1 %1")
+    m1k(string.gsub, s, "(%w+)%s*(%w+)", "%2 %1")
+    m1k(string.len, s)
+    m1k(string.len, s2)
+    m1k(string.len, long_str)
+    m1k(string.lower, s)
+    m1k(string.lower, long_str)
+    m1k(string.match, s, "(L%w+)")
+    m1k(string.rep, s, 2)
+    m1k(string.rep, s, 4)
+    m1k(string.rep, s, 8)
+    m1k(string.rep, s, 16)
+    m1k(string.rep, long_str, 16)
+    m1k(string.reverse, s)
+    m1k(string.reverse, s2)
+    m1k(string.reverse, long_str)
+    m1k(string.sub, s, 10, 13)
+    m1k(string.sub, s, 10, -3)
+    m1k(string.sub, long_str, 10, 13)
+    m1k(string.sub, long_str, 10, -3)
+    m1k(string.upper, s)
+    m1k(string.upper, s2)
+    m1k(string.upper, long_str)
+end
+
+function table_fns1()
+    local a = copy_arr(arr)
+    local a100 = {}
+    for i = 1, 100 do
+        a100[i] = i * i
+    end
+    m1k(table.concat, a, ',')
+    m1k(table.concat, a, ',', 3, 7)
+    m1k(table.concat, a100, ',')
+    m1k(table.concat, a100, ',', 3, 7)
+    m1k(table.concat, a100, ',', 3, 32)
+    local as10 = {}
+    for i = 1, 10 do
+        as10[i] = "hello"
+    end
+    local as100 = {}
+    for i = 1, 100 do
+        as100[i] = "hello"
+    end
+    m1k(table.concat, as10, ',')
+    m1k(table.concat, as10, ',', 3, 7)
+    m1k(table.concat, as100, ',')
+    m1k(table.concat, as100, ',', 3, 7)
+    m1k(table.concat, as100, ',', 3, 32)
+    for i = 1, 10 do
+        as10[i] = "h"
+    end
+    for i = 1, 100 do
+        as100[i] = "h"
+    end
+    m1k(table.concat, as10, ',')
+    m1k(table.concat, as10, ',', 3, 7)
+    m1k(table.concat, as100, ',')
+    m1k(table.concat, as100, ',', 3, 7)
+    m1k(table.concat, as100, ',', 3, 32)
+end
+
+function table_fns2()
+    local a = copy_arr(arr)
+    local a100 = {}
+    for i = 1, 100 do
+        a100[i] = i * i
+    end
+    m1k(table.insert, a, 11)
+    for i = 1, 1000 do
+        table.remove(a)
+    end
+    m1k(table.insert, a, 5, 11)
+    for i = 1, 1000 do
+        table.remove(a, 5)
+    end
+    --m1k(table.insert, a, 5, -5)
+    --m1k(table.insert, a, 1, -5)
+    m1k(table.insert, a100, 11)
+    for i = 1, 1000 do
+        table.remove(a100)
+    end
+    m1k(table.insert, a100, 5, -5)
+    for i = 1, 1000 do
+        table.remove(a100, 5)
+    end
+    --m1k(table.insert, a100, 1, -5)
+end
+
+function table_fns3()
+    local a = copy_arr(arr)
+    local a100 = {}
+    for i = 1, 100 do
+        a100[i] = i * i
+    end
+    m1k(table.maxn, a)
+    m1k(table.maxn, a100)
+    for i = 1, 1000 do
+        table.insert(a, i)
+    end
+    m1k(table.remove, a)
+    for i = 1, 1000 do
+        table.insert(a, 5, i)
+    end
+    m1k(table.remove, a, 5)
+    for i = 1, 1000 do
+        table.insert(a100, i)
+    end
+    m1k(table.remove, a100)
+    for i = 1, 1000 do
+        table.insert(a100, 5, i)
+    end
+    m1k(table.remove, a100, 5)
+end
+
+function table_fns4()
+    local a = copy_arr(arr)
+    local a100 = {}
+    for i = 1, 100 do
+        a100[i] = i * i
+    end
+    m1k(table.sort, a)
+    m1k(table.sort, a, function(x, y) return x > y end)
+    m1k(table.sort, a100)
+    m1k(table.sort, a100, function(x, y) return x > y end)
+end
+
+function math_fns()
+    d = {}
+    for i = 1, loop_cnt do
+        d[i] = -500 + i
+    end
+    for i = 1, loop_cnt, 10 do
+        d[i] = d[i] + 0.5
+    end
+    for i = 1, loop_cnt, 13 do
+        d[i] = d[i] + 0.3
+    end
+    for i = 1, loop_cnt, 17 do
+        d[i] = d[i] + 0.7
+    end
+    f = {}
+    for i = 1, loop_cnt do
+        f[i] = -1 + i * 0.002
+    end
+    local md = function(fn, d, ...)
+        for i, v in ipairs(d) do
+            fn(v, ...)
+        end
+    end
+    md(math.abs, d)
+    md(math.ceil, d)
+    md(math.ceil, f)
+    md(math.floor, d)
+    md(math.floor, f)
+    local filter = function(l, cond)
+        r = {}
+        for i, v in ipairs(l) do
+            if cond(v) then
+                table.insert(r, v)
+            end
+        end
+        return r
+    end
+    ud = filter(d, function(v) return v >= 0 end)
+    uf = filter(f, function(v) return v >= 0 end)
+    m1k(math.max, unpack(ud))
+    m1k(math.max, unpack(d))
+    m1k(math.max, unpack(uf))
+    m1k(math.max, unpack(f))
+    m1k(math.min, unpack(ud))
+    m1k(math.min, unpack(d))
+    m1k(math.min, unpack(uf))
+    m1k(math.min, unpack(f))
+    md(math.pow, d, 2)
+    md(math.pow, d, 4)
+    md(math.pow, d, 8)
+    md(math.pow, f, 2)
+    md(math.pow, f, 4)
+    md(math.pow, f, 8)
+    md(math.pow, ud, 8.4)
+    md(math.pow, uf, 8.4)
+end
+
+function bit_fns()
+    m1k(bit.tobit, 0xffffffff)
+    m1k(bit.tobit, 0xffffffff + 1)
+    m1k(bit.tobit, 2 ^ 40 + 1234)
+    m1k(bit.tohex, 1)
+    m1k(bit.tohex, -1)
+    m1k(bit.tohex, -1, -8)
+    m1k(bit.tohex, 0x87654321, 4)
+    m1k(bit.bnot, 0)
+    m1k(bit.bnot, 0x12345678)
+    m1k(bit.bor, 1)
+    m1k(bit.bor, 1, 2)
+    m1k(bit.bor, 1, 2, 4)
+    m1k(bit.bor, 1, 2, 4, 8)
+    m1k(bit.band, 0x12345678, 0xff)
+    m1k(bit.band, 0x12345678, 0xff, 0x3f)
+    m1k(bit.band, 0x12345678, 0xff, 0x3f, 0x1f)
+    m1k(bit.bxor, 0xa5a5f0f0, 0xaa55ff00)
+    m1k(bit.bxor, 0xa5a5f0f0, 0xaa55ff00, 0x18000000)
+    m1k(bit.bxor, 0xa5a5f0f0, 0xaa55ff00, 0x18000000, 0x00000033)
+    m1k(bit.lshift, 1, 0)
+    m1k(bit.lshift, 1, 8)
+    m1k(bit.lshift, 1, 40)
+    m1k(bit.rshift, 256, 0)
+    m1k(bit.rshift, 256, 8)
+    m1k(bit.rshift, 256, 40)
+    m1k(bit.arshift, 0x87654321, 0)
+    m1k(bit.arshift, 0x87654321, 12)
+    m1k(bit.arshift, 0x87654321, 40)
+    m1k(bit.rol, 0x12345678, 0)
+    m1k(bit.rol, 0x12345678, 12)
+    m1k(bit.rol, 0x12345678, 40)
+    m1k(bit.ror, 0x12345678, 0)
+    m1k(bit.ror, 0x12345678, 12)
+    m1k(bit.ror, 0x12345678, 40)
+    m1k(bit.bswap, 0x12345678)
+end
+
+function main()
+    basic_fns()
+    string_fns()
+    table_fns1()
+    table_fns2()
+    table_fns3()
+    table_fns4()
+    math_fns()
+    bit_fns()
+end
+
+abi.register(main)
diff --git a/contract/vm_dummy/test_files/pcall-events-0.lua b/contract/vm_dummy/test_files/pcall-events-0.lua
new file mode 100644
index 000000000..8979716e3
--- /dev/null
+++ b/contract/vm_dummy/test_files/pcall-events-0.lua
@@ -0,0 +1,38 @@
+state.var {
+  parent = state.value()
+}
+
+function constructor(address)
+  parent:set(address)
+end
+
+function error_handler(err_msg)
+  return "oh no! " .. err_msg
+end
+
+function test_pcall()
+  local s, r = pcall(do_work, parent:get(), "pcall")
+  assert(s == false, "call not failed")
+  return r
+end
+
+function test_xpcall()
+  local s, r = xpcall(do_work, error_handler, parent:get(), "xpcall")
+  assert(s == false, "call not failed")
+  return r
+end
+
+function test_contract_pcall()
+  local s, r = contract.pcall(do_work, parent:get(), "contract.pcall")
+  assert(s == false, "call not failed")
+  return r
+end
+
+function do_work(contract_address, caller)
+  contract.event("inside " .. caller .. " before")
+  local r = contract.call(contract_address, "call_me")
+  contract.event("inside " .. caller .. " after")
+  return r
+end
+
+abi.register(test_pcall, test_xpcall, test_contract_pcall)
diff --git a/contract/vm_dummy/test_files/pcall-events-1.lua b/contract/vm_dummy/test_files/pcall-events-1.lua
new file mode 100644
index 000000000..e1096c7b4
--- /dev/null
+++ b/contract/vm_dummy/test_files/pcall-events-1.lua
@@ -0,0 +1,44 @@
+state.var {
+  parent = state.value()
+}
+
+function constructor(address)
+  parent:set(address)
+end
+
+function error_handler(err_msg)
+  return "oh no! " .. err_msg
+end
+
+function test_pcall()
+  contract.event("before pcall")
+  local s, r = pcall(do_work, parent:get(), "pcall")
+  contract.event("after pcall")
+  assert(s == false, "call not failed")
+  return r
+end
+
+function test_xpcall()
+  contract.event("before xpcall")
+  local s, r = xpcall(do_work, error_handler, parent:get(), "xpcall")
+  contract.event("after xpcall")
+  assert(s == false, "call not failed")
+  return r
+end
+
+function test_contract_pcall()
+  contract.event("before contract.pcall")
+  local s, r = contract.pcall(do_work, parent:get(), "contract.pcall")
+  contract.event("after contract.pcall")
+  assert(s == false, "call not failed")
+  return r
+end
+
+function do_work(contract_address, caller)
+  contract.event("inside " .. caller .. " before")
+  local r = contract.call(contract_address, "call_me")
+  contract.event("inside " .. caller .. " after")
+  return r
+end
+
+abi.register(test_pcall, test_xpcall, test_contract_pcall)
diff --git a/contract/vm_dummy/test_files/pcall-events-2.lua b/contract/vm_dummy/test_files/pcall-events-2.lua
new file mode 100644
index 000000000..03a6b793b
--- /dev/null
+++ b/contract/vm_dummy/test_files/pcall-events-2.lua
@@ -0,0 +1,19 @@
+state.var {
+  parent = state.value()
+}
+
+function constructor(address)
+  parent:set(address)
+end
+
+function call_me()
+  contract.event("contract-2 before call")
+  -- call contract-3
+  local result = contract.call(parent:get(), "call_me")
+  contract.event("contract-2 after call")
+  -- raises an error:
+  assert(1 == 0)
+  contract.event("contract-2 returning")
+end
+
+abi.register(call_me)
diff --git a/contract/vm_dummy/test_files/pcall-events-3.lua b/contract/vm_dummy/test_files/pcall-events-3.lua
new file mode 100644
index 000000000..53de91685
--- /dev/null
+++ b/contract/vm_dummy/test_files/pcall-events-3.lua
@@ -0,0 +1,5 @@
+function call_me()
+  contract.event("contract-3")
+end
+
+abi.register(call_me)
diff --git a/contract/vm_dummy/test_files/resolver.lua b/contract/vm_dummy/test_files/resolver.lua
index 55f694b45..f70b192a6 100644
--- a/contract/vm_dummy/test_files/resolver.lua
+++ b/contract/vm_dummy/test_files/resolver.lua
@@ -1,13 +1,13 @@
 state.var {
-    xx = state.map()
+    registry = state.map()
 }
 
 function set(name, address)
-    xx[name] = address
+    registry[name] = address
 end
 
 function resolve(name)
-    return xx[name]
+    return registry[name]
 end
 
 abi.register(set)
diff --git a/contract/vm_dummy/test_files/type_bignum.lua b/contract/vm_dummy/test_files/type_bignum.lua
index 280392b9e..a6c1d9647 100644
--- a/contract/vm_dummy/test_files/type_bignum.lua
+++ b/contract/vm_dummy/test_files/type_bignum.lua
@@ -43,8 +43,24 @@ function calcBignum()
     bg6 = bignum.number(n1)
     assert(bg3 == bg4 and bg4 == bg5)
     bg5 = bg1 - bg3
-    assert(bignum.isneg(bg5) and bg5 == bignum.neg(bg1))
     system.print(bg3, bg5, bg6)
+    --if system.version() >= 4 then
+    if type(bignum.ispositive) == "function" then
+      -- ispositive() and isnegative() and iszero()
+      assert(bignum.isnegative(bg5) and bg5 == bignum.neg(bg1))
+      assert(bignum.ispositive(bg1) and bignum.ispositive(bg3))
+      assert(not bignum.ispositive(bg5) and not bignum.iszero(bg5))
+      assert(not bignum.isnegative(bg1) and not bignum.iszero(bg1))
+      -- ispositive() and isneg() and iszero()
+      assert(bignum.isneg(bg5) and bg5 == bignum.neg(bg1))
+      assert(bignum.ispositive(bg1) and bignum.ispositive(bg3))
+      assert(not bignum.ispositive(bg5) and not bignum.iszero(bg5))
+      assert(not bignum.isneg(bg1) and not bignum.iszero(bg1))
+    else
+      -- isneg() and iszero()
+      assert(bignum.isneg(bg5) and bg5 == bignum.neg(bg1))
+      assert(not bignum.isneg(bg1) and not bignum.iszero(bg1))
+    end
     bg6 = bignum.number(1)
     assert(bg6 > bg5)
     a = bignum.number(2)
diff --git a/contract/vm_dummy/test_files/type_sparsetable.lua b/contract/vm_dummy/test_files/type_sparsetable.lua
index bc6f9173b..b0c404cab 100644
--- a/contract/vm_dummy/test_files/type_sparsetable.lua
+++ b/contract/vm_dummy/test_files/type_sparsetable.lua
@@ -1,12 +1,10 @@
-function is_table_equal(t1, t2, ignore_mt)
+function is_table_equal(t1, t2)
     local ty1 = type(t1)
     local ty2 = type(t2)
     if ty1 ~= ty2 then return false end
     -- non-table types can be directly compared
     if ty1 ~= 'table' and ty2 ~= 'table' then return t1 == t2 end
-    -- as well as tables which have the metamethod __eq
-    local mt = getmetatable(t1)
-    if not ignore_mt and mt and mt.__eq then return t1 == t2 end
+    -- if table, compare each key-value pair
     for k1, v1 in pairs(t1) do
         local v2 = t2[k1]
         if v2 == nil or not is_table_equal(v1, v2) then return false end
@@ -23,7 +21,7 @@ function r()
     t[10000] = "1234"
     system.setItem("k", t)
     k = system.getItem("k")
-    if is_table_equal(t, k, false) then
+    if is_table_equal(t, k) then
         return 1
     end
     return 0
diff --git a/contract/vm_dummy/vm_dummy.go b/contract/vm_dummy/vm_dummy.go
index 8924e882e..b867941ad 100644
--- a/contract/vm_dummy/vm_dummy.go
+++ b/contract/vm_dummy/vm_dummy.go
@@ -20,6 +20,7 @@ import (
 	"github.com/aergoio/aergo/v2/contract"
 	"github.com/aergoio/aergo/v2/contract/system"
 	"github.com/aergoio/aergo/v2/fee"
+	"github.com/aergoio/aergo/v2/internal/enc/hex"
 	"github.com/aergoio/aergo/v2/internal/enc/base58"
 	"github.com/aergoio/aergo/v2/state"
 	"github.com/aergoio/aergo/v2/state/statedb"
@@ -359,6 +360,7 @@ type luaTxContract interface {
 	amount() *big.Int
 	payload() []byte
 	isFeeDelegate() bool
+	isMultiCall() bool
 }
 
 type luaTxContractCommon struct {
@@ -368,6 +370,7 @@ type luaTxContractCommon struct {
 	_payload    []byte
 	txId        uint64
 	feeDelegate bool
+	multiCall   bool
 }
 
 func (l *luaTxContractCommon) Hash() []byte {
@@ -394,6 +397,10 @@ func (l *luaTxContractCommon) isFeeDelegate() bool {
 	return l.feeDelegate
 }
 
+func (l *luaTxContractCommon) isMultiCall() bool {
+	return l.multiCall
+}
+
 func hash(id uint64) []byte {
 	h := sha256.New()
 	h.Write([]byte(strconv.FormatUint(id, 10)))
@@ -403,6 +410,7 @@ func hash(id uint64) []byte {
 
 type luaTxDeploy struct {
 	luaTxContractCommon
+	isCompiled bool
 	cErr error
 }
 
@@ -412,6 +420,35 @@ func NewLuaTxDeploy(sender, recipient string, amount uint64, code string) *luaTx
 	return NewLuaTxDeployBig(sender, recipient, types.NewAmount(amount, types.Aer), code)
 }
 
+func NewLuaTxDeployBig(sender, recipient string, amount *big.Int, code string) *luaTxDeploy {
+	var payload []byte
+	var isCompiled bool
+	var err error
+
+	if hex.IsHexString(code) {
+		payload, err = hex.Decode(code)
+		if err != nil {
+			return &luaTxDeploy{cErr: err}
+		}
+		isCompiled = true
+	} else {
+		payload = util.NewLuaCodePayload([]byte(code), nil)
+		isCompiled = false
+	}
+
+	return &luaTxDeploy{
+		luaTxContractCommon: luaTxContractCommon{
+			_sender:    contract.StrHash(sender),
+			_recipient: contract.StrHash(recipient),
+			_payload:   payload,
+			_amount:    amount,
+			txId:       newTxId(),
+		},
+		isCompiled: isCompiled,
+		cErr: nil,
+	}
+}
+
 /*
 	func contract.StrHash(d string) []byte {
 		// using real address
@@ -440,7 +477,7 @@ func (l *luaTxDeploy) okMsg() string {
 }
 
 func (l *luaTxDeploy) Constructor(args string) *luaTxDeploy {
-	if len(args) == 0 || strings.Compare(args, "[]") == 0 || l.cErr != nil {
+	if len(args) == 0 || strings.Compare(args, "[]") == 0 || l.isCompiled || l.cErr != nil {
 		return l
 	}
 	l._payload = util.NewLuaCodePayload(util.LuaCodePayload(l._payload).Code(), []byte(args))
@@ -457,15 +494,27 @@ func contractFrame(l luaTxContract, bs *state.BlockState, cdb contract.ChainAcce
 	}
 
 	contractId := types.ToAccountID(l.recipient())
-	contractState, err := state.GetAccountState(l.recipient(), bs.StateDB)
+
+	var contractState *state.AccountState
+	if l.isMultiCall() {
+		contractState = creatorState
+	} else {
+		contractState, err = state.GetAccountState(l.recipient(), bs.StateDB)
+	}
 	if err != nil {
 		return err
 	}
 
-	eContractState, err := statedb.OpenContractState(l.recipient(), contractState.State(), bs.StateDB)
+	var eContractState *statedb.ContractState
+	if l.isMultiCall() {
+		eContractState = statedb.GetMultiCallState(l.sender(), creatorState.State())
+	} else {
+		eContractState, err = statedb.OpenContractState(l.recipient(), contractState.State(), bs.StateDB)
+	}
 	if err != nil {
 		return err
 	}
+
 	usedFee := fee.TxBaseFee(2, types.NewAmount(1, types.Aer), len(l.payload()))
 
 	if l.isFeeDelegate() {
@@ -484,12 +533,14 @@ func contractFrame(l luaTxContract, bs *state.BlockState, cdb contract.ChainAcce
 			return types.ErrNotAllowedFeeDelegation
 		}
 	}
+
 	err = state.SendBalance(creatorState, contractState, l.amount())
 	if err != nil {
 		return err
 	}
 
 	rv, events, cFee, err := run(creatorState, contractState, contractId, eContractState)
+
 	if cFee != nil {
 		usedFee.Add(usedFee, cFee)
 	}
@@ -498,6 +549,7 @@ func contractFrame(l luaTxContract, bs *state.BlockState, cdb contract.ChainAcce
 		status = "ERROR"
 		rv = err.Error()
 	}
+
 	r := types.NewReceipt(l.recipient(), status, rv)
 	r.TxHash = l.Hash()
 	r.GasUsed = usedFee.Uint64()
@@ -524,21 +576,34 @@ func contractFrame(l luaTxContract, bs *state.BlockState, cdb contract.ChainAcce
 		}
 		creatorState.SubBalance(usedFee)
 	}
+
 	bs.PutState(creatorId, creatorState.State())
-	bs.PutState(contractId, contractState.State())
-	return nil
+	if contractId != creatorId {
+		bs.PutState(contractId, contractState.State())
+	}
 
+	return nil
 }
 
 func (l *luaTxDeploy) run(execCtx context.Context, bs *state.BlockState, bc *DummyChain, bi *types.BlockHeaderInfo, receiptTx db.Transaction) error {
 	if l.cErr != nil {
 		return l.cErr
 	}
+	if bc.HardforkVersion < 4 && !l.isCompiled {
+		// compile the plain code to bytecode
+		payload := util.LuaCodePayload(l._payload)
+		code := string(payload.Code())
+		byteCode, err := contract.Compile(code, nil)
+		if err != nil {
+			return err
+		}
+		l._payload = util.NewLuaCodePayload(byteCode, payload.Args())
+	}
 	return contractFrame(l, bs, bc, receiptTx,
 		func(sender, contractV *state.AccountState, contractId types.AccountID, eContractState *statedb.ContractState) (string, []*types.Event, *big.Int, error) {
 			contractV.State().SqlRecoveryPoint = 1
 
-			ctx := contract.NewVmContext(execCtx, bs, nil, sender, contractV, eContractState, sender.ID(), l.Hash(), bi, "", true, false, contractV.State().SqlRecoveryPoint, contract.BlockFactory, l.amount(), math.MaxUint64, false)
+			ctx := contract.NewVmContext(execCtx, bs, nil, sender, contractV, eContractState, sender.ID(), l.Hash(), bi, "", true, false, contractV.State().SqlRecoveryPoint, contract.BlockFactory, l.amount(), math.MaxUint64, false, false)
 
 			rv, events, ctrFee, err := contract.Create(eContractState, l.payload(), l.recipient(), ctx)
 			if err != nil {
@@ -589,6 +654,19 @@ func NewLuaTxCallFeeDelegate(sender, recipient string, amount uint64, payload st
 	}
 }
 
+func NewLuaTxMultiCall(sender, payload string) *luaTxCall {
+	return &luaTxCall{
+		luaTxContractCommon: luaTxContractCommon{
+			_sender:     contract.StrHash(sender),
+			_recipient:  contract.StrHash(""),
+			_amount:     new(big.Int).SetUint64(0),
+			_payload:    []byte(payload),
+			txId:        newTxId(),
+			multiCall:   true,
+		},
+	}
+}
+
 func (l *luaTxCall) Fail(expectedErr string) *luaTxCall {
 	l.expectedErr = expectedErr
 	return l
@@ -597,16 +675,21 @@ func (l *luaTxCall) Fail(expectedErr string) *luaTxCall {
 func (l *luaTxCall) run(execCtx context.Context, bs *state.BlockState, bc *DummyChain, bi *types.BlockHeaderInfo, receiptTx db.Transaction) error {
 	err := contractFrame(l, bs, bc, receiptTx,
 		func(sender, contractV *state.AccountState, contractId types.AccountID, eContractState *statedb.ContractState) (string, []*types.Event, *big.Int, error) {
-			ctx := contract.NewVmContext(execCtx, bs, bc, sender, contractV, eContractState, sender.ID(), l.Hash(), bi, "", true, false, contractV.State().SqlRecoveryPoint, contract.BlockFactory, l.amount(), math.MaxUint64, l.feeDelegate)
+
+			ctx := contract.NewVmContext(execCtx, bs, bc, sender, contractV, eContractState, sender.ID(), l.Hash(), bi, "", true, false, contractV.State().SqlRecoveryPoint, contract.BlockFactory, l.amount(), math.MaxUint64, l.feeDelegate, l.multiCall)
 
 			rv, events, ctrFee, err := contract.Call(eContractState, l.payload(), l.recipient(), ctx)
 			if err != nil {
 				return "", nil, ctrFee, err
 			}
-			err = statedb.StageContractState(eContractState, bs.StateDB)
-			if err != nil {
-				return "", nil, ctrFee, err
+
+			if !ctx.IsMultiCall() {
+				err = statedb.StageContractState(eContractState, bs.StateDB)
+				if err != nil {
+					return "", nil, ctrFee, err
+				}
 			}
+
 			return rv, events, ctrFee, nil
 		},
 	)
diff --git a/contract/vm_dummy/vm_dummy_dbg.go b/contract/vm_dummy/vm_dummy_dbg.go
deleted file mode 100644
index 52892417d..000000000
--- a/contract/vm_dummy/vm_dummy_dbg.go
+++ /dev/null
@@ -1,36 +0,0 @@
-//go:build Debug
-// +build Debug
-
-package vm_dummy
-
-import (
-	"math/big"
-
-	luacUtil "github.com/aergoio/aergo/v2/cmd/aergoluac/util"
-	"github.com/aergoio/aergo/v2/contract"
-)
-
-func getCompiledABI(code string) ([]byte, error) {
-	byteCodeAbi, err := contract.Compile(code, nil)
-	if err != nil {
-		return nil, err
-	}
-	return byteCodeAbi.ABI(), nil
-}
-
-func NewLuaTxDeployBig(sender, recipient string, amount *big.Int, code string) *luaTxDeploy {
-	abi, err := getCompiledABI(code)
-	if err != nil {
-		return &luaTxDeploy{cErr: err}
-	}
-	return &luaTxDeploy{
-		luaTxContractCommon: luaTxContractCommon{
-			_sender:    contract.StrHash(sender),
-			_recipient: contract.StrHash(recipient),
-			_payload:   luacUtil.NewLuaCodePayload(luacUtil.NewLuaCode([]byte(code), abi), nil),
-			_amount:    amount,
-			txId:       newTxId(),
-		},
-		cErr: nil,
-	}
-}
diff --git a/contract/vm_dummy/vm_dummy_pub_test.go b/contract/vm_dummy/vm_dummy_pub_test.go
index 4f41f0395..69416ef87 100644
--- a/contract/vm_dummy/vm_dummy_pub_test.go
+++ b/contract/vm_dummy/vm_dummy_pub_test.go
@@ -45,7 +45,8 @@ func TestContractSendF(t *testing.T) {
 		require.NoErrorf(t, err, "failed to connect new block")
 
 		r := bc.GetReceipt(tx.Hash())
-		assert.Equalf(t, int64(105087), int64(r.GetGasUsed()), "gas used not equal")
+		expectedGas := map[int32]int64{3: 105087, 4: 105087}[version]
+		assert.Equalf(t, expectedGas, int64(r.GetGasUsed()), "gas used not equal")
 
 		state, err := bc.GetAccountState("test2")
 		assert.Equalf(t, int64(2), state.GetBalanceBigInt().Int64(), "balance state not equal")
@@ -55,7 +56,8 @@ func TestContractSendF(t *testing.T) {
 		require.NoErrorf(t, err, "failed to connect new block")
 
 		r = bc.GetReceipt(tx.Hash())
-		assert.Equalf(t, int64(105179), int64(r.GetGasUsed()), "gas used not equal")
+		expectedGas = map[int32]int64{3: 105179, 4: 105755}[version]
+		assert.Equalf(t, expectedGas, int64(r.GetGasUsed()), "gas used not equal")
 
 		state, err = bc.GetAccountState("test2")
 		assert.Equalf(t, int64(6), state.GetBalanceBigInt().Int64(), "balance state not equal")
@@ -78,6 +80,7 @@ func TestGasPerFunction(t *testing.T) {
 		// deploy 2 copies of the contract
 		NewLuaTxDeploy("user", "contract_v2", 0, code),
 		NewLuaTxDeploy("user", "contract_v3", 0, code),
+		NewLuaTxDeploy("user", "contract_v4", 0, code),
 	)
 	assert.NoError(t, err)
 
@@ -85,6 +88,7 @@ func TestGasPerFunction(t *testing.T) {
 	err = bc.ConnectBlock(
 		NewLuaTxCall("user", "contract_v2", uint64(10e18), `{"Name":"default"}`),
 		NewLuaTxCall("user", "contract_v3", uint64(10e18), `{"Name":"default"}`),
+		NewLuaTxCall("user", "contract_v4", uint64(10e18), `{"Name":"default"}`),
 	)
 	assert.NoError(t, err, "sending funds to contracts")
 
@@ -342,6 +346,123 @@ func TestGasPerFunction(t *testing.T) {
 		{"contract.event", "", 0, 153263},
 	}
 
+	tests_v4 := []struct {
+		funcName   string
+		funcArgs   string
+		amount     int64
+		expectedGas int64
+	}{
+		{"comp_ops", "", 0, 143204},
+		{"unarytest_n_copy_ops", "", 0, 143117},
+		{"unary_ops", "", 0, 143552},
+		{"binary_ops", "", 0, 145075},
+		{"constant_ops", "", 0, 143032},
+		{"upvalue_n_func_ops", "", 0, 144347},
+		{"table_ops", "", 0, 144482},
+		{"call_n_vararg_ops", "", 0, 145001},
+		{"return_ops", "", 0, 143037},
+		{"loop_n_branche_ops", "", 0, 146372},
+		{"function_header_ops", "", 0, 143016},
+
+		{"assert", "", 0, 143146},
+		{"ipairs", "", 0, 143039},
+		{"pairs", "", 0, 143039},
+		{"next", "", 0, 143087},
+		{"select", "", 0, 143166},
+		{"tonumber", "", 0, 143186},
+		{"tostring", "", 0, 143457},
+		{"type", "", 0, 143285},
+		{"unpack", "", 0, 150745},
+		{"pcall", "", 0, 147905},
+		{"xpcall", "", 0, 148177},
+
+		{"string.byte", "", 0, 157040},
+		{"string.char", "", 0, 160397},
+		{"string.find", "", 0, 147808},
+		{"string.format", "", 0, 143764},
+		{"string.gmatch", "", 0, 143799},
+		{"string.gsub", "", 0, 144943},
+		{"string.len", "", 0, 143097},
+		{"string.lower", "", 0, 148351},
+		{"string.match", "", 0, 143313},
+		{"string.rep", "", 0, 221928},
+		{"string.reverse", "", 0, 148351},
+		{"string.sub", "", 0, 145205},
+		{"string.upper", "", 0, 148351},
+
+		{"table.concat", "", 0, 163868},
+		{"table.insert", "", 0, 297254},
+		{"table.remove", "", 0, 156664},
+		{"table.maxn", "", 0, 147962},
+		{"table.sort", "", 0, 159866},
+
+		{"math.abs", "", 0, 143184},
+		{"math.ceil", "", 0, 143184},
+		{"math.floor", "", 0, 143184},
+		{"math.max", "", 0, 143556},
+		{"math.min", "", 0, 143556},
+		{"math.pow", "", 0, 143544},
+
+		{"bit.tobit", "", 0, 143079},
+		{"bit.tohex", "", 0, 143590},
+		{"bit.bnot", "", 0, 143056},
+		{"bit.bor", "", 0, 143130},
+		{"bit.band", "", 0, 143106},
+		{"bit.xor", "", 0, 143106},
+		{"bit.lshift", "", 0, 143079},
+		{"bit.rshift", "", 0, 143079},
+		{"bit.ashift", "", 0, 143079},
+		{"bit.rol", "", 0, 143079},
+		{"bit.ror", "", 0, 143079},
+		{"bit.bswap", "", 0, 143036},
+
+		{"bignum.number", "", 0, 144912},
+		{"bignum.isneg", "", 0, 145144},
+		{"bignum.iszero", "", 0, 145144},
+		{"bignum.tonumber", "", 0, 145464},
+		{"bignum.tostring", "", 0, 145755},
+		{"bignum.neg", "", 0, 147208},
+		{"bignum.sqrt", "", 0, 148084},
+		{"bignum.compare", "", 0, 145409},
+		{"bignum.add", "", 0, 146750},
+		{"bignum.sub", "", 0, 146695},
+		{"bignum.mul", "", 0, 149073},
+		{"bignum.div", "", 0, 148563},
+		{"bignum.mod", "", 0, 150498},
+		{"bignum.pow", "", 0, 149492},
+		{"bignum.divmod", "", 0, 154798},
+		{"bignum.powmod", "", 0, 154164},
+		{"bignum.operators", "", 0, 147416},
+
+		{"json", "", 0, 151357},
+
+		{"crypto.sha256", "", 0, 146183},
+		{"crypto.ecverify", "", 0, 148036},
+
+		{"state.set", "", 0, 145915},
+		{"state.get", "", 0, 145720},
+		{"state.delete", "", 0, 145727},
+
+		{"system.getSender", "", 0, 144261},
+		{"system.getBlockheight", "", 0, 143330},
+		//{"system.getTxhash", "", 0, 143734},
+		{"system.getTimestamp", "", 0, 143330},
+		{"system.getContractID", "", 0, 144261},
+		{"system.setItem", "", 0, 144194},
+		{"system.getItem", "", 0, 144503},
+		{"system.getAmount", "", 0, 143408},
+		{"system.getCreator", "", 0, 143761},
+		{"system.getOrigin", "", 0, 144261},
+
+		{"contract.send", "", 0, 144321},
+		{"contract.balance", "", 0, 144333},
+		{"contract.deploy", "", 0, 168092},
+		{"contract.call", "", 0, 159738},
+		{"contract.pcall", "", 0, 160659},
+		{"contract.delegatecall", "", 0, 153795},
+		{"contract.event", "", 0, 163452},
+	}
+
 	// set the hard fork version
 	bc.HardforkVersion = 2
 
@@ -402,6 +523,36 @@ func TestGasPerFunction(t *testing.T) {
 		//fmt.Printf("add_test \"%s\" %d\n", funcName, usedGas)
 	}
 
+	// set the hard fork version
+	bc.HardforkVersion = 4
+
+	// iterate over the tests
+	for _, test := range tests_v4 {
+		funcName := test.funcName
+		funcArgs := test.funcArgs
+		amount := test.amount
+		expectedGas := test.expectedGas
+
+		var payload string
+		if len(funcArgs) == 0 {
+			payload = fmt.Sprintf(`{"Name":"run_test", "Args":["%s"]}`, funcName)
+		} else {
+			payload = fmt.Sprintf(`{"Name":"run_test", "Args":["%s",%s]}`, funcName, funcArgs)
+		}
+		tx := NewLuaTxCall("user", "contract_v4", uint64(amount), payload)
+		err = bc.ConnectBlock(tx)
+		assert.NoError(t, err, "while executing %s", funcName)
+
+		usedGas := bc.GetReceipt(tx.Hash()).GetGasUsed()
+		assert.Equal(t, expectedGas, int64(usedGas), "wrong used gas for %s", funcName)
+
+		// print the function name and the used gas
+		// for this test:
+		//fmt.Printf("		{\"%s\", \"\", 0, %d},\n", funcName, usedGas)
+		// for integration tests (tests/test-gas-per-function-v4.sh):
+		//fmt.Printf("add_test \"%s\" %d\n", funcName, usedGas)
+	}
+
 }
 
 func TestGasHello(t *testing.T) {
@@ -442,6 +593,9 @@ func TestGasDeploy(t *testing.T) {
 
 	err = expectGas(code, 0, `"testPcall"`, ``, 117861, SetHardForkVersion(3))
 	assert.NoError(t, err)
+
+	err = expectGas(code, 0, `"testPcall"`, ``, 118350, SetHardForkVersion(4))
+	assert.NoError(t, err)
 }
 
 func TestGasOp(t *testing.T) {
@@ -458,21 +612,28 @@ func TestGasOp(t *testing.T) {
 
 	err = expectGas(string(code), 0, `"main"`, ``, 117610, SetHardForkVersion(3))
 	assert.NoError(t, err)
+
+	err = expectGas(string(code), 0, `"main"`, ``, 120832, SetHardForkVersion(4))
+	assert.NoError(t, err)
 }
 
 func TestGasBF(t *testing.T) {
 	skipNotOnAmd64(t)
 
 	var err error
-	code := readLuaCode(t, "gas_bf.lua")
+	code2 := readLuaCode(t, "gas_bf_v2.lua")
+	code4 := readLuaCode(t, "gas_bf_v4.lua")
 
-	// err = expectGas(t, string(code), 0, `"main"`, ``, 100000, SetHardForkVersion(1))
+	// err = expectGas(t, string(code), 0, `"main"`, ``, 100000, SetHardForkVersion(1), SetTimeout(500))
 	// assert.NoError(t, err)
 
-	err = expectGas(string(code), 0, `"main"`, ``, 47456244, SetHardForkVersion(2))
+	err = expectGas(string(code2), 0, `"main"`, ``, 47456244, SetHardForkVersion(2), SetTimeout(500))
+	assert.NoError(t, err)
+
+	err = expectGas(string(code2), 0, `"main"`, ``, 47456046, SetHardForkVersion(3), SetTimeout(500))
 	assert.NoError(t, err)
 
-	err = expectGas(string(code), 0, `"main"`, ``, 47456046, SetHardForkVersion(3))
+	err = expectGas(string(code4), 0, `"main"`, ``, 47342481, SetHardForkVersion(4), SetTimeout(500))
 	assert.NoError(t, err)
 }
 
@@ -496,6 +657,14 @@ func TestGasLuaCryptoVerifyProof(t *testing.T) {
 	// v3 hex
 	err = expectGas(string(code), 0, `"verifyProofHex"`, ``, 108404, SetHardForkVersion(3))
 	assert.NoError(t, err)
+
+	// v4 raw
+	err = expectGas(string(code), 0, `"verifyProofRaw"`, ``, 160281, SetHardForkVersion(4))
+	assert.NoError(t, err)
+
+	// v4 hex
+	err = expectGas(string(code), 0, `"verifyProofHex"`, ``, 108404, SetHardForkVersion(4))
+	assert.NoError(t, err)
 }
 
 func expectGas(contractCode string, amount int64, funcName, funcArgs string, expectGas int64, opt ...DummyChainOptions) error {
diff --git a/contract/vm_dummy/vm_dummy_release.go b/contract/vm_dummy/vm_dummy_release.go
deleted file mode 100644
index f0a89f954..000000000
--- a/contract/vm_dummy/vm_dummy_release.go
+++ /dev/null
@@ -1,28 +0,0 @@
-//go:build !Debug
-// +build !Debug
-
-package vm_dummy
-
-import (
-	"math/big"
-
-	"github.com/aergoio/aergo/v2/cmd/aergoluac/util"
-	"github.com/aergoio/aergo/v2/contract"
-)
-
-func NewLuaTxDeployBig(sender, recipient string, amount *big.Int, code string) *luaTxDeploy {
-	byteCode, err := contract.Compile(code, nil)
-	if err != nil {
-		return &luaTxDeploy{cErr: err}
-	}
-	return &luaTxDeploy{
-		luaTxContractCommon: luaTxContractCommon{
-			_sender:    contract.StrHash(sender),
-			_recipient: contract.StrHash(recipient),
-			_payload:   util.NewLuaCodePayload(byteCode, nil),
-			_amount:    amount,
-			txId:       newTxId(),
-		},
-		cErr: nil,
-	}
-}
diff --git a/contract/vm_dummy/vm_dummy_test.go b/contract/vm_dummy/vm_dummy_test.go
index 772eb1876..5cd69ecca 100644
--- a/contract/vm_dummy/vm_dummy_test.go
+++ b/contract/vm_dummy/vm_dummy_test.go
@@ -20,7 +20,29 @@ import (
 )
 
 const min_version int32 = 2
-const max_version int32 = 3
+const max_version int32 = 4
+const min_version_multicall int32 = 4
+
+func TestDisabledFunctions(t *testing.T) {
+	code := readLuaCode(t, "disabled-functions.lua")
+
+	for version := int32(4); version <= max_version; version++ {
+		bc, err := LoadDummyChain(SetHardForkVersion(version), SetPubNet())
+		require.NoErrorf(t, err, "failed to create dummy chain")
+		defer bc.Release()
+
+		err = bc.ConnectBlock(
+			NewLuaTxAccount("user", 1, types.Aergo),
+			NewLuaTxDeploy("user", "test", 0, code),
+		)
+		assert.NoErrorf(t, err, "failed to deploy contract")
+
+		err = bc.ConnectBlock(
+			NewLuaTxCall("user", "test", 0, `{"Name":"check_disabled_functions","Args":[]}`),
+		)
+		assert.NoErrorf(t, err, "failed execution")
+	}
+}
 
 func TestMaxCallDepth(t *testing.T) {
 	//code := readLuaCode(t, "maxcalldepth_1.lua")
@@ -393,6 +415,66 @@ func TestContractSystem(t *testing.T) {
 		exRv := fmt.Sprintf(`["%s","6FbDRScGruVdATaNWzD51xJkTfYCVwxSZDb7gzqCLzwf","AmhNNBNY7XFk4p5ym4CJf8nTcRTEHjWzAeXJfhP71244CjBCAQU3",%d,3,999]`, StrToAddress("user1"), bc.cBlock.Header.Timestamp/1e9)
 		assert.Equal(t, exRv, receipt.GetRet(), "receipt ret error")
 
+		if version >= 4 {
+
+      // system.version()
+
+			tx = NewLuaTxCall("user1", "system", 0, `{"Name":"get_version", "Args":[]}`)
+			err = bc.ConnectBlock(tx)
+			require.NoErrorf(t, err, "failed to call tx")
+
+			receipt = bc.GetReceipt(tx.Hash())
+			expected := fmt.Sprintf(`%d`, version)
+			assert.Equal(t, expected, receipt.GetRet(), "receipt ret error")
+
+			err = bc.Query("system", `{"Name":"get_version", "Args":[]}`, "", expected)
+			require.NoErrorf(t, err, "failed to query")
+
+			// system.toPubKey()
+
+			err = bc.Query("system", `{"Name":"to_pubkey", "Args":["AmgKtCaGjH4XkXwny2Jb1YH5gdsJGJh78ibWEgLmRWBS5LMfQuTf"]}`, "", `"0x0c3270bb25fea5bf0029b57e78581647a143265810b84940dd24e543ddc618ab91"`)
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_pubkey", "Args":["Amhmj6kKZz7mPstBAPJWRe1e8RHP7bZ5pV35XatqTHMWeAVSyMkc"]}`, "", `"0x0cf0d0fd04f44db75d66409346102167d67c40a5d76d46748fc4533f0265d0f83f"`)
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_pubkey", "Args":["6FbDRScGruVdATaNWzD51xJkTfYCVwxSZDb7gzqCLzwf"]}`, "invalid address length", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_pubkey", "Args":["0x0c3270bb25fea5bf0029b57e78581647a143265810b84940dd24e543ddc618ab91"]}`, "invalid address length", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_pubkey", "Args":[""]}`, "invalid address length", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_pubkey", "Args":[]}`, "string expected, got nil", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			// system.toAddress()
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":["0x0c3270bb25fea5bf0029b57e78581647a143265810b84940dd24e543ddc618ab91"]}`, "", `"AmgKtCaGjH4XkXwny2Jb1YH5gdsJGJh78ibWEgLmRWBS5LMfQuTf"`)
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":["0x0cf0d0fd04f44db75d66409346102167d67c40a5d76d46748fc4533f0265d0f83f"]}`, "", `"Amhmj6kKZz7mPstBAPJWRe1e8RHP7bZ5pV35XatqTHMWeAVSyMkc"`)
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":["0cf0d0fd04f44db75d66409346102167d67c40a5d76d46748fc4533f0265d0f83f"]}`, "", `"Amhmj6kKZz7mPstBAPJWRe1e8RHP7bZ5pV35XatqTHMWeAVSyMkc"`)
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":["AmhNNBNY7XFk4p5ym4CJf8nTcRTEHjWzAeXJfhP71244CjBCAQU3"]}`, "invalid public key", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":["6FbDRScGruVdATaNWzD51xJkTfYCVwxSZDb7gzqCLzwf"]}`, "invalid public key", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":[""]}`, "invalid public key", "")
+			require.NoErrorf(t, err, "failed to query")
+
+			err = bc.Query("system", `{"Name":"to_address", "Args":[]}`, "string expected, got nil", "")
+			require.NoErrorf(t, err, "failed to query")
+
+		}
+
 	}
 }
 
@@ -1373,17 +1455,47 @@ func TestSqlOnConflict(t *testing.T) {
 
 		err = bc.ConnectBlock(
 			NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec", "args": ["insert into t values (5)"]}`),
-			NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec", "args": ["insert or rollback into t values (5)"]}`).Fail("syntax error"),
+			NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec", "args": ["insert or rollback into t values (6),(5),(7)"]}`).Fail("syntax error"),
 		)
 		require.NoErrorf(t, err, "failed to call tx")
 
 		err = bc.Query("on_conflict", `{"name":"get"}`, "", `[1,2,3,4,5]`)
 		require.NoErrorf(t, err, "failed to query")
 
-		err = bc.ConnectBlock(NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec_pcall", "args": ["insert or fail into t values (6),(7),(5),(8),(9)"]}`))
+		err = bc.ConnectBlock(NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec", "args": ["insert or abort into t values (6),(7),(5),(8),(9)"]}`).Fail("UNIQUE constraint failed"))
 		require.NoErrorf(t, err, "failed to call tx")
 
-		err = bc.Query("on_conflict", `{"name":"get"}`, "", `[1,2,3,4,5,6,7]`)
+		err = bc.Query("on_conflict", `{"name":"get"}`, "", `[1,2,3,4,5]`)
+		require.NoErrorf(t, err, "failed to query")
+
+		// successful pcall
+		err = bc.ConnectBlock(NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec_pcall", "args": ["insert into t values (6)"]}`))
+		require.NoErrorf(t, err, "failed to call tx")
+
+		err = bc.Query("on_conflict", `{"name":"get"}`, "", `[1,2,3,4,5,6]`)
+		require.NoErrorf(t, err, "failed to query")
+
+		// pcall fails but the tx succeeds
+		err = bc.ConnectBlock(NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec_pcall", "args": ["insert or fail into t values (7),(5),(8)"]}`))
+		require.NoErrorf(t, err, "failed to call tx")
+
+		var expected string
+		if version >= 4 {
+			// pcall reverts the changes
+			expected = `[1,2,3,4,5,6]`
+		} else {
+			// pcall does not revert the changes
+			expected = `[1,2,3,4,5,6,7]`
+		}
+
+		err = bc.Query("on_conflict", `{"name":"get"}`, "", expected)
+		require.NoErrorf(t, err, "failed to query")
+
+		// here the tx is reverted
+		err = bc.ConnectBlock(NewLuaTxCall("user1", "on_conflict", 0, `{"name":"stmt_exec", "args": ["insert or fail into t values (7),(5),(8)"]}`).Fail("UNIQUE constraint failed"))
+		require.NoErrorf(t, err, "failed to call tx")
+
+		err = bc.Query("on_conflict", `{"name":"get"}`, "", expected)
 		require.NoErrorf(t, err, "failed to query")
 
 	}
@@ -2389,6 +2501,132 @@ func TestTypeBignum(t *testing.T) {
 	}
 }
 
+func TestBignumValues(t *testing.T) {
+	code := readLuaCode(t, "bignum_values.lua")
+
+	bc, err := LoadDummyChain(SetHardForkVersion(2))
+	require.NoErrorf(t, err, "failed to create dummy chain")
+	defer bc.Release()
+
+	err = bc.ConnectBlock(
+		NewLuaTxAccount("user1", 1, types.Aergo),
+		NewLuaTxDeploy("user1", "contract1", 0, code),
+	)
+	require.NoErrorf(t, err, "failed to deploy")
+
+	// hardfork 2
+
+	// process octal, hex, binary
+
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0"]}`, "", `"0"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["9"]}`, "", `"9"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0055"]}`, "", `"45"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["01234567"]}`, "", `"342391"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0x123456789abcdef"]}`, "", `"81985529216486895"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0b1010101010101"]}`, "", `"5461"`)
+	require.NoErrorf(t, err, "failed to query")
+
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0"}]}`, "", `"0"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"9"}]}`, "", `"9"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"01234567"}]}`, "", `"342391"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0x123456789abcdef"}]}`, "", `"81985529216486895"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0b1010101010101"}]}`, "", `"5461"`)
+	require.NoErrorf(t, err, "failed to query")
+
+
+	// hardfork 3
+	bc.HardforkVersion = 3
+
+	// block octal, hex and binary
+
+	tx := NewLuaTxCall("user1", "contract1", 0, `{"Name":"parse_bignum", "Args":["01234567"]}`)
+	err = bc.ConnectBlock(tx)
+	require.NoErrorf(t, err, "failed to call tx")
+	receipt := bc.GetReceipt(tx.Hash())
+	assert.Equalf(t, `"1234567"`, receipt.GetRet(), "contract Call ret error")
+
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0"]}`, "", `"0"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["9"]}`, "", `"9"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0055"]}`, "", `"55"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["01234567"]}`, "", `"1234567"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0x123456789abcdef"]}`, "bignum invalid number string", `""`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0b1010101010101"]}`, "bignum invalid number string", `""`)
+	require.NoErrorf(t, err, "failed to query")
+
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0"}]}`, "", `"0"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"9"}]}`, "", `"9"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"01234567"}]}`, "", `"1234567"`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0x123456789abcdef"}]}`, "bignum invalid number string", `""`)
+	require.NoErrorf(t, err, "failed to query")
+	err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0b1010101010101"}]}`, "bignum invalid number string", `""`)
+	require.NoErrorf(t, err, "failed to query")
+
+
+	// hardfork 4 and after
+
+	for version := int32(4); version <= max_version; version++ {
+		bc, err = LoadDummyChain(SetHardForkVersion(version))
+		require.NoErrorf(t, err, "failed to create dummy chain")
+		defer bc.Release()
+
+		err = bc.ConnectBlock(
+			NewLuaTxAccount("user1", 1, types.Aergo),
+			NewLuaTxDeploy("user1", "contract1", 0, code),
+		)
+		require.NoErrorf(t, err, "failed to deploy")
+
+		// process hex, binary. block octal
+
+		tx = NewLuaTxCall("user1", "contract1", 0, `{"Name":"parse_bignum", "Args":["01234567"]}`)
+		err = bc.ConnectBlock(tx)
+		require.NoErrorf(t, err, "failed to call tx")
+		receipt = bc.GetReceipt(tx.Hash())
+		assert.Equalf(t, `"1234567"`, receipt.GetRet(), "contract Call ret error")
+
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0"]}`, "", `"0"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["9"]}`, "", `"9"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0055"]}`, "", `"55"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["01234567"]}`, "", `"1234567"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0x123456789abcdef"]}`, "", `"81985529216486895"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":["0b1010101010101"]}`, "", `"5461"`)
+		require.NoErrorf(t, err, "failed to query")
+
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0"}]}`, "", `"0"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"9"}]}`, "", `"9"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"01234567"}]}`, "", `"1234567"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0x123456789abcdef"}]}`, "", `"81985529216486895"`)
+		require.NoErrorf(t, err, "failed to query")
+		err = bc.Query("contract1", `{"Name":"parse_bignum", "Args":[{"_bignum":"0b1010101010101"}]}`, "", `"5461"`)
+		require.NoErrorf(t, err, "failed to query")
+
+	}
+}
+
 func checkRandomIntValue(v string, min, max int) error {
 	n, _ := strconv.Atoi(v)
 	if n < min || n > max {
@@ -2771,964 +3009,989 @@ func TestFeaturePcallNested(t *testing.T) {
 
 // test rollback of state variable and balance
 func TestPcallStateRollback1(t *testing.T) {
-	code := readLuaCode(t, "feature_pcall_rollback_4.lua")
 	resolver := readLuaCode(t, "resolver.lua")
 
 	for version := min_version; version <= max_version; version++ {
-		bc, err := LoadDummyChain(SetHardForkVersion(version))
-		require.NoErrorf(t, err, "failed to create dummy chain")
-		defer bc.Release()
 
-		// deploy and setup the name resolver
-		err = bc.ConnectBlock(
-			NewLuaTxAccount("user", 10, types.Aergo),
-			NewLuaTxDeploy("user", "resolver", 0, resolver),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["A","%s"]}`, nameToAddress("A"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["B","%s"]}`, nameToAddress("B"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["C","%s"]}`, nameToAddress("C"))),
-		)
-		require.NoErrorf(t, err, "failed to deploy and setup resolver")
+		files := make([]string, 0)
+		files = append(files, "feature_pcall_rollback_4a.lua")   // contract.pcall
+		if version >= 4 {
+			files = append(files, "feature_pcall_rollback_4b.lua") // pcall
+			files = append(files, "feature_pcall_rollback_4c.lua") // xpcall
+		}
 
-		// deploy the contracts
-		err = bc.ConnectBlock(
-			NewLuaTxDeploy("user", "A", 3, code).Constructor(fmt.Sprintf(`["%s","A"]`, nameToAddress("resolver"))),
-			NewLuaTxDeploy("user", "B", 0, code).Constructor(fmt.Sprintf(`["%s","B"]`, nameToAddress("resolver"))),
-			NewLuaTxDeploy("user", "C", 0, code).Constructor(fmt.Sprintf(`["%s","C"]`, nameToAddress("resolver"))),
-		)
-		require.NoErrorf(t, err, "failed to deploy the contracts")
-
-		// A -> A -> A (3 calls on the same contract)
-
-		script := `[[
-			['set','x',111],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['pcall','A']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333}, nil)
-
-		script = `[[
-			['set','x',111],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 222}, nil)
-
-		script = `[[
-			['set','x',111],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111}, nil)
-
-		script = `[[
-			['set','x',111],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',222],
-			['pcall','A']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0}, nil)
-
-		// A -> B -> C (3 different contracts)
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2]
-		],[
-			['set','x',222],
-			['pcall','C',1]
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222, "C": 333},
-			map[string]int64{"A": 1, "B": 1, "C": 1})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2]
-		],[
-			['set','x',222],
-			['pcall','C',1]
-		],[
-			['set','x',333],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222, "C": 0},
-			map[string]int64{"A": 1, "B": 2, "C": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2]
-		],[
-			['set','x',222],
-			['pcall','C',1],
-			['fail']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0, "C": 0},
-			map[string]int64{"A": 3, "B": 0, "C": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2],
-			['fail']
-		],[
-			['set','x',222],
-			['pcall','C',1]
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0, "C": 0},
-			map[string]int64{"A": 3, "B": 0, "C": 0})
-
-		// A -> B -> A (call back to original contract)
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2]
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 222},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2]
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222},
-			map[string]int64{"A": 1, "B": 2})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2]
-		],[
-			['set','x',222],
-			['pcall','A',1],
-			['fail']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',2],
-			['fail']
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		// A -> B -> B
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',3]
-		],[
-			['set','x',222],
-			['pcall','B']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 333},
-			map[string]int64{"A": 0, "B": 3})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',3]
-		],[
-			['set','x',222],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222},
-			map[string]int64{"A": 0, "B": 3})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',3]
-		],[
-			['set','x',222],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',3],
-			['fail']
-		],[
-			['set','x',222],
-			['pcall','B']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		// A -> A -> B
-
-		script = `[[
-			['set','x',111],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['pcall','B',3]
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 222, "B": 333},
-			map[string]int64{"A": 0, "B": 3})
-
-		script = `[[
-			['set','x',111],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['pcall','B',3]
-		],[
-			['set','x',333],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 222, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['pcall','B',3],
-			['fail']
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',222],
-			['pcall','B',3]
-		],[
-			['set','x',333]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		// A -> B -> A -> B -> A  (zigzag)
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',1]
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333],
-			['pcall','B',1]
-		],[
-			['set','x',444],
-			['pcall','A',1]
-		],[
-			['set','x',555]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 555, "B": 444},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',1]
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333],
-			['pcall','B',1]
-		],[
-			['set','x',444],
-			['pcall','A',1]
-		],[
-			['set','x',555],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 444},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',1]
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333],
-			['pcall','B',1]
-		],[
-			['set','x',444],
-			['pcall','A',1],
-			['fail']
-		],[
-			['set','x',555]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 222},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',1]
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333],
-			['pcall','B',1],
-			['fail']
-		],[
-			['set','x',444],
-			['pcall','A',1]
-		],[
-			['set','x',555]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',1]
-		],[
-			['set','x',222],
-			['pcall','A',1],
-			['fail']
-		],[
-			['set','x',333],
-			['pcall','B',1]
-		],[
-			['set','x',444],
-			['pcall','A',1]
-		],[
-			['set','x',555]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['pcall','B',1],
-			['fail']
-		],[
-			['set','x',222],
-			['pcall','A',1]
-		],[
-			['set','x',333],
-			['pcall','B',1]
-		],[
-			['set','x',444],
-			['pcall','A',1]
-		],[
-			['set','x',555]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
+		// iterate over all files
+		for _, file := range files {
+
+			code := readLuaCode(t, file)
 
+			bc, err := LoadDummyChain(SetHardForkVersion(version))
+			require.NoErrorf(t, err, "failed to create dummy chain")
+			defer bc.Release()
+
+			// deploy and setup the name resolver
+			err = bc.ConnectBlock(
+				NewLuaTxAccount("user", 10, types.Aergo),
+				NewLuaTxDeploy("user", "resolver", 0, resolver),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["A","%s"]}`, nameToAddress("A"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["B","%s"]}`, nameToAddress("B"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["C","%s"]}`, nameToAddress("C"))),
+			)
+			require.NoErrorf(t, err, "failed to deploy and setup resolver")
+
+			// deploy the contracts
+			err = bc.ConnectBlock(
+				NewLuaTxDeploy("user", "A", 3, code).Constructor(fmt.Sprintf(`["%s","A"]`, nameToAddress("resolver"))),
+				NewLuaTxDeploy("user", "B", 0, code).Constructor(fmt.Sprintf(`["%s","B"]`, nameToAddress("resolver"))),
+				NewLuaTxDeploy("user", "C", 0, code).Constructor(fmt.Sprintf(`["%s","C"]`, nameToAddress("resolver"))),
+			)
+			require.NoErrorf(t, err, "failed to deploy the contracts")
+
+			// A -> A -> A (3 calls on the same contract)
+
+			script := `[[
+				['set','x',111],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['pcall','A']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333}, nil)
+
+			script = `[[
+				['set','x',111],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 222}, nil)
+
+			script = `[[
+				['set','x',111],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111}, nil)
+
+			script = `[[
+				['set','x',111],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',222],
+				['pcall','A']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0}, nil)
+
+			// A -> B -> C (3 different contracts)
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2]
+			],[
+				['set','x',222],
+				['pcall','C',1]
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222, "C": 333},
+				map[string]int64{"A": 1, "B": 1, "C": 1})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2]
+			],[
+				['set','x',222],
+				['pcall','C',1]
+			],[
+				['set','x',333],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222, "C": 0},
+				map[string]int64{"A": 1, "B": 2, "C": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2]
+			],[
+				['set','x',222],
+				['pcall','C',1],
+				['fail']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0, "C": 0},
+				map[string]int64{"A": 3, "B": 0, "C": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2],
+				['fail']
+			],[
+				['set','x',222],
+				['pcall','C',1]
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0, "C": 0},
+				map[string]int64{"A": 3, "B": 0, "C": 0})
+
+			// A -> B -> A (call back to original contract)
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2]
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 222},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2]
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222},
+				map[string]int64{"A": 1, "B": 2})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2]
+			],[
+				['set','x',222],
+				['pcall','A',1],
+				['fail']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',2],
+				['fail']
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			// A -> B -> B
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',3]
+			],[
+				['set','x',222],
+				['pcall','B']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 333},
+				map[string]int64{"A": 0, "B": 3})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',3]
+			],[
+				['set','x',222],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222},
+				map[string]int64{"A": 0, "B": 3})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',3]
+			],[
+				['set','x',222],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',3],
+				['fail']
+			],[
+				['set','x',222],
+				['pcall','B']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			// A -> A -> B
+
+			script = `[[
+				['set','x',111],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['pcall','B',3]
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 222, "B": 333},
+				map[string]int64{"A": 0, "B": 3})
+
+			script = `[[
+				['set','x',111],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['pcall','B',3]
+			],[
+				['set','x',333],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 222, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['pcall','B',3],
+				['fail']
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',222],
+				['pcall','B',3]
+			],[
+				['set','x',333]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			// A -> B -> A -> B -> A  (zigzag)
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',1]
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333],
+				['pcall','B',1]
+			],[
+				['set','x',444],
+				['pcall','A',1]
+			],[
+				['set','x',555]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 555, "B": 444},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',1]
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333],
+				['pcall','B',1]
+			],[
+				['set','x',444],
+				['pcall','A',1]
+			],[
+				['set','x',555],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 444},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',1]
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333],
+				['pcall','B',1]
+			],[
+				['set','x',444],
+				['pcall','A',1],
+				['fail']
+			],[
+				['set','x',555]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 222},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',1]
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333],
+				['pcall','B',1],
+				['fail']
+			],[
+				['set','x',444],
+				['pcall','A',1]
+			],[
+				['set','x',555]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',1]
+			],[
+				['set','x',222],
+				['pcall','A',1],
+				['fail']
+			],[
+				['set','x',333],
+				['pcall','B',1]
+			],[
+				['set','x',444],
+				['pcall','A',1]
+			],[
+				['set','x',555]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['pcall','B',1],
+				['fail']
+			],[
+				['set','x',222],
+				['pcall','A',1]
+			],[
+				['set','x',333],
+				['pcall','B',1]
+			],[
+				['set','x',444],
+				['pcall','A',1]
+			],[
+				['set','x',555]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+		}
 	}
 }
 
 // test rollback of state variable and balance - send separate from call
 func TestPcallStateRollback2(t *testing.T) {
 	t.Skip("disabled until bug with test is fixed")
-	code := readLuaCode(t, "feature_pcall_rollback_4.lua")
 	resolver := readLuaCode(t, "resolver.lua")
 
 	for version := min_version; version <= max_version; version++ {
-		bc, err := LoadDummyChain(SetHardForkVersion(version))
-		require.NoErrorf(t, err, "failed to create dummy chain")
-		defer bc.Release()
+		files := make([]string, 0)
+		files = append(files, "feature_pcall_rollback_4a.lua")   // contract.pcall
+		if version >= 4 {
+			files = append(files, "feature_pcall_rollback_4b.lua") // pcall
+			files = append(files, "feature_pcall_rollback_4c.lua") // xpcall
+		}
 
-		// deploy and setup the name resolver
-		err = bc.ConnectBlock(
-			NewLuaTxAccount("user", 10, types.Aergo),
-			NewLuaTxDeploy("user", "resolver", 0, resolver),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["A","%s"]}`, nameToAddress("A"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["B","%s"]}`, nameToAddress("B"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["C","%s"]}`, nameToAddress("C"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["D","%s"]}`, nameToAddress("D"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["E","%s"]}`, nameToAddress("E"))),
-		)
-		require.NoErrorf(t, err, "failed to deploy and setup resolver")
+		// iterate over all files
+		for _, file := range files {
 
-		// deploy the contracts
-		err = bc.ConnectBlock(
-			NewLuaTxDeploy("user", "A", 3, code).Constructor(fmt.Sprintf(`["%s","A"]`, nameToAddress("resolver"))),
-			NewLuaTxDeploy("user", "B", 0, code).Constructor(fmt.Sprintf(`["%s","B"]`, nameToAddress("resolver"))),
-			NewLuaTxDeploy("user", "C", 0, code).Constructor(fmt.Sprintf(`["%s","C"]`, nameToAddress("resolver"))),
-		)
-		require.NoErrorf(t, err, "failed to deploy the contracts")
-
-		// A -> A -> A (3 calls on the same contract)
-
-		script := `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','E',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333},
-			map[string]int64{"A": 0, "B": 1, "C": 1, "E": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','D',1],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 222},
-			map[string]int64{"A": 1, "B": 1, "C": 1, "D": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',333],
-			['send','D',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111},
-			map[string]int64{"A": 2, "B": 1, "C": 0, "D": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','D',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0},
-			map[string]int64{"A": 3, "B": 0, "C": 0, "D": 0})
-
-		// A -> B -> C (3 different contracts)
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','C',2],
-			['pcall','C']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222, "C": 333},
-			map[string]int64{"A": 1, "B": 1, "C": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','C',2],
-			['pcall','C']
-		],[
-			['set','x',333],
-			['send','A',1],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222, "C": 0},
-			map[string]int64{"A": 0, "B": 1, "C": 2})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','C',2],
-			['pcall','C'],
-			['fail']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0, "C": 0},
-			map[string]int64{"A": 0, "B": 3, "C": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',222],
-			['send','C',2],
-			['pcall','C']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0, "C": 0},
-			map[string]int64{"A": 3, "B": 0, "C": 0})
-
-		// A -> B -> A (call back to original contract)
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',2],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 222},
-			map[string]int64{"A": 1, "B": 2})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',2],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',2],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',333],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 0, "B": 3})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',222],
-			['send','A',2],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
-
-		// A -> B -> B
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 333},
-			map[string]int64{"A": 1, "B": 1, "C": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['send','A',1],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222},
-			map[string]int64{"A": 0, "B": 2, "C": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 0, "B": 3, "C": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',3],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0, "C": 0})
-
-		// A -> A -> B
-
-		script = `[[
-			['set','x',111],
-			['send','B',2],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 222, "B": 333},
-			map[string]int64{"A": 1, "B": 1, "C": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',2],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['send','A',1],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 222, "B": 0},
-			map[string]int64{"A": 0, "B": 2, "C": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',2],
-			['pcall','A']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 1, "B": 2, "C": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',2],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',222],
-			['send','C',1],
-			['pcall','B']
-		],[
-			['set','x',333],
-			['send','A',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0, "C": 0})
-
-		// A -> B -> A -> B -> A  (zigzag)
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',444],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',555],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 555, "B": 444},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',444],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',555],
-			['send','B',1],
-			['fail']
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 444},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',444],
-			['send','A',1],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',555],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 222},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',444],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',555],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222},
-			map[string]int64{"A": 3, "B": 0})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',222],
-			['send','A',1],
-			['pcall','A'],
-			['fail']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',444],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',555],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0},
-			map[string]int64{"A": 2, "B": 1})
-
-		script = `[[
-			['set','x',111],
-			['send','B',1],
-			['pcall','B'],
-			['fail']
-		],[
-			['set','x',222],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',333],
-			['send','B',1],
-			['pcall','B']
-		],[
-			['set','x',444],
-			['send','A',1],
-			['pcall','A']
-		],[
-			['set','x',555],
-			['send','B',1]
-		]]`
-		testStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0},
-			map[string]int64{"A": 3, "B": 0})
+			code := readLuaCode(t, file)
+
+			bc, err := LoadDummyChain(SetHardForkVersion(version))
+			require.NoErrorf(t, err, "failed to create dummy chain")
+			defer bc.Release()
 
+			// deploy and setup the name resolver
+			err = bc.ConnectBlock(
+				NewLuaTxAccount("user", 10, types.Aergo),
+				NewLuaTxDeploy("user", "resolver", 0, resolver),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["A","%s"]}`, nameToAddress("A"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["B","%s"]}`, nameToAddress("B"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["C","%s"]}`, nameToAddress("C"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["D","%s"]}`, nameToAddress("D"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["E","%s"]}`, nameToAddress("E"))),
+			)
+			require.NoErrorf(t, err, "failed to deploy and setup resolver")
+
+			// deploy the contracts
+			err = bc.ConnectBlock(
+				NewLuaTxDeploy("user", "A", 3, code).Constructor(fmt.Sprintf(`["%s","A"]`, nameToAddress("resolver"))),
+				NewLuaTxDeploy("user", "B", 0, code).Constructor(fmt.Sprintf(`["%s","B"]`, nameToAddress("resolver"))),
+				NewLuaTxDeploy("user", "C", 0, code).Constructor(fmt.Sprintf(`["%s","C"]`, nameToAddress("resolver"))),
+			)
+			require.NoErrorf(t, err, "failed to deploy the contracts")
+
+			// A -> A -> A (3 calls on the same contract)
+
+			script := `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','E',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333},
+				map[string]int64{"A": 0, "B": 1, "C": 1, "E": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','D',1],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 222},
+				map[string]int64{"A": 1, "B": 1, "C": 1, "D": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',333],
+				['send','D',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111},
+				map[string]int64{"A": 2, "B": 1, "C": 0, "D": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','D',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0},
+				map[string]int64{"A": 3, "B": 0, "C": 0, "D": 0})
+
+			// A -> B -> C (3 different contracts)
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','C',2],
+				['pcall','C']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222, "C": 333},
+				map[string]int64{"A": 1, "B": 1, "C": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','C',2],
+				['pcall','C']
+			],[
+				['set','x',333],
+				['send','A',1],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222, "C": 0},
+				map[string]int64{"A": 0, "B": 1, "C": 2})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','C',2],
+				['pcall','C'],
+				['fail']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0, "C": 0},
+				map[string]int64{"A": 0, "B": 3, "C": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',222],
+				['send','C',2],
+				['pcall','C']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0, "C": 0},
+				map[string]int64{"A": 3, "B": 0, "C": 0})
+
+			// A -> B -> A (call back to original contract)
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',2],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 222},
+				map[string]int64{"A": 1, "B": 2})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',2],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',2],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',333],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 0, "B": 3})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',222],
+				['send','A',2],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+			// A -> B -> B
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 333},
+				map[string]int64{"A": 1, "B": 1, "C": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['send','A',1],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222},
+				map[string]int64{"A": 0, "B": 2, "C": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 0, "B": 3, "C": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',3],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0, "C": 0})
+
+			// A -> A -> B
+
+			script = `[[
+				['set','x',111],
+				['send','B',2],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 222, "B": 333},
+				map[string]int64{"A": 1, "B": 1, "C": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',2],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['send','A',1],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 222, "B": 0},
+				map[string]int64{"A": 0, "B": 2, "C": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',2],
+				['pcall','A']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 1, "B": 2, "C": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',2],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',222],
+				['send','C',1],
+				['pcall','B']
+			],[
+				['set','x',333],
+				['send','A',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0, "C": 0})
+
+			// A -> B -> A -> B -> A  (zigzag)
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',444],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',555],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 555, "B": 444},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',444],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',555],
+				['send','B',1],
+				['fail']
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 444},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',444],
+				['send','A',1],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',555],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 222},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',444],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',555],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222},
+				map[string]int64{"A": 3, "B": 0})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',222],
+				['send','A',1],
+				['pcall','A'],
+				['fail']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',444],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',555],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0},
+				map[string]int64{"A": 2, "B": 1})
+
+			script = `[[
+				['set','x',111],
+				['send','B',1],
+				['pcall','B'],
+				['fail']
+			],[
+				['set','x',222],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',333],
+				['send','B',1],
+				['pcall','B']
+			],[
+				['set','x',444],
+				['send','A',1],
+				['pcall','A']
+			],[
+				['set','x',555],
+				['send','B',1]
+			]]`
+			testStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0},
+				map[string]int64{"A": 3, "B": 0})
+
+		}
 	}
 }
 
@@ -3736,491 +3999,519 @@ func TestPcallStateRollback2(t *testing.T) {
 func TestPcallStateRollback3(t *testing.T) {
 	t.Skip("disabled until bug with test is fixed")
 	resolver := readLuaCode(t, "resolver.lua")
-	code := readLuaCode(t, "feature_pcall_rollback_4.lua")
 
 	for version := min_version; version <= max_version; version++ {
-		bc, err := LoadDummyChain(SetHardForkVersion(version))
-		require.NoErrorf(t, err, "failed to create dummy chain")
-		defer bc.Release()
+		files := make([]string, 0)
+		files = append(files, "feature_pcall_rollback_4a.lua")   // contract.pcall
+		if version >= 4 {
+			files = append(files, "feature_pcall_rollback_4b.lua") // pcall
+			files = append(files, "feature_pcall_rollback_4c.lua") // xpcall
+		}
 
-		err = bc.ConnectBlock(
-			NewLuaTxAccount("user", 1, types.Aergo),
-			NewLuaTxDeploy("user", "resolver", 0, resolver),
-			NewLuaTxDeploy("user", "A", 0, code).Constructor(fmt.Sprintf(`["%s","A"]`, nameToAddress("resolver"))),
-			NewLuaTxDeploy("user", "B", 0, code).Constructor(fmt.Sprintf(`["%s","B"]`, nameToAddress("resolver"))),
-			NewLuaTxDeploy("user", "C", 0, code).Constructor(fmt.Sprintf(`["%s","C"]`, nameToAddress("resolver"))),
-		)
-		require.NoErrorf(t, err, "failed to deploy")
+		// iterate over all files
+		for _, file := range files {
 
-		err = bc.ConnectBlock(
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["A","%s"]}`, nameToAddress("A"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["B","%s"]}`, nameToAddress("B"))),
-			NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["C","%s"]}`, nameToAddress("C"))),
-		)
-		require.NoErrorf(t, err, "failed to call resolver contract")
-
-		// A -> A -> A (3 calls on the same contract)
-
-		script := `[[
-			['db.set',111],
-			['pcall','A']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 333})
-
-		script = `[[
-			['db.set',111],
-			['pcall','A']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['fail']
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 222})
-
-		script = `[[
-			['db.set',111],
-			['pcall','A']
-		],[
-			['db.set',222],
-			['pcall','A'],
-			['fail']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111})
-
-		script = `[[
-			['db.set',111],
-			['pcall','A'],
-			['fail']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 0})
-
-		// A -> B -> C (3 different contracts)
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','C']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222, "C": 333})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','C']
-		],[
-			['db.set',333],
-			['fail']
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222, "C": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','C'],
-			['fail']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0, "C": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',222],
-			['pcall','C']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0, "C": 0})
-
-		// A -> B -> A (call back to original contract)
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 222})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['fail']
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A'],
-			['fail']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0})
-
-		// A -> B -> B
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','B']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 333})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','B']
-		],[
-			['db.set',333],
-			['fail']
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',222],
-			['pcall','B']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0})
-
-		// A -> A -> B
-
-		script = `[[
-			['db.set',111],
-			['pcall','A']
-		],[
-			['db.set',222],
-			['pcall','B']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 222, "B": 333})
-
-		script = `[[
-			['db.set',111],
-			['pcall','A']
-		],[
-			['db.set',222],
-			['pcall','B']
-		],[
-			['db.set',333],
-			['fail']
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 222, "B": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','A']
-		],[
-			['db.set',222],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','A'],
-			['fail']
-		],[
-			['db.set',222],
-			['pcall','B']
-		],[
-			['db.set',333]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0})
-
-		// A -> B -> A -> B -> A  (zigzag)
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['pcall','B']
-		],[
-			['db.set',444],
-			['pcall','A']
-		],[
-			['db.set',555]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 555, "B": 444})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['pcall','B']
-		],[
-			['db.set',444],
-			['pcall','A']
-		],[
-			['db.set',555],
-			['fail']
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 444})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['pcall','B']
-		],[
-			['db.set',444],
-			['pcall','A'],
-			['fail']
-		],[
-			['db.set',555]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 333, "B": 222})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',444],
-			['pcall','A']
-		],[
-			['db.set',555]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 222})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B']
-		],[
-			['db.set',222],
-			['pcall','A'],
-			['fail']
-		],[
-			['db.set',333],
-			['pcall','B']
-		],[
-			['db.set',444],
-			['pcall','A']
-		],[
-			['db.set',555]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 111, "B": 0})
-
-		script = `[[
-			['db.set',111],
-			['pcall','B'],
-			['fail']
-		],[
-			['db.set',222],
-			['pcall','A']
-		],[
-			['db.set',333],
-			['pcall','B']
-		],[
-			['db.set',444],
-			['pcall','A']
-		],[
-			['db.set',555]
-		]]`
-		testDbStateRollback(t, bc, script,
-			map[string]int{"A": 0, "B": 0})
+			code := readLuaCode(t, file)
+
+			bc, err := LoadDummyChain(SetHardForkVersion(version))
+			require.NoErrorf(t, err, "failed to create dummy chain")
+			defer bc.Release()
+
+			err = bc.ConnectBlock(
+				NewLuaTxAccount("user", 1, types.Aergo),
+				NewLuaTxDeploy("user", "resolver", 0, resolver),
+				NewLuaTxDeploy("user", "A", 0, code).Constructor(fmt.Sprintf(`["%s","A"]`, nameToAddress("resolver"))),
+				NewLuaTxDeploy("user", "B", 0, code).Constructor(fmt.Sprintf(`["%s","B"]`, nameToAddress("resolver"))),
+				NewLuaTxDeploy("user", "C", 0, code).Constructor(fmt.Sprintf(`["%s","C"]`, nameToAddress("resolver"))),
+			)
+			require.NoErrorf(t, err, "failed to deploy")
+
+			err = bc.ConnectBlock(
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["A","%s"]}`, nameToAddress("A"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["B","%s"]}`, nameToAddress("B"))),
+				NewLuaTxCall("user", "resolver", 0, fmt.Sprintf(`{"Name":"set","Args":["C","%s"]}`, nameToAddress("C"))),
+			)
+			require.NoErrorf(t, err, "failed to call resolver contract")
+
+			// A -> A -> A (3 calls on the same contract)
+
+			script := `[[
+				['db.set',111],
+				['pcall','A']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 333})
+
+			script = `[[
+				['db.set',111],
+				['pcall','A']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['fail']
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 222})
+
+			script = `[[
+				['db.set',111],
+				['pcall','A']
+			],[
+				['db.set',222],
+				['pcall','A'],
+				['fail']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111})
+
+			script = `[[
+				['db.set',111],
+				['pcall','A'],
+				['fail']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 0})
+
+			// A -> B -> C (3 different contracts)
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','C']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222, "C": 333})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','C']
+			],[
+				['db.set',333],
+				['fail']
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222, "C": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','C'],
+				['fail']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0, "C": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',222],
+				['pcall','C']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0, "C": 0})
+
+			// A -> B -> A (call back to original contract)
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 222})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['fail']
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A'],
+				['fail']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0})
+
+			// A -> B -> B
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','B']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 333})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','B']
+			],[
+				['db.set',333],
+				['fail']
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',222],
+				['pcall','B']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0})
+
+			// A -> A -> B
+
+			script = `[[
+				['db.set',111],
+				['pcall','A']
+			],[
+				['db.set',222],
+				['pcall','B']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 222, "B": 333})
+
+			script = `[[
+				['db.set',111],
+				['pcall','A']
+			],[
+				['db.set',222],
+				['pcall','B']
+			],[
+				['db.set',333],
+				['fail']
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 222, "B": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','A']
+			],[
+				['db.set',222],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','A'],
+				['fail']
+			],[
+				['db.set',222],
+				['pcall','B']
+			],[
+				['db.set',333]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0})
+
+			// A -> B -> A -> B -> A  (zigzag)
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['pcall','B']
+			],[
+				['db.set',444],
+				['pcall','A']
+			],[
+				['db.set',555]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 555, "B": 444})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['pcall','B']
+			],[
+				['db.set',444],
+				['pcall','A']
+			],[
+				['db.set',555],
+				['fail']
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 444})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['pcall','B']
+			],[
+				['db.set',444],
+				['pcall','A'],
+				['fail']
+			],[
+				['db.set',555]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 333, "B": 222})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',444],
+				['pcall','A']
+			],[
+				['db.set',555]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 222})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B']
+			],[
+				['db.set',222],
+				['pcall','A'],
+				['fail']
+			],[
+				['db.set',333],
+				['pcall','B']
+			],[
+				['db.set',444],
+				['pcall','A']
+			],[
+				['db.set',555]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 111, "B": 0})
+
+			script = `[[
+				['db.set',111],
+				['pcall','B'],
+				['fail']
+			],[
+				['db.set',222],
+				['pcall','A']
+			],[
+				['db.set',333],
+				['pcall','B']
+			],[
+				['db.set',444],
+				['pcall','A']
+			],[
+				['db.set',555]
+			]]`
+			testDbStateRollback(t, bc, script,
+				map[string]int{"A": 0, "B": 0})
 
+		}
 	}
 }
 
 func testStateRollback(t *testing.T, bc *DummyChain, script string, expected_state map[string]int, expected_amount map[string]int64) {
 	t.Helper()
 
-	err := bc.ConnectBlock(
-		NewLuaTxCall("user", "A", 0, `{"Name":"set","Args":["x",0]}`),
-		NewLuaTxCall("user", "B", 0, `{"Name":"set","Args":["x",0]}`),
-		NewLuaTxCall("user", "C", 0, `{"Name":"set","Args":["x",0]}`),
-		NewLuaTxCall("user", "B", 0, `{"Name":"send_back","Args":["A"]}`),
-		NewLuaTxCall("user", "C", 0, `{"Name":"send_back","Args":["A"]}`),
-	)
-	require.NoErrorf(t, err, "failed to reset")
+	for n := 1; n <= 2; n++ {
 
-	account, _ := bc.GetAccountState("A")
-	if account.GetBalanceBigInt().Int64() != 3 {
-		amount := uint64(3 - account.GetBalanceBigInt().Int64())
-		err = bc.ConnectBlock(
-			NewLuaTxSendBig("user", "A", types.NewAmount(amount, types.Aer)),
+		err := bc.ConnectBlock(
+			NewLuaTxCall("user", "A", 0, `{"Name":"set","Args":["x",0]}`),
+			NewLuaTxCall("user", "B", 0, `{"Name":"set","Args":["x",0]}`),
+			NewLuaTxCall("user", "C", 0, `{"Name":"set","Args":["x",0]}`),
+			NewLuaTxCall("user", "B", 0, `{"Name":"send_back","Args":["A"]}`),
+			NewLuaTxCall("user", "C", 0, `{"Name":"send_back","Args":["A"]}`),
 		)
-		require.NoErrorf(t, err, "failed to send")
-	}
+		require.NoErrorf(t, err, "failed to reset")
 
-	names := make(map[string]int64)
-	names["A"] = 3
-	names["B"] = 0
-	names["C"] = 0
-	for name, amount := range names {
-		account, _ := bc.GetAccountState(name)
-		assert.Equal(t, amount, account.GetBalanceBigInt().Int64(), "balance of "+name+" is not reset")
-		err = bc.Query(name, `{"Name":"get", "Args":["x"]}`, "", "0")
-		require.NoErrorf(t, err, "failed to query on reset")
-	}
+		account, _ := bc.GetAccountState("A")
+		if account.GetBalanceBigInt().Int64() != 3 {
+			amount := uint64(3 - account.GetBalanceBigInt().Int64())
+			err = bc.ConnectBlock(
+				NewLuaTxSendBig("user", "A", types.NewAmount(amount, types.Aer)),
+			)
+			require.NoErrorf(t, err, "failed to send")
+		}
 
-	script = strings.ReplaceAll(script, "'", "\"")
-	tx := NewLuaTxCall("user", "A", 0, fmt.Sprintf(`{"Name":"test", "Args":[%s]}`, script))
-	err = bc.ConnectBlock(tx)
-	//require.NoErrorf(t, err, "failed to call tx")
-	//receipt := bc.GetReceipt(tx.Hash())
-	//assert.Equal(t, ``, receipt.GetRet(), "receipt ret error")
-	//fmt.Printf("events: %v\n", receipt.GetEvents())
-
-	for contract, value := range expected_state {
-		err = bc.Query(contract, `{"Name":"get", "Args":["x"]}`, "", fmt.Sprintf("%d", value))
-		require.NoErrorf(t, err, "query failed")
-	}
+		names := make(map[string]int64)
+		names["A"] = 3
+		names["B"] = 0
+		names["C"] = 0
+		for name, amount := range names {
+			account, _ := bc.GetAccountState(name)
+			assert.Equal(t, amount, account.GetBalanceBigInt().Int64(), "balance of "+name+" is not reset")
+			err = bc.Query(name, `{"Name":"get", "Args":["x"]}`, "", "0")
+			require.NoErrorf(t, err, "failed to query on reset")
+		}
 
-	for name, amount := range expected_amount {
-		account, err := bc.GetAccountState(name)
-		require.NoErrorf(t, err, "failed to get account state")
-		assert.Equal(t, amount, account.GetBalanceBigInt().Int64(), "balance is different")
+		script = strings.ReplaceAll(script, "'", "\"")
+		var tx LuaTxTester
+		if n == 1 {
+			tx = NewLuaTxCall("user", "A", 0, fmt.Sprintf(`{"Name":"test", "Args":[%s]}`, script))
+		} else {
+			tx = NewLuaTxMultiCall("user", fmt.Sprintf(`[["call","%s","test",%s]]`, nameToAddress("A"), script))
+		}
+		err = bc.ConnectBlock(tx)
+		//require.NoErrorf(t, err, "failed to call tx")
+		//receipt := bc.GetReceipt(tx.Hash())
+		//assert.Equal(t, ``, receipt.GetRet(), "receipt ret error")
+		//fmt.Printf("events: %v\n", receipt.GetEvents())
+
+		for contract, value := range expected_state {
+			err = bc.Query(contract, `{"Name":"get", "Args":["x"]}`, "", fmt.Sprintf("%d", value))
+			require.NoErrorf(t, err, "query failed")
+		}
+
+		for name, amount := range expected_amount {
+			account, err := bc.GetAccountState(name)
+			require.NoErrorf(t, err, "failed to get account state")
+			assert.Equal(t, amount, account.GetBalanceBigInt().Int64(), "balance is different")
+		}
 	}
 }
 
 func testDbStateRollback(t *testing.T, bc *DummyChain, script string, expected map[string]int) {
 	t.Helper()
 
-	err := bc.ConnectBlock(
-		NewLuaTxCall("user", "A", 0, `{"Name":"db_reset"}`),
-		NewLuaTxCall("user", "B", 0, `{"Name":"db_reset"}`),
-		NewLuaTxCall("user", "C", 0, `{"Name":"db_reset"}`),
-	)
-	require.NoErrorf(t, err, "failed to reset")
+	for n := 1; n <= 2; n++ {
 
-	names := []string{"A", "B", "C"}
-	for _, name := range names {
-		err = bc.Query(name, `{"Name":"db_get"}`, "", "0")
-		require.NoErrorf(t, err, "failed to query on reset")
-	}
+		err := bc.ConnectBlock(
+			NewLuaTxCall("user", "A", 0, `{"Name":"db_reset"}`),
+			NewLuaTxCall("user", "B", 0, `{"Name":"db_reset"}`),
+			NewLuaTxCall("user", "C", 0, `{"Name":"db_reset"}`),
+		)
+		require.NoErrorf(t, err, "failed to reset")
 
-	script = strings.ReplaceAll(script, "'", "\"")
-	tx := NewLuaTxCall("user", "A", 0, fmt.Sprintf(`{"Name":"test", "Args":[%s]}`, script))
-	err = bc.ConnectBlock(tx)
-	//require.NoErrorf(t, err, "failed to call tx")
-	//receipt := bc.GetReceipt(tx.Hash())
-	//assert.Equal(t, ``, receipt.GetRet(), "receipt ret error")
-	//fmt.Printf("events: %v\n", receipt.GetEvents())
-
-	for contract, value := range expected {
-		err = bc.Query(contract, `{"Name":"db_get"}`, "", fmt.Sprintf("%d", value))
-		require.NoErrorf(t, err, "query failed")
+		names := []string{"A", "B", "C"}
+		for _, name := range names {
+			err = bc.Query(name, `{"Name":"db_get"}`, "", "0")
+			require.NoErrorf(t, err, "failed to query on reset")
+		}
+
+		script = strings.ReplaceAll(script, "'", "\"")
+		var tx LuaTxTester
+		if n == 1 {
+			tx = NewLuaTxCall("user", "A", 0, fmt.Sprintf(`{"Name":"test", "Args":[%s]}`, script))
+		} else {
+			tx = NewLuaTxMultiCall("user", fmt.Sprintf(`[["call","%s","test",%s]]`, nameToAddress("A"), script))
+		}
+		err = bc.ConnectBlock(tx)
+		//require.NoErrorf(t, err, "failed to call tx")
+		//receipt := bc.GetReceipt(tx.Hash())
+		//assert.Equal(t, ``, receipt.GetRet(), "receipt ret error")
+		//fmt.Printf("events: %v\n", receipt.GetEvents())
+
+		for contract, value := range expected {
+			err = bc.Query(contract, `{"Name":"db_get"}`, "", fmt.Sprintf("%d", value))
+			require.NoErrorf(t, err, "query failed")
+		}
 	}
 }
 
@@ -4392,6 +4683,1585 @@ func TestContractIsolation(t *testing.T) {
 	}
 }
 
+//////////////////////////////////////////////////////////////////////
+// COMPOSABLE TRANSACTIONS
+//////////////////////////////////////////////////////////////////////
+
+func multicall(t *testing.T, bc *DummyChain, params ...string) {
+	t.Helper()
+
+	var expectedError, expectedResult string
+	account := params[0]
+	payload := params[1]
+	if len(params) > 2 {
+		expectedError = params[2]
+	}
+	if len(params) > 3 {
+		expectedResult = params[3]
+	}
+
+	tx := NewLuaTxMultiCall(account, payload).Fail(expectedError)
+
+	err := bc.ConnectBlock(tx)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if expectedError == "" && expectedResult != "" {
+		receipt := bc.GetReceipt(tx.Hash())
+		if receipt.GetRet() != expectedResult {
+			t.Errorf("multicall invalid result - expected: %s	got: %s", expectedResult, receipt.GetRet())
+		}
+	}
+
+}
+
+func call(t *testing.T, bc *DummyChain,
+          account string, amount uint64,
+          contract string, function string, args string,
+          expectedError string, expectedResult string) {
+
+	t.Helper()
+
+	callinfo := fmt.Sprintf(`{"Name":"%s", "Args":%s}`, function, args)
+
+	tx := NewLuaTxCall(account, contract, amount, callinfo).Fail(expectedError)
+
+	err := bc.ConnectBlock(tx)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if expectedError == "" && expectedResult != "" {
+		receipt := bc.GetReceipt(tx.Hash())
+		if receipt.GetRet() != expectedResult {
+			t.Errorf("call invalid result - expected: %s  got: %s", expectedResult, receipt.GetRet())
+		}
+	}
+
+}
+
+func contract_multicall(t *testing.T, bc *DummyChain,
+          account string, contract string, function string, script string,
+          expectedError string, expectedResult string) {
+
+	t.Helper()
+
+	// escape the script JSON string
+	callinfo := fmt.Sprintf(`{"Name":"%s", "Args":[%s]}`, function, strconv.Quote(script))
+
+	tx := NewLuaTxCall(account, contract, 0, callinfo).Fail(expectedError)
+
+	err := bc.ConnectBlock(tx)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if expectedError == "" && expectedResult != "" {
+		receipt := bc.GetReceipt(tx.Hash())
+		if receipt.GetRet() != expectedResult {
+			t.Errorf("call invalid result - expected: %s  got: %s", expectedResult, receipt.GetRet())
+		}
+	}
+
+}
+
+func build_call_tx(account string, contract string, function string, args string) *luaTxCall {
+	callinfo := fmt.Sprintf(`{"Name":"%s", "Args":%s}`, function, args)
+	return NewLuaTxCall(account, contract, 0, callinfo)
+}
+
+func build_contract_multicall_tx(account string, contract string, function string, script string) *luaTxCall {
+	callinfo := fmt.Sprintf(`{"Name":"%s", "Args":[%s]}`, function, strconv.Quote(script))
+	return NewLuaTxCall(account, contract, 0, callinfo)
+}
+
+func execute_block(t *testing.T, bc *DummyChain, txns []*luaTxCall, expectedResults []string) {
+	t.Helper()
+
+	// Convert []*luaTxCall to []LuaTxTester
+	luaTxTesters := make([]LuaTxTester, len(txns))
+	for i, tx := range txns {
+		luaTxTesters[i] = LuaTxTester(tx)
+	}
+
+	err := bc.ConnectBlock(luaTxTesters...)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	for i, tx := range txns {
+		receipt := bc.GetReceipt(tx.Hash())
+		if receipt.GetRet() != expectedResults[i] {
+			t.Errorf("call invalid result - expected: %s  got: %s", expectedResults[i], receipt.GetRet())
+		}
+	}
+
+}
+
+func TestComposableTransactions(t *testing.T) {
+	code := readLuaCode(t, "feature_multicall.lua")
+
+	for version := min_version_multicall; version <= max_version; version++ {
+		bc, err := LoadDummyChain(SetHardForkVersion(version))
+		require.NoErrorf(t, err, "failed to create dummy chain")
+		defer bc.Release()
+
+		err = bc.ConnectBlock(
+			NewLuaTxAccount("ac0", 10, types.Aergo),
+			NewLuaTxAccount("ac1", 10, types.Aergo),
+			NewLuaTxAccount("ac2", 10, types.Aergo),
+			NewLuaTxAccount("ac3", 10, types.Aergo),
+			NewLuaTxAccount("ac4", 10, types.Aergo),
+			NewLuaTxAccount("ac5", 10, types.Aergo),
+			NewLuaTxDeploy("ac0", "tables", 0, code),
+			NewLuaTxDeploy("ac0", "c1", 0, code),
+			NewLuaTxDeploy("ac0", "c2", 0, code),
+			NewLuaTxDeploy("ac0", "c3", 0, code),
+		)
+		if err != nil {
+			t.Error(err)
+		}
+
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_dict"],
+		 ["store result as","dict"],
+		 ["set","%dict%","two",22],
+		 ["set","%dict%","four",4],
+		 ["set","%dict%","one",null],
+		 ["get","%dict%","two"],
+		 ["set","%dict%","copy","%last result%"],
+		 ["return","%dict%"]
+		]`, ``, `{"copy":22,"four":4,"three":3,"two":22}`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_list"],
+		 ["store result as","array"],
+		 ["set","%array%",2,"2nd"],
+		 ["insert","%array%",1,"zero"],
+		 ["insert","%array%","last"],
+		 ["return","%array%"]
+		]`, ``, `["zero","first","2nd","third",123,12.5,true,"last"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_list"],
+		 ["store result as","array"],
+		 ["remove","%array%",3],
+		 ["return","%array%","%last result%"]
+		]`, ``, `[["first","second",123,12.5,true],"third"]`)
+
+
+		// create new dict or array using fromjson
+
+		multicall(t, bc, "ac1", `[
+		 ["from json","{\"one\":1,\"two\":2}"],
+		 ["set","%last result%","three",3],
+		 ["return","%last result%"]
+		]`, ``, `{"one":1,"three":3,"two":2}`)
+
+
+		// define dict or list using let
+
+		multicall(t, bc, "ac1", `[
+		 ["let","obj",{"one":1,"two":2}],
+		 ["set","%obj%","three",3],
+		 ["return","%obj%"]
+		]`, ``, `{"one":1,"three":3,"two":2}`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",["one",1,"two",2,2.5,true,false]],
+		 ["set","%list%",4,"three"],
+		 ["insert","%list%",1,"first"],
+		 ["insert","%list%","last"],
+		 ["return","%list%"]
+		]`, ``, `["first","one",1,"two","three",2.5,true,false,"last"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",["one",22,3.3,true,false]],
+		 ["get","%list%",1],
+		 ["assert","%last result%","=","one"],
+		 ["get","%list%",2],
+		 ["assert","%last result%","=",22],
+		 ["get","%list%",3],
+		 ["assert","%last result%","=",3.3],
+		 ["get","%list%",4],
+		 ["assert","%last result%","=",true],
+		 ["get","%list%",5],
+		 ["assert","%last result%","=",false],
+		 ["return","%list%"]
+		]`, ``, `["one",22,3.3,true,false]`)
+
+
+		// get size
+
+		multicall(t, bc, "ac1", `[
+		 ["let","str","this is a string"],
+		 ["get size","%str%"],
+		 ["return","%last result%"]
+		]`, ``, `16`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",["one",1,"two",2,2.5,true,false]],
+		 ["get size","%list%"],
+		 ["return","%last result%"]
+		]`, ``, `7`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","obj",{"one":1,"two":2,"three":3}],
+		 ["get size","%obj%"],
+		 ["return","%last result%"]
+		]`, ``, `0`)
+
+
+
+
+		// BIGNUM
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number",123],
+		 ["store result as","a"],
+		 ["to big number",123],
+		 ["store result as","b"],
+		 ["multiply","%a%","%b%"],
+		 ["return","%last result%"]
+		]`, ``, `{"_bignum":"15129"}`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","100000"],
+		 ["store result as","b"],
+		 ["divide","%a%","%b%"],
+		 ["return","%last result%"]
+		]`, ``, `{"_bignum":"5000000000000000"}`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","100000"],
+		 ["store result as","b"],
+		 ["divide","%a%","%b%"],
+		 ["to string","%last result%"],
+		 ["return","%last result%"]
+		]`, ``, `"5000000000000000"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+
+		 ["to big number","100000"],
+		 ["divide","%a%","%last result%"],
+		 ["store result as","a"],
+
+		 ["to big number","1000000000000000"],
+		 ["subtract","%a%","%last result%"],
+		 ["store result as","a"],
+
+		 ["to big number","1234"],
+		 ["add","%a%","%last result%"],
+		 ["store result as","a"],
+
+		 ["to big number","2"],
+		 ["remainder","%a%","10000"],
+
+		 ["return","%last result%"]
+		]`, ``, `{"_bignum":"1234"}`)
+
+
+
+		// STRINGS
+
+		multicall(t, bc, "ac1", `[
+		 ["format","%s%s%s","hello"," ","world"],
+		 ["return","%last result%"]
+		]`, ``, `"hello world"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s","hello world"],
+		 ["extract","%s%",1,4],
+		 ["return","%last result%"]
+		]`, ``, `"hell"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s","hello world"],
+		 ["extract","%s%",-2,-1],
+		 ["return","%last result%"]
+		]`, ``, `"ld"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s","the amount is 12345"],
+		 ["find","%s%","%d+"],
+		 ["to number"],
+		 ["return","%last result%"]
+		]`, ``, `12345`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s","rate: 55 10%"],
+		 ["find","%s%","(%d+)%%"],
+		 ["to number"],
+		 ["return","%last result%"]
+		]`, ``, `10`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s","rate: 12%"],
+		 ["find","%s%","%s*(%d+)%%"],
+		 ["to number"],
+		 ["return","%last result%"]
+		]`, ``, `12`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s","hello world"],
+		 ["replace","%s%","hello","good bye"],
+		 ["return","%last result%"]
+		]`, ``, `"good bye world"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["from json","{\"name\":\"ticket\",\"value\":12.5,\"amount\":10}"],
+		 ["replace","name = $name, value = $value, amount = $amount","%$(%w+)","%last result%"],
+		 ["return","%last result%"]
+		]`, ``, `"name = ticket, value = 12.5, amount = 10"`)
+
+
+		// IF THEN ELSE
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s",20],
+		 ["if","%s%",">=",20],
+		 ["let","b","big"],
+		 ["else if","%s%",">=",10],
+		 ["let","b","medium"],
+		 ["else"],
+		 ["let","b","low"],
+		 ["end if"],
+		 ["let","c","after"],
+		 ["return","%b%","%c%"]
+		]`, ``, `["big","after"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s",10],
+		 ["if","%s%",">=",20],
+		 ["let","b","big"],
+		 ["else if","%s%",">=",10],
+		 ["let","b","medium"],
+		 ["else"],
+		 ["let","b","low"],
+		 ["end if"],
+		 ["let","c","after"],
+		 ["return","%b%","%c%"]
+		]`, ``, `["medium","after"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s",5],
+		 ["if","%s%",">=",20],
+		 ["let","b","big"],
+		 ["else if","%s%",">=",10],
+		 ["let","b","medium"],
+		 ["else"],
+		 ["let","b","low"],
+		 ["end if"],
+		 ["let","c","after"],
+		 ["return","%b%","%c%"]
+		]`, ``, `["low","after"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s",20],
+		 ["if","%s%",">=",20],
+		 ["return","big"],
+		 ["else if","%s%",">=",10],
+		 ["return","medium"],
+		 ["else"],
+		 ["return","low"],
+		 ["end if"],
+		 ["return","after"]
+		]`, ``, `"big"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s",10],
+		 ["if","%s%",">=",20],
+		 ["return","big"],
+		 ["else if","%s%",">=",10],
+		 ["return","medium"],
+		 ["else"],
+		 ["return","low"],
+		 ["end if"],
+		 ["return","after"]
+		]`, ``, `"medium"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","s",5],
+		 ["if","%s%",">=",20],
+		 ["return","big"],
+		 ["else if","%s%",">=",10],
+		 ["return","medium"],
+		 ["else"],
+		 ["return","low"],
+		 ["end if"],
+		 ["return","after"]
+		]`, ``, `"low"`)
+
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000000"],
+		 ["store result as","b"],
+		 ["if","%a%","=","%b%"],
+		 ["let","b","equal"],
+		 ["else"],
+		 ["let","b","diff"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"equal"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000001"],
+		 ["store result as","b"],
+		 ["if","%a%","=","%b%"],
+		 ["let","b","equal"],
+		 ["else"],
+		 ["let","b","diff"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"diff"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000001"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000000"],
+		 ["store result as","b"],
+		 ["if","%a%",">","%b%"],
+		 ["let","b","bigger"],
+		 ["else"],
+		 ["let","b","lower"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"bigger"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000001"],
+		 ["store result as","b"],
+		 ["if","%a%",">","%b%"],
+		 ["let","b","bigger"],
+		 ["else"],
+		 ["let","b","lower"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"lower"`)
+
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000001"],
+		 ["store result as","b"],
+		 ["if","%a%","<","%b%","and","1","=","0"],
+		 ["let","b","wrong 1"],
+		 ["else if","%a%","<","%b%","and","1","=","1"],
+		 ["let","b","correct"],
+		 ["else"],
+		 ["let","b","wrong 2"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"correct"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000001"],
+		 ["store result as","b"],
+		 ["if","%a%","<","%b%","and",1,"=",0],
+		 ["let","b","wrong 1"],
+		 ["else if","%a%","<","%b%","and",1,"=",1],
+		 ["let","b","correct"],
+		 ["else"],
+		 ["let","b","wrong 2"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"correct"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000001"],
+		 ["store result as","b"],
+		 ["to big number","400000000000000000000"],
+		 ["store result as","c"],
+		 ["if","%a%","<","%b%","and","%a%","<","%c%"],
+		 ["let","b","wrong 1"],
+		 ["else if","%a%",">","%b%","and","%a%",">","%c%"],
+		 ["let","b","wrong 2"],
+		 ["else if","%a%","<","%b%","and","%a%",">","%c%"],
+		 ["let","b","correct"],
+		 ["else"],
+		 ["let","b","wrong 3"],
+		 ["end if"],
+		 ["return","%b%"]
+		]`, ``, `"correct"`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","500000000000000000000"],
+		 ["store result as","a"],
+		 ["to big number","500000000000000000001"],
+		 ["store result as","b"],
+		 ["to big number","400000000000000000000"],
+		 ["store result as","c"],
+		 ["to string",0],
+
+		 ["if","%a%",">","%b%","or","%a%","<","%c%"],
+		 ["format","%s%s","%last result%","1"],
+		 ["end if"],
+
+		 ["if","%a%","=","%b%","or","%a%","=","%c%"],
+		 ["format","%s%s","%last result%","2"],
+		 ["end if"],
+
+		 ["if","%a%","<","%b%","or","%a%","<","%c%"],
+		 ["format","%s%s","%last result%","3"],
+		 ["end if"],
+
+		 ["if","%a%",">","%b%","or","%a%",">","%c%"],
+		 ["format","%s%s","%last result%","4"],
+		 ["end if"],
+
+		 ["if","%a%","<","%b%","or","%a%",">","%c%"],
+		 ["format","%s%s","%last result%","5"],
+		 ["end if"],
+
+		 ["if","%a%","!=","%b%","or","%a%","=","%c%"],
+		 ["format","%s%s","%last result%","6"],
+		 ["end if"],
+
+		 ["if","%a%","=","%b%","or","%a%","!=","%c%"],
+		 ["format","%s%s","%last result%","7"],
+		 ["end if"],
+
+
+		 ["if","%a%",">=","%b%","and","%a%","<=","%c%"],
+		 ["format","%s%s","%last result%","8"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%c%","and","%a%","<=","%b%"],
+		 ["format","%s%s","%last result%","9"],
+		 ["end if"],
+
+		 ["if","%b%",">=","%a%","and","%b%","<=","%c%"],
+		 ["format","%s%s","%last result%","A"],
+		 ["end if"],
+
+		 ["if","%b%",">=","%c%","and","%b%","<=","%a%"],
+		 ["format","%s%s","%last result%","B"],
+		 ["end if"],
+
+		 ["if","%c%",">=","%a%","and","%c%","<=","%b%"],
+		 ["format","%s%s","%last result%","C"],
+		 ["end if"],
+
+		 ["if","%c%",">=","%b%","and","%c%","<=","%a%"],
+		 ["format","%s%s","%last result%","D"],
+		 ["end if"],
+
+
+		 ["if","%a%",">=","%b%","and","%a%","<=","%c%","or",1,"=",0],
+		 ["format","%s%s","%last result%","E"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%b%","and","%a%","<=","%c%","or",1,"=",1],
+		 ["format","%s%s","%last result%","F"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%b%","and","%a%","<=","%c%","and",1,"=",0],
+		 ["format","%s%s","%last result%","G"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%b%","and","%a%","<=","%c%","and",1,"=",1],
+		 ["format","%s%s","%last result%","H"],
+		 ["end if"],
+
+
+		 ["if","%a%",">=","%c%","and","%a%","<=","%b%","or",1,"=",0],
+		 ["format","%s%s","%last result%","I"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%c%","and","%a%","<=","%b%","or",1,"=",1],
+		 ["format","%s%s","%last result%","J"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%c%","and","%a%","<=","%b%","and",1,"=",0],
+		 ["format","%s%s","%last result%","K"],
+		 ["end if"],
+
+		 ["if","%a%",">=","%c%","and","%a%","<=","%b%","and",1,"=",1],
+		 ["format","%s%s","%last result%","L"],
+		 ["end if"],
+
+
+		 ["if",1,"=",0,"or","%a%",">=","%b%","and","%a%","<=","%c%"],
+		 ["format","%s%s","%last result%","M"],
+		 ["end if"],
+
+		 ["if",1,"=",1,"or","%a%",">=","%b%","and","%a%","<=","%c%"],
+		 ["format","%s%s","%last result%","N"],
+		 ["end if"],
+
+		 ["if",1,"=",0,"or","%a%",">=","%c%","and","%a%","<=","%b%"],
+		 ["format","%s%s","%last result%","O"],
+		 ["end if"],
+
+		 ["if",1,"=",1,"or","%a%",">=","%c%","and","%a%","<=","%b%"],
+		 ["format","%s%s","%last result%","P"],
+		 ["end if"],
+
+
+		 ["return","%last result%"]
+		]`, ``, `"0345679IJLNOP"`)
+
+
+
+
+		// FOR
+
+		multicall(t, bc, "ac1", `[
+		 ["for","n",1,5],
+		 ["loop"],
+		 ["return","%n%"]
+		]`, ``, `6`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",1,5],
+		 ["add","%last result%",1],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `5`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to big number","10000000000000000001"],
+		 ["store result as","to_add"],
+		 ["to big number","100000000000000000000"],
+
+		 ["for","n",1,3],
+		 ["add","%last result%","%to_add%"],
+		 ["loop"],
+
+		 ["to string","%last result%"],
+		 ["return","%last result%"]
+		]`, ``, `"130000000000000000003"`)
+
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",500,10,-5],
+		 ["add","%last result%",1],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `99`)
+
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",5,1,-1],
+		 ["add","%last result%",1],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `5`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",5,1],
+		 ["add","%last result%",1],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `0`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",1,5],
+		 ["add","%last result%",1],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `5`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",1,5,-1],
+		 ["add","%last result%",1],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `0`)
+
+
+
+		// FOREACH
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",[11,22,33]],
+		 ["let","r",0],
+		 ["for each","item","in","%list%"],
+		 ["add","%r%","%item%"],
+		 ["store result as","r"],
+		 ["loop"],
+		 ["return","%r%"]
+		]`, ``, `66`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",[11,22,33]],
+		 ["let","counter",0],
+		 ["for each","item","in","%list%"],
+		 ["add","%counter%",1],
+		 ["store result as","counter"],
+		 ["loop"],
+		 ["return","%counter%"]
+		]`, ``, `3`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",[]],
+		 ["let","counter",0],
+		 ["for each","item","in","%list%"],
+		 ["add","%counter%",1],
+		 ["store result as","counter"],
+		 ["loop"],
+		 ["return","%counter%"]
+		]`, ``, `0`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",["one",1,"two",2,2.5,true,false]],
+		 ["let","counter",0],
+		 ["for each","item","in","%list%"],
+		 ["add","%counter%",1],
+		 ["store result as","counter"],
+		 ["loop"],
+		 ["return","%counter%"]
+		]`, ``, `7`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","list",[10,21,32]],
+		 ["let","r",0],
+		 ["for each","item","in","%list%"],
+		 ["if","%item%","<",30],
+		 ["add","%r%","%item%"],
+		 ["store result as","r"],
+		 ["end if"],
+		 ["loop"],
+		 ["return","%r%"]
+		]`, ``, `31`)
+
+
+
+		// FORPAIR
+
+		multicall(t, bc, "ac1", `[
+		 ["let","str",""],
+		 ["let","sum",0],
+		 ["let","obj",{"one":1,"two":2,"three":3}],
+		 ["for each","key","value","in","%obj%"],
+		 ["combine","%str%","%key%"],
+		 ["store result as","str"],
+		 ["add","%sum%","%value%"],
+		 ["store result as","sum"],
+		 ["loop"],
+		 ["return","%str%","%sum%"]
+		]`, ``, `["onethreetwo",6]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","str",""],
+		 ["let","sum",0],
+		 ["let","obj",{"one":1.5,"two":2.5,"three":3.5,"four":4.5}],
+		 ["for each","key","value","in","%obj%"],
+		 ["combine","%str%","%key%"],
+		 ["store result as","str"],
+		 ["add","%sum%","%value%"],
+		 ["store result as","sum"],
+		 ["loop"],
+		 ["return","%str%","%sum%"]
+		]`, ``, `["fouronethreetwo",12]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","names",[]],
+		 ["let","values",[]],
+		 ["let","obj",{"one":1.5,"two":2.5,"three":3.5,"four":4.5}],
+		 ["for each","key","value","in","%obj%"],
+		 ["insert","%names%","%key%"],
+		 ["insert","%values%","%value%"],
+		 ["loop"],
+		 ["return","%names%","%values%"]
+		]`, ``, `[["four","one","three","two"],[4.5,1.5,3.5,2.5]]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","names",[]],
+		 ["let","values",[]],
+		 ["let","obj",{"one":1.5,"two":2.5,"three":3.5,"four":4.5}],
+		 ["for each","key","value","in","%obj%"],
+		 ["insert","%names%","%key%"],
+		 ["insert","%values%","%value%"],
+		 ["loop"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","sort","%values%"],
+		 ["store result as","values"],
+		 ["return","%names%","%values%"]
+		]`, ``, `[["four","one","three","two"],[1.5,2.5,3.5,4.5]]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","obj",{}],
+		 ["let","counter",0],
+		 ["for each","key","value","in","%obj%"],
+		 ["add","%counter%",1],
+		 ["store result as","counter"],
+		 ["loop"],
+		 ["return","%counter%"]
+		]`, ``, `0`)
+
+
+
+		// FOR "BREAK"
+
+		multicall(t, bc, "ac1", `[
+		 ["let","c",0],
+		 ["for","n",1,10],
+		 ["add","%c%",1],
+		 ["store result as","c"],
+		 ["if","%n%","=",5],
+		 ["let","n",500],
+		 ["end if"],
+		 ["loop"],
+		 ["return","%c%"]
+		]`, ``, `5`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",500,10,-5],
+		 ["add","%last result%",1],
+		 ["if","%n%","=",475],
+		 ["let","n",2],
+		 ["end if"],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `6`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","c",0],
+		 ["for","n",1,10],
+		 ["add","%c%",1],
+		 ["store result as","c"],
+		 ["if","%n%","=",5],
+		 ["break"],
+		 ["end if"],
+		 ["loop"],
+		 ["return","%c%"]
+		]`, ``, `5`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","c",0],
+		 ["for","n",1,10],
+		 ["add","%c%",1],
+		 ["store result as","c"],
+		 ["break","if","%n%","=",5],
+		 ["loop"],
+		 ["return","%c%"]
+		]`, ``, `5`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",500,10,-5],
+		 ["add","%last result%",1],
+		 ["if","%n%","=",475],
+		 ["break"],
+		 ["end if"],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `6`)
+
+		multicall(t, bc, "ac1", `[
+		 ["to number","0"],
+		 ["for","n",500,10,-5],
+		 ["add","%last result%",1],
+		 ["break","if","%n%","=",475],
+		 ["loop"],
+		 ["return","%last result%"]
+		]`, ``, `6`)
+
+		multicall(t, bc, "ac1", `[
+		 ["for","n",1,5],
+		 ["loop"],
+		 ["return","%n%"]
+		]`, ``, `6`)
+
+		multicall(t, bc, "ac1", `[
+		 ["for","n",1,5],
+		 ["break"],
+		 ["loop"],
+		 ["return","%n%"]
+		]`, ``, `1`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","names",[]],
+		 ["let","list",["one","two","three","four"]],
+		 ["for each","item","in","%list%"],
+		 ["if","%item%","=","three"],
+		 ["break"],
+		 ["end if"],
+		 ["insert","%names%","%item%"],
+		 ["loop"],
+		 ["return","%names%"]
+		]`, ``, `["one","two"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","names",[]],
+		 ["let","list",["one","two","three","four"]],
+		 ["for each","item","in","%list%"],
+		 ["break","if","%item%","=","three"],
+		 ["insert","%names%","%item%"],
+		 ["loop"],
+		 ["return","%names%"]
+		]`, ``, `["one","two"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","names",[]],
+		 ["let","obj",{"one":true,"two":false,"three":false,"four":true}],
+		 ["for each","key","value","in","%obj%"],
+		 ["if","%value%","=",false],
+		 ["break"],
+		 ["end if"],
+		 ["insert","%names%","%key%"],
+		 ["loop"],
+		 ["return","%names%"]
+		]`, ``, `["four","one"]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","names",[]],
+		 ["let","obj",{"one":true,"two":false,"three":false,"four":true}],
+		 ["for each","key","value","in","%obj%"],
+		 ["break","if","%value%","=",false],
+		 ["insert","%names%","%key%"],
+		 ["loop"],
+		 ["return","%names%"]
+		]`, ``, `["four","one"]`)
+
+
+
+		// RETURN before the end
+
+		multicall(t, bc, "ac1", `[
+		 ["let","v",123],
+		 ["if","%v%",">",100],
+		 ["return"],
+		 ["end if"],
+		 ["let","v",500],
+		 ["return","%v%"]
+		]`, ``, ``)
+
+		multicall(t, bc, "ac1", `[
+		 ["let","v",123],
+		 ["if","%v%",">",200],
+		 ["return"],
+		 ["end if"],
+		 ["let","v",500],
+		 ["return","%v%"]
+		]`, ``, `500`)
+
+
+
+		// FULL LOOPS
+
+		multicall(t, bc, "ac1", `[
+		 ["let","c","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["call","%c%","inc","n"],
+		 ["call","%c%","get","n"],
+		 ["if","%last result%",">=",5],
+		 ["return","%last result%"],
+		 ["end if"],
+		 ["loop"]
+		]`, ``, `5`)
+
+
+
+
+		// CALLS
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","works"],
+		 ["assert","%last result%","=",123],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","works"],
+		 ["return","%last result%"]
+		]`, ``, `123`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","works"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","fails"]
+		]`, `this call should fail`)
+
+
+		multicall(t, bc, "ac3", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set_name","test"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_name"],
+		 ["assert","%last result%","=","test"]
+		]`)
+
+		multicall(t, bc, "ac3", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set_name","wrong"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_name"],
+		 ["assert","%last result%","=","wrong"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set_name",123]
+		]`, `must be string`)
+
+		multicall(t, bc, "ac3", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_name"],
+		 ["assert","%last result%","=","test"],
+		 ["return","%last result%"]
+		]`, ``, `"test"`)
+
+
+		multicall(t, bc, "ac3", `[
+		 ["let","c","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["call","%c%","set_name","test2"],
+		 ["call","%c%","get_name"],
+		 ["assert","%last result%","=","test2"]
+		]`)
+
+		multicall(t, bc, "ac3", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","sender"],
+		 ["assert","%last result%","=","%my account address%"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","is_contract","%my account address%"],
+		 ["assert","%last result%","=",false],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set","account","%my account address%"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","account"],
+		 ["assert","%last result%","=","%my account address%"]
+		]`)
+
+		// CALL + SEND
+
+		multicall(t, bc, "ac3", `[
+		 ["get aergo balance","%my account address%"],
+		 ["store result as","my balance before"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["store result as","contract balance before"],
+		 ["call + send","0.25 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","resend_to","%my account address%"],
+		 ["assert","%last result%","=","250000000000000000"],
+		 ["get aergo balance","%my account address%"],
+		 ["assert","%last result%","=","%my balance before%"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","%contract balance before%"]
+		]`)
+
+		multicall(t, bc, "ac3", `[
+		 ["get aergo balance","%my account address%"],
+		 ["store result as","my balance before"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["store result as","contract balance before"],
+
+		 ["let","amount","1.5","aergo"],
+		 ["call + send","%amount%","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","recv_aergo"],
+
+		 ["assert","%my aergo balance%","<","%my balance before%"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%",">","%contract balance before%"],
+
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","send_to","%my account address%","%amount%"],
+
+		 ["assert","%my aergo balance%","=","%my balance before%"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","%contract balance before%"]
+		]`)
+
+
+		// CALL LOOP
+
+		multicall(t, bc, "ac3", `[
+		 ["let","list",["first","second","third"]],
+		 ["for each","item","in","%list%"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","add","%item%"],
+		 ["loop"]
+		]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","1"],
+		 ["assert","%last result%","=","first"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","2"],
+		 ["assert","%last result%","=","second"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","3"],
+		 ["assert","%last result%","=","third"]
+		]`)
+
+		multicall(t, bc, "ac3", `[
+		 ["let","list",["1st","2nd","3rd"]],
+		 ["let","n",1],
+		 ["for each","item","in","%list%"],
+		 ["to string","%n%"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set","%last result%","%item%"],
+		 ["add","%n%",1],
+		 ["store result as","n"],
+		 ["loop"]
+		]`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","1"],
+		 ["assert","%last result%","=","1st"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","2"],
+		 ["assert","%last result%","=","2nd"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","3"],
+		 ["assert","%last result%","=","3rd"]
+		]`)
+
+
+
+		// TRY CALL
+
+		multicall(t, bc, "ac1", `[
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","works"],
+		 ["assert","%call succeeded%","=",true],
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","fails"],
+		 ["assert","%call succeeded%","=",false]
+		]`)
+
+		multicall(t, bc, "ac3", `[
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set_name","1st"],
+		 ["assert","%call succeeded%"],
+
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_name"],
+		 ["assert","%call succeeded%","=",true],
+		 ["assert","%last result%","=","1st"],
+
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set_name",22],
+		 ["assert","%call succeeded%","=",false],
+
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get_name"],
+		 ["assert","%call succeeded%","=",true],
+		 ["assert","%last result%","=","1st"],
+
+		 ["return","%last result%"]
+		]`, ``, `"1st"`)
+
+
+		// TRY CALL + SEND
+
+		multicall(t, bc, "ac1", `[
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","0"],
+		 ["try call + send","0.25 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","recv_aergo"],
+		 ["assert","%call succeeded%"],
+		 ["try call + send","1 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","recv_aergo"],
+		 ["assert","%call succeeded%","=",true],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","1.25 aergo"],
+		 ["try call + send","1 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRB","recv_aergo"],
+		 ["assert","%call succeeded%","=",false]
+		]`)
+
+		// ac1: AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1
+		// ac2: AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2
+
+		multicall(t, bc, "ac1", `[
+		 ["let","balance before","%my aergo balance%"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","1.25 aergo"],
+
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","send_and_fail","AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1","0.5 aergo"],
+		 ["assert","%call succeeded%","=",false],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","1.25 aergo"],
+		 ["assert","%my aergo balance%","=","%balance before%"],
+
+		 ["try call + send","0.25 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","resend_and_fail","AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1"],
+		 ["assert","%call succeeded%","=",false],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","1.25 aergo"],
+		 ["assert","%my aergo balance%","=","%balance before%"],
+
+		 ["try call + send","0.25 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","resend_and_fail","AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2"],
+		 ["assert","%call succeeded%","=",false],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","1.25 aergo"],
+		 ["assert","%my aergo balance%","=","%balance before%"],
+
+		 ["try call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","send_to","AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1","0.5 aergo"],
+		 ["assert","%call succeeded%"],
+		 ["get aergo balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last result%","=","0.75 aergo"],
+		 ["subtract","%my aergo balance%","%balance before%"],
+		 ["assert","%last result%","=","0.5 aergo"]
+		]`)
+
+
+		// MULTICALL ON ACCOUNT ------------------------------------------
+
+
+		//deploy ac0 0 c1 test.lua
+		//deploy ac0 0 c2 test.lua
+		//deploy ac0 0 c3 test.lua
+
+		// c1: AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9
+		// c2: Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4
+		// c3: AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK
+
+		multicall(t, bc, "ac0", `[
+		 ["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","set_name","testing multicall"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","set_name","contract 2"],
+		 ["call","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","set_name","third one"]
+		]`)
+
+		multicall(t, bc, "ac0", `[
+		 ["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","get_name"],
+		 ["assert","%last result%","=","testing multicall"],
+		 ["store result as","r1"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","get_name"],
+		 ["assert","%last result%","=","contract 2"],
+		 ["store result as","r2"],
+		 ["call","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","get_name"],
+		 ["assert","%last result%","=","third one"],
+		 ["store result as","r3"],
+		 ["return","%r1%","%r2%","%r3%"]
+		]`, ``, `["testing multicall","contract 2","third one"]`)
+
+		multicall(t, bc, "ac0", `[
+		 ["from json","{}"],
+		 ["store result as","res"],
+		 ["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","get_name"],
+		 ["set","%res%","r1","%last result%"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","get_name"],
+		 ["set","%res%","r2","%last result%"],
+		 ["call","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","get_name"],
+		 ["set","%res%","r3","%last result%"],
+		 ["return","%res%"]
+		]`, ``, `{"r1":"testing multicall","r2":"contract 2","r3":"third one"}`)
+
+
+		multicall(t, bc, "ac0", `[
+		 ["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","set_name","wohooooooo"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","set_name","it works!"],
+		 ["call","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","set_name","it really works!"]
+		]`)
+
+		multicall(t, bc, "ac0", `[
+		 ["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","get_name"],
+		 ["assert","%last result%","=","wohooooooo"],
+		 ["store result as","r1"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","get_name"],
+		 ["assert","%last result%","=","it works!"],
+		 ["store result as","r2"],
+		 ["call","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","get_name"],
+		 ["assert","%last result%","=","it really works!"],
+		 ["store result as","r3"],
+		 ["return","%r1%","%r2%","%r3%"]
+		]`, ``, `["wohooooooo","it works!","it really works!"]`)
+
+		multicall(t, bc, "ac0", `[
+		 ["from json","{}"],
+		 ["store result as","res"],
+		 ["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","get_name"],
+		 ["set","%res%","r1","%last result%"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","get_name"],
+		 ["set","%res%","r2","%last result%"],
+		 ["call","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","get_name"],
+		 ["set","%res%","r3","%last result%"],
+		 ["return","%res%"]
+		]`, ``, `{"r1":"wohooooooo","r2":"it works!","r3":"it really works!"}`)
+
+
+
+		// aergo BALANCE and SEND
+
+		multicall(t, bc, "ac5", `[
+		 ["assert","%my aergo balance%","=","10 aergo"],
+
+		 ["send","AmhC1V24v3MM6EzLaypudkrEP4NyX3D44aU9vmzV9cAxXUjbRTK6","0.5 aergo"],
+		 ["assert","%my aergo balance%","=","9.5 aergo"],
+
+		 ["let","amount","1.5","aergo"],
+		 ["send","AmhC1V24v3MM6EzLaypudkrEP4NyX3D44aU9vmzV9cAxXUjbRTK6","%amount%"],
+		 ["assert","%my aergo balance%","=","8000000000000000000"],
+
+		 ["let","amount","2","aergo"],
+		 ["send","AmhC1V24v3MM6EzLaypudkrEP4NyX3D44aU9vmzV9cAxXUjbRTK6","%amount%"],
+		 ["assert","%my aergo balance%","=","6 aergo"],
+
+		 ["return","%my aergo balance%"]
+		]`, ``, `{"_bignum":"6000000000000000000"}`)
+
+		multicall(t, bc, "ac2", `[
+		 ["get aergo balance"],
+		 ["assert","%last result%","=","10000000000000000000"],
+
+		 ["get aergo balance","AmgHyfkUt5iuXJKZNTrdthtXWLLJCrKWdJ6H6Yshn6ZR285Wr2Hc"],
+		 ["assert","%last result%","=","0"],
+
+		 ["send","AmgHyfkUt5iuXJKZNTrdthtXWLLJCrKWdJ6H6Yshn6ZR285Wr2Hc","3000000000000000000"],
+
+		 ["get aergo balance","AmgHyfkUt5iuXJKZNTrdthtXWLLJCrKWdJ6H6Yshn6ZR285Wr2Hc"],
+		 ["assert","%last result%","=","3000000000000000000"],
+
+		 ["get aergo balance"],
+		 ["assert","%last result%","=","7000000000000000000"],
+
+		 ["to string"],
+		 ["return","%last result%"]
+		]`, ``, `"7000000000000000000"`)
+
+
+
+		// SECURITY CHECKS
+
+		// it should not be possible to call the code from another account
+
+		// a. from an account (via multicall, using the 'call' command)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2","execute",[["add",11,22],["return","%last result%"]]],
+		 ["return","%last result%"]
+		]`, `nd contract`)
+
+
+		// b. from an account (via a call tx)
+
+		call(t, bc, "ac1", 0, "ac1", "execute", `[[["add",11,22],["return","%last result%"]]]`, `nd contract`, ``)
+
+		call(t, bc, "ac1", 0, "ac2", "execute", `[[["add",11,22],["return","%last result%"]]]`, `nd contract`, ``)
+
+
+		// c. from a contract (calling back)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","call","AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1","execute",[["add",11,22],["return","%last result%"]]],
+		 ["return","%last result%"]
+		]`, `nd contract`)
+
+
+		// d. from a contract (calling another account)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","call","AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2","execute",[["add",11,22],["return","%last result%"]]],
+		 ["return","%last result%"]
+		]`, `nd contract`)
+
+
+		// e. from a contract (via a call txn)
+
+		call(t, bc, "ac1", 0, "c2", "call", `["AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1","execute",[["add",11,22],["return","%last result%"]]]`, `nd contract`, ``)
+
+		call(t, bc, "ac1", 0, "c2", "call", `["AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2","execute",[["add",11,22],["return","%last result%"]]]`, `nd contract`, ``)
+
+
+		// system.isContract() should return false on user accounts
+
+		call(t, bc, "ac1", 0, "c2", "is_contract", `["AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1"]`, ``, `false`)
+
+		call(t, bc, "ac1", 0, "c2", "is_contract", `["AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2"]`, ``, `false`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","is_contract","AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1"],
+		 ["assert","%last result%","=",false],
+		 ["return","%last result%"]
+		]`, ``, `false`)
+
+		multicall(t, bc, "ac1", `[
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","is_contract","AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2"],
+		 ["assert","%last result%","=",false],
+		 ["return","%last result%"]
+		]`, ``, `false`)
+
+
+		// on a contract called by multicall, the system.getSender() and system.getOrigin() must be the same
+
+		multicall(t, bc, "ac1", `[
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","sender"],
+		 ["store result as","sender"],
+		 ["call","Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4","origin"],
+		 ["store result as","origin"],
+		 ["assert","%sender%","=","%origin%"],
+		 ["return","%sender%"]
+		]`, ``, `"AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1"`)
+
+	}
+}
+
+func TestContractMulticall(t *testing.T) {
+	code1 := readLuaCode(t, "feature_multicall_contract.lua")
+	code2 := readLuaCode(t, "feature_multicall.lua")
+
+	for version := min_version_multicall; version <= max_version; version++ {
+		bc, err := LoadDummyChain(SetHardForkVersion(version))
+		require.NoErrorf(t, err, "failed to create dummy chain")
+		defer bc.Release()
+
+		err = bc.ConnectBlock(
+			NewLuaTxAccount("ac0", 10, types.Aergo),
+			NewLuaTxAccount("ac1", 10, types.Aergo),
+			NewLuaTxAccount("ac2", 10, types.Aergo),
+			NewLuaTxAccount("ac3", 10, types.Aergo),
+
+			NewLuaTxDeploy("ac0", "caller", 0, code1),
+			NewLuaTxDeploy("ac0", "c1", 0, code2),
+			NewLuaTxDeploy("ac0", "c2", 0, code2),
+			NewLuaTxDeploy("ac0", "c3", 0, code2),
+		)
+		if err != nil {
+			t.Error(err)
+		}
+
+		// ac1: AmgMPiyZYr19kQ1kHFNiGenez1CRTBqNWqppj6gGZGEP6qszDGe1
+		// ac2: AmgeSw3M3V3orBMjf1j98kGne4WycnmQWVTJe6MYNrQ2wuVz3Li2
+
+		// caller: AmggmgtWPXtsDkC5hkYYx2iYaWfGs8D4ZvZNwxwdm4gxGSDaCqKn
+		// c1: AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9
+		// c2: Amh8PekqkDmLiwE6FUX6JejjWk3R54cmTaa1Tc1VHZmTRJMruWe4
+		// c3: AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK
+
+		// simple script, no state change
+		contract_multicall(t, bc, "ac1", "caller", "multicall", `[
+			["add",11,22],
+			["return","%last result%"]
+		]`, ``, `33`)
+
+		// state change
+		call(t, bc, "ac1", 0, "caller", "set_value", `["num",111]`, ``, ``)
+		call(t, bc, "ac1", 0, "caller", "get_value", `["num"]`, ``, `111`)
+
+		// check balance
+		state, err := bc.GetAccountState("caller")
+		assert.Equalf(t, uint64(0), state.GetBalanceBigInt().Uint64(), "balance error")
+
+		contract_multicall(t, bc, "ac1", "caller", "multicall", `[
+			["return","%my aergo balance%"]
+		]`, ``, `{"_bignum":"0"}`)
+
+		// transfer aergo to the 'caller' contract
+		call(t, bc, "ac1", types.NewAmount(1,types.Aergo).Uint64(), "caller", "recv_aergo", `[]`, ``, ``)
+
+		// use the multicall contract in a delegated call
+		contract_multicall(t, bc, "ac1", "caller", "multicall_and_check", `[
+			["assert","%my aergo balance%","=","1 aergo"],
+			["call + send","0.125 aergo","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","recv_aergo"],
+			["assert","%my aergo balance%","=","0.875 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.125 aergo"],
+			["return","%my aergo balance%","%last result%"]
+		]`, ``, `[{"_bignum":"875000000000000000"},{"_bignum":"125000000000000000"}]`)
+
+		// check the state of the 2 contracts
+
+		state, err = bc.GetAccountState("caller")
+		assert.Equalf(t, int64(875000000000000000), state.GetBalanceBigInt().Int64(), "balance error")
+
+		state, err = bc.GetAccountState("AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9")
+		assert.Equalf(t, int64(125000000000000000), state.GetBalanceBigInt().Int64(), "balance error")
+
+		contract_multicall(t, bc, "ac1", "caller", "multicall", `[
+			["assert","%my aergo balance%","=","0.875 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.125 aergo"],
+			["return","%my aergo balance%","%last result%"]
+		]`, ``, `[{"_bignum":"875000000000000000"},{"_bignum":"125000000000000000"}]`)
+
+		// send the aergo back to the 'caller' contract
+		call(t, bc, "ac1", 0, "c1", "send_to", `["AmggmgtWPXtsDkC5hkYYx2iYaWfGs8D4ZvZNwxwdm4gxGSDaCqKn","0.125 aergo"]`, ``, ``)
+
+		contract_multicall(t, bc, "ac1", "caller", "multicall", `[
+			["assert","%my aergo balance%","=","1 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0 aergo"],
+			["return","%my aergo balance%","%last result%"]
+		]`, ``, `[{"_bignum":"1000000000000000000"},{"_bignum":"0"}]`)
+
+
+		// make sure that the called contract state is not replaced by the multicall contract
+
+		// transfer tokens to other contract and:
+		// - check amounts on the same transaction (in the multicall contract)
+		// - check amounts on the same transaction (in the caller contract, after returning from the multicall contract)
+		// - check amounts on the same block (another transaction)
+		// - check amounts on the next block
+		// and different ABI on all 3 contracts
+
+		tx1 := build_contract_multicall_tx("ac1", "caller", "multicall_and_check", `[
+			["send","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","0.125 aergo"],
+			["assert","%my aergo balance%","=","0.875 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.125 aergo"],
+			["return","%my aergo balance%","%last result%"]
+		]`)
+		tx2 := build_call_tx("ac1", "caller", "get_balance", `[]`)
+		tx3 := build_call_tx("ac1", "c1", "get_aergo_balance", `[]`)
+
+		execute_block(t, bc, []*luaTxCall{tx1, tx2, tx3}, []string{`[{"_bignum":"875000000000000000"},{"_bignum":"125000000000000000"}]`, `"875000000000000000"`, `"125000000000000000"`})
+
+
+		// now the same with just delegate call (no multicall)
+
+		call(t, bc, "ac1", 0, "caller", "get_value", `["num"]`, ``, `111`)
+
+		tx1 = build_call_tx("ac1", "caller", "delegate_call", `["AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","set","num",222]`)
+		tx2 = build_call_tx("ac1", "caller", "get_value", `["num"]`)
+		tx3 = build_call_tx("ac1", "c1", "get", `["num"]`)
+
+		execute_block(t, bc, []*luaTxCall{tx1, tx2, tx3}, []string{``, `222`, `null`})
+
+		call(t, bc, "ac1", 0, "caller", "get_value", `["num"]`, ``, `222`)
+
+
+		// test state recovery - normal atomic txn
+
+		tx1 = build_contract_multicall_tx("ac1", "caller", "multicall_and_check", `[
+			["assert","%my aergo balance%","=","0.875 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.125 aergo"],
+
+			["send","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","0.125 aergo"],
+			["assert","%my aergo balance%","=","0.75 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.25 aergo"],
+
+			["call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","fails"],
+
+			["return","%my aergo balance%","%last result%"]
+		]`)
+		tx2 = build_call_tx("ac1", "caller", "get_balance", `[]`)
+		tx3 = build_call_tx("ac1", "c1", "get_aergo_balance", `[]`)
+
+		tx1 = tx1.Fail("this call should fail")
+
+		execute_block(t, bc, []*luaTxCall{tx1, tx2, tx3}, []string{`[Contract.LuaDelegateCallContract] call error: [Contract.LuaCallContract] call err: AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9:0: this call should fail`, `"875000000000000000"`, `"125000000000000000"`})
+
+
+		// test state recovery - pcall
+
+		tx1 = build_contract_multicall_tx("ac1", "caller", "multicall_and_check", `[
+			["assert","%my aergo balance%","=","0.875 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.125 aergo"],
+
+			["try call","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9","send_and_fail","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","0.125 aergo"],
+
+			["assert","%my aergo balance%","=","0.875 aergo"],
+			["get aergo balance","AmhXhR3Eguhu5qjVoqcg7aCFMpw1GGZJfqDDqfy6RsTP7MrpWeJ9"],
+			["assert","%last result%","=","0.125 aergo"],
+
+			["return","%my aergo balance%","%last result%"]
+		]`)
+		tx2 = build_call_tx("ac1", "caller", "get_balance", `[]`)
+		tx3 = build_call_tx("ac1", "c1", "get_aergo_balance", `[]`)
+		tx4 := build_call_tx("ac1", "c3", "get_aergo_balance", `[]`)
+
+		execute_block(t, bc, []*luaTxCall{tx1, tx2, tx3, tx4}, []string{`[{"_bignum":"875000000000000000"},{"_bignum":"125000000000000000"}]`, `"875000000000000000"`, `"125000000000000000"`, `"0"`})
+
+		state, err = bc.GetAccountState("caller")
+		assert.Equalf(t, int64(875000000000000000), state.GetBalanceBigInt().Int64(), "balance error")
+
+		state, err = bc.GetAccountState("c1")
+		assert.Equalf(t, int64(125000000000000000), state.GetBalanceBigInt().Int64(), "balance error")
+
+		state, err = bc.GetAccountState("c3")
+		assert.Equalf(t, int64(0), state.GetBalanceBigInt().Int64(), "balance error")
+
+	}
+
+}
+
 // ----------------------------------------------------------------------------
 
 const (
diff --git a/contract/vm_multicall.go b/contract/vm_multicall.go
new file mode 100644
index 000000000..f2967fc63
--- /dev/null
+++ b/contract/vm_multicall.go
@@ -0,0 +1,336 @@
+package contract
+
+import (
+	luacUtil "github.com/aergoio/aergo/v2/cmd/aergoluac/util"
+)
+
+var multicall_compiled luacUtil.LuaCode
+
+const multicall_code = `
+vars = {}
+
+skip = {['store result as']=true,let=true,set=true,insert=true,assert=true,send=true}
+
+action = {
+
+  -- contract call
+  call = function (...) return contract.call(...) end,
+  ["call + send"] = function (amount,...) return contract.call.value(amount)(...) end,
+  ["try call"] = function (...) return try_call(contract.call,...) end,
+  ["try call + send"] = function (amount,...) return try_call(contract.call.value(amount),...) end,
+
+  -- aergo balance and transfer
+  ["get aergo balance"] = function (address) return bignum.number(contract.balance(address)) end,
+  send = function (address,amount) return contract.send(address, amount) end,
+
+  -- variables
+  let = function (x,y,z) if z then y = convert_bignum(y,z) end vars[x] = y end,
+  ["store result as"] = function (n) vars[n] = vars['last result'] end,
+
+  -- tables
+  get = function (o,k) return o[k] end,
+  set = function (o,k,v) o[k] = v end,
+  insert = function (...) table.insert(...) end,   -- inserts at the end if no position is informed
+  remove = function (...) return table.remove(...) end,   -- returns the removed item
+  ["get size"] = function (x) return #x end,
+
+  -- math
+  add = function (x,y) return x+y end,
+  ["subtract"] = function (x,y) return x-y end,
+  ["multiply"] = function (x,y) return x*y end,
+  ["divide"] = function (x,y) return x/y end,
+  ["remainder"] = function (x,y) return x%y end,
+
+  -- strings
+  ["combine"] = function (...) return table.concat({...}) end,
+  format = function (...) return string.format(...) end, -- for concat: ['format','%s%s','%val1%','%val2%']
+  ["extract"] = function (...) return string.sub(...) end,
+  find = function (...) return string.match(...) end,
+  replace = function (...) return string.gsub(...) end,
+
+  -- conversions
+  ["to big number"] = function (x) if x==nil then x=vars['last result'] end; return bignum.number(x) end,
+  ["to number"] = function (x) if x==nil then x=vars['last result'] end; return tonumber(x) end,
+  ["to string"] = function (x) if x==nil then x=vars['last result'] end; return tostring(x) end,
+  ["to json"]   = function (x) if x==nil then x=vars['last result'] end; return json.encode(x) end,
+  ["from json"] = function (x) if x==nil then x=vars['last result'] end; return json.decode(x) end,
+
+  -- assertion
+  assert = function (...) assert(eval(...),"assertion failed: " .. json.encode({...})) end,
+
+}
+
+function try_call(fn, ...)
+  local success, result = pcall(fn, ...)
+  vars['call succeeded'] = success
+  return result
+end
+
+function process_arg(arg)
+  if type(arg) == 'string' then
+    if #arg >= 3 and string.sub(arg, 1, 1) == '%' and string.sub(arg, -1, -1) == '%' then
+      local varname = string.sub(arg, 2, -2)
+      arg = get_arg_value(varname, arg)
+    end
+  elseif type(arg) == 'table' then
+    for k,v in pairs(arg) do arg[k] = process_arg(v) end
+  end
+  return arg
+end
+
+function get_arg_value(varname, default)
+  local value = default
+  if varname == "my account address" then
+    value = system.getContractID()
+  elseif varname == "my aergo balance" then
+    value = action["get aergo balance"]()
+  elseif vars[varname] ~= nil then
+    value = vars[varname]
+  end
+  return value
+end
+
+function execute(calls)
+
+  local if_on = true
+  local if_done = false
+
+  local for_cmdpos
+  local for_var, for_var2, for_type
+  local for_obj, for_list, for_pos
+  local for_last, for_increment
+  local skip_for = false
+
+  local cmdpos = 1
+  while cmdpos <= #calls do
+    local call = calls[cmdpos]
+    local args = {}  -- use a copy of the list because of loops
+
+    -- copy values and process variables
+    for i,arg in ipairs(call) do
+      if i == 1 then
+        args[i] = arg
+      else
+        args[i] = process_arg(arg)
+      end
+    end
+
+    -- process the command
+    local cmd = table.remove(args, 1)
+    local fn = action[cmd]
+    if fn and if_on then
+      local result = fn(unpack(args))
+      if not skip[cmd] then
+        vars['last result'] = result
+      end
+
+    -- if elif else end
+    elseif cmd == "if" then
+      if_on = eval(unpack(args))
+      if_done = if_on
+    elseif cmd == "else if" then
+      if if_on then
+        if_on = false
+      elseif not if_done then
+        if_on = eval(unpack(args))
+        if_done = if_on
+      end
+    elseif cmd == "else" then
+      if_on = (not if_on) and (not if_done)
+    elseif cmd == "end if" then
+      if_on = true
+
+    -- for foreach break loop
+    elseif cmd == "for each" and if_on then
+      -- "for each", "item", "in", "list"
+      if args[2] == "in" then
+        for_var2 = "__"
+        for_obj = {}
+        for_list = args[3]
+      -- "for each", "key", "value", "in", "object"
+      elseif args[3] == "in" then
+        for_var2 = args[2]
+        for_obj = args[4]
+        for_list = get_keys(for_obj)
+        vars[for_var2] = for_obj[for_list[1]]
+      else
+        assert(false, "for each: invalid syntax")
+      end
+      for_cmdpos = cmdpos
+      for_type = "each"
+      for_var = args[1]
+      for_pos = 1
+      vars[for_var] = for_list[1]
+      skip_for = (for_list[1] == nil)  -- if the list is empty or it is a dictionary
+    elseif cmd == "for" and if_on then
+      for_cmdpos = cmdpos
+      for_type = "number"
+      for_var = args[1]
+      for_last = args[3]
+      for_increment = args[4] or 1
+      vars[for_var] = args[2]
+      skip_for = ((for_increment > 0 and vars[for_var] > for_last) or (for_increment < 0 and vars[for_var] < for_last))
+    elseif cmd == "break" and if_on then
+      if table.remove(args, 1) == "if" then
+        skip_for = eval(unpack(args))
+      else
+        skip_for = true
+      end
+    elseif cmd == "loop" and if_on then
+      if for_type == "each" then
+        for_pos = for_pos + 1
+        if for_pos <= #for_list then
+          vars[for_var] = for_list[for_pos]
+          vars[for_var2] = for_obj[for_list[for_pos]]
+          cmdpos = for_cmdpos
+        end
+      elseif for_type == "number" then
+        vars[for_var] = vars[for_var] + for_increment
+        if (for_increment > 0 and vars[for_var] > for_last) or (for_increment < 0 and vars[for_var] < for_last) then
+          -- quit loop (continue to the next command)
+        else
+          cmdpos = for_cmdpos
+        end
+      else
+        cmdpos = 0
+      end
+
+    -- return
+    elseif cmd == "return" and if_on then
+      return unpack(args)  -- or the array itself
+    elseif if_on then
+      assert(false, "command not found: " .. cmd)
+    end
+
+    if skip_for then
+      repeat
+        cmdpos = cmdpos + 1
+        call = calls[cmdpos]
+      until call == nil or call[1] == "loop"
+      skip_for = false
+    end
+
+    cmdpos = cmdpos + 1
+  end
+
+end
+
+function eval(...)
+  local args = {...}
+  if #args == 1 and type(args[1]) == 'boolean' then
+    return args[1]
+  end
+  local v1 = args[1]
+  local op = args[2]
+  local v2 = args[3]
+  local neg = false
+  local matches = false
+  -- if v1 is a bignum and v2 is a string, convert v2 to a bignum
+  if bignum.isbignum(v1) and type(v2) == 'string' then
+    v2 = to_bignum(v2)
+  end
+  if string.sub(op,1,1) == "!" then
+    neg = true
+    op = string.sub(op, 2)
+  end
+  if v1 == nil and op ~= "=" then
+    -- does not match
+  elseif op == "=" then
+    matches = v1 == v2
+  elseif op == ">" then
+    matches = v1 > v2
+  elseif op == ">=" then
+    matches = v1 >= v2
+  elseif op == "<" then
+    matches = v1 < v2
+  elseif op == "<=" then
+    matches = v1 <= v2
+  elseif op == "match" then
+    matches = string.match(v1, v2) ~= nil
+  else
+    assert(false, "operator not known: " .. op)
+  end
+  if neg then matches = not matches end
+  if #args > 3 then
+    op = args[4]
+    local matches2 = eval(unpack(args, 5, #args))
+    if op == "and" then
+      return (matches and matches2)
+    elseif op == "or" then
+      return (matches or matches2)
+    else
+      assert(false, "operator not known: " .. op)
+    end
+  end
+  return matches
+end
+
+-- convert a number to a big number with the correct number of decimals
+function convert_bignum(x, token)
+  -- convert the number to a string
+  if type(x) ~= 'string' then
+    x = tostring(x)
+  end
+
+  -- check if the string contains invalid characters
+  assert(string.match(x, '[^0-9.]') == nil, "the amount contains invalid character")
+
+  -- count the number of dots
+  local _, count = string.gsub(x, "%.", "")
+  assert(count <= 1, "the amount is invalid")
+
+  -- get the number of decimals from the token
+  local num_decimals
+  if token:lower() == 'aergo' then
+    num_decimals = 18
+  else
+    num_decimals = contract.call(token, "decimals")
+  end
+  assert(num_decimals >= 0 and num_decimals <= 18, "token with invalid decimals")
+
+  -- split the amount into integer and fractional parts
+  local p1, p2
+  if count == 1 then
+    p1, p2 = string.match('0' .. x .. '0', '(%d+)%.(%d+)')
+  else
+    p1 = x
+    p2 = ""
+  end
+  -- compute the number of zeros to add or remove
+  local to_add = num_decimals - #p2
+  if to_add > 0 then
+    p2 = p2 .. string.rep('0', to_add)
+  elseif to_add < 0 then
+    p2 = string.sub(p2, 1, num_decimals)
+  end
+  -- join the two parts
+  x = p1 .. p2
+  -- remove leading zeros
+  x = string.gsub(x, '0*', '', 1)
+  -- if the result is empty, return 0
+  if #x == 0 then x = '0' end
+  -- convert to big number
+  return bignum.number(x)
+end
+
+function to_bignum(x)
+  -- if there is a space, separate the amount and the symbol
+  local amount, symbol = string.match(x, '([^%s]+)%s+(.+)')
+  if amount and symbol then
+    return convert_bignum(amount, symbol)
+  else
+    return bignum.number(x)
+  end
+end
+
+function get_keys(obj)
+  local list = {}
+  for key,_ in pairs(obj) do
+    list[#list + 1] = key
+  end
+  table.sort(list)  -- for a deterministic output
+  return list
+end
+
+abi.register(execute)
+`
diff --git a/contract/vm_multicall.lua b/contract/vm_multicall.lua
new file mode 100644
index 000000000..10b3c99f7
--- /dev/null
+++ b/contract/vm_multicall.lua
@@ -0,0 +1,330 @@
+-------------------------------------------------------------------
+-- COMPOSABLE EXECUTION
+-------------------------------------------------------------------
+
+vars = {}
+
+skip = {['store result as']=true,let=true,set=true,insert=true,assert=true,send=true}
+
+action = {
+
+  -- contract call
+  call = function (...) return contract.call(...) end,
+  ["call + send"] = function (amount,...) return contract.call.value(amount)(...) end,
+  ["try call"] = function (...) return try_call(contract.call,...) end,
+  ["try call + send"] = function (amount,...) return try_call(contract.call.value(amount),...) end,
+
+  -- aergo balance and transfer
+  ["get aergo balance"] = function (address) return bignum.number(contract.balance(address)) end,
+  send = function (address,amount) return contract.send(address, amount) end,
+
+  -- variables
+  let = function (x,y,z) if z then y = convert_bignum(y,z) end vars[x] = y end,
+  ["store result as"] = function (n) vars[n] = vars['last result'] end,
+
+  -- tables
+  get = function (o,k) return o[k] end,
+  set = function (o,k,v) o[k] = v end,
+  insert = function (...) table.insert(...) end,   -- inserts at the end if no position is informed
+  remove = function (...) return table.remove(...) end,   -- returns the removed item
+  ["get size"] = function (x) return #x end,
+
+  -- math
+  add = function (x,y) return x+y end,
+  ["subtract"] = function (x,y) return x-y end,
+  ["multiply"] = function (x,y) return x*y end,
+  ["divide"] = function (x,y) return x/y end,
+  ["remainder"] = function (x,y) return x%y end,
+
+  -- strings
+  ["combine"] = function (...) return table.concat({...}) end,
+  format = function (...) return string.format(...) end, -- for concat: ['format','%s%s','%val1%','%val2%']
+  ["extract"] = function (...) return string.sub(...) end,
+  find = function (...) return string.match(...) end,
+  replace = function (...) return string.gsub(...) end,
+
+  -- conversions
+  ["to big number"] = function (x) if x==nil then x=vars['last result'] end; return bignum.number(x) end,
+  ["to number"] = function (x) if x==nil then x=vars['last result'] end; return tonumber(x) end,
+  ["to string"] = function (x) if x==nil then x=vars['last result'] end; return tostring(x) end,
+  ["to json"]   = function (x) if x==nil then x=vars['last result'] end; return json.encode(x) end,
+  ["from json"] = function (x) if x==nil then x=vars['last result'] end; return json.decode(x) end,
+
+  -- assertion
+  assert = function (...) assert(eval(...),"assertion failed: " .. json.encode({...})) end,
+
+}
+
+function try_call(fn, ...)
+  local success, result = pcall(fn, ...)
+  vars['call succeeded'] = success
+  return result
+end
+
+function process_arg(arg)
+  if type(arg) == 'string' then
+    if #arg >= 3 and string.sub(arg, 1, 1) == '%' and string.sub(arg, -1, -1) == '%' then
+      local varname = string.sub(arg, 2, -2)
+      arg = get_arg_value(varname, arg)
+    end
+  elseif type(arg) == 'table' then
+    for k,v in pairs(arg) do arg[k] = process_arg(v) end
+  end
+  return arg
+end
+
+function get_arg_value(varname, default)
+  local value = default
+  if varname == "my account address" then
+    value = system.getContractID()
+  elseif varname == "my aergo balance" then
+    value = action["get aergo balance"]()
+  elseif vars[varname] ~= nil then
+    value = vars[varname]
+  end
+  return value
+end
+
+function execute(calls)
+
+  local if_on = true
+  local if_done = false
+
+  local for_cmdpos
+  local for_var, for_var2, for_type
+  local for_obj, for_list, for_pos
+  local for_last, for_increment
+  local skip_for = false
+
+  local cmdpos = 1
+  while cmdpos <= #calls do
+    local call = calls[cmdpos]
+    local args = {}  -- use a copy of the list because of loops
+
+    -- copy values and process variables
+    for i,arg in ipairs(call) do
+      if i == 1 then
+        args[i] = arg
+      else
+        args[i] = process_arg(arg)
+      end
+    end
+
+    -- process the command
+    local cmd = table.remove(args, 1)
+    local fn = action[cmd]
+    if fn and if_on then
+      local result = fn(unpack(args))
+      if not skip[cmd] then
+        vars['last result'] = result
+      end
+
+    -- if elif else end
+    elseif cmd == "if" then
+      if_on = eval(unpack(args))
+      if_done = if_on
+    elseif cmd == "else if" then
+      if if_on then
+        if_on = false
+      elseif not if_done then
+        if_on = eval(unpack(args))
+        if_done = if_on
+      end
+    elseif cmd == "else" then
+      if_on = (not if_on) and (not if_done)
+    elseif cmd == "end if" then
+      if_on = true
+
+    -- for foreach break loop
+    elseif cmd == "for each" and if_on then
+      -- "for each", "item", "in", "list"
+      if args[2] == "in" then
+        for_var2 = "__"
+        for_obj = {}
+        for_list = args[3]
+      -- "for each", "key", "value", "in", "object"
+      elseif args[3] == "in" then
+        for_var2 = args[2]
+        for_obj = args[4]
+        for_list = get_keys(for_obj)
+        vars[for_var2] = for_obj[for_list[1]]
+      else
+        assert(false, "for each: invalid syntax")
+      end
+      for_cmdpos = cmdpos
+      for_type = "each"
+      for_var = args[1]
+      for_pos = 1
+      vars[for_var] = for_list[1]
+      skip_for = (for_list[1] == nil)  -- if the list is empty or it is a dictionary
+    elseif cmd == "for" and if_on then
+      for_cmdpos = cmdpos
+      for_type = "number"
+      for_var = args[1]
+      for_last = args[3]
+      for_increment = args[4] or 1
+      vars[for_var] = args[2]
+      skip_for = ((for_increment > 0 and vars[for_var] > for_last) or (for_increment < 0 and vars[for_var] < for_last))
+    elseif cmd == "break" and if_on then
+      if table.remove(args, 1) == "if" then
+        skip_for = eval(unpack(args))
+      else
+        skip_for = true
+      end
+    elseif cmd == "loop" and if_on then
+      if for_type == "each" then
+        for_pos = for_pos + 1
+        if for_pos <= #for_list then
+          vars[for_var] = for_list[for_pos]
+          vars[for_var2] = for_obj[for_list[for_pos]]
+          cmdpos = for_cmdpos
+        end
+      elseif for_type == "number" then
+        vars[for_var] = vars[for_var] + for_increment
+        if (for_increment > 0 and vars[for_var] > for_last) or (for_increment < 0 and vars[for_var] < for_last) then
+          -- quit loop (continue to the next command)
+        else
+          cmdpos = for_cmdpos
+        end
+      else
+        cmdpos = 0
+      end
+
+    -- return
+    elseif cmd == "return" and if_on then
+      return unpack(args)  -- or the array itself
+    elseif if_on then
+      assert(false, "command not found: " .. cmd)
+    end
+
+    if skip_for then
+      repeat
+        cmdpos = cmdpos + 1
+        call = calls[cmdpos]
+      until call == nil or call[1] == "loop"
+      skip_for = false
+    end
+
+    cmdpos = cmdpos + 1
+  end
+
+end
+
+function eval(...)
+  local args = {...}
+  if #args == 1 and type(args[1]) == 'boolean' then
+    return args[1]
+  end
+  local v1 = args[1]
+  local op = args[2]
+  local v2 = args[3]
+  local neg = false
+  local matches = false
+  -- if v1 is a bignum and v2 is a string, convert v2 to a bignum
+  if bignum.isbignum(v1) and type(v2) == 'string' then
+    v2 = to_bignum(v2)
+  end
+  if string.sub(op,1,1) == "!" then
+    neg = true
+    op = string.sub(op, 2)
+  end
+  if v1 == nil and op ~= "=" then
+    -- does not match
+  elseif op == "=" then
+    matches = v1 == v2
+  elseif op == ">" then
+    matches = v1 > v2
+  elseif op == ">=" then
+    matches = v1 >= v2
+  elseif op == "<" then
+    matches = v1 < v2
+  elseif op == "<=" then
+    matches = v1 <= v2
+  elseif op == "match" then
+    matches = string.match(v1, v2) ~= nil
+  else
+    assert(false, "operator not known: " .. op)
+  end
+  if neg then matches = not matches end
+  if #args > 3 then
+    op = args[4]
+    local matches2 = eval(unpack(args, 5, #args))
+    if op == "and" then
+      return (matches and matches2)
+    elseif op == "or" then
+      return (matches or matches2)
+    else
+      assert(false, "operator not known: " .. op)
+    end
+  end
+  return matches
+end
+
+-- convert a number to a big number with the correct number of decimals
+function convert_bignum(x, token)
+  -- convert the number to a string
+  if type(x) ~= 'string' then
+    x = tostring(x)
+  end
+
+  -- check if the string contains invalid characters
+  assert(string.match(x, '[^0-9.]') == nil, "the amount contains invalid character")
+
+  -- count the number of dots
+  local _, count = string.gsub(x, "%.", "")
+  assert(count <= 1, "the amount is invalid")
+
+  -- get the number of decimals from the token
+  local num_decimals
+  if token:lower() == 'aergo' then
+    num_decimals = 18
+  else
+    num_decimals = contract.call(token, "decimals")
+  end
+  assert(num_decimals >= 0 and num_decimals <= 18, "token with invalid decimals")
+
+  -- split the amount into integer and fractional parts
+  local p1, p2
+  if count == 1 then
+    p1, p2 = string.match('0' .. x .. '0', '(%d+)%.(%d+)')
+  else
+    p1 = x
+    p2 = ""
+  end
+  -- compute the number of zeros to add or remove
+  local to_add = num_decimals - #p2
+  if to_add > 0 then
+    p2 = p2 .. string.rep('0', to_add)
+  elseif to_add < 0 then
+    p2 = string.sub(p2, 1, num_decimals)
+  end
+  -- join the two parts
+  x = p1 .. p2
+  -- remove leading zeros
+  x = string.gsub(x, '0*', '', 1)
+  -- if the result is empty, return 0
+  if #x == 0 then x = '0' end
+  -- convert to big number
+  return bignum.number(x)
+end
+
+function to_bignum(x)
+  -- if there is a space, separate the amount and the symbol
+  local amount, symbol = string.match(x, '([^%s]+)%s+(.+)')
+  if amount and symbol then
+    return convert_bignum(amount, symbol)
+  else
+    return bignum.number(x)
+  end
+end
+
+function get_keys(obj)
+  local list = {}
+  for key,_ in pairs(obj) do
+    list[#list + 1] = key
+  end
+  table.sort(list)  -- for a deterministic output
+  return list
+end
+
+abi.register(execute)
diff --git a/contract/vm_state.go b/contract/vm_state.go
index c3f613e72..27e2bd62f 100644
--- a/contract/vm_state.go
+++ b/contract/vm_state.go
@@ -88,6 +88,8 @@ type recoveryEntry struct {
 func (re *recoveryEntry) recovery(bs *state.BlockState) error {
 	var zero big.Int
 	cs := re.callState
+
+	// restore the contract balance
 	if re.amount.Cmp(&zero) > 0 {
 		if re.senderState != nil {
 			re.senderState.AddBalance(re.amount)
@@ -99,6 +101,8 @@ func (re *recoveryEntry) recovery(bs *state.BlockState) error {
 	if re.onlySend {
 		return nil
 	}
+
+	// restore the contract nonce
 	if re.senderState != nil {
 		re.senderState.SetNonce(re.senderNonce)
 	}
@@ -106,19 +110,23 @@ func (re *recoveryEntry) recovery(bs *state.BlockState) error {
 	if cs == nil {
 		return nil
 	}
+
+	// restore the contract state
 	if re.stateRevision != -1 {
 		err := cs.ctrState.Rollback(re.stateRevision)
 		if err != nil {
 			return newDbSystemError(err)
 		}
 		if re.isDeploy {
-			err := cs.ctrState.SetCode(nil)
+			err := cs.ctrState.SetCode(nil, nil)
 			if err != nil {
 				return newDbSystemError(err)
 			}
 			bs.RemoveCache(cs.ctrState.GetAccountID())
 		}
 	}
+
+	// restore the contract SQL db state
 	if cs.tx != nil {
 		if re.sqlSaveName == nil {
 			err := cs.tx.rollbackToSavepoint()
@@ -133,6 +141,7 @@ func (re *recoveryEntry) recovery(bs *state.BlockState) error {
 			}
 		}
 	}
+
 	return nil
 }
 
diff --git a/internal/enc/hex/hex.go b/internal/enc/hex/hex.go
index 6c484ee4d..fa2ea8525 100644
--- a/internal/enc/hex/hex.go
+++ b/internal/enc/hex/hex.go
@@ -9,3 +9,17 @@ func Encode(b []byte) string {
 func Decode(s string) ([]byte, error) {
 	return hex.DecodeString(s)
 }
+
+func IsHexString(s string) bool {
+	// check is the input has even number of characters
+	if len(s)%2 != 0 {
+		return false
+	}
+	// check if the input contains only hex characters
+	for _, c := range s {
+		if !((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/libtool/src/luajit b/libtool/src/luajit
index 6fa714f1f..eda86b19a 160000
--- a/libtool/src/luajit
+++ b/libtool/src/luajit
@@ -1 +1 @@
-Subproject commit 6fa714f1fc7508500882738dbe81685b4b50bc63
+Subproject commit eda86b19a18b0f1da53bdc3c0f281124d4fe4260
diff --git a/state/account.go b/state/account.go
index a2948721a..973aa2a65 100644
--- a/state/account.go
+++ b/state/account.go
@@ -102,7 +102,7 @@ func (as *AccountState) IsNew() bool {
 }
 
 func (as *AccountState) IsContract() bool {
-	return len(as.State().CodeHash) > 0
+	return len(as.State().CodeHash) > 0 || len(as.State().SourceHash) > 0
 }
 
 func (as *AccountState) IsDeploy() bool {
diff --git a/state/statedb/contract.go b/state/statedb/contract.go
index 21f315ae2..88ee0ba3c 100644
--- a/state/statedb/contract.go
+++ b/state/statedb/contract.go
@@ -1,8 +1,6 @@
 package statedb
 
 import (
-	"bytes"
-
 	"github.com/aergoio/aergo-lib/db"
 	"github.com/aergoio/aergo/v2/internal/common"
 	"github.com/aergoio/aergo/v2/internal/enc/proto"
@@ -18,20 +16,41 @@ type ContractState struct {
 	store   db.DB
 }
 
-func (cs *ContractState) SetCode(code []byte) error {
-	codeHash := common.Hasher(code)
-	storedCode, err := cs.GetRawKV(codeHash[:])
-	if err == nil && !bytes.Equal(code, storedCode) {
-		err = cs.SetRawKV(codeHash[:], code)
-	}
+func (cs *ContractState) SetCode(sourceCode []byte, bytecode []byte) error {
+	var err error
+
+	// hash the bytecode
+	bytecodeHash := common.Hasher(bytecode)
+	// save the bytecode to the database
+	err = cs.SetRawKV(bytecodeHash[:], bytecode)
 	if err != nil {
 		return err
 	}
-	cs.State.CodeHash = codeHash[:]
-	cs.code = code
+	// update the contract state
+	cs.State.CodeHash = bytecodeHash[:]
+	// update the contract bytecode
+	cs.code = bytecode
+
+	if len(sourceCode) > 0 {
+		// hash the source code
+		sourceCodeHash := common.Hasher(sourceCode)
+		// save the source code to the database
+		err = cs.SetRawKV(sourceCodeHash[:], sourceCode)
+		if err != nil {
+			return err
+		}
+		// update the contract state
+		cs.State.SourceHash = sourceCodeHash[:]
+	}
+
 	return nil
 }
 
+func (cs *ContractState) SetMultiCallCode(code []byte) {
+	// no codeHash means it is not a contract
+	cs.code = code
+}
+
 func (cs *ContractState) GetCode() ([]byte, error) {
 	if cs.code != nil {
 		// already loaded.
@@ -42,13 +61,28 @@ func (cs *ContractState) GetCode() ([]byte, error) {
 		// not defined. do nothing.
 		return nil, nil
 	}
-	err := loadData(cs.store, cs.State.GetCodeHash(), &cs.code)
+	// load the code into the contract state
+	err := loadData(cs.store, codeHash, &cs.code)
 	if err != nil {
 		return nil, err
 	}
 	return cs.code, nil
 }
 
+func (cs *ContractState) GetSourceCode() []byte {
+	sourceCodeHash := cs.GetSourceHash()
+	if sourceCodeHash == nil {
+		return nil
+	}
+	// load the source code from the database
+	var sourceCode []byte
+	err := loadData(cs.store, sourceCodeHash, &sourceCode)
+	if err != nil {
+		return nil
+	}
+	return sourceCode
+}
+
 func (cs *ContractState) GetAccountID() types.AccountID {
 	return cs.account
 }
@@ -148,6 +182,20 @@ func (cs *ContractState) cache() *stateBuffer {
 //---------------------------------------------------------------//
 // global functions
 
+func GetMultiCallState(id []byte, st *types.State) (*ContractState) {
+	aid := types.ToAccountID(id)
+	res := &ContractState{
+		State:   st,
+		account: aid,
+	}
+	return res
+}
+
+// this refers to the specific contract, not the transaction
+func (ctrState *ContractState) IsMultiCall() bool {
+	return ctrState.storage == nil
+}
+
 func OpenContractStateAccount(id []byte, states *StateDB) (*ContractState, error) {
 	aid := types.ToAccountID(id)
 	st, err := states.GetAccountState(aid)
diff --git a/state/statedb/contract_test.go b/state/statedb/contract_test.go
index 6761e1608..ebaa74f84 100644
--- a/state/statedb/contract_test.go
+++ b/state/statedb/contract_test.go
@@ -17,7 +17,7 @@ func TestContractStateCode(t *testing.T) {
 	assert.NoError(t, err, "could not open contract state")
 
 	// set code
-	err = contractState.SetCode(testBytes)
+	err = contractState.SetCode(nil, testBytes)
 	assert.NoError(t, err, "set code to contract state")
 
 	// get code
diff --git a/tests/common.sh b/tests/common.sh
index 8ac62a70e..c7da4c6ea 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -100,7 +100,7 @@ get_receipt() {
     #echo "output: $output"
 
     if [[ $output == *"tx not found"* ]]; then
-      sleep 0.5
+      sleep 0.4
       counter=$((counter+1))
       if [ $counter -gt 10 ]; then
         echo "Error: tx not found: $txhash"
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index bebe6e279..c87aed23b 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -130,6 +130,9 @@ check ./test-gas-bf.sh
 check ./test-gas-verify-proof.sh
 check ./test-gas-per-function-v2.sh
 check ./test-contract-deploy.sh
+check ./test-pcall-events.sh
+check ./test-transaction-types.sh
+check ./test-name-service.sh
 
 # change the hardfork version
 set_version 3
@@ -142,6 +145,26 @@ check ./test-gas-bf.sh
 check ./test-gas-verify-proof.sh
 check ./test-gas-per-function-v3.sh
 check ./test-contract-deploy.sh
+check ./test-pcall-events.sh
+check ./test-transaction-types.sh
+check ./test-name-service.sh
+
+# change the hardfork version
+set_version 4
+
+# run the integration tests - version 4
+check ./test-max-call-depth.sh
+check ./test-gas-deploy.sh
+check ./test-gas-op.sh
+check ./test-gas-bf.sh
+check ./test-gas-verify-proof.sh
+check ./test-gas-per-function-v4.sh
+check ./test-contract-deploy.sh
+check ./test-pcall-events.sh
+check ./test-transaction-types.sh
+check ./test-name-service.sh
+check ./test-multicall.sh
+check ./test-disabled-functions.sh
 
 # terminate the server process
 echo ""
diff --git a/tests/test-contract-deploy.sh b/tests/test-contract-deploy.sh
index 8774a6e93..755ac0c37 100755
--- a/tests/test-contract-deploy.sh
+++ b/tests/test-contract-deploy.sh
@@ -57,7 +57,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -74,7 +74,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -91,7 +91,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -108,7 +108,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -125,5 +125,5 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
diff --git a/tests/test-disabled-functions.sh b/tests/test-disabled-functions.sh
new file mode 100755
index 000000000..0805e22b8
--- /dev/null
+++ b/tests/test-disabled-functions.sh
@@ -0,0 +1,31 @@
+set -e
+source common.sh
+
+fork_version=$1
+
+
+echo "-- deploy --"
+
+deploy ../contract/vm_dummy/test_files/disabled-functions.lua
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+echo "-- call --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $address check_disabled_functions "[]" | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status" "SUCCESS"
diff --git a/tests/test-gas-bf.sh b/tests/test-gas-bf.sh
index 42845bd1c..bcffba363 100755
--- a/tests/test-gas-bf.sh
+++ b/tests/test-gas-bf.sh
@@ -6,7 +6,11 @@ fork_version=$1
 
 echo "-- deploy --"
 
-deploy ../contract/vm_dummy/test_files/gas_bf.lua
+if [ "$fork_version" -eq "4" ]; then
+  deploy ../contract/vm_dummy/test_files/gas_bf_v4.lua
+else
+  deploy ../contract/vm_dummy/test_files/gas_bf_v2.lua
+fi
 
 get_receipt $txhash
 
@@ -29,9 +33,11 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 
-if [ "$fork_version" -eq "3" ]; then
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$gasUsed"  "47342481"
+elif [ "$fork_version" -eq "3" ]; then
   assert_equals "$gasUsed"  "47456046"
 else
   assert_equals "$gasUsed"  "47456244"
diff --git a/tests/test-gas-deploy.sh b/tests/test-gas-deploy.sh
index 35a47d540..0f2621081 100755
--- a/tests/test-gas-deploy.sh
+++ b/tests/test-gas-deploy.sh
@@ -29,5 +29,10 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
-assert_equals "$gasUsed"  "117861"
+#assert_equals "$ret"      ""
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$gasUsed"  "118350"
+else
+  assert_equals "$gasUsed"  "117861"
+fi
diff --git a/tests/test-gas-op.sh b/tests/test-gas-op.sh
index 297f18f40..ac4d3e448 100755
--- a/tests/test-gas-op.sh
+++ b/tests/test-gas-op.sh
@@ -29,5 +29,10 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
-assert_equals "$gasUsed"  "117610"
+#assert_equals "$ret"      ""
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$gasUsed"  "120832"
+else
+  assert_equals "$gasUsed"  "117610"
+fi
diff --git a/tests/test-gas-per-function-v4.sh b/tests/test-gas-per-function-v4.sh
new file mode 100755
index 000000000..89701753b
--- /dev/null
+++ b/tests/test-gas-per-function-v4.sh
@@ -0,0 +1,202 @@
+set -e
+source common.sh
+
+fork_version=$1
+
+
+echo "-- deploy --"
+
+deploy ../contract/vm_dummy/test_files/gas_per_function.lua
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+echo "-- transfer funds to the contract --"
+
+from=AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  sendtx --from $from --to $address --amount 5aergo \
+  | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+
+assert_equals "$status" "SUCCESS"
+assert_equals "$ret"    ""
+
+
+echo "-- get account's nonce --"
+
+account_state=$(../bin/aergocli getstate --address $from)
+nonce=$(echo $account_state | jq .nonce | sed 's/"//g')
+
+
+# create an iterable map of function name -> expected gas
+declare -a names
+declare -A gas
+
+add_test() {
+  names+=("$1")
+  gas["$1"]="$2"
+}
+
+add_test "comp_ops" 143204
+add_test "unarytest_n_copy_ops" 143117
+add_test "unary_ops" 143552
+add_test "binary_ops" 145075
+add_test "constant_ops" 143032
+add_test "upvalue_n_func_ops" 144347
+add_test "table_ops" 144482
+add_test "call_n_vararg_ops" 145001
+add_test "return_ops" 143037
+add_test "loop_n_branche_ops" 146372
+add_test "function_header_ops" 143016
+
+add_test "assert" 143146
+add_test "ipairs" 143039
+add_test "pairs" 143039
+add_test "next" 143087
+add_test "select" 143166
+add_test "tonumber" 143186
+add_test "tostring" 143457
+add_test "type" 143285
+add_test "unpack" 150745
+add_test "pcall" 147905
+add_test "xpcall" 148177
+
+add_test "string.byte" 157040
+add_test "string.char" 160397
+add_test "string.find" 147808
+add_test "string.format" 143764
+add_test "string.gmatch" 143799
+add_test "string.gsub" 144943
+add_test "string.len" 143097
+add_test "string.lower" 148351
+add_test "string.match" 143313
+add_test "string.rep" 221928
+add_test "string.reverse" 148351
+add_test "string.sub" 145205
+add_test "string.upper" 148351
+
+add_test "table.concat" 163868
+add_test "table.insert" 297254
+add_test "table.remove" 156664
+add_test "table.maxn" 147962
+add_test "table.sort" 159866
+
+add_test "math.abs" 143184
+add_test "math.ceil" 143184
+add_test "math.floor" 143184
+add_test "math.max" 143556
+add_test "math.min" 143556
+add_test "math.pow" 143544
+
+add_test "bit.tobit" 143079
+add_test "bit.tohex" 143590
+add_test "bit.bnot" 143056
+add_test "bit.bor" 143130
+add_test "bit.band" 143106
+add_test "bit.xor" 143106
+add_test "bit.lshift" 143079
+add_test "bit.rshift" 143079
+add_test "bit.ashift" 143079
+add_test "bit.rol" 143079
+add_test "bit.ror" 143079
+add_test "bit.bswap" 143036
+
+add_test "bignum.number" 144912
+add_test "bignum.isneg" 145144
+add_test "bignum.iszero" 145144
+add_test "bignum.tonumber" 145464
+add_test "bignum.tostring" 145755
+add_test "bignum.neg" 147208
+add_test "bignum.sqrt" 148084
+add_test "bignum.compare" 145409
+add_test "bignum.add" 146750
+add_test "bignum.sub" 146695
+add_test "bignum.mul" 149073
+add_test "bignum.div" 148563
+add_test "bignum.mod" 150498
+add_test "bignum.pow" 149492
+add_test "bignum.divmod" 154798
+add_test "bignum.powmod" 154164
+add_test "bignum.operators" 147416
+
+add_test "json" 151357
+
+add_test "crypto.sha256" 146183
+add_test "crypto.ecverify" 148036
+
+add_test "state.set" 145915
+add_test "state.get" 145720
+add_test "state.delete" 145727
+
+add_test "system.getSender" 144261
+add_test "system.getBlockheight" 143330
+add_test "system.getTxhash" 143737
+add_test "system.getTimestamp" 143330
+add_test "system.getContractID" 144261
+add_test "system.setItem" 144194
+add_test "system.getItem" 144503
+add_test "system.getAmount" 143408
+add_test "system.getCreator" 143761
+add_test "system.getOrigin" 144261
+
+add_test "contract.send" 144321
+#add_test "contract.balance" 144402
+add_test "contract.deploy" 168092
+add_test "contract.call" 159738
+add_test "contract.pcall" 160659
+add_test "contract.delegatecall" 153795
+add_test "contract.event" 163452
+
+# as the returned value differs in length (43 or 44)
+# due to base58, the computed gas is different.
+#add_test "system.getPrevBlockHash" 135132
+
+# contract.balance() also use diff gas
+# according to the returned string size
+
+declare -A txhashes
+i=0
+
+echo "-- send the transactions --"
+
+for function_name in "${names[@]}"; do
+  echo -n "."
+  i=$(($i+1))
+  txhash=$(../bin/aergocli --keystore . --password bmttest --nonce $(($nonce+$i)) \
+    contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+    $address run_test "[\"$function_name\"]" | jq .hash | sed 's/"//g')
+  txhashes[$function_name]=$txhash
+done
+
+echo ""
+echo "-- check the results --"
+
+for function_name in "${names[@]}"; do
+  echo $function_name
+  txhash=${txhashes[$function_name]}
+  expected_gas=${gas[$function_name]}
+
+  get_receipt $txhash
+
+  status=$(cat receipt.json | jq .status | sed 's/"//g')
+  used_gas=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+  assert_equals "$status"   "SUCCESS"
+  assert_equals "$used_gas" "$expected_gas"
+done
+
+
+# it can have 2 variations of this file
+# 1. one test per txn
+# 2. multiple tests per txn - to use the pre-loader
diff --git a/tests/test-gas-verify-proof.sh b/tests/test-gas-verify-proof.sh
index 98bd142c6..6093f9035 100755
--- a/tests/test-gas-verify-proof.sh
+++ b/tests/test-gas-verify-proof.sh
@@ -29,8 +29,13 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
-assert_equals "$gasUsed"  "154137"
+#assert_equals "$ret"      ""
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$gasUsed"  "160281"
+else
+  assert_equals "$gasUsed"  "154137"
+fi
 
 
 echo "-- call 2 --"
@@ -46,5 +51,10 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
-assert_equals "$gasUsed"  "108404"
+#assert_equals "$ret"      ""
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$gasUsed"  "108404"
+else
+  assert_equals "$gasUsed"  "108404"
+fi
diff --git a/tests/test-multicall.sh b/tests/test-multicall.sh
new file mode 100755
index 000000000..81aca55db
--- /dev/null
+++ b/tests/test-multicall.sh
@@ -0,0 +1,1582 @@
+set -e
+source common.sh
+
+fork_version=$1
+
+
+echo "-- deploy --"
+
+deploy ../contract/vm_dummy/test_files/feature_multicall.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+deploy ../contract/vm_dummy/test_files/feature_multicall.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address1=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+deploy ../contract/vm_dummy/test_files/feature_multicall.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address2=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+deploy ../contract/vm_dummy/test_files/feature_multicall.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address3=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+deploy ../contract/vm_dummy/test_files/feature_multicall_contract.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address4=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+
+echo "-- create accounts --"
+
+
+# AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke
+# AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34
+# AmPfKfrbSjbHD77JjpEvdktgH3w6sbWRhhwFmFAyi1ZSsiePs7XP
+# AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw
+
+../bin/aergocli account import --keystore . --password bmttest --if 47FPLReaeJi6BNRgxYURjR1yvtWoCY9vs2zEU7NFCUEyQKKMWeZe9SKaU41YR6aVMAHpyHSDw
+../bin/aergocli account import --keystore . --password bmttest --if 477rUib5imztPLhszhdKrqarWpxwxgP8hwPDTbxFJBzdSG1rfssBQeZv3q3FqSzbQF1ioMjMJ
+../bin/aergocli account import --keystore . --password bmttest --if 47djKu2o5NshYhMtPsu62GektW7C1nKaxVNgnJUJWMKDr77gjv2aHSom1aZjrwwqQNKGKRaFv
+../bin/aergocli account import --keystore . --password bmttest --if 47G3YUtkcLQGWX2wQMTTFTvyf2ZRTQz1ZdEMaX26FcXqMRhNF2J8KVSrhY1MrZuVvTgaMWmDC
+
+account0=AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R
+
+account1=AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke
+account2=AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34
+account3=AmPfKfrbSjbHD77JjpEvdktgH3w6sbWRhhwFmFAyi1ZSsiePs7XP
+account4=AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw
+
+if [ "$consensus" != "sbp" ]; then
+	# send 20 aergo to each address
+	accounts=($account1 $account2 $account3 $account4 $address4)
+	for account in "${accounts[@]}"; do
+		echo "sending 20 aergo to $account ..."
+
+		txhash=$(../bin/aergocli --keystore . --password bmttest \
+			sendtx --from $account0 --to $account --amount 20aergo \
+			| jq .hash | sed 's/"//g')
+
+		get_receipt $txhash
+
+		status=$(cat receipt.json | jq .status | sed 's/"//g')
+		assert_equals "$status"   "SUCCESS"
+	done
+fi
+
+
+function get_account_address() {
+	account=$1
+	if [ "$account" == "ac0" ]; then
+		account=AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R
+	elif [ "$account" == "ac1" ]; then
+		account=AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke
+	elif [ "$account" == "ac2" ]; then
+		account=AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34
+	elif [ "$account" == "ac3" ]; then
+		account=AmPfKfrbSjbHD77JjpEvdktgH3w6sbWRhhwFmFAyi1ZSsiePs7XP
+	elif [ "$account" == "ac4" ]; then
+		account=AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw
+	elif [ "$account" == "c1" ]; then
+		account=$address
+	elif [ "$account" == "c2" ]; then
+		account=$address1
+	elif [ "$account" == "c3" ]; then
+		account=$address2
+	elif [ "$account" == "c4" ]; then
+		account=$address3
+	elif [ "$account" == "caller" ]; then
+		account=$address4
+	fi
+	echo $account
+}
+
+function call() {
+	account=$1
+	contract=$2
+	method=$3
+	args=$4
+	expected_error=$5
+	expected_result=$6
+
+	echo " "
+	echo "-- call --"
+
+	echo "$contract $method $args"
+	if [ -n "$expected_error" ]; then
+		echo "expected_error=$expected_error"
+	else
+		echo "expected_result=$expected_result"
+	fi
+
+	account=$(get_account_address $account)
+	contract=$(get_account_address $contract)
+
+	set +e
+	result=$(../bin/aergocli --keystore . --password bmttest \
+	  contract call $account $contract $method "$args" 2>&1)
+	set -e
+
+	# if result starts with "Error"
+	if [[ $result == "Error"* ]]; then
+		if [ -n "$expected_error" ]; then
+			assert_contains "$result" "$expected_error"
+		else
+			echo "error=$result"
+			exit 1
+		fi
+	else
+		txhash=$(echo "$result" | jq .hash | sed 's/"//g')
+		check_result "$txhash" "$expected_error" "$expected_result"
+	fi
+
+}
+
+function contract_multicall() {
+	account=$1
+	contract=$2
+	method=$3
+	args=$4
+	expected_error=$5
+	expected_result=$6
+
+	# escape and quote the args
+	args=$(echo "$args" | jq -R -s '.')
+	# include within []
+	args="[$args]"
+
+	call "$account" "$contract" "$method" "$args" "$expected_error" "$expected_result"
+}
+
+function multicall() {
+	account=$1
+	script=$2
+	expected_error=$3
+	expected_result=$4
+
+	echo " "
+	echo "-- multicall --"
+
+	echo "script=$script"
+	if [ -n "$expected_error" ]; then
+		echo "expected_error=$expected_error"
+	else
+		echo "expected_result=$expected_result"
+	fi
+
+	account=$(get_account_address $account)
+
+	txhash=$(../bin/aergocli --keystore . --password bmttest \
+	  contract multicall $account "$script" | jq .hash | sed 's/"//g')
+
+	check_result "$txhash" "$expected_error" "$expected_result"
+}
+
+function check_result() {
+	txhash=$1
+	expected_error=$2
+	expected_result=$3
+
+	get_receipt $txhash
+
+	status=$(cat receipt.json | jq .status | sed 's/"//g')
+	ret=$(cat receipt.json | jq -c .ret)
+	gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+	if [ "$ret" == '""' ]; then
+	  ret=""
+	fi
+
+	#expected_result=$(echo "$expected_result" | jq -c .)
+	#echo "ret            =$ret"
+	#echo "expected_result=$expected_result"
+
+	if [ -n "$expected_error" ]; then
+		assert_equals "$status"   "ERROR"
+		#assert_contains "$ret"    "$expected_error"
+	else
+		assert_equals "$status"   "SUCCESS"
+		assert_equals "$ret"      "$expected_result"
+	fi
+}
+
+
+
+multicall "ac1" '[
+ ["call","'$address'","get_dict"],
+ ["store result as","dict"],
+ ["set","%dict%","two",22],
+ ["set","%dict%","four",4],
+ ["set","%dict%","one",null],
+ ["get","%dict%","two"],
+ ["set","%dict%","copy","%last result%"],
+ ["return","%dict%"]
+]' '' '{"copy":22,"four":4,"three":3,"two":22}'
+
+multicall "ac1" '[
+ ["call","'$address'","get_list"],
+ ["store result as","array"],
+ ["set","%array%",2,"2nd"],
+ ["insert","%array%",1,"zero"],
+ ["insert","%array%","last"],
+ ["return","%array%"]
+]' '' '["zero","first","2nd","third",123,12.5,true,"last"]'
+
+multicall "ac1" '[
+ ["call","'$address'","get_list"],
+ ["store result as","array"],
+ ["remove","%array%",3],
+ ["return","%array%","%last result%"]
+]' '' '[["first","second",123,12.5,true],"third"]'
+
+
+# create new dict or array using fromjson
+
+multicall "ac1" '[
+ ["from json","{\"one\":1,\"two\":2}"],
+ ["set","%last result%","three",3],
+ ["return","%last result%"]
+]' '' '{"one":1,"three":3,"two":2}'
+
+
+# define dict or list using let
+
+multicall "ac1" '[
+ ["let","obj",{"one":1,"two":2}],
+ ["set","%obj%","three",3],
+ ["return","%obj%"]
+]' '' '{"one":1,"three":3,"two":2}'
+
+multicall "ac1" '[
+ ["let","list",["one",1,"two",2,2.5,true,false]],
+ ["set","%list%",4,"three"],
+ ["insert","%list%",1,"first"],
+ ["insert","%list%","last"],
+ ["return","%list%"]
+]' '' '["first","one",1,"two","three",2.5,true,false,"last"]'
+
+multicall "ac1" '[
+ ["let","list",["one",22,3.3,true,false]],
+ ["get","%list%",1],
+ ["assert","%last result%","=","one"],
+ ["get","%list%",2],
+ ["assert","%last result%","=",22],
+ ["get","%list%",3],
+ ["assert","%last result%","=",3.3],
+ ["get","%list%",4],
+ ["assert","%last result%","=",true],
+ ["get","%list%",5],
+ ["assert","%last result%","=",false],
+ ["return","%list%"]
+]' '' '["one",22,3.3,true,false]'
+
+
+# get size
+
+multicall "ac1" '[
+ ["let","str","this is a string"],
+ ["get size","%str%"],
+ ["return","%last result%"]
+]' '' '16'
+
+multicall "ac1" '[
+ ["let","list",["one",1,"two",2,2.5,true,false]],
+ ["get size","%list%"],
+ ["return","%last result%"]
+]' '' '7'
+
+multicall "ac1" '[
+ ["let","obj",{"one":1,"two":2,"three":3}],
+ ["get size","%obj%"],
+ ["return","%last result%"]
+]' '' '0'
+
+
+
+
+# BIGNUM
+
+multicall "ac1" '[
+ ["to big number",123],
+ ["store result as","a"],
+ ["to big number",123],
+ ["store result as","b"],
+ ["multiply","%a%","%b%"],
+ ["return","%last result%"]
+]' '' '{"_bignum":"15129"}'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","100000"],
+ ["store result as","b"],
+ ["divide","%a%","%b%"],
+ ["return","%last result%"]
+]' '' '{"_bignum":"5000000000000000"}'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","100000"],
+ ["store result as","b"],
+ ["divide","%a%","%b%"],
+ ["to string","%last result%"],
+ ["return","%last result%"]
+]' '' '"5000000000000000"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+
+ ["to big number","100000"],
+ ["divide","%a%","%last result%"],
+ ["store result as","a"],
+
+ ["to big number","1000000000000000"],
+ ["subtract","%a%","%last result%"],
+ ["store result as","a"],
+
+ ["to big number","1234"],
+ ["add","%a%","%last result%"],
+ ["store result as","a"],
+
+ ["to big number","2"],
+ ["remainder","%a%","10000"],
+
+ ["return","%last result%"]
+]' '' '{"_bignum":"1234"}'
+
+
+
+# STRINGS
+
+multicall "ac1" '[
+ ["format","%s%s%s","hello"," ","world"],
+ ["return","%last result%"]
+]' '' '"hello world"'
+
+multicall "ac1" '[
+ ["let","s","hello world"],
+ ["extract","%s%",1,4],
+ ["return","%last result%"]
+]' '' '"hell"'
+
+multicall "ac1" '[
+ ["let","s","hello world"],
+ ["extract","%s%",-2,-1],
+ ["return","%last result%"]
+]' '' '"ld"'
+
+multicall "ac1" '[
+ ["let","s","the amount is 12345"],
+ ["find","%s%","%d+"],
+ ["to number"],
+ ["return","%last result%"]
+]' '' '12345'
+
+multicall "ac1" '[
+ ["let","s","rate: 55 10%"],
+ ["find","%s%","(%d+)%%"],
+ ["to number"],
+ ["return","%last result%"]
+]' '' '10'
+
+multicall "ac1" '[
+ ["let","s","rate: 12%"],
+ ["find","%s%","%s*(%d+)%%"],
+ ["to number"],
+ ["return","%last result%"]
+]' '' '12'
+
+multicall "ac1" '[
+ ["let","s","hello world"],
+ ["replace","%s%","hello","good bye"],
+ ["return","%last result%"]
+]' '' '"good bye world"'
+
+multicall "ac1" '[
+ ["from json","{\"name\":\"ticket\",\"value\":12.5,\"amount\":10}"],
+ ["replace","name = $name, value = $value, amount = $amount","%$(%w+)","%last result%"],
+ ["return","%last result%"]
+]' '' '"name = ticket, value = 12.5, amount = 10"'
+
+
+# IF THEN ELSE
+
+multicall "ac1" '[
+ ["let","s",20],
+ ["if","%s%",">=",20],
+ ["let","b","big"],
+ ["else if","%s%",">=",10],
+ ["let","b","medium"],
+ ["else"],
+ ["let","b","low"],
+ ["end if"],
+ ["let","c","after"],
+ ["return","%b%","%c%"]
+]' '' '["big","after"]'
+
+multicall "ac1" '[
+ ["let","s",10],
+ ["if","%s%",">=",20],
+ ["let","b","big"],
+ ["else if","%s%",">=",10],
+ ["let","b","medium"],
+ ["else"],
+ ["let","b","low"],
+ ["end if"],
+ ["let","c","after"],
+ ["return","%b%","%c%"]
+]' '' '["medium","after"]'
+
+multicall "ac1" '[
+ ["let","s",5],
+ ["if","%s%",">=",20],
+ ["let","b","big"],
+ ["else if","%s%",">=",10],
+ ["let","b","medium"],
+ ["else"],
+ ["let","b","low"],
+ ["end if"],
+ ["let","c","after"],
+ ["return","%b%","%c%"]
+]' '' '["low","after"]'
+
+multicall "ac1" '[
+ ["let","s",20],
+ ["if","%s%",">=",20],
+ ["return","big"],
+ ["else if","%s%",">=",10],
+ ["return","medium"],
+ ["else"],
+ ["return","low"],
+ ["end if"],
+ ["return","after"]
+]' '' '"big"'
+
+multicall "ac1" '[
+ ["let","s",10],
+ ["if","%s%",">=",20],
+ ["return","big"],
+ ["else if","%s%",">=",10],
+ ["return","medium"],
+ ["else"],
+ ["return","low"],
+ ["end if"],
+ ["return","after"]
+]' '' '"medium"'
+
+multicall "ac1" '[
+ ["let","s",5],
+ ["if","%s%",">=",20],
+ ["return","big"],
+ ["else if","%s%",">=",10],
+ ["return","medium"],
+ ["else"],
+ ["return","low"],
+ ["end if"],
+ ["return","after"]
+]' '' '"low"'
+
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000000"],
+ ["store result as","b"],
+ ["if","%a%","=","%b%"],
+ ["let","b","equal"],
+ ["else"],
+ ["let","b","diff"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"equal"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000001"],
+ ["store result as","b"],
+ ["if","%a%","=","%b%"],
+ ["let","b","equal"],
+ ["else"],
+ ["let","b","diff"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"diff"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000001"],
+ ["store result as","a"],
+ ["to big number","500000000000000000000"],
+ ["store result as","b"],
+ ["if","%a%",">","%b%"],
+ ["let","b","bigger"],
+ ["else"],
+ ["let","b","lower"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"bigger"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000001"],
+ ["store result as","b"],
+ ["if","%a%",">","%b%"],
+ ["let","b","bigger"],
+ ["else"],
+ ["let","b","lower"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"lower"'
+
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000001"],
+ ["store result as","b"],
+ ["if","%a%","<","%b%","and","1","=","0"],
+ ["let","b","wrong 1"],
+ ["else if","%a%","<","%b%","and","1","=","1"],
+ ["let","b","correct"],
+ ["else"],
+ ["let","b","wrong 2"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"correct"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000001"],
+ ["store result as","b"],
+ ["if","%a%","<","%b%","and",1,"=",0],
+ ["let","b","wrong 1"],
+ ["else if","%a%","<","%b%","and",1,"=",1],
+ ["let","b","correct"],
+ ["else"],
+ ["let","b","wrong 2"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"correct"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000001"],
+ ["store result as","b"],
+ ["to big number","400000000000000000000"],
+ ["store result as","c"],
+ ["if","%a%","<","%b%","and","%a%","<","%c%"],
+ ["let","b","wrong 1"],
+ ["else if","%a%",">","%b%","and","%a%",">","%c%"],
+ ["let","b","wrong 2"],
+ ["else if","%a%","<","%b%","and","%a%",">","%c%"],
+ ["let","b","correct"],
+ ["else"],
+ ["let","b","wrong 3"],
+ ["end if"],
+ ["return","%b%"]
+]' '' '"correct"'
+
+multicall "ac1" '[
+ ["to big number","500000000000000000000"],
+ ["store result as","a"],
+ ["to big number","500000000000000000001"],
+ ["store result as","b"],
+ ["to big number","400000000000000000000"],
+ ["store result as","c"],
+ ["to string",0],
+
+ ["if","%a%",">","%b%","or","%a%","<","%c%"],
+ ["format","%s%s","%last result%","1"],
+ ["end if"],
+
+ ["if","%a%","=","%b%","or","%a%","=","%c%"],
+ ["format","%s%s","%last result%","2"],
+ ["end if"],
+
+ ["if","%a%","<","%b%","or","%a%","<","%c%"],
+ ["format","%s%s","%last result%","3"],
+ ["end if"],
+
+ ["if","%a%",">","%b%","or","%a%",">","%c%"],
+ ["format","%s%s","%last result%","4"],
+ ["end if"],
+
+ ["if","%a%","<","%b%","or","%a%",">","%c%"],
+ ["format","%s%s","%last result%","5"],
+ ["end if"],
+
+ ["if","%a%","!=","%b%","or","%a%","=","%c%"],
+ ["format","%s%s","%last result%","6"],
+ ["end if"],
+
+ ["if","%a%","=","%b%","or","%a%","!=","%c%"],
+ ["format","%s%s","%last result%","7"],
+ ["end if"],
+
+
+ ["if","%a%",">=","%b%","and","%a%","<=","%c%"],
+ ["format","%s%s","%last result%","8"],
+ ["end if"],
+
+ ["if","%a%",">=","%c%","and","%a%","<=","%b%"],
+ ["format","%s%s","%last result%","9"],
+ ["end if"],
+
+ ["if","%b%",">=","%a%","and","%b%","<=","%c%"],
+ ["format","%s%s","%last result%","A"],
+ ["end if"],
+
+ ["if","%b%",">=","%c%","and","%b%","<=","%a%"],
+ ["format","%s%s","%last result%","B"],
+ ["end if"],
+
+ ["if","%c%",">=","%a%","and","%c%","<=","%b%"],
+ ["format","%s%s","%last result%","C"],
+ ["end if"],
+
+ ["if","%c%",">=","%b%","and","%c%","<=","%a%"],
+ ["format","%s%s","%last result%","D"],
+ ["end if"],
+
+
+ ["if","%a%",">=","%b%","and","%a%","<=","%c%","or",1,"=",0],
+ ["format","%s%s","%last result%","E"],
+ ["end if"],
+
+ ["if","%a%",">=","%b%","and","%a%","<=","%c%","or",1,"=",1],
+ ["format","%s%s","%last result%","F"],
+ ["end if"],
+
+ ["if","%a%",">=","%b%","and","%a%","<=","%c%","and",1,"=",0],
+ ["format","%s%s","%last result%","G"],
+ ["end if"],
+
+ ["if","%a%",">=","%b%","and","%a%","<=","%c%","and",1,"=",1],
+ ["format","%s%s","%last result%","H"],
+ ["end if"],
+
+
+ ["if","%a%",">=","%c%","and","%a%","<=","%b%","or",1,"=",0],
+ ["format","%s%s","%last result%","I"],
+ ["end if"],
+
+ ["if","%a%",">=","%c%","and","%a%","<=","%b%","or",1,"=",1],
+ ["format","%s%s","%last result%","J"],
+ ["end if"],
+
+ ["if","%a%",">=","%c%","and","%a%","<=","%b%","and",1,"=",0],
+ ["format","%s%s","%last result%","K"],
+ ["end if"],
+
+ ["if","%a%",">=","%c%","and","%a%","<=","%b%","and",1,"=",1],
+ ["format","%s%s","%last result%","L"],
+ ["end if"],
+
+
+ ["if",1,"=",0,"or","%a%",">=","%b%","and","%a%","<=","%c%"],
+ ["format","%s%s","%last result%","M"],
+ ["end if"],
+
+ ["if",1,"=",1,"or","%a%",">=","%b%","and","%a%","<=","%c%"],
+ ["format","%s%s","%last result%","N"],
+ ["end if"],
+
+ ["if",1,"=",0,"or","%a%",">=","%c%","and","%a%","<=","%b%"],
+ ["format","%s%s","%last result%","O"],
+ ["end if"],
+
+ ["if",1,"=",1,"or","%a%",">=","%c%","and","%a%","<=","%b%"],
+ ["format","%s%s","%last result%","P"],
+ ["end if"],
+
+
+ ["return","%last result%"]
+]' '' '"0345679IJLNOP"'
+
+
+
+
+# FOR
+
+multicall "ac1" '[
+ ["for","n",1,5],
+ ["loop"],
+ ["return","%n%"]
+]' '' '6'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",1,5],
+ ["add","%last result%",1],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '5'
+
+multicall "ac1" '[
+ ["to big number","10000000000000000001"],
+ ["store result as","to_add"],
+ ["to big number","100000000000000000000"],
+
+ ["for","n",1,3],
+ ["add","%last result%","%to_add%"],
+ ["loop"],
+
+ ["to string","%last result%"],
+ ["return","%last result%"]
+]' '' '"130000000000000000003"'
+
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",500,10,-5],
+ ["add","%last result%",1],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '99'
+
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",5,1,-1],
+ ["add","%last result%",1],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '5'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",5,1],
+ ["add","%last result%",1],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '0'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",1,5],
+ ["add","%last result%",1],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '5'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",1,5,-1],
+ ["add","%last result%",1],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '0'
+
+
+
+# FOREACH
+
+multicall "ac1" '[
+ ["let","list",[11,22,33]],
+ ["let","r",0],
+ ["for each","item","in","%list%"],
+ ["add","%r%","%item%"],
+ ["store result as","r"],
+ ["loop"],
+ ["return","%r%"]
+]' '' '66'
+
+multicall "ac1" '[
+ ["let","list",[11,22,33]],
+ ["let","counter",0],
+ ["for each","item","in","%list%"],
+ ["add","%counter%",1],
+ ["store result as","counter"],
+ ["loop"],
+ ["return","%counter%"]
+]' '' '3'
+
+multicall "ac1" '[
+ ["let","list",[]],
+ ["let","counter",0],
+ ["for each","item","in","%list%"],
+ ["add","%counter%",1],
+ ["store result as","counter"],
+ ["loop"],
+ ["return","%counter%"]
+]' '' '0'
+
+multicall "ac1" '[
+ ["let","list",["one",1,"two",2,2.5,true,false]],
+ ["let","counter",0],
+ ["for each","item","in","%list%"],
+ ["add","%counter%",1],
+ ["store result as","counter"],
+ ["loop"],
+ ["return","%counter%"]
+]' '' '7'
+
+multicall "ac1" '[
+ ["let","list",[10,21,32]],
+ ["let","r",0],
+ ["for each","item","in","%list%"],
+ ["if","%item%","<",30],
+ ["add","%r%","%item%"],
+ ["store result as","r"],
+ ["end if"],
+ ["loop"],
+ ["return","%r%"]
+]' '' '31'
+
+
+
+# FORPAIR
+
+multicall "ac1" '[
+ ["let","str",""],
+ ["let","sum",0],
+ ["let","obj",{"one":1,"two":2,"three":3}],
+ ["for each","key","value","in","%obj%"],
+ ["combine","%str%","%key%"],
+ ["store result as","str"],
+ ["add","%sum%","%value%"],
+ ["store result as","sum"],
+ ["loop"],
+ ["return","%str%","%sum%"]
+]' '' '["onethreetwo",6]'
+
+multicall "ac1" '[
+ ["let","str",""],
+ ["let","sum",0],
+ ["let","obj",{"one":1.5,"two":2.5,"three":3.5,"four":4.5}],
+ ["for each","key","value","in","%obj%"],
+ ["combine","%str%","%key%"],
+ ["store result as","str"],
+ ["add","%sum%","%value%"],
+ ["store result as","sum"],
+ ["loop"],
+ ["return","%str%","%sum%"]
+]' '' '["fouronethreetwo",12]'
+
+multicall "ac1" '[
+ ["let","names",[]],
+ ["let","values",[]],
+ ["let","obj",{"one":1.5,"two":2.5,"three":3.5,"four":4.5}],
+ ["for each","key","value","in","%obj%"],
+ ["insert","%names%","%key%"],
+ ["insert","%values%","%value%"],
+ ["loop"],
+ ["return","%names%","%values%"]
+]' '' '[["four","one","three","two"],[4.5,1.5,3.5,2.5]]'
+
+multicall "ac1" '[
+ ["let","names",[]],
+ ["let","values",[]],
+ ["let","obj",{"one":1.5,"two":2.5,"three":3.5,"four":4.5}],
+ ["for each","key","value","in","%obj%"],
+ ["insert","%names%","%key%"],
+ ["insert","%values%","%value%"],
+ ["loop"],
+ ["call","'$address'","sort","%values%"],
+ ["store result as","values"],
+ ["return","%names%","%values%"]
+]' '' '[["four","one","three","two"],[1.5,2.5,3.5,4.5]]'
+
+multicall "ac1" '[
+ ["let","obj",{}],
+ ["let","counter",0],
+ ["for each","key","value","in","%obj%"],
+ ["add","%counter%",1],
+ ["store result as","counter"],
+ ["loop"],
+ ["return","%counter%"]
+]' '' '0'
+
+
+
+# FOR "BREAK"
+
+multicall "ac1" '[
+ ["let","c",0],
+ ["for","n",1,10],
+ ["add","%c%",1],
+ ["store result as","c"],
+ ["if","%n%","=",5],
+ ["let","n",500],
+ ["end if"],
+ ["loop"],
+ ["return","%c%"]
+]' '' '5'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",500,10,-5],
+ ["add","%last result%",1],
+ ["if","%n%","=",475],
+ ["let","n",2],
+ ["end if"],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '6'
+
+multicall "ac1" '[
+ ["let","c",0],
+ ["for","n",1,10],
+ ["add","%c%",1],
+ ["store result as","c"],
+ ["if","%n%","=",5],
+ ["break"],
+ ["end if"],
+ ["loop"],
+ ["return","%c%"]
+]' '' '5'
+
+multicall "ac1" '[
+ ["let","c",0],
+ ["for","n",1,10],
+ ["add","%c%",1],
+ ["store result as","c"],
+ ["break","if","%n%","=",5],
+ ["loop"],
+ ["return","%c%"]
+]' '' '5'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",500,10,-5],
+ ["add","%last result%",1],
+ ["if","%n%","=",475],
+ ["break"],
+ ["end if"],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '6'
+
+multicall "ac1" '[
+ ["to number","0"],
+ ["for","n",500,10,-5],
+ ["add","%last result%",1],
+ ["break","if","%n%","=",475],
+ ["loop"],
+ ["return","%last result%"]
+]' '' '6'
+
+multicall "ac1" '[
+ ["for","n",1,5],
+ ["loop"],
+ ["return","%n%"]
+]' '' '6'
+
+multicall "ac1" '[
+ ["for","n",1,5],
+ ["break"],
+ ["loop"],
+ ["return","%n%"]
+]' '' '1'
+
+multicall "ac1" '[
+ ["let","names",[]],
+ ["let","list",["one","two","three","four"]],
+ ["for each","item","in","%list%"],
+ ["if","%item%","=","three"],
+ ["break"],
+ ["end if"],
+ ["insert","%names%","%item%"],
+ ["loop"],
+ ["return","%names%"]
+]' '' '["one","two"]'
+
+multicall "ac1" '[
+ ["let","names",[]],
+ ["let","list",["one","two","three","four"]],
+ ["for each","item","in","%list%"],
+ ["break","if","%item%","=","three"],
+ ["insert","%names%","%item%"],
+ ["loop"],
+ ["return","%names%"]
+]' '' '["one","two"]'
+
+multicall "ac1" '[
+ ["let","names",[]],
+ ["let","obj",{"one":true,"two":false,"three":false,"four":true}],
+ ["for each","key","value","in","%obj%"],
+ ["if","%value%","=",false],
+ ["break"],
+ ["end if"],
+ ["insert","%names%","%key%"],
+ ["loop"],
+ ["return","%names%"]
+]' '' '["four","one"]'
+
+multicall "ac1" '[
+ ["let","names",[]],
+ ["let","obj",{"one":true,"two":false,"three":false,"four":true}],
+ ["for each","key","value","in","%obj%"],
+ ["break","if","%value%","=",false],
+ ["insert","%names%","%key%"],
+ ["loop"],
+ ["return","%names%"]
+]' '' '["four","one"]'
+
+
+
+# RETURN before the end
+
+multicall "ac1" '[
+ ["let","v",123],
+ ["if","%v%",">",100],
+ ["return"],
+ ["end if"],
+ ["let","v",500],
+ ["return","%v%"]
+]' '' ''
+
+multicall "ac1" '[
+ ["let","v",123],
+ ["if","%v%",">",200],
+ ["return"],
+ ["end if"],
+ ["let","v",500],
+ ["return","%v%"]
+]' '' '500'
+
+
+
+# FULL LOOPS
+
+multicall "ac1" '[
+ ["let","c","'$address'"],
+ ["call","%c%","inc","n"],
+ ["call","%c%","get","n"],
+ ["if","%last result%",">=",5],
+ ["return","%last result%"],
+ ["end if"],
+ ["loop"]
+]' '' '5'
+
+
+
+# CALLS
+
+multicall "ac1" '[
+ ["call","'$address'","works"],
+ ["assert","%last result%","=",123],
+ ["call","'$address'","works"],
+ ["return","%last result%"]
+]' '' '123'
+
+multicall "ac1" '[
+ ["call","'$address'","works"],
+ ["call","'$address'","fails"]
+]', 'this call should fail'
+
+
+multicall "ac3" '[
+ ["call","'$address'","set_name","test"],
+ ["call","'$address'","get_name"],
+ ["assert","%last result%","=","test"]
+]'
+
+multicall "ac3" '[
+ ["call","'$address'","set_name","wrong"],
+ ["call","'$address'","get_name"],
+ ["assert","%last result%","=","wrong"],
+ ["call","'$address'","set_name",123]
+]', 'must be string'
+
+multicall "ac3" '[
+ ["call","'$address'","get_name"],
+ ["assert","%last result%","=","test"],
+ ["return","%last result%"]
+]' '' '"test"'
+
+
+multicall "ac3" '[
+ ["let","c","'$address'"],
+ ["call","%c%","set_name","test2"],
+ ["call","%c%","get_name"],
+ ["assert","%last result%","=","test2"]
+]'
+
+multicall "ac3" '[
+ ["call","'$address'","sender"],
+ ["assert","%last result%","=","%my account address%"],
+ ["call","'$address'","is_contract","%my account address%"],
+ ["assert","%last result%","=",false],
+ ["call","'$address'","set","account","%my account address%"],
+ ["call","'$address'","get","account"],
+ ["assert","%last result%","=","%my account address%"]
+]'
+
+# CALL + SEND
+
+multicall "ac3" '[
+ ["get aergo balance","%my account address%"],
+ ["store result as","my balance before"],
+ ["get aergo balance","'$address'"],
+ ["store result as","contract balance before"],
+ ["call + send","0.25 aergo","'$address'","resend_to","%my account address%"],
+ ["assert","%last result%","=","250000000000000000"],
+ ["get aergo balance","%my account address%"],
+ ["assert","%last result%","=","%my balance before%"],
+ ["get aergo balance","'$address'"],
+ ["assert","%last result%","=","%contract balance before%"]
+]'
+
+multicall "ac3" '[
+ ["get aergo balance","%my account address%"],
+ ["store result as","my balance before"],
+ ["get aergo balance","'$address'"],
+ ["store result as","contract balance before"],
+
+ ["let","amount","1.5","aergo"],
+ ["call + send","%amount%","'$address'","recv_aergo"],
+
+ ["assert","%my aergo balance%","<","%my balance before%"],
+ ["get aergo balance","'$address'"],
+ ["assert","%last result%",">","%contract balance before%"],
+
+ ["call","'$address'","send_to","%my account address%","%amount%"],
+
+ ["assert","%my aergo balance%","=","%my balance before%"],
+ ["get aergo balance","'$address'"],
+ ["assert","%last result%","=","%contract balance before%"]
+]'
+
+
+# CALL LOOP
+
+multicall "ac3" '[
+ ["let","list",["first","second","third"]],
+ ["for each","item","in","%list%"],
+ ["call","'$address'","add","%item%"],
+ ["loop"]
+]'
+
+multicall "ac1" '[
+ ["call","'$address'","get","1"],
+ ["assert","%last result%","=","first"],
+ ["call","'$address'","get","2"],
+ ["assert","%last result%","=","second"],
+ ["call","'$address'","get","3"],
+ ["assert","%last result%","=","third"]
+]'
+
+multicall "ac3" '[
+ ["let","list",["1st","2nd","3rd"]],
+ ["let","n",1],
+ ["for each","item","in","%list%"],
+ ["to string","%n%"],
+ ["call","'$address'","set","%last result%","%item%"],
+ ["add","%n%",1],
+ ["store result as","n"],
+ ["loop"]
+]'
+
+multicall "ac1" '[
+ ["call","'$address'","get","1"],
+ ["assert","%last result%","=","1st"],
+ ["call","'$address'","get","2"],
+ ["assert","%last result%","=","2nd"],
+ ["call","'$address'","get","3"],
+ ["assert","%last result%","=","3rd"]
+]'
+
+
+
+# TRY CALL (PCALL)
+
+multicall "ac1" '[
+ ["try call","'$address'","works"],
+ ["assert","%call succeeded%","=",true],
+ ["try call","'$address'","fails"],
+ ["assert","%call succeeded%","=",false]
+]'
+
+multicall "ac3" '[
+ ["try call","'$address'","set_name","1st"],
+ ["assert","%call succeeded%"],
+
+ ["try call","'$address'","get_name"],
+ ["assert","%call succeeded%","=",true],
+ ["assert","%last result%","=","1st"],
+
+ ["try call","'$address'","set_name",22],
+ ["assert","%call succeeded%","=",false],
+
+ ["try call","'$address'","get_name"],
+ ["assert","%call succeeded%","=",true],
+ ["assert","%last result%","=","1st"],
+
+ ["return","%last result%"]
+]' '' '"1st"'
+
+
+# TRY CALL + SEND (PCALL)
+
+multicall "ac1" '[
+ ["get aergo balance","'$address'"],
+ ["store result as","balance before"],
+ ["try call + send","0.25 aergo","'$address'","recv_aergo"],
+ ["assert","%call succeeded%"],
+ ["try call + send","1 aergo","'$address'","recv_aergo"],
+ ["assert","%call succeeded%","=",true],
+ ["get aergo balance","'$address'"],
+ ["store result as","balance after"],
+ ["subtract","%balance after%","%balance before%"],
+ ["assert","%last result%","=","1.25 aergo"],
+ ["try call + send","1 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRB","recv_aergo"],
+ ["assert","%call succeeded%","=",false]
+]'
+
+multicall "ac1" '[
+	["let","my balance before","%my aergo balance%"],
+	["get aergo balance","'$address'"],
+	["let","contract balance before","%last result%"],
+
+	["try call","'$address'","send_and_fail","AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke","0.5 aergo"],
+	["assert","%call succeeded%","=",false],
+	["get aergo balance","'$address'"],
+	["assert","%last result%","=","%contract balance before%"],
+	["assert","%my aergo balance%","=","%my balance before%"],
+
+	["try call + send","0.25 aergo","'$address'","resend_and_fail","AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke"],
+	["assert","%call succeeded%","=",false],
+	["get aergo balance","'$address'"],
+	["assert","%last result%","=","%contract balance before%"],
+	["assert","%my aergo balance%","=","%my balance before%"],
+
+	["try call + send","0.25 aergo","'$address'","resend_and_fail","AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34"],
+	["assert","%call succeeded%","=",false],
+	["get aergo balance","'$address'"],
+	["assert","%last result%","=","%contract balance before%"],
+	["assert","%my aergo balance%","=","%my balance before%"],
+
+	["try call","'$address'","send_to","AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke","0.125 aergo"],
+	["assert","%call succeeded%"],
+	["get aergo balance","'$address'"],
+	["subtract","%contract balance before%","%last result%"],
+	["assert","%last result%","=","0.125 aergo"],
+	["subtract","%my aergo balance%","%my balance before%"],
+	["assert","%last result%","=","0.125 aergo"]
+]' '' ''
+
+
+# MULTICALL ON ACCOUNT ------------------------------------------
+
+multicall "ac0" '[
+ ["call","'$address1'","set_name","testing multicall"],
+ ["call","'$address2'","set_name","contract 2"],
+ ["call","'$address3'","set_name","third one"]
+]'
+
+multicall "ac0" '[
+ ["call","'$address1'","get_name"],
+ ["assert","%last result%","=","testing multicall"],
+ ["store result as","r1"],
+ ["call","'$address2'","get_name"],
+ ["assert","%last result%","=","contract 2"],
+ ["store result as","r2"],
+ ["call","'$address3'","get_name"],
+ ["assert","%last result%","=","third one"],
+ ["store result as","r3"],
+ ["return","%r1%","%r2%","%r3%"]
+]' '' '["testing multicall","contract 2","third one"]'
+
+multicall "ac0" '[
+ ["from json","{}"],
+ ["store result as","res"],
+ ["call","'$address1'","get_name"],
+ ["set","%res%","r1","%last result%"],
+ ["call","'$address2'","get_name"],
+ ["set","%res%","r2","%last result%"],
+ ["call","'$address3'","get_name"],
+ ["set","%res%","r3","%last result%"],
+ ["return","%res%"]
+]' '' '{"r1":"testing multicall","r2":"contract 2","r3":"third one"}'
+
+
+multicall "ac0" '[
+ ["call","'$address1'","set_name","wohooooooo"],
+ ["call","'$address2'","set_name","it works!"],
+ ["call","'$address3'","set_name","it really works!"]
+]'
+
+multicall "ac0" '[
+ ["call","'$address1'","get_name"],
+ ["assert","%last result%","=","wohooooooo"],
+ ["store result as","r1"],
+ ["call","'$address2'","get_name"],
+ ["assert","%last result%","=","it works!"],
+ ["store result as","r2"],
+ ["call","'$address3'","get_name"],
+ ["assert","%last result%","=","it really works!"],
+ ["store result as","r3"],
+ ["return","%r1%","%r2%","%r3%"]
+]' '' '["wohooooooo","it works!","it really works!"]'
+
+multicall "ac0" '[
+ ["from json","{}"],
+ ["store result as","res"],
+ ["call","'$address1'","get_name"],
+ ["set","%res%","r1","%last result%"],
+ ["call","'$address2'","get_name"],
+ ["set","%res%","r2","%last result%"],
+ ["call","'$address3'","get_name"],
+ ["set","%res%","r3","%last result%"],
+ ["return","%res%"]
+]' '' '{"r1":"wohooooooo","r2":"it works!","r3":"it really works!"}'
+
+
+
+# aergo BALANCE and SEND
+
+parse_balance() {
+  local number=$1
+  number=${number/ aergo/}
+  local result=$(echo "scale=0; $number * 1000000000000000000 / 1" | bc)
+  echo $result
+}
+
+# 0: AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R
+# 1: AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke
+# 2: AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34
+# 3: AmPfKfrbSjbHD77JjpEvdktgH3w6sbWRhhwFmFAyi1ZSsiePs7XP
+# 4: AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw
+
+account_state=$(../bin/aergocli getstate --address AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke)
+echo $account_state
+balance1=$(echo $account_state | jq .balance | sed 's/"//g')
+balance1=$(parse_balance $balance1)
+echo balance=$balance1
+
+account_state=$(../bin/aergocli getstate --address AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw)
+echo $account_state
+balance4=$(echo $account_state | jq .balance | sed 's/"//g')
+balance4=$(parse_balance $balance4)
+echo balance=$balance4
+
+multicall "ac4" '[
+ ["get aergo balance"],
+ ["to string"],
+ ["assert","%last result%","=","'$balance4'"],
+ ["return","%last result%"]
+]' '' '"'$balance4'"'
+
+# retrieve it again because it decreased due to tx fee
+account_state=$(../bin/aergocli getstate --address AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw)
+echo $account_state
+balance4=$(echo $account_state | jq .balance | sed 's/"//g')
+balance4=$(parse_balance $balance4)
+echo balance=$balance4
+
+amount=1230000000000000000
+
+balance4after=$(echo "$balance4 + $amount" | bc)
+balance1after=$(echo "$balance1 - $amount" | bc)
+
+multicall "ac1" '[
+ ["get aergo balance"],
+ ["to string","%last result%"],
+ ["assert","%last result%","=","'$balance1'"],
+
+ ["get aergo balance","AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw"],
+ ["to string","%last result%"],
+ ["assert","%last result%","=","'$balance4'"],
+
+ ["send","AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw","'$amount'"],
+
+ ["get aergo balance","AmLaPgDNg3tsebXSU19bftkr1XxvmySWGusEti9SaHoKDJEZNjSw"],
+ ["to string","%last result%"],
+ ["assert","%last result%","=","'$balance4after'"],
+
+ ["get aergo balance"],
+ ["to string"],
+ ["assert","%last result%","=","'$balance1after'"],
+
+ ["return","%last result%"]
+]' '' '"'$balance1after'"'
+
+
+
+# test the multicall contract in a delegated call
+
+account_state=$(../bin/aergocli getstate --address $address4)
+echo $account_state
+balance1=$(echo $account_state | jq .balance | sed 's/"//g')
+balance1=$(parse_balance $balance1)
+echo balance=$balance1
+
+account_state=$(../bin/aergocli getstate --address $address2)
+echo $account_state
+balance2=$(echo $account_state | jq .balance | sed 's/"//g')
+balance2=$(parse_balance $balance2)
+echo balance=$balance2
+
+amount=125000000000000000
+
+balance1after=$(echo "$balance1 - $amount" | bc)
+balance2after=$(echo "$balance2 + $amount" | bc)
+
+contract_multicall "ac1" "caller" "multicall" '[
+	["assert","%my aergo balance%","=","'$balance1'"],
+	["get aergo balance","'$address2'"],
+	["assert","%last result%","=","'$balance2'"],
+
+	["call + send","0.125 aergo","'$address2'","recv_aergo"],
+
+	["assert","%my aergo balance%","=","'$balance1after'"],
+	["get aergo balance","'$address2'"],
+	["assert","%last result%","=","'$balance2after'"],
+
+	["return","%my aergo balance%","%last result%"]
+]' '' '[{"_bignum":"'$balance1after'"},{"_bignum":"'$balance2after'"}]'
+
+
+# test state recovery - normal atomic txn
+
+account_state=$(../bin/aergocli getstate --address $address4)
+echo $account_state
+balance1=$(echo $account_state | jq .balance | sed 's/"//g')
+balance1=$(parse_balance $balance1)
+echo balance=$balance1
+
+account_state=$(../bin/aergocli getstate --address $address2)
+echo $account_state
+balance2=$(echo $account_state | jq .balance | sed 's/"//g')
+balance2=$(parse_balance $balance2)
+echo balance=$balance2
+
+amount=125000000000000000
+
+balance1after=$(echo "$balance1 - $amount" | bc)
+balance2after=$(echo "$balance2 + $amount" | bc)
+
+contract_multicall "ac1" "caller" "multicall" '[
+	["assert","%my aergo balance%","=","'$balance1'"],
+	["get aergo balance","'$address2'"],
+	["assert","%last result%","=","'$balance2'"],
+
+	["send","'$address2'","0.125 aergo"],
+
+	["assert","%my aergo balance%","=","'$balance1after'"],
+	["get aergo balance","'$address2'"],
+	["assert","%last result%","=","'$balance2after'"],
+
+	["call","'$address2'","fails"],
+
+	["return","%my aergo balance%","%last result%"]
+]' 'this call should fail' ''
+
+
+# test state recovery - pcall
+
+account_state=$(../bin/aergocli getstate --address $address4)
+echo $account_state
+balance1=$(echo $account_state | jq .balance | sed 's/"//g')
+balance1=$(parse_balance $balance1)
+echo balance=$balance1
+
+account_state=$(../bin/aergocli getstate --address $address2)
+echo $account_state
+balance2=$(echo $account_state | jq .balance | sed 's/"//g')
+balance2=$(parse_balance $balance2)
+echo balance=$balance2
+
+contract_multicall "ac1" "caller" "multicall" '[
+	["assert","%my aergo balance%","=","'$balance1'"],
+	["get aergo balance","'$address2'"],
+	["assert","%last result%","=","'$balance2'"],
+
+	["try call","'$address2'","send_and_fail","AmgtL32d1M56xGENKDnDqXFzkrYJwWidzSMtay3F8fFDU1VAEdvK","0.125 aergo"],
+
+	["assert","%my aergo balance%","=","'$balance1'"],
+	["get aergo balance","'$address2'"],
+	["assert","%last result%","=","'$balance2'"],
+
+	["return","%my aergo balance%","%last result%"]
+]' '' '[{"_bignum":"'$balance1'"},{"_bignum":"'$balance2'"}]'
+
+
+
+# SECURITY CHECKS
+
+# it should not be possible to call the code from another account
+
+# a. from an account (via multicall, using the 'call' command)
+
+multicall "ac1" '[
+ ["call","AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34","execute",[["add",11,22],["return","%last result%"]]],
+ ["return","%last result%"]
+]' 'nd contract' ''
+
+
+# b. from an account (via a call tx)
+
+call "ac1" "ac1" "execute" '[[["add",11,22],["return","%last result%"]]]' 'nd contract' ''
+
+call "ac1" "ac2" "execute" '[[["add",11,22],["return","%last result%"]]]' 'nd contract' ''
+
+
+# c. from a contract (calling back)
+
+multicall "ac1" '[
+ ["call","'$address1'","call","AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke","execute",[["add",11,22],["return","%last result%"]]],
+ ["return","%last result%"]
+]' 'nd contract' ''
+
+
+# d. from a contract (calling another account)
+
+multicall "ac1" '[
+ ["call","'$address1'","call","AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34","execute",[["add",11,22],["return","%last result%"]]],
+ ["return","%last result%"]
+]' 'nd contract' ''
+
+
+# e. from a contract (via a call txn)
+
+call "ac1" "c2" "call" '["AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke","execute",[["add",11,22],["return","%last result%"]]]' 'nd contract' ''
+
+call "ac1" "c2" "call" '["AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34","execute",[["add",11,22],["return","%last result%"]]]' 'nd contract' ''
+
+
+# system.isContract() should return false on user accounts
+
+call "ac1" "c2" "is_contract" '["AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke"]' '' 'false'
+
+call "ac1" "c2" "is_contract" '["AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34"]' '' 'false'
+
+multicall "ac1" '[
+ ["call","'$address1'","is_contract","AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke"],
+ ["assert","%last result%","=",false],
+ ["return","%last result%"]
+]' '' 'false'
+
+multicall "ac1" '[
+ ["call","'$address1'","is_contract","AmLhv6rvLEMoL5MLws1tNTyiYYyzTx4JGjaPAugzqabpjxxWyP34"],
+ ["assert","%last result%","=",false],
+ ["return","%last result%"]
+]' '' 'false'
+
+
+# on a contract called by multicall, the system.getSender() and system.getOrigin() must be the same
+
+multicall "ac1" '[
+ ["call","'$address1'","sender"],
+ ["store result as","sender"],
+ ["call","'$address1'","origin"],
+ ["store result as","origin"],
+ ["assert","%sender%","=","%origin%"],
+ ["return","%sender%"]
+]' '' '"AmNLhiVVdLxbPW5NxpLibqoLdobc2TaKVk8bwrPn5VXz6gUSLvke"'
diff --git a/tests/test-name-service.lua b/tests/test-name-service.lua
new file mode 100644
index 000000000..fb8046297
--- /dev/null
+++ b/tests/test-name-service.lua
@@ -0,0 +1,6 @@
+
+function resolve(name)
+  return name_service.resolve(name)
+end
+
+abi.register(resolve)
diff --git a/tests/test-name-service.sh b/tests/test-name-service.sh
new file mode 100755
index 000000000..8fdb8db29
--- /dev/null
+++ b/tests/test-name-service.sh
@@ -0,0 +1,183 @@
+set -e
+source common.sh
+
+fork_version=$1
+
+
+echo "-- deploy contract --"
+
+deploy test-name-service.lua
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+echo "-- call contract with an invalid address --"
+
+txhash=$(../bin/aergocli --keystore . contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	${address} resolve '["AmgExqUu6J4Za8VjyWMJANxoRaUvwgngGQJgemHgwWvuRSEd3wnX"]' \
+	--password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals   "$status" "ERROR"
+  # assert_equals "$ret"    "[Contract.LuaResolve] Data and checksum don't match"
+  assert_contains "$ret"    "Data and checksum don't match"
+else
+  assert_equals   "$status" "ERROR"
+  assert_contains "$ret"    "attempt to index global 'name_service'"
+fi
+
+
+echo "-- call contract with a valid address --"
+
+txhash=$(../bin/aergocli --keystore . contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	${address} resolve '["AmgExqUu6J4Za8VjyWMJANxoRaUvwgngGQJgemHgwWvuRSEd3wnE"]' \
+	--password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$status" "SUCCESS"
+  assert_equals "$ret"    "AmgExqUu6J4Za8VjyWMJANxoRaUvwgngGQJgemHgwWvuRSEd3wnE"
+else
+  assert_equals   "$status" "ERROR"
+  assert_contains "$ret"    "attempt to index global 'name_service'"
+fi
+
+
+echo "-- call contract with invalid name --"
+
+txhash=$(../bin/aergocli --keystore . contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	${address} resolve '["long_name-with-invalid.chars"]' \
+	--password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$status" "SUCCESS"
+  assert_equals "$ret"    ""
+else
+  assert_equals   "$status" "ERROR"
+  assert_contains "$ret"    "attempt to index global 'name_service'"
+fi
+
+
+echo "-- call contract with valid but not set name --"
+
+txhash=$(../bin/aergocli --keystore . contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	${address} resolve '["testnametest"]'   --password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$status" "SUCCESS"
+  assert_equals "$ret"    ""
+else
+  assert_equals   "$status" "ERROR"
+  assert_contains "$ret"    "attempt to index global 'name_service'"
+fi
+
+
+# use a different account name for each hardfork
+account_name="testnamever$fork_version"
+# later, it could also:
+#  - drop the account name, to recreate it later
+#  - let the account name to expire, by forwarding time
+
+
+echo "-- register a new account name --"
+
+txhash=$(../bin/aergocli --keystore . name new --name="$account_name" \
+	--from AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	--password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+
+assert_equals "$status" "SUCCESS"
+
+
+echo "-- call contract --"
+
+txhash=$(../bin/aergocli --keystore . contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	${address} resolve '["'$account_name'"]'   --password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$status" "SUCCESS"
+  assert_equals "$ret"    "AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R"
+else
+  assert_equals   "$status" "ERROR"
+  assert_contains "$ret"    "attempt to index global 'name_service'"
+fi
+
+
+echo "-- transfer the name --"
+
+txhash=$(../bin/aergocli --keystore . name update --name="$account_name" \
+	--from AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	--to Amh9vfP5My5DpSafe3gcZ1u8DiZNuqHSN2oAWehZW1kgB3XP4kPi \
+	--password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+
+assert_equals "$status" "SUCCESS"
+
+
+echo "-- call contract --"
+
+txhash=$(../bin/aergocli --keystore . contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+	${address} resolve '["'$account_name'"]'   --password bmttest | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+
+if [ "$fork_version" -eq "4" ]; then
+  assert_equals "$status" "SUCCESS"
+  assert_equals "$ret"    "Amh9vfP5My5DpSafe3gcZ1u8DiZNuqHSN2oAWehZW1kgB3XP4kPi"
+else
+  assert_equals   "$status" "ERROR"
+  assert_contains "$ret"    "attempt to index global 'name_service'"
+fi
+
+
+echo "-- query the contract --"
+
+../bin/aergocli contract query ${address} resolve '["'$account_name'"]' > result.txt 2> result.txt || true
+result=$(cat result.txt)
+
+if [ "$fork_version" -eq "4" ]; then
+  result=$(echo $result | sed 's/"//g' | sed 's/\\//g' | sed 's/value://g')
+  assert_equals   "$result"  "Amh9vfP5My5DpSafe3gcZ1u8DiZNuqHSN2oAWehZW1kgB3XP4kPi"
+else
+  assert_contains "$result"  "Error: failed to query contract"
+  assert_contains "$result"  "attempt to index global 'name_service'"
+fi
diff --git a/tests/test-pcall-events.sh b/tests/test-pcall-events.sh
new file mode 100755
index 000000000..206f83f9f
--- /dev/null
+++ b/tests/test-pcall-events.sh
@@ -0,0 +1,137 @@
+set -e
+source common.sh
+
+fork_version=$1
+
+
+echo "-- deploy --"
+
+deploy ../contract/vm_dummy/test_files/pcall-events-3.lua
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address3=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+get_deploy_args ../contract/vm_dummy/test_files/pcall-events-2.lua
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+    contract deploy AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+    $deploy_args '["'$address3'"]' | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address2=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+get_deploy_args ../contract/vm_dummy/test_files/pcall-events-1.lua
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+    contract deploy AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+    $deploy_args '["'$address2'"]' | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address1=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+get_deploy_args ../contract/vm_dummy/test_files/pcall-events-0.lua
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+    contract deploy AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+    $deploy_args '["'$address2'"]' | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+address0=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+
+assert_equals "$status" "CREATED"
+
+
+echo "-- pcall --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $address1 test_pcall "[]" | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+nevents=$(cat receipt.json | jq '.events | length')
+
+assert_equals "$status"   "SUCCESS"
+#assert_equals "$ret"      "{}"
+
+if [ "$fork_version" -eq "4" ]; then
+	assert_equals "$nevents" "2"
+else
+	assert_equals "$nevents" "6"
+fi
+
+
+echo "-- xpcall --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $address1 test_xpcall "[]" | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+nevents=$(cat receipt.json | jq '.events | length')
+
+assert_equals "$status"   "SUCCESS"
+#assert_equals "$ret"      "{}"
+
+if [ "$fork_version" -eq "4" ]; then
+	assert_equals "$nevents" "2"
+else
+	assert_equals "$nevents" "6"
+fi
+
+
+echo "-- contract.pcall --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $address1 test_contract_pcall "[]" | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+nevents=$(cat receipt.json | jq '.events | length')
+
+assert_equals "$status"   "SUCCESS"
+#assert_equals "$ret"      "{}"
+
+if [ "$fork_version" -eq "4" ]; then
+	assert_equals "$nevents" "2"
+else
+	assert_equals "$nevents" "6"
+fi
+
+
+#echo "----------- contract-1 event list ------------"
+#aergocli event list --address $address1 --recent 1000
+
+#echo "----------- contract-2 event list ------------"
+#aergocli event list --address $address2 --recent 1000
+
+#echo "----------- contract-3 event list ------------"
+#aergocli event list --address $address3 --recent 1000
diff --git a/tests/test-transaction-types.sh b/tests/test-transaction-types.sh
new file mode 100755
index 000000000..e08259fb4
--- /dev/null
+++ b/tests/test-transaction-types.sh
@@ -0,0 +1,415 @@
+set -e
+source common.sh
+
+fork_version=$1
+
+
+# contract without "default" function
+cat > test-tx-type-1.lua << EOF
+function default()
+  return system.getAmount()
+end
+
+function default2()
+  return system.getAmount()
+end
+
+abi.payable(default2)
+EOF
+
+# contract with not payable "default" function
+cat > test-tx-type-2.lua << EOF
+function default()
+  return system.getAmount()
+end
+
+abi.register(default)
+EOF
+
+# contract with payable "default" function
+cat > test-tx-type-3.lua << EOF
+function default()
+  return system.getAmount()
+end
+
+abi.payable(default)
+EOF
+
+echo "-- deploy 1 --"
+deploy test-tx-type-1.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+no_default=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+echo "-- deploy 2 --"
+deploy test-tx-type-2.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+not_payable=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+echo "-- deploy 3 --"
+deploy test-tx-type-3.lua
+get_receipt $txhash
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+payable_default=$(cat receipt.json | jq .contractAddress | sed 's/"//g')
+assert_equals "$status" "CREATED"
+
+# delete the contract files
+rm test-tx-type-*.lua
+
+
+# get some info
+from=AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R
+chainIdHash=$(../bin/aergocli blockchain | jq -r '.chainIdHash')
+
+
+echo "-- TRANSFER type, contract without 'default' function --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  sendtx --from $from --to $no_default --amount 1aergo \
+  | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "ERROR"
+assert_equals "$ret"      "'default' is not payable"
+#assert_equals "$gasUsed"  "117861"
+
+
+echo "-- TRANSFER type, contract with not payable 'default' function --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  sendtx --from $from --to $not_payable --amount 1aergo \
+  | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "ERROR"
+assert_equals "$ret"      "'default' is not payable"
+#assert_equals "$gasUsed"  "117861"
+
+
+echo "-- TRANSFER type, contract with payable 'default' function --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  sendtx --from $from --to $payable_default --amount 1aergo \
+  | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "SUCCESS"
+assert_equals "$ret"      "1000000000000000000"
+#assert_equals "$gasUsed"  "117861"
+
+
+nonce=$(../bin/aergocli getstate --address $from | jq -r '.nonce')
+
+#echo "-- TRANSFER type, trying to make a call --"
+
+
+echo "-- NORMAL type, contract without 'default' function (not sending) --"
+
+nonce=$((nonce + 1))
+
+#"Payload": "'$from'",
+
+jsontx='{
+"Account": "'$from'",
+"Recipient": "'$no_default'",
+"Amount": "0",
+"Type": 0,
+"Nonce": '$nonce',
+"chainIdHash": "'$chainIdHash'"}'
+
+jsontx=$(../bin/aergocli --keystore . --password bmttest \
+  signtx --address $from --jsontx "$jsontx" )
+
+txhash=$(../bin/aergocli committx --jsontx "$jsontx" | jq .results[0].hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -ge "4" ]; then
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "tx not allowed recipient"
+	#assert_equals "$gasUsed"  "117861"
+else
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "undefined function: default"
+	#assert_equals "$gasUsed"  "117861"
+fi
+
+
+echo "-- NORMAL type, contract without 'default' function (sending) --"
+
+nonce=$((nonce + 1))
+
+#"Payload": "'$from'",
+
+jsontx='{
+"Account": "'$from'",
+"Recipient": "'$no_default'",
+"Amount": "1.23aergo",
+"Type": 0,
+"Nonce": '$nonce',
+"chainIdHash": "'$chainIdHash'"}'
+
+jsontx=$(../bin/aergocli --keystore . --password bmttest \
+  signtx --address $from --jsontx "$jsontx" )
+
+txhash=$(../bin/aergocli committx --jsontx "$jsontx" | jq .results[0].hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -ge "4" ]; then
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "tx not allowed recipient"
+	#assert_equals "$gasUsed"  "117861"
+else
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "'default' is not payable"
+	#assert_equals "$gasUsed"  "117861"
+fi
+
+
+echo "-- NORMAL type, contract with not payable 'default' function (not sending) --"
+
+nonce=$((nonce + 1))
+
+jsontx='{
+"Account": "'$from'",
+"Recipient": "'$not_payable'",
+"Amount": "0",
+"Type": 0,
+"Nonce": '$nonce',
+"chainIdHash": "'$chainIdHash'"}'
+
+jsontx=$(../bin/aergocli --keystore . --password bmttest \
+  signtx --address $from --jsontx "$jsontx" )
+
+txhash=$(../bin/aergocli committx --jsontx "$jsontx" | jq .results[0].hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -ge "4" ]; then
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "tx not allowed recipient"
+	#assert_equals "$gasUsed"  "117861"
+else
+	assert_equals "$status"   "SUCCESS"
+	assert_equals "$ret"      "0"
+	#assert_equals "$gasUsed"  "117861"
+fi
+
+
+echo "-- NORMAL type, contract with not payable 'default' function (sending) --"
+
+nonce=$((nonce + 1))
+
+jsontx='{
+"Account": "'$from'",
+"Recipient": "'$not_payable'",
+"Amount": "1.23aergo",
+"Type": 0,
+"Nonce": '$nonce',
+"chainIdHash": "'$chainIdHash'"}'
+
+jsontx=$(../bin/aergocli --keystore . --password bmttest \
+  signtx --address $from --jsontx "$jsontx" )
+
+txhash=$(../bin/aergocli committx --jsontx "$jsontx" | jq .results[0].hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -ge "4" ]; then
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "tx not allowed recipient"
+	#assert_equals "$gasUsed"  "117861"
+else
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "'default' is not payable"
+	#assert_equals "$gasUsed"  "117861"
+fi
+
+
+echo "-- NORMAL type, contract with payable 'default' function (not sending) --"
+
+nonce=$((nonce + 1))
+
+jsontx='{
+"Account": "'$from'",
+"Recipient": "'$payable_default'",
+"Amount": "0",
+"Type": 0,
+"Nonce": '$nonce',
+"chainIdHash": "'$chainIdHash'"}'
+
+jsontx=$(../bin/aergocli --keystore . --password bmttest \
+  signtx --address $from --jsontx "$jsontx" )
+
+txhash=$(../bin/aergocli committx --jsontx "$jsontx" | jq .results[0].hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -ge "4" ]; then
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "tx not allowed recipient"
+	#assert_equals "$gasUsed"  "117861"
+else
+	assert_equals "$status"   "SUCCESS"
+	assert_equals "$ret"      "0"
+	#assert_equals "$gasUsed"  "117861"
+fi
+
+
+echo "-- NORMAL type, contract with payable 'default' function (sending) --"
+
+nonce=$((nonce + 1))
+
+jsontx='{
+"Account": "'$from'",
+"Recipient": "'$payable_default'",
+"Amount": "1.23aergo",
+"Type": 0,
+"Nonce": '$nonce',
+"chainIdHash": "'$chainIdHash'"}'
+
+jsontx=$(../bin/aergocli --keystore . --password bmttest \
+  signtx --address $from --jsontx "$jsontx" )
+
+txhash=$(../bin/aergocli committx --jsontx "$jsontx" | jq .results[0].hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+if [ "$fork_version" -ge "4" ]; then
+	assert_equals "$status"   "ERROR"
+	assert_equals "$ret"      "tx not allowed recipient"
+	#assert_equals "$gasUsed"  "117861"
+else
+	assert_equals "$status"   "SUCCESS"
+	assert_equals "$ret"      "1230000000000000000"
+	#assert_equals "$gasUsed"  "117861"
+fi
+
+
+
+echo "-- CALL type, contract without 'default' function (not sending) --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $no_default default | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "ERROR"
+assert_equals "$ret"      "undefined function: default"
+#assert_equals "$gasUsed"  "117861"
+
+
+echo "-- CALL type, contract without 'default' function (sending)  --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $no_default default --amount 1aergo | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "ERROR"
+assert_equals "$ret"      "'default' is not payable"
+#assert_equals "$gasUsed"  "117861"
+
+
+echo "-- CALL type, contract with not payable 'default' function (not sending) --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $not_payable default | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "SUCCESS"
+assert_equals "$ret"      "0"
+#assert_equals "$gasUsed"  "117861"
+
+
+echo "-- CALL type, contract with not payable 'default' function (sending) --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $not_payable default --amount 1aergo | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "ERROR"
+assert_equals "$ret"      "'default' is not payable"
+#assert_equals "$gasUsed"  "117861"
+
+
+echo "-- CALL type, contract with payable 'default' function --"
+
+txhash=$(../bin/aergocli --keystore . --password bmttest \
+  contract call AmPpcKvToDCUkhT1FJjdbNvR4kNDhLFJGHkSqfjWe3QmHm96qv4R \
+  $payable_default default --amount 1aergo | jq .hash | sed 's/"//g')
+
+get_receipt $txhash
+
+status=$(cat receipt.json | jq .status | sed 's/"//g')
+ret=$(cat receipt.json | jq .ret | sed 's/"//g')
+gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
+
+assert_equals "$status"   "SUCCESS"
+assert_equals "$ret"      "1000000000000000000"
+#assert_equals "$gasUsed"  "117861"
diff --git a/types/blockchain.pb.go b/types/blockchain.pb.go
index d1e20db85..23bf90efa 100644
--- a/types/blockchain.pb.go
+++ b/types/blockchain.pb.go
@@ -30,6 +30,7 @@ const (
 	TxType_TRANSFER      TxType = 4
 	TxType_CALL          TxType = 5
 	TxType_DEPLOY        TxType = 6
+	TxType_MULTICALL     TxType = 7
 )
 
 // Enum value maps for TxType.
@@ -42,6 +43,7 @@ var (
 		4: "TRANSFER",
 		5: "CALL",
 		6: "DEPLOY",
+		7: "MULTICALL",
 	}
 	TxType_value = map[string]int32{
 		"NORMAL":        0,
@@ -51,6 +53,7 @@ var (
 		"TRANSFER":      4,
 		"CALL":          5,
 		"DEPLOY":        6,
+		"MULTICALL":     7,
 	}
 )
 
@@ -668,6 +671,7 @@ type State struct {
 	CodeHash         []byte `protobuf:"bytes,3,opt,name=codeHash,proto3" json:"codeHash,omitempty"`
 	StorageRoot      []byte `protobuf:"bytes,4,opt,name=storageRoot,proto3" json:"storageRoot,omitempty"`
 	SqlRecoveryPoint uint64 `protobuf:"varint,5,opt,name=sqlRecoveryPoint,proto3" json:"sqlRecoveryPoint,omitempty"`
+	SourceHash       []byte `protobuf:"bytes,6,opt,name=sourceHash,proto3" json:"sourceHash,omitempty"`
 }
 
 func (x *State) Reset() {
@@ -723,6 +727,13 @@ func (x *State) GetCodeHash() []byte {
 	return nil
 }
 
+func (x *State) GetSourceHash() []byte {
+	if x != nil {
+		return x.SourceHash
+	}
+	return nil
+}
+
 func (x *State) GetStorageRoot() []byte {
 	if x != nil {
 		return x.StorageRoot
diff --git a/types/errors.go b/types/errors.go
index d3ab2c969..2643f3741 100644
--- a/types/errors.go
+++ b/types/errors.go
@@ -38,6 +38,8 @@ var (
 	//ErrInvalidRecipient
 	ErrTxInvalidRecipient = errors.New("tx invalid recipient")
 
+	ErrTxNotAllowedRecipient = errors.New("tx not allowed recipient")
+
 	ErrTxInvalidAmount = errors.New("tx invalid amount")
 
 	ErrTxInvalidPrice = errors.New("tx invalid price")
diff --git a/types/token_unit.go b/types/token_unit.go
index 1bf2caf35..18ac87547 100644
--- a/types/token_unit.go
+++ b/types/token_unit.go
@@ -17,3 +17,7 @@ func NewAmount(amount uint64, unit TokenUnit) *big.Int {
 func NewZeroAmount() *big.Int {
 	return new(big.Int)
 }
+
+func IsZeroAmount(n *big.Int) bool {
+  return n.Sign() == 0
+}
diff --git a/types/transaction.go b/types/transaction.go
index bd4928610..fe3f1b15f 100644
--- a/types/transaction.go
+++ b/types/transaction.go
@@ -159,13 +159,18 @@ func (tx *transaction) Validate(chainidhash []byte, isPublic bool) error {
 		if tx.GetBody().GetRecipient() == nil {
 			return ErrTxInvalidRecipient
 		}
-	case TxType_DEPLOY:
+	case TxType_DEPLOY, TxType_MULTICALL:
 		if tx.GetBody().GetRecipient() != nil {
 			return ErrTxInvalidRecipient
 		}
 		if len(tx.GetBody().GetPayload()) == 0 {
 			return ErrTxFormatInvalid
 		}
+		if tx.GetBody().Type == TxType_MULTICALL {
+			if amount.Cmp(big.NewInt(0)) != 0 {
+				return ErrTxInvalidAmount
+			}
+		}
 	default:
 		return ErrTxInvalidType
 	}