Merge pull request #5687 from multiversx/merge-master-rc-v1.6.0-2023.…

…11.07 Merge master rc v1.6.0 2023.11.07
multiversx · Nov 8, 2023 · 78dd240 · 78dd240
2 parents c6b66c8 + 37c2eda
commit 78dd240
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/cmd/node/config/config.toml b/cmd/node/config/config.toml
@@ -696,7 +696,7 @@
         WasmVMVersions = [
             { StartEpoch = 0, Version = "v1.3" },
             { StartEpoch = 1, Version = "v1.4" },
-            { StartEpoch = 2, Version = "v1.5" },
+            { StartEpoch = 3, Version = "v1.5" },
         ]
 
     [VirtualMachine.Querying]
@@ -706,7 +706,7 @@
         WasmVMVersions = [
             { StartEpoch = 0, Version = "v1.3" },
             { StartEpoch = 1, Version = "v1.4" },
-            { StartEpoch = 2, Version = "v1.5" },
+            { StartEpoch = 3, Version = "v1.5" },
         ]
 
     [VirtualMachine.GasConfig]

diff --git a/cmd/node/config/enableEpochs.toml b/cmd/node/config/enableEpochs.toml
@@ -252,22 +252,22 @@
     DeterministicSortOnValidatorsInfoEnableEpoch = 1
 
     # SCProcessorV2EnableEpoch represents the epoch when SC processor V2 will be used
-    SCProcessorV2EnableEpoch = 6
+    SCProcessorV2EnableEpoch = 3
 
     # AutoBalanceDataTriesEnableEpoch represents the epoch when the data tries are automatically balanced by inserting at the hashed key instead of the normal key
-    AutoBalanceDataTriesEnableEpoch = 5
+    AutoBalanceDataTriesEnableEpoch = 3
 
     # KeepExecOrderOnCreatedSCRsEnableEpoch represents the epoch when the execution order of created SCRs is ensured
-    KeepExecOrderOnCreatedSCRsEnableEpoch = 2
+    KeepExecOrderOnCreatedSCRsEnableEpoch = 3
 
     # MultiClaimOnDelegationEnableEpoch represents the epoch when the multi claim on delegation is enabled
     MultiClaimOnDelegationEnableEpoch = 3
 
     # ChangeUsernameEnableEpoch represents the epoch when changing username is enabled
-    ChangeUsernameEnableEpoch = 2
+    ChangeUsernameEnableEpoch = 3
 
     # ConsistentTokensValuesLengthCheckEnableEpoch represents the epoch when the consistent tokens values length check is enabled
-    ConsistentTokensValuesLengthCheckEnableEpoch = 2
+    ConsistentTokensValuesLengthCheckEnableEpoch = 3
 
     # FixDelegationChangeOwnerOnAccountEnableEpoch represents the epoch when the fix for the delegation system smart contract is enabled
     FixDelegationChangeOwnerOnAccountEnableEpoch = 3

diff --git a/go.mod b/go.mod
@@ -21,10 +21,10 @@ require (
 	github.com/multiversx/mx-chain-scenario-go v1.2.1
 	github.com/multiversx/mx-chain-storage-go v1.0.13
 	github.com/multiversx/mx-chain-vm-common-go v1.5.7
-	github.com/multiversx/mx-chain-vm-go v1.5.18
+	github.com/multiversx/mx-chain-vm-go v1.5.19
 	github.com/multiversx/mx-chain-vm-v1_2-go v1.2.61
 	github.com/multiversx/mx-chain-vm-v1_3-go v1.3.62
-	github.com/multiversx/mx-chain-vm-v1_4-go v1.4.88
+	github.com/multiversx/mx-chain-vm-v1_4-go v1.4.90
 	github.com/pelletier/go-toml v1.9.3
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil v3.21.11+incompatible

diff --git a/go.sum b/go.sum
@@ -400,14 +400,14 @@ github.com/multiversx/mx-chain-storage-go v1.0.13 h1:i41VPDJZ0pn5gf18zTXrac5xeio
 github.com/multiversx/mx-chain-storage-go v1.0.13/go.mod h1:sJ2q49tgjxNpMpsHysjABqCAB0FLBmDblbjBkQ8XfmA=
 github.com/multiversx/mx-chain-vm-common-go v1.5.7 h1:GiT2MWG2aCQX59iOk5waB+z7XSLHH7N5xO8b91j6L6s=
 github.com/multiversx/mx-chain-vm-common-go v1.5.7/go.mod h1:sqkKMCnwkWl8DURdb9q7pctK8IANghdHY1KJLE0ox2c=
-github.com/multiversx/mx-chain-vm-go v1.5.18 h1:jLgB/9vcqkQz+2P/lFYIfrubDT5gErn+ioPd74+nga8=
-github.com/multiversx/mx-chain-vm-go v1.5.18/go.mod h1:uZ4uinTCa2r3UT1WwbGg6yMq5HLeivHnFemmPG/4V+o=
+github.com/multiversx/mx-chain-vm-go v1.5.19 h1:3kTYI0+dKgU7XhEy0q5Dnhx2r1schiywpMbOzXiOdds=
+github.com/multiversx/mx-chain-vm-go v1.5.19/go.mod h1:uZ4uinTCa2r3UT1WwbGg6yMq5HLeivHnFemmPG/4V+o=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.61 h1:7c3VRhr5JDu7qs3AkmKQu7DzWGGIoiHfSIMrzw3x5Ao=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.61/go.mod h1:bQFh+KuUIEBmCfKJ0qVN2+DbRRbAqW0huKfHpiTbyEE=
 github.com/multiversx/mx-chain-vm-v1_3-go v1.3.62 h1:rQaWRbrQwrEhSN0ZEQQ0JAbttgi+OrMf/CLziWpRUCA=
 github.com/multiversx/mx-chain-vm-v1_3-go v1.3.62/go.mod h1:RJaDHRU9Fk4oGWQH1sUp8soCsfW6FmNfWyhImTg0294=
-github.com/multiversx/mx-chain-vm-v1_4-go v1.4.88 h1:siLqUwhoXJVs+DvC/uRc9CwCzYmFXtrIru0aMlizUjI=
-github.com/multiversx/mx-chain-vm-v1_4-go v1.4.88/go.mod h1:ZvI1nJCnfl0xJiTSWK39U2G3oHZIyMPWjlxUw/8NunI=
+github.com/multiversx/mx-chain-vm-v1_4-go v1.4.90 h1:tavoUgxPmcs2AjRc9r890FUiNX5ghmsADs2q4ZLWz1Y=
+github.com/multiversx/mx-chain-vm-v1_4-go v1.4.90/go.mod h1:ZvI1nJCnfl0xJiTSWK39U2G3oHZIyMPWjlxUw/8NunI=
 github.com/multiversx/mx-components-big-int v1.0.0 h1:Wkr8lSzK2nDqixOrrBa47VNuqdhV1m/aJhaP1EMaiS8=
 github.com/multiversx/mx-components-big-int v1.0.0/go.mod h1:maIEMgHlNE2u78JaDD0oLzri+ShgU4okHfzP3LWGdQM=
 github.com/multiversx/protobuf v1.3.2 h1:RaNkxvGTGbA0lMcnHAN24qE1G1i+Xs5yHA6MDvQ4mSM=

diff --git a/integrationTests/vm/wasm/testdata/hello-v1/answer.c b/integrationTests/vm/wasm/testdata/hello-v1/answer.c
@@ -4,6 +4,10 @@ void init()
 {
 }
 
+void upgrade()
+{
+}
+
 void getUltimateAnswer()
 {
     int64finish(24);

diff --git a/integrationTests/vm/wasm/testdata/hello-v1/answer.export b/integrationTests/vm/wasm/testdata/hello-v1/answer.export
@@ -1,2 +1,3 @@
 init
+upgrade
 getUltimateAnswer
diff --git a/integrationTests/vm/wasm/testdata/hello-v1/output/answer.wasm b/integrationTests/vm/wasm/testdata/hello-v1/output/answer.wasm
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,10 @@ void init() @@
     {
     }
+    void upgrade()
+    {
+    }
     void getUltimateAnswer()
     {
         int64finish(24);
@@ Expand Down @@