Skip to content

vm integration for get all transfers value hook, get code hash hook and internal errors masking #6774

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

Merged
merged 6 commits into from
Feb 10, 2025
Merged

vm integration for get all transfers value hook, get code hash hook and internal errors masking #6774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32eb78d
vm integration for get all call value hook and internal errors masking
laurci Feb 4, 2025
b41d170
vm integration for get all call value hook and internal errors masking
laurci Feb 4, 2025
7885faf
add GetCodeMetadata hook
laurci Feb 5, 2025
a5e427a
set MaskVMInternalDependenciesErrorsEnableEpoch in config
laurci Feb 6, 2025
db608bc
set MaskVMInternalDependenciesErrorsEnableEpoch to 1
laurci Feb 10, 2025
256c857
set MaskVMInternalDependenciesErrorsEnableEpoch to 2
laurci Feb 10, 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
3 changes: 3 additions & 0 deletions cmd/node/config/enableEpochs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,9 @@
# RelayedTransactionsV3EnableEpoch represents the epoch when the relayed transactions v3 will be enabled
RelayedTransactionsV3EnableEpoch = 1

# MaskVMInternalDependenciesErrorsEnableEpoch represents the epoch when the additional internal erorr masking in vm is enabled
MaskVMInternalDependenciesErrorsEnableEpoch = 2

# BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
BLSMultiSignerEnableEpoch = [
{ EnableEpoch = 0, Type = "no-KOSK" },
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 1000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV2.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV4.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
GetCurrentTxHash = 10000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV5.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV6.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV7.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions cmd/node/config/gasSchedules/gasScheduleV8.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
SetAsyncContextCallback = 100000
GetCallbackClosure = 10000
GetCodeMetadata = 10000
GetCodeHash = 10000
IsBuiltinFunction = 10000
IsReservedFunctionName = 10000
GetRoundTime = 10000
Expand Down
1 change: 1 addition & 0 deletions common/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,5 +1241,6 @@ const (
MultiESDTNFTTransferAndExecuteByUserFlag core.EnableEpochFlag = "MultiESDTNFTTransferAndExecuteByUserFlag"
FixRelayedMoveBalanceToNonPayableSCFlag core.EnableEpochFlag = "FixRelayedMoveBalanceToNonPayableSCFlag"
RelayedTransactionsV3Flag core.EnableEpochFlag = "RelayedTransactionsV3Flag"
MaskInternalDependenciesErrorsFlag core.EnableEpochFlag = "MaskInternalDependenciesErrorsFlag"
// all new flags must be added to createAllFlagsMap method, as part of enableEpochsHandler allFlagsDefined
)
6 changes: 6 additions & 0 deletions common/enablers/enableEpochsHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,12 @@ func (handler *enableEpochsHandler) createAllFlagsMap() {
},
activationEpoch: handler.enableEpochsConfig.RelayedTransactionsV3EnableEpoch,
},
common.MaskInternalDependenciesErrorsFlag: {
isActiveInEpoch: func(epoch uint32) bool {
return epoch >= handler.enableEpochsConfig.MaskVMInternalDependenciesErrorsEnableEpoch
},
activationEpoch: handler.enableEpochsConfig.MaskVMInternalDependenciesErrorsEnableEpoch,
},
}
}

Expand Down
1 change: 1 addition & 0 deletions config/epochConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ type EnableEpochs struct {
MultiESDTNFTTransferAndExecuteByUserEnableEpoch uint32
FixRelayedMoveBalanceToNonPayableSCEnableEpoch uint32
RelayedTransactionsV3EnableEpoch uint32
MaskVMInternalDependenciesErrorsEnableEpoch uint32
BLSMultiSignerEnableEpoch []MultiSignerConfig
}

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 @@ -22,7 +22,7 @@ require (
github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240802080531-0906745c04b2
github.com/multiversx/mx-chain-storage-go v1.0.19
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241021074004-c2bdb78da54a
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20241222212702-7f493a77b009
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20250205124044-c1734c751e92
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20241021081333-37461f04f0de
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20241021081245-2ef08dbcbc2e
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99-0.20241021081009-82e60082ab7a
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 @@ -401,8 +401,8 @@ github.com/multiversx/mx-chain-storage-go v1.0.19 h1:2R35MoSXcuNJOFmV5xEhcXqiEGZ
github.com/multiversx/mx-chain-storage-go v1.0.19/go.mod h1:Pb/BuVmiFqO66DSZO16KFkSUeom94x3e3Q9IloBvkYI=
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241021074004-c2bdb78da54a h1:+D5GR9SkHTkKU6fIMZLdSQHeIzbDzOT6fSJfKBG80+g=
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241021074004-c2bdb78da54a/go.mod h1:1rSkXreUZNXyPTTdhj47M+Fy62yjxbu3aAsXEtKN3UY=
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20241222212702-7f493a77b009 h1:N6j71XcyQm+zy+eK8/ETc7FaRvMoTaIwoPxp5TSZIJ4=
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20241222212702-7f493a77b009/go.mod h1:DkzpYQIGUpKFoIe5qpW5Ncd3Unq7Fr6A4m8u419+GHU=
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20250205124044-c1734c751e92 h1:O8Gvo59RgApIvJcm8AxnJCq+qKQ9bu5M/EvknOlMg/Q=
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20250205124044-c1734c751e92/go.mod h1:DkzpYQIGUpKFoIe5qpW5Ncd3Unq7Fr6A4m8u419+GHU=
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20241021081333-37461f04f0de h1:MxwcRm1sFME42bayUaQASyTMCNivcK9luXd64MT/Ozo=
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20241021081333-37461f04f0de/go.mod h1:lwcj/pxxKRVVD9MWVrePEdZTRxxbd2XPTlIBhwnYPsA=
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20241021081245-2ef08dbcbc2e h1:NmsXxAAFflQ3hnKjKJ5X6niFaFa4kO4wXI1uCc8nNVo=
Expand Down