Skip to content

Commit

Permalink
Merge pull request #204 from arda-org/dev
Browse files Browse the repository at this point in the history
dev into main
  • Loading branch information
lcswillems authored Aug 11, 2024
2 parents 54bc291 + 282af2e commit 63b4782
Show file tree
Hide file tree
Showing 28 changed files with 1,386 additions and 244 deletions.
2 changes: 1 addition & 1 deletion xsuite-fullsimulnet-darwin-amd64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xsuite/full-simulnet-darwin-amd64",
"version": "0.0.10",
"version": "0.0.12",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion xsuite-fullsimulnet-linux-amd64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xsuite/full-simulnet-linux-amd64",
"version": "0.0.10",
"version": "0.0.12",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion xsuite-fullsimulnet/build-binary.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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-fix2`;
await $`GOBIN="$(pwd)" go install -ldflags ${argv.ldflags} github.com/multiversx/mx-chain-simulator-go/cmd/chainsimulator@v1.7.13-fix7`;
await $`mv ./chainsimulator ../xsuite-fullsimulnet-${argv.os}-${argv.arch}/bin/fsproxy`;
3 changes: 3 additions & 0 deletions xsuite-fullsimulnet/config/node/config/api.toml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@

# /transaction/:txhash will return the transaction in JSON format based on its hash
{ Name = "/:txhash", Open = true },

# /transaction/scrs-by-tx-hash/:txhash will return the smart contract results generated by the provided transaction hash
{ Name = "/scrs-by-tx-hash/:txhash", Open = true },
]

[APIPackages.block]
Expand Down
20 changes: 12 additions & 8 deletions xsuite-fullsimulnet/config/node/config/enableEpochs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -285,25 +285,29 @@
FixGasRemainingForSaveKeyValueBuiltinFunctionEnableEpoch = 1

# CurrentRandomnessOnSortingEnableEpoch represents the epoch when the current randomness on sorting is enabled
CurrentRandomnessOnSortingEnableEpoch = 4
CurrentRandomnessOnSortingEnableEpoch = 1

# StakeLimitsEnableEpoch represents the epoch when stake limits on validators are enabled
# Should have the same value as StakingV4Step1EnableEpoch that triggers the automatic unstake operations for the queue nodes
StakeLimitsEnableEpoch = 4
StakeLimitsEnableEpoch = 1

# StakingV4Step1EnableEpoch represents the epoch when staking v4 is initialized. This is the epoch in which
# all nodes from staking queue are moved in the auction list
StakingV4Step1EnableEpoch = 4
StakingV4Step1EnableEpoch = 1

# StakingV4Step2EnableEpoch represents the epoch when staking v4 is enabled. Should have a greater value than StakingV4Step1EnableEpoch.
# From this epoch, all shuffled out nodes are moved to auction nodes. No auction nodes selection is done yet.
StakingV4Step2EnableEpoch = 5
StakingV4Step2EnableEpoch = 2

# StakingV4Step3EnableEpoch represents the epoch in which selected nodes from auction will be distributed to waiting list
StakingV4Step3EnableEpoch = 6
StakingV4Step3EnableEpoch = 3

# CleanupAuctionOnLowWaitingListEnableEpoch represents the epoch when duplicated data cleanup from auction list is enabled in the condition of a low waiting list
# Should have the same value as StakingV4Step1EnableEpoch if the low waiting list has not happened, otherwise should have a greater value
CleanupAuctionOnLowWaitingListEnableEpoch = 1

# AlwaysMergeContextsInEEIEnableEpoch represents the epoch in which the EEI will always merge the contexts
AlwaysMergeContextsInEEIEnableEpoch = 4
AlwaysMergeContextsInEEIEnableEpoch = 1

# BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
BLSMultiSignerEnableEpoch = [
Expand All @@ -319,11 +323,11 @@
# - Enable epoch = StakingV4Step3EnableEpoch
# - NodesToShufflePerShard = same as previous entry in MaxNodesChangeEnableEpoch
# - MaxNumNodes = (MaxNumNodesFromPreviousEpochEnable - (numOfShards+1)*NodesToShufflePerShard)
{ EpochEnable = 6, MaxNumNodes = 56, NodesToShufflePerShard = 2 },
{ EpochEnable = 3, MaxNumNodes = 56, NodesToShufflePerShard = 2 },
]

[GasSchedule]
# GasScheduleByEpochs holds the configuration for the gas schedule that will be applied from specific epochs
GasScheduleByEpochs = [
{ StartEpoch = 0, FileName = "gasScheduleV7.toml" },
{ StartEpoch = 0, FileName = "gasScheduleV8.toml" },
]
Loading

0 comments on commit 63b4782

Please sign in to comment.