feat async v3

Makefile

@@ -8,6 +8,9 @@ clean:
 build:
 	go build ./...
 
+gen-async:
+	 protoc -I=./vmhost -I=${GOPATH}/src -I=${GOPATH}/src/github.com/multiversx/protobuf/protobuf -I=${GOPATH}/src/github.com/gogo/protobuf  --gogoslick_out=./vmhost ./vmhost/asyncCall.proto
+
 vmserver:
 ifndef VMSERVER_PATH
 	$(error VMSERVER_PATH is undefined)

config/config.toml

@@ -45,6 +45,7 @@
     AsyncCallStep = 10
     AsyncCallbackGasLock = 10
     CreateAsyncCall = 10
+    CreateAsyncV3Call = 10
     SetAsyncCallback = 10
     SetAsyncGroupCallback = 10
     SetAsyncContextCallback = 10

config/gasCost.go

@@ -70,6 +70,7 @@ type BaseOpsAPICost struct {
 	AsyncCallStep           uint64
 	AsyncCallbackGasLock    uint64
 	CreateAsyncCall         uint64
+	CreateAsyncV3Call       uint64
 	SetAsyncCallback        uint64
 	SetAsyncGroupCallback   uint64
 	SetAsyncContextCallback uint64

config/gasSchedule.go

@@ -301,6 +301,7 @@ func FillGasMapBaseOpsAPICosts(value, asyncCallbackGasLock uint64) map[string]ui
 	gasMap["AsyncCallStep"] = value
 	gasMap["AsyncCallbackGasLock"] = asyncCallbackGasLock
 	gasMap["CreateAsyncCall"] = value
+	gasMap["CreateAsyncV3Call"] = value
 	gasMap["SetAsyncCallback"] = value
 	gasMap["SetAsyncGroupCallback"] = value
 	gasMap["SetAsyncContextCallback"] = value

scenario/gasSchedules/gasSchedules.go

@@ -1,6 +1,5 @@
 package gasschedules
 
-// TODO: go:embed can be used after we upgrade to go 1.16
 // import _ "embed"
 
 // //go:embed gasScheduleV1.toml

test/contracts/erc20/erc20.c

@@ -44,7 +44,6 @@ void computeAllowanceKey(byte *destination, byte *from, byte* to) {
   // Note: in smart contract addresses, the first 10 bytes are all 0
   // therefore we read from byte 10 onwards to provide more significant bytes
   // and to minimize the chance for collisions
-  // TODO: switching to a hash instead of a concatenation of addresses might make it safer
   for (int i = 0; i < 15; i++) {
     destination[1+i] = from[10+i];
   }

vmhost/asyncCall.go

@@ -23,21 +23,28 @@ type AsyncCall struct {
 	CallbackClosure []byte
 
 	IsBuiltinFunctionCall bool
+	IsAsyncV3             bool
+
+	HasPendingCallback     bool
+	PendingCallbackGasLocked uint64
 }
 
 // Clone creates a deep clone of the AsyncCall
 func (ac *AsyncCall) Clone() *AsyncCall {
 	clone := &AsyncCall{
-		CallID:          ac.CallID,
-		Status:          ac.Status,
-		ExecutionMode:   ac.ExecutionMode,
-		Destination:     make([]byte, len(ac.Destination)),
-		Data:            make([]byte, len(ac.Data)),
-		GasLimit:        ac.GasLimit,
-		GasLocked:       ac.GasLocked,
-		ValueBytes:      make([]byte, len(ac.ValueBytes)),
-		SuccessCallback: ac.SuccessCallback,
-		ErrorCallback:   ac.ErrorCallback,
+		CallID:            ac.CallID,
+		Status:            ac.Status,
+		ExecutionMode:     ac.ExecutionMode,
+		Destination:       make([]byte, len(ac.Destination)),
+		Data:              make([]byte, len(ac.Data)),
+		GasLimit:          ac.GasLimit,
+		GasLocked:         ac.GasLocked,
+		ValueBytes:        make([]byte, len(ac.ValueBytes)),
+		SuccessCallback:   ac.SuccessCallback,
+		ErrorCallback:     ac.ErrorCallback,
+		IsAsyncV3:         ac.IsAsyncV3,
+		HasPendingCallback: ac.HasPendingCallback,
+		PendingCallbackGasLocked: ac.PendingCallbackGasLocked,
 	}
 
 	copy(clone.Destination, ac.Destination)
@@ -105,6 +112,12 @@ func (ac *AsyncCall) HasDefinedAnyCallback() bool {
 	return len(ac.SuccessCallback) > 0 || len(ac.ErrorCallback) > 0
 }
 
+// MarkSkippedCallback this async call has skipped calling its callback
+func (ac *AsyncCall) MarkSkippedCallback(pendingGasLock uint64) {
+	ac.HasPendingCallback = true
+	ac.PendingCallbackGasLocked = pendingGasLock
+}
+
 // UpdateStatus sets the status of the async call depending on the provided ReturnCode
 func (ac *AsyncCall) UpdateStatus(returnCode vmcommon.ReturnCode) {
 	ac.Status = AsyncCallResolved
@@ -135,17 +148,20 @@ func (ac *AsyncCall) IsInterfaceNil() bool {
 
 func (ac *AsyncCall) toSerializable() *SerializableAsyncCall {
 	return &SerializableAsyncCall{
-		CallID:          ac.CallID,
-		Status:          SerializableAsyncCallStatus(ac.Status),
-		ExecutionMode:   SerializableAsyncCallExecutionMode(ac.ExecutionMode),
-		Destination:     ac.Destination,
-		Data:            ac.Data,
-		GasLimit:        ac.GasLimit,
-		GasLocked:       ac.GasLocked,
-		ValueBytes:      ac.ValueBytes,
-		SuccessCallback: ac.SuccessCallback,
-		ErrorCallback:   ac.ErrorCallback,
-		CallbackClosure: ac.CallbackClosure,
+		CallID:            ac.CallID,
+		Status:            SerializableAsyncCallStatus(ac.Status),
+		ExecutionMode:     SerializableAsyncCallExecutionMode(ac.ExecutionMode),
+		Destination:       ac.Destination,
+		Data:              ac.Data,
+		GasLimit:          ac.GasLimit,
+		GasLocked:         ac.GasLocked,
+		ValueBytes:        ac.ValueBytes,
+		SuccessCallback:   ac.SuccessCallback,
+		ErrorCallback:     ac.ErrorCallback,
+		CallbackClosure:   ac.CallbackClosure,
+		IsAsyncV3:         ac.IsAsyncV3,
+		HasPendingCallback: ac.HasPendingCallback,
+		PendingCallbackGasLocked: ac.PendingCallbackGasLocked,
 	}
 }
 
@@ -159,16 +175,19 @@ func fromSerializableAsyncCalls(serializableAsyncCalls []*SerializableAsyncCall)
 
 func (serAsyncCall *SerializableAsyncCall) fromSerializable() *AsyncCall {
 	return &AsyncCall{
-		CallID:          serAsyncCall.CallID,
-		Status:          AsyncCallStatus(serAsyncCall.Status),
-		ExecutionMode:   AsyncCallExecutionMode(serAsyncCall.ExecutionMode),
-		Destination:     serAsyncCall.Destination,
-		Data:            serAsyncCall.Data,
-		GasLimit:        serAsyncCall.GasLimit,
-		GasLocked:       serAsyncCall.GasLocked,
-		ValueBytes:      serAsyncCall.ValueBytes,
-		SuccessCallback: serAsyncCall.SuccessCallback,
-		ErrorCallback:   serAsyncCall.ErrorCallback,
-		CallbackClosure: serAsyncCall.CallbackClosure,
+		CallID:            serAsyncCall.CallID,
+		Status:            AsyncCallStatus(serAsyncCall.Status),
+		ExecutionMode:     AsyncCallExecutionMode(serAsyncCall.ExecutionMode),
+		Destination:       serAsyncCall.Destination,
+		Data:              serAsyncCall.Data,
+		GasLimit:          serAsyncCall.GasLimit,
+		GasLocked:         serAsyncCall.GasLocked,
+		ValueBytes:        serAsyncCall.ValueBytes,
+		SuccessCallback:   serAsyncCall.SuccessCallback,
+		ErrorCallback:     serAsyncCall.ErrorCallback,
+		CallbackClosure:   serAsyncCall.CallbackClosure,
+		IsAsyncV3:         serAsyncCall.IsAsyncV3,
+		HasPendingCallback: serAsyncCall.HasPendingCallback,
+		PendingCallbackGasLocked: serAsyncCall.PendingCallbackGasLocked,
 	}
 }