Fix timeout handling on multi depth call (experimental)

Author: hayarobi

contract/vm.go

@@ -54,7 +54,7 @@ const (
 	checkFeeDelegationFn = "check_delegation"
 	constructor          = "constructor"
 
-	vmTimeoutErrMsg = "[Contract.LuaCallContract] call err: contract timeout"
+	vmTimeoutErrMsg = "contract timeout of VmTimeoutError"
 )
 
 var (
@@ -621,9 +621,9 @@ func (ce *executor) call(instLimit C.int, target *LState) C.int {
 				ce.err = errors.New(errMsg)
 			}
 		}
-		ctrLgr.Debug().Err(ce.err).Str(
+		ctrLgr.Debug().Err(ce.err).Stringer(
 			"contract",
-			types.EncodeAddress(ce.ctx.curContract.contractId),
+			types.LogAddr(ce.ctx.curContract.contractId),
 		).Msg("contract is failed")
 		if target != nil {
 			if C.luaL_hasuncatchablerror(ce.L) != C.int(0) {

contract/vm_callback.go

@@ -343,7 +343,13 @@ func luaCallContract(L *LState, service C.int, contractId *C.char, fname *C.char
 		if ctx.traceFile != nil {
 			_, _ = ctx.traceFile.WriteString(fmt.Sprintf("recovery snapshot: %d\n", seq))
 		}
-		return -1, C.CString("[Contract.LuaCallContract] call err: " + ce.err.Error())
+		switch ceErr := ce.err.(type) {
+		case *VmTimeoutError:
+			return -1, C.CString(ceErr.Error())
+		default:
+			return -1, C.CString("[Contract.LuaCallContract] call err: " + ceErr.Error())
+
+		}
 	}
 
 	if seq == 1 {