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

Merge master into rc barnard 2025.01.29 #6750

Merged
merged 13 commits into from
Jan 30, 2025
Merged

Merge master into rc barnard 2025.01.29 #6750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eba9199
SCDeployEnableEpoch and BuiltInFunctionsEnableEpoch from epoch 0
sstanculeanu Sep 25, 2024
470a63f
Merge branch 'master' into test_sc_epoch_0
sstanculeanu Nov 14, 2024
1c86a1e
new indexer
miiu96 Jan 22, 2025
e9dfa12
fixes
miiu96 Jan 23, 2025
4ff8d19
proper tag
miiu96 Jan 23, 2025
88c9501
Merge pull request #6731 from multiversx/extra-info-spica-patch-es-in…
sstanculeanu Jan 27, 2025
c4148e7
Merge pull request #6657 from multiversx/rc/spica-patch-relayedv3
sstanculeanu Jan 27, 2025
373fab6
compressed relayed v3 flag
sstanculeanu Jan 27, 2025
b505135
Merge pull request #6741 from multiversx/v1.8.9-dev-config
sstanculeanu Jan 28, 2025
b298ab9
Merge branch 'master' into test_sc_epoch_0
sstanculeanu Jan 28, 2025
a16a899
Merge branch 'master' of https://github.com/multiversx/mx-chain-go in…
sstanculeanu Jan 29, 2025
02d8d81
Merge pull request #6497 from multiversx/test_sc_epoch_0
sstanculeanu Jan 30, 2025
4a248d6
Merge branch 'master' of https://github.com/multiversx/mx-chain-go in…
sstanculeanu Jan 30, 2025
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
6 changes: 3 additions & 3 deletions cmd/node/config/enableEpochs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[EnableEpochs]
# SCDeployEnableEpoch represents the epoch when the deployment of smart contracts will be enabled
SCDeployEnableEpoch = 1
SCDeployEnableEpoch = 0

# BuiltInFunctionsEnableEpoch represents the epoch when the built in functions will be enabled
BuiltInFunctionsEnableEpoch = 1
BuiltInFunctionsEnableEpoch = 0

# RelayedTransactionsEnableEpoch represents the epoch when the relayed transactions will be enabled
RelayedTransactionsEnableEpoch = 1
Expand Down Expand Up @@ -334,7 +334,7 @@
FixRelayedMoveBalanceToNonPayableSCEnableEpoch = 1

# RelayedTransactionsV3EnableEpoch represents the epoch when the relayed transactions v3 will be enabled
RelayedTransactionsV3EnableEpoch = 2
RelayedTransactionsV3EnableEpoch = 1

# BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
BLSMultiSignerEnableEpoch = [
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/multiversx/mx-chain-communication-go v1.1.1
github.com/multiversx/mx-chain-core-go v1.2.24
github.com/multiversx/mx-chain-crypto-go v1.2.12
github.com/multiversx/mx-chain-es-indexer-go v1.7.13
github.com/multiversx/mx-chain-es-indexer-go v1.7.14
github.com/multiversx/mx-chain-logger-go v1.0.15
github.com/multiversx/mx-chain-scenario-go v1.4.4
github.com/multiversx/mx-chain-storage-go v1.0.19
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24 h1:O0X7N9GfNVUCE9fukXA+dvfCRRjViY
github.com/multiversx/mx-chain-core-go v1.2.24/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk=
github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4=
github.com/multiversx/mx-chain-es-indexer-go v1.7.13 h1:1Boeb0x28fzYBVRlnaCPRaXifRXAFiCit34t6O8efyM=
github.com/multiversx/mx-chain-es-indexer-go v1.7.13/go.mod h1:5Sr49FjWWzZ3/WcC3jzln8TlMSNToCIT9Lqy6P7i7bs=
github.com/multiversx/mx-chain-es-indexer-go v1.7.14 h1:V4fuubEUYskWCLQIkbuoB0WHoKyldLQRq/fllIzW1CU=
github.com/multiversx/mx-chain-es-indexer-go v1.7.14/go.mod h1:5Sr49FjWWzZ3/WcC3jzln8TlMSNToCIT9Lqy6P7i7bs=
github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc=
github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ=
github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460=
Expand Down