Merge pull request #793 from multiversx/upgrade-from-contract

upgrade from contract fix
multiversx · Nov 7, 2023 · 2cc31dd · 2cc31dd
2 parents e19b3c6 + d1bb152
commit 2cc31dd
Show file tree

Hide file tree

Showing 22 changed files with 105 additions and 43 deletions.
diff --git a/integrationTests/json/scenariosAdderLog_test.go b/integrationTests/json/scenariosAdderLog_test.go
@@ -5,10 +5,10 @@ import (
 )
 
 const expectedAdderLog = `starting log:
-GetFunctionNames: [add callBack getSum init]
+GetFunctionNames: [add callBack getSum init upgrade]
 ValidateFunctionArities: true
-GetFunctionNames: [add callBack getSum init]
-GetFunctionNames: [add callBack getSum init]
+GetFunctionNames: [add callBack getSum init upgrade]
+GetFunctionNames: [add callBack getSum init upgrade]
 HasFunction(init): true
 CallFunction(init):
 VM hook begin: CheckNoPayment()
@@ -23,12 +23,12 @@ VM hook begin: BigIntGetUnsignedArgument(0, -101)
 GetPointsUsed: 249
 SetPointsUsed: 1249
 VM hook end:   BigIntGetUnsignedArgument(0, -101)
-VM hook begin: MBufferSetBytes(-102, 1048601, 3)
+VM hook begin: MBufferSetBytes(-102, 131097, 3)
 GetPointsUsed: 1289
 SetPointsUsed: 3289
 GetPointsUsed: 3289
 SetPointsUsed: 6289
-VM hook end:   MBufferSetBytes(-102, 1048601, 3)
+VM hook end:   MBufferSetBytes(-102, 131097, 3)
 VM hook begin: MBufferFromBigIntUnsigned(-103, -101)
 GetPointsUsed: 6333
 SetPointsUsed: 10333
@@ -52,7 +52,7 @@ GetPointsUsed: 135352
 GetPointsUsed: 135352
 Reset: true
 SetPointsUsed: 0
-SetGasLimit: 9223372036853567307
+SetGasLimit: 9223372036853566707
 SetBreakpointValue: 0
 HasFunction(getSum): true
 CallFunction(getSum):
@@ -64,12 +64,12 @@ VM hook begin: GetNumArguments()
 GetPointsUsed: 110
 SetPointsUsed: 210
 VM hook end:   GetNumArguments()
-VM hook begin: MBufferSetBytes(-101, 1048601, 3)
+VM hook begin: MBufferSetBytes(-101, 131097, 3)
 GetPointsUsed: 250
 SetPointsUsed: 2250
 GetPointsUsed: 2250
 SetPointsUsed: 5250
-VM hook end:   MBufferSetBytes(-101, 1048601, 3)
+VM hook end:   MBufferSetBytes(-101, 131097, 3)
 VM hook begin: MBufferStorageLoad(-101, -102)
 GetPointsUsed: 5291
 SetPointsUsed: 6291
@@ -97,7 +97,7 @@ GetPointsUsed: 71337
 GetPointsUsed: 71337
 Reset: true
 SetPointsUsed: 0
-SetGasLimit: 3791500
+SetGasLimit: 3790900
 SetBreakpointValue: 0
 HasFunction(add): true
 CallFunction(add):
@@ -113,12 +113,12 @@ VM hook begin: BigIntGetUnsignedArgument(0, -101)
 GetPointsUsed: 249
 SetPointsUsed: 1249
 VM hook end:   BigIntGetUnsignedArgument(0, -101)
-VM hook begin: MBufferSetBytes(-102, 1048601, 3)
+VM hook begin: MBufferSetBytes(-102, 131097, 3)
 GetPointsUsed: 1289
 SetPointsUsed: 3289
 GetPointsUsed: 3289
 SetPointsUsed: 6289
-VM hook end:   MBufferSetBytes(-102, 1048601, 3)
+VM hook end:   MBufferSetBytes(-102, 131097, 3)
 VM hook begin: MBufferStorageLoad(-102, -103)
 GetPointsUsed: 6333
 SetPointsUsed: 7333

diff --git a/integrationTests/json/scenariosFeatures_test.go b/integrationTests/json/scenariosFeatures_test.go
@@ -97,14 +97,6 @@ func TestRustPromisesFeatures(t *testing.T) {
 		CheckNoError()
 }
 
-// TODO: debug, then delete
-func TestRustPromisesFeaturesDebug(t *testing.T) {
-	ScenariosTest(t).
-		Folder("features/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json").
-		Run().
-		CheckNoError()
-}
-
 func TestRustFormattedMessageFeatures(t *testing.T) {
 	ScenariosTest(t).
 		Folder("features/formatted-message-features/scenarios").

diff --git a/mock/contracts/deployerSimpleSC.go b/mock/contracts/deployerSimpleSC.go
@@ -57,6 +57,12 @@ func InitMockMethod(instanceMock *mock.InstanceMock, config interface{}) {
 	instanceMock.AddMockMethod("init", testcommon.SimpleWasteGasMockMethod(instanceMock, testConfig.GasUsedByInit))
 }
 
+// UpgradeMockMethod -
+func UpgradeMockMethod(instanceMock *mock.InstanceMock, config interface{}) {
+	testConfig := config.(*testcommon.TestConfig)
+	instanceMock.AddMockMethod("upgrade", testcommon.SimpleWasteGasMockMethod(instanceMock, testConfig.GasUsedByInit))
+}
+
 // CallbackTestConfig -
 type CallbackTestConfig interface {
 	CallbackFails() bool

diff --git a/test/adder/output/adder.wasm b/test/adder/output/adder.wasm
diff --git a/test/contracts/init-correct/init-correct.c b/test/contracts/init-correct/init-correct.c
@@ -27,3 +27,7 @@ void init() {
 		}
 	}
 }
+
+void upgrade() {
+	init();
+}
diff --git a/test/contracts/init-correct/init-correct.export b/test/contracts/init-correct/init-correct.export
@@ -1 +1,2 @@
 init
+upgrade
diff --git a/test/contracts/init-correct/output/init-correct.wasm b/test/contracts/init-correct/output/init-correct.wasm
diff --git a/test/features/composability/proxy-test-first/output/proxy-test-first.wasm b/test/features/composability/proxy-test-first/output/proxy-test-first.wasm
diff --git a/test/features/composability/proxy-test-second/output/proxy-test-second.wasm b/test/features/composability/proxy-test-second/output/proxy-test-second.wasm
diff --git a/test/features/composability/scenarios/forw_raw_contract_upgrade.scen.json b/test/features/composability/scenarios/forw_raw_contract_upgrade.scen.json
@@ -8,6 +8,9 @@
                 "sc:forwarder": {
                     "code": "file:../forwarder-raw/output/forwarder-raw.wasm"
                 },
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
+                },
                 "sc:child": {
                     "code": "file:../vault/output/vault.wasm",
                     "owner": "sc:forwarder"
@@ -16,27 +19,28 @@
         },
         {
             "step": "scCall",
-            "id": "upgrade-vault-to-forwarder",
+            "id": "upgrade-vault-from-source",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
                 "function": "call_upgrade_from_source",
                 "arguments": [
                     "sc:child",
-                    "sc:forwarder"
+                    "sc:reference"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": "*",
+                "status": ""
             }
         },
         {
             "step": "checkState",
             "accounts": {
                 "sc:child": {
-                    "code": "file:../forwarder-raw/output/forwarder-raw.wasm"
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 },
                 "+": ""
             }
@@ -58,6 +62,7 @@
             },
             "expect": {
                 "out": [
+                    "str:upgraded",
                     "str:upgrade-init-arg"
                 ]
             }

diff --git a/test/features/composability/scenarios/forw_raw_contract_upgrade_self.scen.json b/test/features/composability/scenarios/forw_raw_contract_upgrade_self.scen.json
@@ -9,8 +9,8 @@
                     "code": "file:../forwarder-raw/output/forwarder-raw.wasm",
                     "owner": "sc:forwarder"
                 },
-                "sc:vault": {
-                    "code": "file:../vault/output/vault.wasm"
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 }
             }
         },
@@ -23,13 +23,15 @@
                 "function": "call_upgrade_from_source",
                 "arguments": [
                     "sc:forwarder",
-                    "sc:vault"
+                    "sc:reference"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": [
+                    "str:upgraded"
+                ]
             }
         },
         {
@@ -39,11 +41,11 @@
                     "nonce": "*"
                 },
                 "sc:forwarder": {
-                    "code": "file:../vault/output/vault.wasm",
+                    "code": "file:../vault/output/vault-upgrade.wasm",
                     "owner": "sc:forwarder"
                 },
-                "sc:vault": {
-                    "code": "file:../vault/output/vault.wasm"
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 }
             }
         }

diff --git a/test/features/composability/scenarios/forwarder_contract_upgrade.scen.json b/test/features/composability/scenarios/forwarder_contract_upgrade.scen.json
@@ -8,6 +8,9 @@
                 "sc:forwarder": {
                     "code": "file:../forwarder/output/forwarder.wasm"
                 },
+                "sc:reference": {
+                    "code": "file:../vault/output/vault-upgrade.wasm"
+                },
                 "sc:child": {
                     "code": "file:../vault/output/vault.wasm",
                     "owner": "sc:forwarder"
@@ -16,27 +19,28 @@
         },
         {
             "step": "scCall",
-            "id": "upgrade-vault-to-forwarder",
+            "id": "upgrade-vault-from-source",
             "tx": {
                 "from": "address:a_user",
                 "to": "sc:forwarder",
                 "function": "upgrade_vault_from_source",
                 "arguments": [
                     "sc:child",
-                    "sc:forwarder"
+                    "sc:reference"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": "*",
+                "status": ""
             }
         },
         {
             "step": "checkState",
             "accounts": {
                 "sc:child": {
-                    "code": "file:../forwarder/output/forwarder.wasm"
+                    "code": "file:../vault/output/vault-upgrade.wasm"
                 },
                 "+": ""
             }
@@ -51,13 +55,56 @@
                 "function": "upgradeVault",
                 "arguments": [
                     "sc:child",
-                    "file:../vault/output/vault.wasm"
+                    "file:../vault/output/vault.wasm",
+                    "str:arg"
                 ],
                 "gasLimit": "500,000,000",
                 "gasPrice": "0"
             },
             "expect": {
-                "out": []
+                "out": "*",
+                "logs": [
+                    {
+                        "address": "sc:forwarder",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "",
+                            "sc:child"
+                        ],
+                        "data": [
+                            "str:UpgradeFromSource",
+                            "str:upgradeContract",
+                            "*",
+                            "0x0100",
+                            "str:arg"
+                        ]
+                    },
+                    {
+                        "address": "sc:child",
+                        "endpoint": "str:upgradeContract",
+                        "topics": [
+                            "str:upgraded"
+                        ],
+                        "data": [
+                            ""
+                        ]
+                    },
+                    {
+                        "address": "sc:child",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "",
+                            "sc:forwarder"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:callBack",
+                            "0x00",
+                            "str:upgraded",
+                            "str:arg"
+                        ]
+                    }
+                ]
             }
         },
         {

diff --git a/test/features/composability/vault/output/vault-promises.wasm b/test/features/composability/vault/output/vault-promises.wasm
diff --git a/test/features/composability/vault/output/vault-upgrade.wasm b/test/features/composability/vault/output/vault-upgrade.wasm
diff --git a/test/features/composability/vault/output/vault.wasm b/test/features/composability/vault/output/vault.wasm
diff --git a/test/multisig/output/multisig-full.wasm b/test/multisig/output/multisig-full.wasm
diff --git a/test/multisig/output/multisig-view.wasm b/test/multisig/output/multisig-view.wasm
diff --git a/test/multisig/output/multisig.wasm b/test/multisig/output/multisig.wasm
diff --git a/test/multisig/test-contracts/adder.wasm b/test/multisig/test-contracts/adder.wasm
diff --git a/vmhost/hostCore/execution.go b/vmhost/hostCore/execution.go
@@ -819,7 +819,7 @@ func (host *vmHost) executeUpgrade(input *vmcommon.ContractCallInput) error {
 		return vmhost.ErrContractInvalid
 	}
 
-	err = host.callInitFunction()
+	err = host.callUpgradeFunction()
 	if err != nil {
 		return err
 	}

diff --git a/vmhost/hosttest/contracts_deploy_test.go b/vmhost/hosttest/contracts_deploy_test.go
@@ -386,9 +386,14 @@ func runUpdateFromSourceTest(t *testing.T, testConfig *testcommon.TestConfig, as
 	var deployedContract test.MockTestSmartContract
 	var contractToUpdate test.MockTestSmartContract
 	if testConfig.DeployedContractAddress != nil {
+		// The DeployedContract will be the source of the code to be written in
+		// ContractToBeUpdated. Therefore it is the DeployedContract which must
+		// initially have UpgradeMockMethod. After the code update, the
+		// ContractToBeUpdated will also have the UpgradeMockMethod and it will be
+		// called by the VM.
 		deployedContract = test.CreateMockContract(testConfig.DeployedContractAddress).
 			WithConfig(testConfig).
-			WithMethods(contracts.InitMockMethod)
+			WithMethods(contracts.InitMockMethod, contracts.UpgradeMockMethod)
 	}
 	if testConfig.ContractToBeUpdatedAddress != nil {
 		contractToUpdate = test.CreateMockContract(testConfig.ContractToBeUpdatedAddress).

diff --git a/vmhost/hosttest/execution_test.go b/vmhost/hosttest/execution_test.go
@@ -185,7 +185,7 @@ func TestExecution_DeployWASM_Successful(t *testing.T) {
 		AndAssertResults(func(blockchainHook *contextmock.BlockchainHookStub, verify *test.VMOutputVerifier) {
 			verify.Ok().
 				ReturnData([]byte("init successful")).
-				GasRemaining(430).
+				GasRemaining(410).
 				Nonce([]byte("caller"), 24).
 				Code(newAddress, input.ContractCode).
 				BalanceDelta(newAddress, 88)
@@ -449,7 +449,7 @@ func TestExecution_Deploy_DisallowFloatingPoint(t *testing.T) {
 
 func TestExecution_DeployWASM_GasValidation(t *testing.T) {
 	var gasProvided uint64
-	gasUsedByDeployment := uint64(570)
+	gasUsedByDeployment := uint64(590)
 
 	inputBuilder := test.CreateTestContractCreateInputBuilder().
 		WithContractCode(test.GetTestSCCode("init-correct", "../../")).
@@ -2983,13 +2983,13 @@ func TestExecution_CreateNewContract_Success(t *testing.T) {
 		AndAssertResults(func(host vmhost.VMHost, stubBlockchainHook *contextmock.BlockchainHookStub, verify *test.VMOutputVerifier) {
 			verify.Ok().
 				Balance(test.ParentAddress, 1000).
-				GasUsed(test.ParentAddress, 1069).
-				GasRemaining(998361).
+				GasUsed(test.ParentAddress, 1109).
+				GasRemaining(998301).
 				BalanceDelta(childAddress, 42).
 				Code(childAddress, childCode).
 				CodeMetadata(childAddress, []byte{1, 0}).
 				CodeDeployerAddress(childAddress, test.ParentAddress).
-				GasUsed(childAddress, 570).
+				GasUsed(childAddress, 590).
 				ReturnData([]byte{byte(l / 256), byte(l % 256)}, []byte("init successful"), []byte("succ")).
 				Storage().
 				Logs(vmcommon.LogEntry{
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,3 +27,7 @@ void init() { @@
     		}
     	}
     }
+    void upgrade() {
+    	init();
+    }