Merge branch 'main' into bhagya

Dharitri-org · Mar 22, 2024 · 20da641 · 20da641
2 parents 8db992e + a2f8ece
commit 20da641
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -7,5 +7,6 @@
 [![](https://img.shields.io/badge/made%20by-Dharitri-green.svg?style=flat-square)](https://dharitri.org/)
 [![](https://img.shields.io/badge/project-Dharitri%20Testnet-green.svg?style=flat-square)](https://dharitri.org/)
 
+
 # drtg-vm-common
 Common structs between VM and node
diff --git a/coverage.txt b/coverage.txt
@@ -270,10 +270,9 @@ github.com/Dharitri-org/drtg-vm-common/parsers/tokenize.go:32.2,32.13 1 3
 github.com/Dharitri-org/drtg-vm-common/parsers/tokenize.go:35.52,36.24 1 2
 github.com/Dharitri-org/drtg-vm-common/parsers/tokenize.go:36.24,38.3 1 1
 github.com/Dharitri-org/drtg-vm-common/parsers/tokenize.go:40.2,40.29 1 1
-<<<<<<< HEAD
-=======
 
->>>>>>> f5eec5a53c66e8f18a8ed69ed6142c55328c0e6a
+
+
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:12.30,16.2 1 13
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:19.62,25.2 4 107
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:29.67,33.9 3 102
@@ -286,14 +285,10 @@ github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:65.42,68.27 3 102
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:68.27,70.3 1 303
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:71.2,73.13 2 102
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:77.44,80.34 3 103
-<<<<<<< HEAD
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:80.34,82.3 1 5155
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:83.2,85.15 2 103
-=======
-github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:80.34,82.3 1 5154
-github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:83.2,85.15 2 103
 
->>>>>>> f5eec5a53c66e8f18a8ed69ed6142c55328c0e6a
+
 github.com/Dharitri-org/drtg-vm-common/dataTrieMigrator/dataTrieMigrator.go:27.74,34.2 1 7
 github.com/Dharitri-org/drtg-vm-common/dataTrieMigrator/dataTrieMigrator.go:38.59,39.41 1 3
 github.com/Dharitri-org/drtg-vm-common/dataTrieMigrator/dataTrieMigrator.go:39.41,41.3 1 1
@@ -420,8 +415,7 @@ github.com/Dharitri-org/drtg-vm-common/parsers/dataField/utils.go:104.39,105.34
 github.com/Dharitri-org/drtg-vm-common/parsers/dataField/utils.go:105.34,106.34 1 315
 github.com/Dharitri-org/drtg-vm-common/parsers/dataField/utils.go:106.34,108.4 1 4
 github.com/Dharitri-org/drtg-vm-common/parsers/dataField/utils.go:111.2,111.13 1 31
-<<<<<<< HEAD
-=======
+
 
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:12.30,16.2 1 13
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:19.62,25.2 4 107
@@ -438,7 +432,7 @@ github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:77.44,80.34 3 103
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:80.34,82.3 1 5155
 github.com/Dharitri-org/drtg-vm-common/container/mutexMap.go:83.2,85.15 2 103
 
->>>>>>> f5eec5a53c66e8f18a8ed69ed6142c55328c0e6a
+
 github.com/Dharitri-org/drtg-vm-common/builtInFunctions/baseAccountGuarder.go:32.86,33.34 1 29
 github.com/Dharitri-org/drtg-vm-common/builtInFunctions/baseAccountGuarder.go:33.34,35.3 1 3
 github.com/Dharitri-org/drtg-vm-common/builtInFunctions/baseAccountGuarder.go:36.2,36.43 1 26

diff --git a/interface.go b/interface.go
@@ -393,6 +393,7 @@ type EnableEpochsHandler interface {
 	IsChangeOwnerAddressCrossShardThroughSCEnabled() bool
 	FixGasRemainingForSaveKeyValueBuiltinFunctionEnabled() bool
 
+
 	MultiDCTTransferAsyncCallBackEnableEpoch() uint32
 	FixOOGReturnCodeEnableEpoch() uint32
 	RemoveNonUpdatedStorageEnableEpoch() uint32

diff --git a/mock/enableEpochsHandlerStub.go b/mock/enableEpochsHandlerStub.go
@@ -54,6 +54,58 @@ type EnableEpochsHandlerStub struct {
 	RefactorContextEnableEpochField                           uint32
 	CheckExecuteReadOnlyEnableEpochField                      uint32
 	StorageAPICostOptimizationEnableEpochField                uint32
+=======
+	IsGlobalMintBurnFlagEnabledField                     bool
+	IsDCTTransferRoleFlagEnabledField                    bool
+	IsBuiltInFunctionsFlagEnabledField                   bool
+	IsCheckCorrectTokenIDForTransferRoleFlagEnabledField bool
+	IsMultiDCTTransferFixOnCallBackFlagEnabledField      bool
+	IsFixOOGReturnCodeFlagEnabledField                   bool
+	IsRemoveNonUpdatedStorageFlagEnabledField            bool
+	IsCreateNFTThroughExecByCallerFlagEnabledField       bool
+	IsStorageAPICostOptimizationFlagEnabledField         bool
+	IsFailExecutionOnEveryAPIErrorFlagEnabledField       bool
+	IsManagedCryptoAPIsFlagEnabledField                  bool
+	IsSCDeployFlagEnabledField                           bool
+	IsAheadOfTimeGasUsageFlagEnabledField                bool
+	IsRepairCallbackFlagEnabledField                     bool
+	IsDisableExecByCallerFlagEnabledField                bool
+	IsRefactorContextFlagEnabledField                    bool
+	IsCheckFunctionArgumentFlagEnabledField              bool
+	IsCheckExecuteOnReadOnlyFlagEnabledField             bool
+	IsFixAsyncCallbackCheckFlagEnabledField              bool
+	IsSaveToSystemAccountFlagEnabledField                bool
+	IsCheckFrozenCollectionFlagEnabledField              bool
+	IsSendAlwaysFlagEnabledField                         bool
+	IsValueLengthCheckFlagEnabledField                   bool
+	IsCheckTransferFlagEnabledField                      bool
+	IsTransferToMetaFlagEnabledField                     bool
+	IsDCTNFTImprovementV1FlagEnabledField                bool
+	IsFixOldTokenLiquidityEnabledField                   bool
+	IsRuntimeMemStoreLimitEnabledField                   bool
+	IsRuntimeCodeSizeFixEnabledField                     bool
+	IsMaxBlockchainHookCountersFlagEnabledField          bool
+	IsWipeSingleNFTLiquidityDecreaseEnabledField         bool
+	IsAlwaysSaveTokenMetaDataEnabledField                bool
+	IsChangeUsernameEnabledEpochField                    bool
+	IsDynamicGasCostForDataTrieStorageLoadEnabledField   bool
+	IsSetGuardianEnabledField                            bool
+	IsScToScEventLogEnabledField                         bool
+	IsConsistentTokensValuesLengthCheckEnabledField      bool
+	IsAutoBalanceDataTriesEnabledField                   bool
+	IsChangeOwnerAddressCrossShardThroughSCEnabledField  bool
+	MultiDCTTransferAsyncCallBackEnableEpochField        uint32
+	FixOOGReturnCodeEnableEpochField                     uint32
+	RemoveNonUpdatedStorageEnableEpochField              uint32
+	CreateNFTThroughExecByCallerEnableEpochField         uint32
+	UseDifferentGasCostForReadingCachedStorageEpochField uint32
+	FixFailExecutionOnErrorEnableEpochField              uint32
+	TimeOutForSCExecutionInMillisecondsField             uint32
+	ManagedCryptoAPIEnableEpochField                     uint32
+	DisableExecByCallerEnableEpochField                  uint32
+	RefactorContextEnableEpochField                      uint32
+	CheckExecuteReadOnlyEnableEpochField                 uint32
+	StorageAPICostOptimizationEnableEpochField           uint32
 }
 
 // IsDynamicGasCostForDataTrieStorageLoadEnabled -
@@ -297,6 +349,7 @@ func (stub *EnableEpochsHandlerStub) IsAutoBalanceDataTriesEnabled() bool {
 }
 
 // IsChangeOwnerAddressCrossShardThroughSCEnabled -
+
 func (stub *EnableEpochsHandlerStub) IsChangeOwnerAddressCrossShardThroughSCEnabled() bool {
 	return stub.IsChangeOwnerAddressCrossShardThroughSCEnabledField
 }