WIP

arda-org · Nov 20, 2024 · 9dbd875 · 9dbd875
1 parent c30c8f5
commit 9dbd875
Show file tree

Hide file tree

Showing 31 changed files with 337 additions and 192 deletions.
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     permissions:
       contents: read

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/release-scenexec.yml b/.github/workflows/release-scenexec.yml
@@ -10,9 +10,9 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-22.04, macos-12]
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             wasmer_lib: libwasmer_linux_amd64.so
             wasmer2_lib: libvmexeccapi.so
             flags: -ldflags "-extldflags '-Wl,-rpath,\$ORIGIN'"
@@ -56,7 +56,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-22.04, macos-12]
 
     runs-on: ${{ matrix.os }}
 
@@ -75,7 +75,7 @@ jobs:
 
   release:
     needs: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Download binaries

diff --git a/.github/workflows/release-xsuite-fullsimulnet.yml b/.github/workflows/release-xsuite-fullsimulnet.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [macos-12, ubuntu-20.04]
+        os: [macos-12, ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
 
@@ -40,7 +40,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-12, ubuntu-20.04]
+        os: [macos-12, ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
 
@@ -63,7 +63,7 @@ jobs:
   publish:
     needs: test
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/release-xsuite-lightsimulnet.yml b/.github/workflows/release-xsuite-lightsimulnet.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [macos-12, ubuntu-20.04]
+        os: [macos-12, ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
 
@@ -40,7 +40,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-12, ubuntu-20.04]
+        os: [macos-12, ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
 
@@ -63,7 +63,7 @@ jobs:
   publish:
     needs: test
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/release-xsuite.yml b/.github/workflows/release-xsuite.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   build-and-publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout

diff --git a/Todo-PR.md b/Todo-PR.md
@@ -0,0 +1,2 @@
+- Avoir un helper pour EGLD-000000. E.g. egldId?
+- Rajouter test pour LSWorld & FSWorld
diff --git a/xsuite-fullsimulnet/build-binary.mjs b/xsuite-fullsimulnet/build-binary.mjs
@@ -10,5 +10,5 @@ if (process.env.CI) {
   ]);
 }
 
-await $`GOBIN="$(pwd)" go install -ldflags ${argv.ldflags} github.com/multiversx/mx-chain-simulator-go/cmd/chainsimulator@v1.7.13-patch2-fix1`;
+await $`GOBIN="$(pwd)" go install -ldflags ${argv.ldflags} github.com/multiversx/mx-chain-simulator-go/cmd/chainsimulator@0507df2631a6437ee5ce9dc1e2474c6946c12825`;
 await $`mv ./chainsimulator ../xsuite-fullsimulnet-${argv.os}-${argv.arch}/bin/fsproxy`;
diff --git a/xsuite-fullsimulnet/config/node/config/config.toml b/xsuite-fullsimulnet/config/node/config/config.toml
@@ -672,15 +672,23 @@
         TimeOutForSCExecutionInMilliseconds = 10000 # 10 seconds = 10000 milliseconds
         WasmerSIGSEGVPassthrough            = false # must be false for release
         WasmVMVersions = [
-            { StartEpoch = 0, Version = "v1.5" }, # TODO: set also the RoundActivations.DisableAsyncCallV1 accordingly
+            { StartEpoch = 0, Version = "v1.4" },
+            { StartEpoch = 1, Version = "v1.5" }, # TODO: set also the RoundActivations.DisableAsyncCallV1 accordingly
+        ]
+        TransferAndExecuteByUserAddresses = [ # TODO: set real contract addresses for all shards
+            "erd1qqqqqqqqqqqqqpgqr46jrxr6r2unaqh75ugd308dwx5vgnhwh47qtvepe3", #shard 0
         ]
 
     [VirtualMachine.Querying]
         NumConcurrentVMs = 1
         TimeOutForSCExecutionInMilliseconds = 10000 # 10 seconds = 10000 milliseconds
         WasmerSIGSEGVPassthrough            = false # must be false for release
         WasmVMVersions = [
-            { StartEpoch = 0, Version = "v1.5" }, # TODO: set also the RoundActivations.DisableAsyncCallV1 accordingly
+            { StartEpoch = 0, Version = "v1.4" },
+            { StartEpoch = 1, Version = "v1.5" }, # TODO: set also the RoundActivations.DisableAsyncCallV1 accordingly
+        ]
+        TransferAndExecuteByUserAddresses = [ # TODO: set real contract addresses for all shards
+            "erd1qqqqqqqqqqqqqpgqr46jrxr6r2unaqh75ugd308dwx5vgnhwh47qtvepe3",
         ]
 
     [VirtualMachine.GasConfig]
@@ -938,3 +946,6 @@
     # MaxRoundsOfInactivityAccepted defines the number of rounds missed by a main or higher level backup machine before
     # the current machine will take over and propose/sign blocks. Used in both single-key and multi-key modes.
     MaxRoundsOfInactivityAccepted = 3
+
+[RelayedTransactionConfig]
+    MaxTransactionsAllowed = 50
diff --git a/xsuite-fullsimulnet/config/node/config/enableEpochs.toml b/xsuite-fullsimulnet/config/node/config/enableEpochs.toml
@@ -309,6 +309,31 @@
     # AlwaysMergeContextsInEEIEnableEpoch represents the epoch in which the EEI will always merge the contexts
     AlwaysMergeContextsInEEIEnableEpoch = 1
 
+    # UseGasBoundedShouldFailExecutionEnableEpoch represents the epoch when use bounded gas function should fail execution in case of error
+    UseGasBoundedShouldFailExecutionEnableEpoch = 1
+
+    # DynamicESDTEnableEpoch represents the epoch when dynamic NFT feature is enabled
+    DynamicESDTEnableEpoch = 4
+
+    # EGLDInMultiTransferEnableEpoch represents the epoch when EGLD in multitransfer is enabled
+    EGLDInMultiTransferEnableEpoch = 4
+
+    # CryptoOpcodesV2EnableEpoch represents the epoch when BLSMultiSig, Secp256r1 and other opcodes are enabled
+    CryptoOpcodesV2EnableEpoch = 4
+
+    # UnjailCleanupEnableEpoch represents the epoch when the cleanup of the unjailed nodes is enabled
+    UnJailCleanupEnableEpoch = 4
+
+    # RelayedTransactionsV3EnableEpoch represents the epoch when the relayed transactions V3 will be enabled
+    RelayedTransactionsV3EnableEpoch = 4
+
+    # LinkInnerTransactionEnableEpoch represents the epoch when the inner transactions of relayed V3 will be linked to results
+    LinkInnerTransactionEnableEpoch = 4
+
+    # MultiESDTNFTTransferAndExecuteByUserEnableEpoch represents the epoch when enshrined sovereign cross chain opcodes are enabled
+    MultiESDTNFTTransferAndExecuteByUserEnableEpoch = 9999999
+
+
     # BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
     BLSMultiSignerEnableEpoch = [
         { EnableEpoch = 0, Type = "no-KOSK" },

diff --git a/xsuite-fullsimulnet/config/node/config/fullArchiveP2P.toml b/xsuite-fullsimulnet/config/node/config/fullArchiveP2P.toml
@@ -49,9 +49,12 @@
     # RefreshIntervalInSec represents the time in seconds between querying for new peers
     RefreshIntervalInSec = 10
 
-    # ProtocolID represents the protocol that this node will advertize to other peers
-    # To connect to other nodes, those nodes should have the same ProtocolID string
-    ProtocolID = "/erd/kad/1.0.0"
+    # ProtocolIDs represents the protocols that this node will advertise to other peers
+    # To connect to other nodes, those nodes should have at least one common protocol string
+    ProtocolIDs = [
+        "/erd/kad/1.0.0",
+        "mvx-full-archive",
+    ]
 
     # InitialPeerList represents the list of strings of some known nodes that will bootstrap this node
     # The address will be in a self-describing addressing format.

diff --git a/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV1.toml b/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV1.toml
@@ -15,6 +15,11 @@
     ESDTNFTAddUri            = 500000
     ESDTNFTUpdateAttributes  = 500000
     ESDTNFTMultiTransfer     = 1000000
+    ESDTModifyRoyalties      = 500000
+    ESDTModifyCreator        = 500000
+    ESDTNFTRecreate          = 1000000
+    ESDTNFTUpdate            = 1000000
+    ESDTNFTSetNewURIs        = 500000
     SetGuardian              = 250000
     GuardAccount             = 250000
     UnGuardAccount           = 250000
@@ -107,6 +112,7 @@
     GetCallbackClosure   = 10000
     GetCodeMetadata      = 10000
     IsBuiltinFunction    = 10000
+    IsReservedFunctionName = 10000
 
 [EthAPICost]
     UseGas              = 100
@@ -206,6 +212,9 @@
     UnmarshalCompressedECC = 270000
     GenerateKeyECC         = 7000000
     EncodeDERSig           = 10000000
+    VerifySecp256r1        = 2000000
+    VerifyBLSSignatureShare = 2000000
+    VerifyBLSMultiSig      = 2000000
 
 [ManagedBufferAPICost]
     MBufferNew                   = 2000

diff --git a/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV2.toml b/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV2.toml
@@ -15,6 +15,11 @@
     ESDTNFTAddUri            = 500000
     ESDTNFTUpdateAttributes  = 500000
     ESDTNFTMultiTransfer     = 1000000
+    ESDTModifyRoyalties      = 500000
+    ESDTModifyCreator        = 500000
+    ESDTNFTRecreate          = 1000000
+    ESDTNFTUpdate            = 1000000
+    ESDTNFTSetNewURIs        = 500000
     SetGuardian              = 250000
     GuardAccount             = 250000
     UnGuardAccount           = 250000
@@ -107,6 +112,7 @@
     GetCallbackClosure   = 10000
     GetCodeMetadata      = 10000
     IsBuiltinFunction    = 10000
+    IsReservedFunctionName = 10000
 
 [EthAPICost]
     UseGas              = 100
@@ -206,6 +212,9 @@
     UnmarshalCompressedECC = 270000
     GenerateKeyECC         = 7000000
     EncodeDERSig           = 10000000
+    VerifySecp256r1        = 2000000
+    VerifyBLSSignatureShare = 2000000
+    VerifyBLSMultiSig      = 2000000
 
 [ManagedBufferAPICost]
     MBufferNew                   = 2000

diff --git a/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV3.toml b/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV3.toml
@@ -15,6 +15,11 @@
     ESDTNFTAddUri            = 500000
     ESDTNFTUpdateAttributes  = 500000
     ESDTNFTMultiTransfer     = 1000000
+    ESDTModifyRoyalties      = 500000
+    ESDTModifyCreator        = 500000
+    ESDTNFTRecreate          = 1000000
+    ESDTNFTUpdate            = 1000000
+    ESDTNFTSetNewURIs        = 500000
     SetGuardian              = 250000
     GuardAccount             = 250000
     UnGuardAccount           = 250000
@@ -107,6 +112,7 @@
     GetCallbackClosure   = 10000
     GetCodeMetadata      = 10000
     IsBuiltinFunction    = 10000
+    IsReservedFunctionName = 10000
 
 [EthAPICost]
     UseGas              = 100
@@ -206,6 +212,9 @@
     UnmarshalCompressedECC = 270000
     GenerateKeyECC         = 7000000
     EncodeDERSig           = 10000000
+    VerifySecp256r1        = 2000000
+    VerifyBLSSignatureShare = 2000000
+    VerifyBLSMultiSig      = 2000000
 
 [ManagedBufferAPICost]
     MBufferNew                   = 2000

diff --git a/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV4.toml b/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV4.toml
@@ -15,6 +15,11 @@
     ESDTNFTAddUri            = 50000
     ESDTNFTUpdateAttributes  = 50000
     ESDTNFTMultiTransfer     = 200000
+    ESDTModifyRoyalties      = 500000
+    ESDTModifyCreator        = 500000
+    ESDTNFTRecreate          = 1000000
+    ESDTNFTUpdate            = 1000000
+    ESDTNFTSetNewURIs        = 500000
     SetGuardian              = 250000
     GuardAccount             = 250000
     UnGuardAccount           = 250000
@@ -107,6 +112,7 @@
     GetCallbackClosure   = 10000
     GetCodeMetadata      = 10000
     IsBuiltinFunction    = 10000
+    IsReservedFunctionName = 10000
 
 [EthAPICost]
     UseGas              = 100
@@ -206,6 +212,9 @@
     UnmarshalCompressedECC = 270000
     GenerateKeyECC         = 7000000
     EncodeDERSig           = 10000000
+    VerifySecp256r1        = 2000000
+    VerifyBLSSignatureShare = 2000000
+    VerifyBLSMultiSig      = 2000000
 
 [ManagedBufferAPICost]
     MBufferNew                   = 2000

diff --git a/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV5.toml b/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV5.toml
@@ -15,6 +15,11 @@
     ESDTNFTAddUri            = 50000
     ESDTNFTUpdateAttributes  = 50000
     ESDTNFTMultiTransfer     = 200000
+    ESDTModifyRoyalties      = 500000
+    ESDTModifyCreator        = 500000
+    ESDTNFTRecreate          = 1000000
+    ESDTNFTUpdate            = 1000000
+    ESDTNFTSetNewURIs        = 500000
     SetGuardian              = 250000
     GuardAccount             = 250000
     UnGuardAccount           = 250000
@@ -107,6 +112,7 @@
     GetCallbackClosure   = 10000
     GetCodeMetadata      = 10000
     IsBuiltinFunction    = 10000
+    IsReservedFunctionName = 10000
 
 [EthAPICost]
     UseGas              = 100
@@ -206,6 +212,9 @@
     UnmarshalCompressedECC = 270000
     GenerateKeyECC         = 7000000
     EncodeDERSig           = 10000000
+    VerifySecp256r1        = 2000000
+    VerifyBLSSignatureShare = 2000000
+    VerifyBLSMultiSig      = 2000000
 
 [ManagedBufferAPICost]
     MBufferNew                   = 2000

diff --git a/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV6.toml b/xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV6.toml
@@ -15,6 +15,11 @@
     ESDTNFTAddUri            = 50000
     ESDTNFTUpdateAttributes  = 50000
     ESDTNFTMultiTransfer     = 200000
+    ESDTModifyRoyalties      = 500000
+    ESDTModifyCreator        = 500000
+    ESDTNFTRecreate          = 1000000
+    ESDTNFTUpdate            = 1000000
+    ESDTNFTSetNewURIs        = 500000
     SetGuardian              = 250000
     GuardAccount             = 250000
     UnGuardAccount           = 250000
@@ -107,6 +112,7 @@
     GetCallbackClosure   = 10000
     GetCodeMetadata      = 10000
     IsBuiltinFunction    = 10000
+    IsReservedFunctionName = 10000
 
 [EthAPICost]
     UseGas              = 100
@@ -206,6 +212,9 @@
     UnmarshalCompressedECC = 270000
     GenerateKeyECC         = 7000000
     EncodeDERSig           = 10000000
+    VerifySecp256r1        = 2000000
+    VerifyBLSSignatureShare = 2000000
+    VerifyBLSMultiSig      = 2000000
 
 [ManagedBufferAPICost]
     MBufferNew                   = 2000
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Avoir un helper pour EGLD-000000. E.g. egldId?
		- Rajouter test pour LSWorld & FSWorld