fix build

cmd/brick/exec/multicall.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/aergoio/aergo/cmd/brick/context"
-	"github.com/aergoio/aergo/contract"
-	"github.com/aergoio/aergo/types"
+	"github.com/aergoio/aergo/v2/cmd/brick/context"
+	"github.com/aergoio/aergo/v2/contract/vm_dummy"
+	"github.com/aergoio/aergo/v2/types"
 )
 
 func init() {
@@ -76,7 +76,7 @@ func (c *multicall) Run(args string) (string, uint64, []*types.Event, error) {
 
 	accountName, payload, expectedError, expectedRes, _ := c.parse(args)
 
-	multicallTx := contract.NewLuaTxMultiCall(accountName, payload)
+	multicallTx := vm_dummy.NewLuaTxMultiCall(accountName, payload)
 
 	logLevel := zerolog.GlobalLevel()
 

contract/contract.go

@@ -309,7 +309,7 @@ func preloadWorker() {
 // 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 txBody.Type == types.TxType_MULTICALL {
+	if txType == types.TxType_MULTICALL {
 		return true, nil
 	}
 

contract/vm.go

@@ -180,7 +180,7 @@ func getTraceFile(blkno uint64, tx []byte) *os.File {
 	return f
 }
 
-func NewVmContext(execCtx context.Context, blockState *state.BlockState, cdb ChainAccessor, sender, reciever *state.V, contractState *state.ContractState, senderID, txHash []byte, bi *types.BlockHeaderInfo, node string, confirmed, query bool, rp uint64, service int, amount *big.Int, gasLimit uint64, feeDelegation bool, isMultiCall bool) *vmContext {
+func NewVmContext(execCtx context.Context, blockState *state.BlockState, cdb ChainAccessor, sender, receiver *state.V, contractState *state.ContractState, senderID, txHash []byte, bi *types.BlockHeaderInfo, node string, confirmed, query bool, rp uint64, service int, amount *big.Int, gasLimit uint64, feeDelegation bool, isMultiCall bool) *vmContext {
 
 	cs := &callState{ctrState: contractState, curState: receiver.State()}
 
@@ -240,6 +240,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
 }

contract/vm_dummy/vm_dummy.go

@@ -612,13 +612,13 @@ func NewLuaTxCallFeeDelegate(sender, recipient string, amount uint64, payload st
 	}
 }
 
-func NewLuaTxMultiCall(sender, code string) *luaTxCall {
+func NewLuaTxMultiCall(sender, payload string) *luaTxCall {
 	return &luaTxCall{
 		luaTxContractCommon: luaTxContractCommon{
-			_sender:     strHash(sender),
-			_contract:   strHash(""),
+			_sender:     contract.StrHash(sender),
+			_recipient:  contract.StrHash(""),
 			_amount:     new(big.Int).SetUint64(0),
-			_code:       []byte(code),
+			_payload:    []byte(payload),
 			txId:        newTxId(),
 			multiCall:   true,
 		},
@@ -641,7 +641,7 @@ func (l *luaTxCall) run(execCtx context.Context, bs *state.BlockState, bc *Dummy
 				return "", nil, ctrFee, err
 			}
 
-			if !ctx.isMultiCall {
+			if !ctx.IsMultiCall() {
 				err = bs.StageContractState(eContractState)
 				if err != nil {
 					return "", nil, ctrFee, err

contract/vm_dummy/vm_dummy_test.go

@@ -4547,16 +4547,16 @@ abi.payable(recv_aergo)
 `
 
   err = bc.ConnectBlock(
-    NewLuaTxAccount("ac0", 10000000000000000000),
-    NewLuaTxAccount("ac1", 10000000000000000000),
-    NewLuaTxAccount("ac2", 10000000000000000000),
-    NewLuaTxAccount("ac3", 10000000000000000000),
-    NewLuaTxAccount("ac4", 10000000000000000000),
-    NewLuaTxAccount("ac5", 10000000000000000000),
-    NewLuaTxDef("ac0", "tables", 0, definition),
-    NewLuaTxDef("ac0", "c1", 0, definition),
-    NewLuaTxDef("ac0", "c2", 0, definition),
-    NewLuaTxDef("ac0", "c3", 0, definition),
+    NewLuaTxAccount("ac0", 100, types.Aergo),
+    NewLuaTxAccount("ac1", 100, types.Aergo),
+    NewLuaTxAccount("ac2", 100, types.Aergo),
+    NewLuaTxAccount("ac3", 100, types.Aergo),
+    NewLuaTxAccount("ac4", 100, types.Aergo),
+    NewLuaTxAccount("ac5", 100, types.Aergo),
+    NewLuaTxDeploy("ac0", "tables", 0, definition),
+    NewLuaTxDeploy("ac0", "c1", 0, definition),
+    NewLuaTxDeploy("ac0", "c2", 0, definition),
+    NewLuaTxDeploy("ac0", "c3", 0, definition),
   )
   if err != nil {
     t.Error(err)