Merge branch 'master' into merge-master-rc1.7.next1-20-08-2024

# Conflicts: # vmhost/contexts/storage.go # vmhost/flags.go # vmhost/hostCore/host.go # vmhost/vmhooks/cryptoei.go
multiversx · Aug 20, 2024 · c9deb92 · c9deb92
2 parents 80062df + fe09132
commit c9deb92
Show file tree

Hide file tree

Showing 32 changed files with 1,651 additions and 504 deletions.
diff --git a/integrationTests/json/scenariosAdderLog_test.go b/integrationTests/json/scenariosAdderLog_test.go
@@ -12,28 +12,35 @@ HasFunction(init): true
 CallFunction(init):
 VM hook begin: CheckNoPayment()
 GetPointsUsed: 3
+GetPointsUsed: 3
 SetPointsUsed: 103
 VM hook end:   CheckNoPayment()
 VM hook begin: GetNumArguments()
 GetPointsUsed: 110
+GetPointsUsed: 110
 SetPointsUsed: 210
 VM hook end:   GetNumArguments()
 VM hook begin: BigIntGetUnsignedArgument(0, -101)
 GetPointsUsed: 249
+GetPointsUsed: 249
 SetPointsUsed: 1249
 VM hook end:   BigIntGetUnsignedArgument(0, -101)
 VM hook begin: MBufferSetBytes(-102, 131097, 3)
 GetPointsUsed: 1289
+GetPointsUsed: 1289
 SetPointsUsed: 3289
 GetPointsUsed: 3289
+GetPointsUsed: 3289
 SetPointsUsed: 6289
 VM hook end:   MBufferSetBytes(-102, 131097, 3)
 VM hook begin: MBufferFromBigIntUnsigned(-103, -101)
 GetPointsUsed: 6333
+GetPointsUsed: 6333
 SetPointsUsed: 10333
 VM hook end:   MBufferFromBigIntUnsigned(-103, -101)
 VM hook begin: MBufferStorageStore(-102, -103)
 GetPointsUsed: 10345
+GetPointsUsed: 10345
 SetPointsUsed: 85345
 GetPointsUsed: 85345
 GetPointsUsed: 85345
@@ -57,33 +64,41 @@ HasFunction(getSum): true
 CallFunction(getSum):
 VM hook begin: CheckNoPayment()
 GetPointsUsed: 3
+GetPointsUsed: 3
 SetPointsUsed: 103
 VM hook end:   CheckNoPayment()
 VM hook begin: GetNumArguments()
 GetPointsUsed: 110
+GetPointsUsed: 110
 SetPointsUsed: 210
 VM hook end:   GetNumArguments()
 VM hook begin: MBufferSetBytes(-101, 131097, 3)
 GetPointsUsed: 250
+GetPointsUsed: 250
 SetPointsUsed: 2250
 GetPointsUsed: 2250
+GetPointsUsed: 2250
 SetPointsUsed: 5250
 VM hook end:   MBufferSetBytes(-101, 131097, 3)
 VM hook begin: MBufferStorageLoad(-101, -102)
 GetPointsUsed: 5291
+GetPointsUsed: 5291
 SetPointsUsed: 6291
 GetPointsUsed: 6291
 GetPointsUsed: 6291
 SetPointsUsed: 21578
 VM hook end:   MBufferStorageLoad(-101, -102)
 VM hook begin: MBufferToBigIntUnsigned(-102, -103)
 GetPointsUsed: 21611
+GetPointsUsed: 21611
 SetPointsUsed: 25611
 VM hook end:   MBufferToBigIntUnsigned(-102, -103)
 VM hook begin: BigIntFinishUnsigned(-103)
 GetPointsUsed: 25622
+GetPointsUsed: 25622
 SetPointsUsed: 26622
 GetPointsUsed: 26622
+GetPointsUsed: 26622
 SetPointsUsed: 36622
 VM hook end:   BigIntFinishUnsigned(-103)
 GetPointsUsed: 36624
@@ -102,43 +117,53 @@ HasFunction(add): true
 CallFunction(add):
 VM hook begin: CheckNoPayment()
 GetPointsUsed: 3
+GetPointsUsed: 3
 SetPointsUsed: 103
 VM hook end:   CheckNoPayment()
 VM hook begin: GetNumArguments()
 GetPointsUsed: 110
+GetPointsUsed: 110
 SetPointsUsed: 210
 VM hook end:   GetNumArguments()
 VM hook begin: BigIntGetUnsignedArgument(0, -101)
 GetPointsUsed: 249
+GetPointsUsed: 249
 SetPointsUsed: 1249
 VM hook end:   BigIntGetUnsignedArgument(0, -101)
 VM hook begin: MBufferSetBytes(-102, 131097, 3)
 GetPointsUsed: 1289
+GetPointsUsed: 1289
 SetPointsUsed: 3289
 GetPointsUsed: 3289
+GetPointsUsed: 3289
 SetPointsUsed: 6289
 VM hook end:   MBufferSetBytes(-102, 131097, 3)
 VM hook begin: MBufferStorageLoad(-102, -103)
 GetPointsUsed: 6333
+GetPointsUsed: 6333
 SetPointsUsed: 7333
 GetPointsUsed: 7333
 GetPointsUsed: 7333
 SetPointsUsed: 22620
 VM hook end:   MBufferStorageLoad(-102, -103)
 VM hook begin: MBufferToBigIntUnsigned(-103, -104)
 GetPointsUsed: 22653
+GetPointsUsed: 22653
 SetPointsUsed: 26653
 VM hook end:   MBufferToBigIntUnsigned(-103, -104)
 VM hook begin: BigIntAdd(-104, -104, -101)
 GetPointsUsed: 26673
+GetPointsUsed: 26673
 SetPointsUsed: 28673
 VM hook end:   BigIntAdd(-104, -104, -101)
 VM hook begin: MBufferFromBigIntUnsigned(-105, -104)
 GetPointsUsed: 28712
+GetPointsUsed: 28712
 SetPointsUsed: 32712
 VM hook end:   MBufferFromBigIntUnsigned(-105, -104)
 VM hook begin: MBufferStorageStore(-102, -105)
 GetPointsUsed: 32724
+GetPointsUsed: 32724
 SetPointsUsed: 107724
 GetPointsUsed: 107724
 GetPointsUsed: 107724

diff --git a/mock/context/meteringContextMock.go b/mock/context/meteringContextMock.go
@@ -50,7 +50,7 @@ func (m *MeteringContextMock) GasSchedule() *config.GasCost {
 }
 
 // UseGas mocked method
-func (m *MeteringContextMock) UseGas(gas uint64) {
+func (m *MeteringContextMock) useGas(gas uint64) {
 	if gas > m.GasLeftMock {
 		m.GasLeftMock = 0
 		return
@@ -59,12 +59,6 @@ func (m *MeteringContextMock) UseGas(gas uint64) {
 	m.GasLeftMock -= gas
 }
 
-// UseAndTraceGas mocked method
-func (m *MeteringContextMock) UseAndTraceGas(_ uint64) {}
-
-// UseGasAndAddTracedGas mocked method
-func (m *MeteringContextMock) UseGasAndAddTracedGas(_ string, _ uint64) {}
-
 // UseGasBoundedAndAddTracedGas -
 func (m *MeteringContextMock) UseGasBoundedAndAddTracedGas(_ string, _ uint64) error {
 	return nil
@@ -151,6 +145,11 @@ func (m *MeteringContextMock) DeductGasIfAsyncStep() error {
 	return m.Err
 }
 
+// UseGasForContractInit mocked method
+func (m *MeteringContextMock) UseGasForContractInit(gasToUse uint64) {
+	m.useGas(gasToUse)
+}
+
 // UseGasBounded mocked method
 func (m *MeteringContextMock) UseGasBounded(gas uint64) error {
 	if m.Err != nil {
@@ -159,7 +158,7 @@ func (m *MeteringContextMock) UseGasBounded(gas uint64) error {
 	if m.GasLeft() <= gas {
 		return vmhost.ErrNotEnoughGas
 	}
-	m.UseGas(gas)
+	m.useGas(gas)
 	return nil
 }
 

diff --git a/mock/context/runtimeContextMock.go b/mock/context/runtimeContextMock.go
@@ -315,6 +315,11 @@ func (r *RuntimeContextMock) ManagedMapAPIErrorShouldFailExecution() bool {
 	return r.FailManagedMapAPI
 }
 
+// UseGasBoundedShouldFailExecution mocked method
+func (r *RuntimeContextMock) UseGasBoundedShouldFailExecution() bool {
+	return true
+}
+
 // FailExecution mocked method
 func (r *RuntimeContextMock) FailExecution(_ error) {
 }

diff --git a/mock/context/runtimeContextWrapper.go b/mock/context/runtimeContextWrapper.go
@@ -533,6 +533,11 @@ func (contextWrapper *RuntimeContextWrapper) ManagedMapAPIErrorShouldFailExecuti
 	return contextWrapper.runtimeContext.ManagedMapAPIErrorShouldFailExecution()
 }
 
+// UseGasBoundedShouldFailExecution calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
+func (contextWrapper *RuntimeContextWrapper) UseGasBoundedShouldFailExecution() bool {
+	return contextWrapper.runtimeContext.UseGasBoundedShouldFailExecution()
+}
+
 // GetVMExecutor calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
 func (contextWrapper *RuntimeContextWrapper) GetVMExecutor() executor.Executor {
 	return contextWrapper.GetVMExecutorFunc()

diff --git a/mock/contracts/asyncChildSC.go b/mock/contracts/asyncChildSC.go
@@ -17,7 +17,7 @@ func TransferToAsyncParentOnCallbackChildMock(instanceMock *mock.InstanceMock, c
 		host := instanceMock.Host
 		instance := mock.GetMockInstance(host)
 
-		host.Metering().UseGas(testConfig.GasUsedByChild)
+		_ = host.Metering().UseGasBounded(testConfig.GasUsedByChild)
 
 		runtime := host.Runtime()
 		output := host.Output()

diff --git a/mock/contracts/directSimpleSC.go b/mock/contracts/directSimpleSC.go
@@ -161,7 +161,7 @@ func ExecOnDestCtxSingleCallParentMock(instanceMock *mock.InstanceMock, config i
 		testConfig := config.(*test.TestConfig)
 		host := instanceMock.Host
 		instance := mock.GetMockInstance(host)
-		host.Metering().UseGas(testConfig.GasUsedByParent)
+		_ = host.Metering().UseGasBounded(testConfig.GasUsedByParent)
 
 		arguments := host.Runtime().Arguments()
 		if len(arguments) < 2 {
@@ -287,7 +287,7 @@ func esdtTransferToParentMock(instanceMock *mock.InstanceMock, config interface{
 		testConfig := config.(*test.TestConfig)
 		host := instanceMock.Host
 		instance := mock.GetMockInstance(host)
-		host.Metering().UseGas(testConfig.GasUsedByChild)
+		_ = host.Metering().UseGasBounded(testConfig.GasUsedByChild)
 
 		switch behavior {
 		case esdtOnCallbackSuccess:

diff --git a/mock/contracts/gasMismatchParent.go b/mock/contracts/gasMismatchParent.go
@@ -19,7 +19,7 @@ func GasMismatchAsyncCallParentMock(instanceMock *mock.InstanceMock, _ interface
 		valueHandle := managedTypes.NewBigIntFromInt64(0)
 		functionHandle := managedTypes.NewManagedBufferFromBytes([]byte("gasMismatchChild"))
 		argumentsHandle := managedTypes.NewManagedBuffer()
-		managedTypes.WriteManagedVecOfManagedBuffers([][]byte{}, argumentsHandle)
+		_ = managedTypes.WriteManagedVecOfManagedBuffers([][]byte{}, argumentsHandle)
 
 		vmhooks.ManagedAsyncCallWithHost(
 			host,

diff --git a/mock/contracts/transferAndExecuteSC.go b/mock/contracts/transferAndExecuteSC.go
@@ -23,7 +23,7 @@ func TransferAndExecute(instanceMock *mock.InstanceMock, config interface{}) {
 		host := instanceMock.Host
 		instance := mock.GetMockInstance(host)
 
-		host.Metering().UseGas(testConfig.GasUsedByParent)
+		_ = host.Metering().UseGasBounded(testConfig.GasUsedByParent)
 
 		arguments := host.Runtime().Arguments()
 		noOfTransfers := int(big.NewInt(0).SetBytes(arguments[0]).Int64())
@@ -50,7 +50,7 @@ func TransferEGLDToParent(instanceMock *mock.InstanceMock, config interface{}) {
 		host := instanceMock.Host
 		instance := mock.GetMockInstance(host)
 
-		host.Metering().UseGas(testConfig.GasUsedByChild)
+		_ = host.Metering().UseGasBounded(testConfig.GasUsedByChild)
 
 		vmhooks.TransferValueExecuteWithTypedArgs(host,
 			test.ParentAddress,