Merge pull request #349 from aergoio/release/2.5.1-dev1

hayarobi · web-flow · commit 877e52d5d108 · 2024-02-07T18:41:31.000+09:00
Release/2.5.1
diff --git a/contract/vm_callback.go b/contract/vm_callback.go
@@ -399,7 +399,12 @@ func luaDelegateCallContract(L *LState, service C.int, contractId *C.char,
 		if ctx.traceFile != nil {
 			_, _ = ctx.traceFile.WriteString(fmt.Sprintf("recovery snapshot: %d\n", seq))
 		}
-		return -1, C.CString("[Contract.LuaDelegateCallContract] call error: " + ce.err.Error())
+		switch ceErr := ce.err.(type) {
+		case *VmTimeoutError:
+			return -1, C.CString(ceErr.Error())
+		default:
+			return -1, C.CString("[Contract.LuaDelegateCallContract] call error: " + ce.err.Error())
+		}
 	}
 
 	if seq == 1 {

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,12 @@ func luaDelegateCallContract(L LState, service C.int, contractId C.char,`
`399`	`399`	`if ctx.traceFile != nil {`
`400`	`400`	`_, _ = ctx.traceFile.WriteString(fmt.Sprintf("recovery snapshot: %d\n", seq))`
`401`	`401`	`}`
`402`		`- return -1, C.CString("[Contract.LuaDelegateCallContract] call error: " + ce.err.Error())`
	`402`	`+ switch ceErr := ce.err.(type) {`
	`403`	`+ case *VmTimeoutError:`
	`404`	`+ return -1, C.CString(ceErr.Error())`
	`405`	`+ default:`
	`406`	`+ return -1, C.CString("[Contract.LuaDelegateCallContract] call error: " + ce.err.Error())`
	`407`	`+ }`
`403`	`408`	`}`
`404`	`409`
`405`	`410`	`if seq == 1 {`