Skip to content

Commit

Permalink
Merge branch 'rc/v1.6.0' into relayed-v2-multi-transfer-semi-int-test
Browse files Browse the repository at this point in the history
  • Loading branch information
@bogdan-rosianu
bogdan-rosianu authored May 25, 2023
2 parents 5c2dcb3 + f5ad863 commit 26ace54
Show file tree
Hide file tree
Showing 16 changed files with 115 additions and 84 deletions.
13 changes: 8 additions & 5 deletions cmd/node/config/enableEpochs.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,18 @@
# ChangeUsernameEnableEpoch represents the epoch when changing username is enabled
ChangeUsernameEnableEpoch = 2

# SetGuardianEnableEpoch represents the epoch when the guard account feature is enabled in the protocol
SetGuardianEnableEpoch = 2

# ConsistentTokensValuesLengthCheckEnableEpoch represents the epoch when the consistent tokens values length check is enabled
ConsistentTokensValuesLengthCheckEnableEpoch = 2

# BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
BLSMultiSignerEnableEpoch = [
{ EnableEpoch = 0, Type = "no-KOSK"},
{ EnableEpoch = 1, Type = "KOSK"}
{ EnableEpoch = 0, Type = "no-KOSK" },
{ EnableEpoch = 1, Type = "KOSK" }
]

# SetGuardianEnableEpoch represents the epoch when the guard account feature is enabled in the protocol
SetGuardianEnableEpoch = 2

# MaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
MaxNodesChangeEnableEpoch = [
{ EpochEnable = 0, MaxNumNodes = 36, NodesToShufflePerShard = 4 },
Expand Down
1 change: 1 addition & 0 deletions common/enablers/enableEpochsHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func (handler *enableEpochsHandler) EpochConfirmed(epoch uint32, _ uint64) {
handler.setFlagValue(epoch >= handler.enableEpochsConfig.SetGuardianEnableEpoch, handler.setGuardianFlag, "setGuardianFlag", epoch, handler.enableEpochsConfig.SetGuardianEnableEpoch)
handler.setFlagValue(epoch >= handler.enableEpochsConfig.KeepExecOrderOnCreatedSCRsEnableEpoch, handler.keepExecOrderOnCreatedSCRsFlag, "keepExecOrderOnCreatedSCRsFlag", epoch, handler.enableEpochsConfig.KeepExecOrderOnCreatedSCRsEnableEpoch)
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ChangeUsernameEnableEpoch, handler.changeUsernameFlag, "changeUsername", epoch, handler.enableEpochsConfig.ChangeUsernameEnableEpoch)
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ConsistentTokensValuesLengthCheckEnableEpoch, handler.consistentTokensValuesCheckFlag, "consistentTokensValuesCheckFlag", epoch, handler.enableEpochsConfig.ConsistentTokensValuesLengthCheckEnableEpoch)
}

func (handler *enableEpochsHandler) setFlagValue(value bool, flag *atomic.Flag, flagName string, epoch uint32, flagEpoch uint32) {
Expand Down
1 change: 1 addition & 0 deletions common/enablers/enableEpochsHandler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) {
assert.True(t, handler.IsMaxBlockchainHookCountersFlagEnabled())
assert.True(t, handler.IsAlwaysSaveTokenMetaDataEnabled())
assert.True(t, handler.IsRuntimeCodeSizeFixEnabled())
assert.True(t, handler.IsConsistentTokensValuesLengthCheckEnabled())
assert.False(t, handler.IsKeepExecOrderOnCreatedSCRsEnabled())
assert.False(t, handler.IsMultiClaimOnDelegationEnabled())
assert.False(t, handler.IsChangeUsernameEnabled())
Expand Down
7 changes: 7 additions & 0 deletions common/enablers/epochFlags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ type epochFlagsHolder struct {
keepExecOrderOnCreatedSCRsFlag *atomic.Flag
multiClaimOnDelegationFlag *atomic.Flag
changeUsernameFlag *atomic.Flag
consistentTokensValuesCheckFlag *atomic.Flag
}

func newEpochFlagsHolder() *epochFlagsHolder {
Expand Down Expand Up @@ -185,6 +186,7 @@ func newEpochFlagsHolder() *epochFlagsHolder {
alwaysSaveTokenMetaDataFlag: &atomic.Flag{},
setGuardianFlag: &atomic.Flag{},
keepExecOrderOnCreatedSCRsFlag: &atomic.Flag{},
consistentTokensValuesCheckFlag: &atomic.Flag{},
multiClaimOnDelegationFlag: &atomic.Flag{},
changeUsernameFlag: &atomic.Flag{},
}
Expand Down Expand Up @@ -673,6 +675,11 @@ func (holder *epochFlagsHolder) IsSetGuardianEnabled() bool {
return holder.setGuardianFlag.IsSet()
}

// IsConsistentTokensValuesLengthCheckEnabled returns true if consistentTokensValuesCheckFlag is enabled
func (holder *epochFlagsHolder) IsConsistentTokensValuesLengthCheckEnabled() bool {
return holder.consistentTokensValuesCheckFlag.IsSet()
}

// IsKeepExecOrderOnCreatedSCRsEnabled returns true if keepExecOrderOnCreatedSCRsFlag is enabled
func (holder *epochFlagsHolder) IsKeepExecOrderOnCreatedSCRsEnabled() bool {
return holder.keepExecOrderOnCreatedSCRsFlag.IsSet()
Expand Down
1 change: 1 addition & 0 deletions common/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ type EnableEpochsHandler interface {
IsKeepExecOrderOnCreatedSCRsEnabled() bool
IsMultiClaimOnDelegationEnabled() bool
IsChangeUsernameEnabled() bool
IsConsistentTokensValuesLengthCheckEnabled() bool

IsInterfaceNil() bool
}
Expand Down
1 change: 1 addition & 0 deletions config/epochConfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ type EnableEpochs struct {
ChangeUsernameEnableEpoch uint32
BLSMultiSignerEnableEpoch []MultiSignerConfig
SetGuardianEnableEpoch uint32
ConsistentTokensValuesLengthCheckEnableEpoch uint32
}

// GasScheduleByEpochs represents a gas schedule toml entry that will be applied from the provided epoch
Expand Down
120 changes: 62 additions & 58 deletions config/tomlConfig_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,13 +705,16 @@ func TestEnableEpochConfig(t *testing.T) {
SetGuardianEnableEpoch = 64
# KeepExecOrderOnCreatedSCRsEnableEpoch represents the epoch when the execution order of created SCRs is ensured
KeepExecOrderOnCreatedSCRsEnableEpoch = 64
KeepExecOrderOnCreatedSCRsEnableEpoch = 65
# MultiClaimOnDelegationEnableEpoch represents the epoch when the multi claim on delegation function is enabled
MultiClaimOnDelegationEnableEpoch = 65
MultiClaimOnDelegationEnableEpoch = 66
# ChangeUsernameEnableEpoch represents the epoch when change username is enabled
ChangeUsernameEnableEpoch = 64
ChangeUsernameEnableEpoch = 67
# ConsistentTokensValuesLengthCheckEnableEpoch represents the epoch when the consistent tokens values length check is enabled
ConsistentTokensValuesLengthCheckEnableEpoch = 68
# MaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
MaxNodesChangeEnableEpoch = [
Expand Down Expand Up @@ -757,61 +760,62 @@ func TestEnableEpochConfig(t *testing.T) {
NodesToShufflePerShard: 80,
},
},
BlockGasAndFeesReCheckEnableEpoch: 13,
StakingV2EnableEpoch: 18,
StakeEnableEpoch: 17,
DoubleKeyProtectionEnableEpoch: 19,
ESDTEnableEpoch: 20,
GovernanceEnableEpoch: 21,
DelegationManagerEnableEpoch: 22,
DelegationSmartContractEnableEpoch: 23,
CorrectLastUnjailedEnableEpoch: 24,
BalanceWaitingListsEnableEpoch: 14,
ReturnDataToLastTransferEnableEpoch: 15,
SenderInOutTransferEnableEpoch: 16,
RelayedTransactionsV2EnableEpoch: 25,
UnbondTokensV2EnableEpoch: 26,
SaveJailedAlwaysEnableEpoch: 27,
ValidatorToDelegationEnableEpoch: 29,
ReDelegateBelowMinCheckEnableEpoch: 28,
WaitingListFixEnableEpoch: 30,
IncrementSCRNonceInMultiTransferEnableEpoch: 31,
ESDTMultiTransferEnableEpoch: 32,
GlobalMintBurnDisableEpoch: 33,
ESDTTransferRoleEnableEpoch: 34,
BuiltInFunctionOnMetaEnableEpoch: 35,
ComputeRewardCheckpointEnableEpoch: 36,
SCRSizeInvariantCheckEnableEpoch: 37,
BackwardCompSaveKeyValueEnableEpoch: 38,
ESDTNFTCreateOnMultiShardEnableEpoch: 39,
MetaESDTSetEnableEpoch: 40,
AddTokensToDelegationEnableEpoch: 41,
MultiESDTTransferFixOnCallBackOnEnableEpoch: 42,
OptimizeGasUsedInCrossMiniBlocksEnableEpoch: 43,
FixOOGReturnCodeEnableEpoch: 44,
RemoveNonUpdatedStorageEnableEpoch: 45,
OptimizeNFTStoreEnableEpoch: 46,
CreateNFTThroughExecByCallerEnableEpoch: 47,
IsPayableBySCEnableEpoch: 48,
CleanUpInformativeSCRsEnableEpoch: 49,
StorageAPICostOptimizationEnableEpoch: 50,
TransformToMultiShardCreateEnableEpoch: 51,
ESDTRegisterAndSetAllRolesEnableEpoch: 52,
FailExecutionOnEveryAPIErrorEnableEpoch: 53,
ManagedCryptoAPIsEnableEpoch: 54,
ESDTMetadataContinuousCleanupEnableEpoch: 55,
FixAsyncCallBackArgsListEnableEpoch: 56,
FixOldTokenLiquidityEnableEpoch: 57,
SetSenderInEeiOutputTransferEnableEpoch: 58,
MaxBlockchainHookCountersEnableEpoch: 59,
WipeSingleNFTLiquidityDecreaseEnableEpoch: 60,
AlwaysSaveTokenMetaDataEnableEpoch: 61,
RuntimeCodeSizeFixEnableEpoch: 62,
RuntimeMemStoreLimitEnableEpoch: 63,
SetGuardianEnableEpoch: 64,
MultiClaimOnDelegationEnableEpoch: 65,
KeepExecOrderOnCreatedSCRsEnableEpoch: 64,
ChangeUsernameEnableEpoch: 64,
BlockGasAndFeesReCheckEnableEpoch: 13,
StakingV2EnableEpoch: 18,
StakeEnableEpoch: 17,
DoubleKeyProtectionEnableEpoch: 19,
ESDTEnableEpoch: 20,
GovernanceEnableEpoch: 21,
DelegationManagerEnableEpoch: 22,
DelegationSmartContractEnableEpoch: 23,
CorrectLastUnjailedEnableEpoch: 24,
BalanceWaitingListsEnableEpoch: 14,
ReturnDataToLastTransferEnableEpoch: 15,
SenderInOutTransferEnableEpoch: 16,
RelayedTransactionsV2EnableEpoch: 25,
UnbondTokensV2EnableEpoch: 26,
SaveJailedAlwaysEnableEpoch: 27,
ValidatorToDelegationEnableEpoch: 29,
ReDelegateBelowMinCheckEnableEpoch: 28,
WaitingListFixEnableEpoch: 30,
IncrementSCRNonceInMultiTransferEnableEpoch: 31,
ESDTMultiTransferEnableEpoch: 32,
GlobalMintBurnDisableEpoch: 33,
ESDTTransferRoleEnableEpoch: 34,
BuiltInFunctionOnMetaEnableEpoch: 35,
ComputeRewardCheckpointEnableEpoch: 36,
SCRSizeInvariantCheckEnableEpoch: 37,
BackwardCompSaveKeyValueEnableEpoch: 38,
ESDTNFTCreateOnMultiShardEnableEpoch: 39,
MetaESDTSetEnableEpoch: 40,
AddTokensToDelegationEnableEpoch: 41,
MultiESDTTransferFixOnCallBackOnEnableEpoch: 42,
OptimizeGasUsedInCrossMiniBlocksEnableEpoch: 43,
FixOOGReturnCodeEnableEpoch: 44,
RemoveNonUpdatedStorageEnableEpoch: 45,
OptimizeNFTStoreEnableEpoch: 46,
CreateNFTThroughExecByCallerEnableEpoch: 47,
IsPayableBySCEnableEpoch: 48,
CleanUpInformativeSCRsEnableEpoch: 49,
StorageAPICostOptimizationEnableEpoch: 50,
TransformToMultiShardCreateEnableEpoch: 51,
ESDTRegisterAndSetAllRolesEnableEpoch: 52,
FailExecutionOnEveryAPIErrorEnableEpoch: 53,
ManagedCryptoAPIsEnableEpoch: 54,
ESDTMetadataContinuousCleanupEnableEpoch: 55,
FixAsyncCallBackArgsListEnableEpoch: 56,
FixOldTokenLiquidityEnableEpoch: 57,
SetSenderInEeiOutputTransferEnableEpoch: 58,
MaxBlockchainHookCountersEnableEpoch: 59,
WipeSingleNFTLiquidityDecreaseEnableEpoch: 60,
AlwaysSaveTokenMetaDataEnableEpoch: 61,
RuntimeCodeSizeFixEnableEpoch: 62,
RuntimeMemStoreLimitEnableEpoch: 63,
SetGuardianEnableEpoch: 64,
KeepExecOrderOnCreatedSCRsEnableEpoch: 65,
MultiClaimOnDelegationEnableEpoch: 66,
ChangeUsernameEnableEpoch: 67,
ConsistentTokensValuesLengthCheckEnableEpoch: 68,
BLSMultiSignerEnableEpoch: []MultiSignerConfig{
{
EnableEpoch: 0,
Expand Down
7 changes: 3 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ require (
github.com/google/gops v0.3.18
github.com/gorilla/websocket v1.5.0
github.com/mitchellh/mapstructure v1.5.0
github.com/multiversx/mx-chain-communication-go v1.0.0
github.com/multiversx/mx-chain-communication-go v1.0.2
github.com/multiversx/mx-chain-core-go v1.2.5
github.com/multiversx/mx-chain-crypto-go v1.2.6
github.com/multiversx/mx-chain-es-indexer-go v1.4.3
github.com/multiversx/mx-chain-logger-go v1.0.11
github.com/multiversx/mx-chain-p2p-go v1.0.16
github.com/multiversx/mx-chain-storage-go v1.0.10
github.com/multiversx/mx-chain-vm-common-go v1.4.4
github.com/multiversx/mx-chain-vm-common-go v1.4.5
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.55
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.56
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.82
Expand Down Expand Up @@ -151,7 +150,7 @@ require (
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/smartystreets/assertions v1.13.0 // indirect
github.com/smartystreets/assertions v1.13.1 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,9 @@ github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2
github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUYwbO0993uPI=
github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o=
github.com/multiversx/mx-chain-communication-go v1.0.0 h1:ZGIIrWIE7RqpF7gvMfshH+CJUehviXzkWlxnpZ02efE=
github.com/multiversx/mx-chain-communication-go v1.0.0/go.mod h1:GPHOm4HSXbvC0IotMziWXQmhtsUe69ScBPYsb+mF9bk=
github.com/multiversx/mx-chain-communication-go v1.0.2 h1:1AKdqFZNmigt1kcwYMl+L8fzolsb+WpeTX6yzpmvbV4=
github.com/multiversx/mx-chain-communication-go v1.0.2/go.mod h1:OnnSUjnSP87H5MtQtxn33FGnTVRVgo2Huo3ijmCgN2M=
github.com/multiversx/mx-chain-core-go v1.1.30/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
github.com/multiversx/mx-chain-core-go v1.2.1-0.20230510143029-ab37792342df/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
github.com/multiversx/mx-chain-core-go v1.2.1/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
Expand All @@ -630,14 +631,13 @@ github.com/multiversx/mx-chain-es-indexer-go v1.4.3 h1:s6eX2dJSr/yjbGiF00Q68ar0j
github.com/multiversx/mx-chain-es-indexer-go v1.4.3/go.mod h1:b2TVf5kCmmFQUjagI962YaKa2uqOEMn7dbTsiE/0J6U=
github.com/multiversx/mx-chain-logger-go v1.0.11 h1:DFsHa+sc5fKwhDR50I8uBM99RTDTEW68ESyr5ALRDwE=
github.com/multiversx/mx-chain-logger-go v1.0.11/go.mod h1:1srDkP0DQucWQ+rYfaq0BX2qLnULsUdRPADpYUTM6dA=
github.com/multiversx/mx-chain-p2p-go v1.0.16 h1:iMK8KUi006/avVcmecnk7lqbDCRL0BN04vgepoVLlyY=
github.com/multiversx/mx-chain-p2p-go v1.0.16/go.mod h1:7piVUb5Z7UHK6n3JW8yIc32RdDFZu7GivRY29q0r2gI=
github.com/multiversx/mx-chain-storage-go v1.0.8/go.mod h1:lEkFYFe6taKYxqO1einNgT1esY3K9Pj6vPnoCwV9C3U=
github.com/multiversx/mx-chain-storage-go v1.0.10 h1:5rzPMME+CEJyoGGJ1tAb6ISnPmr68VFvGoKo0hF0WtU=
github.com/multiversx/mx-chain-storage-go v1.0.10/go.mod h1:VP9fwyFBmbmDzahUuu0IeGX/dKG3iBWjN6FSQ6YtVaI=
github.com/multiversx/mx-chain-vm-common-go v1.4.1/go.mod h1:K6yCdro8VohzYI6GwjGzTO+fJiPgO5coo2sgQb+zA24=
github.com/multiversx/mx-chain-vm-common-go v1.4.4 h1:hD5Sx1leFEvF/4qXcWSK9O+/MxGJGrEHzUe1HPXm9DU=
github.com/multiversx/mx-chain-vm-common-go v1.4.4/go.mod h1:+AjDwO/RJwQ75dzHJ/gBxmi5uTdICdhAo8bGNHTf7Yk=
github.com/multiversx/mx-chain-vm-common-go v1.4.5 h1:/pIMGSGqNJXbfAKOqigU2yapuBlosMCJiu6r+r+XcHE=
github.com/multiversx/mx-chain-vm-common-go v1.4.5/go.mod h1:+AjDwO/RJwQ75dzHJ/gBxmi5uTdICdhAo8bGNHTf7Yk=
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.55 h1:jvBLu7JoitavahMDCkfOGYWjgXGBOe+3JJ0hNxj9AZM=
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.55/go.mod h1:jCNgHGyj0JoLAsmijOSVK0G+yphccp9gIKsp/mRguF4=
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.56 h1:VXveqaT/wdipfhIdUHXxFderY3+KxtFEbrDkF+zirr8=
Expand Down Expand Up @@ -767,8 +767,8 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs=
github.com/smartystreets/assertions v1.13.0/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8=
github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU=
github.com/smartystreets/assertions v1.13.1/go.mod h1:cXr/IwVfSo/RbCSPhoAPv73p3hlSdrBH/b3SdnW/LMY=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
Expand Down
2 changes: 1 addition & 1 deletion p2p/config/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package config

import "github.com/multiversx/mx-chain-p2p-go/config"
import "github.com/multiversx/mx-chain-communication-go/p2p/config"

// P2PConfig will hold all the P2P settings
type P2PConfig = config.P2PConfig
Expand Down
2 changes: 1 addition & 1 deletion p2p/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package p2p

import (
p2p "github.com/multiversx/mx-chain-p2p-go"
"github.com/multiversx/mx-chain-communication-go/p2p"
)

// NodeOperation defines the p2p node operation
Expand Down
2 changes: 1 addition & 1 deletion p2p/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package p2p
import (
"errors"

p2p "github.com/multiversx/mx-chain-p2p-go"
"github.com/multiversx/mx-chain-communication-go/p2p"
)

// ErrNilMessage signals that a nil message has been received
Expand Down
14 changes: 7 additions & 7 deletions p2p/factory/factory.go
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package factory

import (
"github.com/multiversx/mx-chain-communication-go/p2p/libp2p"
"github.com/multiversx/mx-chain-communication-go/p2p/libp2p/crypto"
"github.com/multiversx/mx-chain-communication-go/p2p/message"
messagecheck "github.com/multiversx/mx-chain-communication-go/p2p/messageCheck"
"github.com/multiversx/mx-chain-communication-go/p2p/peersHolder"
"github.com/multiversx/mx-chain-communication-go/p2p/rating"
"github.com/multiversx/mx-chain-go/p2p"
"github.com/multiversx/mx-chain-p2p-go/libp2p"
p2pCrypto "github.com/multiversx/mx-chain-p2p-go/libp2p/crypto"
"github.com/multiversx/mx-chain-p2p-go/message"
messagecheck "github.com/multiversx/mx-chain-p2p-go/messageCheck"
"github.com/multiversx/mx-chain-p2p-go/peersHolder"
"github.com/multiversx/mx-chain-p2p-go/rating"
)

// ArgsNetworkMessenger defines the options used to create a p2p wrapper
Expand Down Expand Up @@ -53,7 +53,7 @@ func NewPeersHolder(preferredConnectionAddresses []string) (p2p.PreferredPeersHo

// NewP2PKeyConverter returns a new instance of p2pKeyConverter
func NewP2PKeyConverter() p2p.P2PKeyConverter {
return p2pCrypto.NewP2PKeyConverter()
return crypto.NewP2PKeyConverter()
}

// NewMessageVerifier will return a new instance of messages verifier
Expand Down
2 changes: 1 addition & 1 deletion p2p/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/hex"
"time"

"github.com/multiversx/mx-chain-communication-go/p2p"
"github.com/multiversx/mx-chain-core-go/core"
crypto "github.com/multiversx/mx-chain-crypto-go"
p2p "github.com/multiversx/mx-chain-p2p-go"
)

// MessageProcessor is the interface used to describe what a receive message processor should do
Expand Down
5 changes: 5 additions & 0 deletions sharding/mock/enableEpochsHandlerMock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,11 @@ func (mock *EnableEpochsHandlerMock) IsChangeUsernameEnabled() bool {
return false
}

// IsConsistentTokensValuesLengthCheckEnabled -
func (mock *EnableEpochsHandlerMock) IsConsistentTokensValuesLengthCheckEnabled() bool {
return false
}

// IsInterfaceNil returns true if there is no value under the interface
func (mock *EnableEpochsHandlerMock) IsInterfaceNil() bool {
return mock == nil
Expand Down
Loading

0 comments on commit 26ace54

Please sign in to comment.