Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev into main #241

Merged
merged 27 commits into from
Nov 30, 2024
Merged

dev into main #241

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b20d474
Add fetcher option to proxy to override the fetcher
lcswillems Nov 13, 2024
834d82a
Release xsuite@0.0.93
lcswillems Nov 13, 2024
c5c4654
Use stable toolchain
lcswillems Nov 16, 2024
3a89605
Fix paths
lcswillems Nov 16, 2024
8b2ac2e
Merge pull request #236 from arda-org/use-stable
lcswillems Nov 16, 2024
c30c8f5
Release xsuite@0.0.94
lcswillems Nov 16, 2024
8a6feb3
Integrate Spica v1.8.4
lcswillems Nov 21, 2024
6b68361
Merge pull request #227 from arda-org/upgrade-to-node-1.8
lcswillems Nov 21, 2024
ca02273
Release @xsuite/full-simulnet@0.0.16 @xsuite/light-simulnet@0.0.33 xs…
lcswillems Nov 21, 2024
e3345db
Add NativeSelect helper component
lcswillems Nov 21, 2024
f76130d
Expose node URLs
lcswillems Nov 24, 2024
59c9216
Merge pull request #237 from arda-org/expose-node-urls
lcswillems Nov 24, 2024
b60f836
Release xsuite@0.0.96
lcswillems Nov 24, 2024
0368656
Fix libs + only use local dir
lcswillems Nov 26, 2024
7189323
Merge pull request #238 from arda-org/fix-libs
lcswillems Nov 26, 2024
3abb2e2
Fix build commands
lcswillems Nov 26, 2024
6cd22ec
Release @xsuite/full-simulnet@0.0.17 @xsuite/light-simulnet@0.0.35 xs…
lcswillems Nov 26, 2024
73d0170
Remove esbuild target
lcswillems Nov 28, 2024
2bbabaa
Merge pull request #239 from arda-org/remove-esbuild-target-setting
lcswillems Nov 28, 2024
b4fb85c
Remove unnecessary library
lcswillems Nov 28, 2024
9ed9342
Simplify index.js
lcswillems Nov 28, 2024
31d9bcc
Add getNodeUrls
lcswillems Nov 29, 2024
52ce24f
Release xsuite@0.0.98
lcswillems Nov 29, 2024
6f4d8a8
Add getNodeUrl + more fixes in tests
lcswillems Nov 29, 2024
be0af45
Release xsuite@0.0.99
lcswillems Nov 29, 2024
9303354
Allow to customize the proxy URL
lcswillems Nov 30, 2024
a8ab02c
Release xsuite@0.0.100
lcswillems Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Integrate Spica v1.8.4
  • Loading branch information
@lcswillems
lcswillems committed Nov 21, 2024
commit 8a6feb37c90527dfd99edc29a53f6b5e46718276
2 changes: 1 addition & 1 deletion .github/workflows/deploy-website.yml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

permissions:
contents: read
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ on:

jobs:
build-and-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
8 changes: 4 additions & 4 deletions .github/workflows/release-scenexec.yml
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .github/workflows/release-xsuite-fullsimulnet.yml
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .github/workflows/release-xsuite-lightsimulnet.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release-xsuite.yml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ on:

jobs:
build-and-publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
2 changes: 1 addition & 1 deletion xsuite-fullsimulnet/build-binary.mjs
View file
Original file line number Diff line number Diff line change
@@ -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@v1.8.4-fix1`;
await $`mv ./chainsimulator ../xsuite-fullsimulnet-${argv.os}-${argv.arch}/bin/fsproxy`;
12 changes: 10 additions & 2 deletions xsuite-fullsimulnet/config/node/config/config.toml
View file
Original file line number Diff line number Diff line change
@@ -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]
24 changes: 24 additions & 0 deletions xsuite-fullsimulnet/config/node/config/enableEpochs.toml
View file
Original file line number Diff line number Diff line change
@@ -309,6 +309,30 @@
# 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

# FixRelayedBaseCostEnableEpoch represents the epoch when the fix for relayed base cost will be enabled
FixRelayedBaseCostEnableEpoch = 4

# MultiESDTNFTTransferAndExecuteByUserEnableEpoch represents the epoch when enshrined sovereign cross chain opcodes are enabled
MultiESDTNFTTransferAndExecuteByUserEnableEpoch = 9999999

# FixRelayedMoveBalanceToNonPayableSCEnableEpoch represents the epoch when the fix for relayed move balance to non payable sc will be enabled
FixRelayedMoveBalanceToNonPayableSCEnableEpoch = 4

# BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
BLSMultiSignerEnableEpoch = [
{ EnableEpoch = 0, Type = "no-KOSK" },
2 changes: 1 addition & 1 deletion xsuite-fullsimulnet/config/node/config/external.toml
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@

# URL for the WebSocket client/server connection
# This value represents the IP address and port number that the WebSocket client or server will use to establish a connection.
URL = "127.0.0.1:22111"
URL = "ws://127.0.0.1:22111"

# After a message will be sent it will wait for an ack message if this flag is enabled
WithAcknowledge = true
9 changes: 6 additions & 3 deletions xsuite-fullsimulnet/config/node/config/fullArchiveP2P.toml
View file
Original file line number Diff line number Diff line change
@@ -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.
9 changes: 9 additions & 0 deletions xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV1.toml
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV2.toml
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV3.toml
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV4.toml
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV5.toml
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions xsuite-fullsimulnet/config/node/config/gasSchedules/gasScheduleV6.toml
View file
Original file line number Diff line number Diff line change
@@ -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
Loading