diff --git a/go.mod b/go.mod index 24ff615847..174e882f8b 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/gogo/protobuf v1.3.1 github.com/google/gofuzz v1.1.0 github.com/ipfs/go-datastore v0.1.1 - github.com/ipfs/go-log v0.0.1 + github.com/ipfs/go-log/v2 v2.0.4 github.com/keep-network/go-libp2p-bootstrap v0.0.0-20190611114437-e92bd71e8199 github.com/keep-network/keep-common v0.2.0-rc github.com/libp2p/go-addr-util v0.0.1 diff --git a/go.sum b/go.sum index f58f3d13b3..4b4ca3664f 100644 --- a/go.sum +++ b/go.sum @@ -208,8 +208,8 @@ github.com/ipfs/go-ipfs-config v0.0.4/go.mod h1:KDbHjNyg4e6LLQSQpkgQMBz6Jf4LXiWA github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50= github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc= -github.com/ipfs/go-log v0.0.1 h1:9XTUN/rW64BCG1YhPK9Hoy3q8nr4gOmHHBpgFdfw6Lc= -github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM= +github.com/ipfs/go-log/v2 v2.0.4 h1:z407osngfwCZImQM/sxfpPsNja0kDyDoRuXfiMHTgRg= +github.com/ipfs/go-log/v2 v2.0.4/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0= github.com/ipfs/go-todocounter v0.0.1 h1:kITWA5ZcQZfrUnDNkRn04Xzh0YFaDFXsoO2A81Eb6Lw= github.com/ipfs/go-todocounter v0.0.1/go.mod h1:l5aErvQc8qKE2r7NDMjmq5UNAvuZy0rC8BHOplkWvZ4= github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc= @@ -601,6 +601,19 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo= +go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/main.go b/main.go index 039507c869..a9332b2b1d 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "path" "time" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-common/pkg/logging" "github.com/keep-network/keep-core/cmd" "github.com/urfave/cli" diff --git a/pkg/beacon/beacon.go b/pkg/beacon/beacon.go index cb1046c128..3a222c58a4 100644 --- a/pkg/beacon/beacon.go +++ b/pkg/beacon/beacon.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "sync" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-common/pkg/persistence" "github.com/keep-network/keep-core/pkg/beacon/relay" diff --git a/pkg/beacon/relay/dkg/dkg.go b/pkg/beacon/relay/dkg/dkg.go index da4a984d03..9b745f62e9 100644 --- a/pkg/beacon/relay/dkg/dkg.go +++ b/pkg/beacon/relay/dkg/dkg.go @@ -5,7 +5,7 @@ import ( "fmt" "math/big" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" relayChain "github.com/keep-network/keep-core/pkg/beacon/relay/chain" dkgResult "github.com/keep-network/keep-core/pkg/beacon/relay/dkg/result" @@ -90,7 +90,7 @@ func ExecuteDKG( // chain for the result published by any other group member and based // on that, we decide whether we should stay in the final group // or drop our membership. - logger.Warningf( + logger.Warnf( "[member:%v] DKG result publication process failed [%v]", playerIndex, err, diff --git a/pkg/beacon/relay/dkg/result/result.go b/pkg/beacon/relay/dkg/result/result.go index 7ac28e97af..f019c5ba0b 100644 --- a/pkg/beacon/relay/dkg/result/result.go +++ b/pkg/beacon/relay/dkg/result/result.go @@ -1,5 +1,5 @@ package result -import "github.com/ipfs/go-log" +import "github.com/ipfs/go-log/v2" var logger = log.Logger("keep-dkg-result") diff --git a/pkg/beacon/relay/entry/entry.go b/pkg/beacon/relay/entry/entry.go index 55a1c9844d..abb846433a 100644 --- a/pkg/beacon/relay/entry/entry.go +++ b/pkg/beacon/relay/entry/entry.go @@ -7,7 +7,7 @@ import ( "github.com/keep-network/keep-core/pkg/beacon/relay/event" bn256 "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" relayChain "github.com/keep-network/keep-core/pkg/beacon/relay/chain" "github.com/keep-network/keep-core/pkg/beacon/relay/dkg" "github.com/keep-network/keep-core/pkg/beacon/relay/group" @@ -102,7 +102,7 @@ func SignAndSubmit( previousEntry, ) if err != nil { - logger.Warningf( + logger.Warnf( "[member:%v] rejecting signature share from "+ "member [%v]: [%v]", signer.MemberID(), diff --git a/pkg/beacon/relay/gjkr/gjkr.go b/pkg/beacon/relay/gjkr/gjkr.go index 23237f1e79..5dfbbe161d 100644 --- a/pkg/beacon/relay/gjkr/gjkr.go +++ b/pkg/beacon/relay/gjkr/gjkr.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/beacon/relay/group" "github.com/keep-network/keep-core/pkg/beacon/relay/state" diff --git a/pkg/beacon/relay/gjkr/protocol.go b/pkg/beacon/relay/gjkr/protocol.go index 2605d2f455..fb95d0c0de 100644 --- a/pkg/beacon/relay/gjkr/protocol.go +++ b/pkg/beacon/relay/gjkr/protocol.go @@ -70,7 +70,7 @@ func (sm *SymmetricKeyGeneratingMember) GenerateSymmetricKeys( otherMember := ephemeralPubKeyMessage.senderID if !sm.isValidEphemeralPublicKeyMessage(ephemeralPubKeyMessage) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "sending invalid ephemeral public key message", sm.ID, @@ -124,7 +124,7 @@ func (sm *SymmetricKeyGeneratingMember) isValidEphemeralPublicKeyMessage( } if _, ok := message.ephemeralPublicKeys[memberID]; !ok { - logger.Warningf( + logger.Warnf( "[member:%v] ephemeral public key message from member [%v] "+ "does not contain public key for member [%v]", sm.ID, @@ -193,7 +193,7 @@ func (cm *CommittingMember) CalculateMembersSharesAndCommitments() ( // yield an error. symmetricKey, hasKey := cm.symmetricKeys[receiverID] if !hasKey { - logger.Warningf("no symmetric key for receiver: [%v]", receiverID) + logger.Warnf("no symmetric key for receiver: [%v]", receiverID) continue } @@ -315,7 +315,7 @@ func (cvm *CommitmentsVerifyingMember) VerifyReceivedSharesAndCommitmentsMessage accusedMembersKeys := make(map[group.MemberIndex]*ephemeral.PrivateKey) for _, commitmentsMessage := range commitmentsMessages { if !cvm.isValidMemberCommitmentsMessage(commitmentsMessage) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "sending invalid member commitments message", cvm.ID, @@ -335,7 +335,7 @@ func (cvm *CommitmentsVerifyingMember) VerifyReceivedSharesAndCommitmentsMessage sharesMessageFound = true if !cvm.isValidPeerSharesMessage(sharesMessage) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "sending invalid peer shares message", cvm.ID, @@ -373,7 +373,7 @@ func (cvm *CommitmentsVerifyingMember) VerifyReceivedSharesAndCommitmentsMessage symmetricKey, ) if err != nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because "+ "could not decrypt shares received from them", cvm.ID, @@ -391,7 +391,7 @@ func (cvm *CommitmentsVerifyingMember) VerifyReceivedSharesAndCommitmentsMessage commitmentsMessage.commitments, // C_j cvm.ID, // i ) { - logger.Warningf( + logger.Warnf( "[member:%v] shares from member [%v] invalid against "+ "commitments; disqualifying and accusing the member", cvm.ID, @@ -408,7 +408,7 @@ func (cvm *CommitmentsVerifyingMember) VerifyReceivedSharesAndCommitmentsMessage } } if !sharesMessageFound { - logger.Warningf("cannot find shares message from member: [%v]", + logger.Warnf("cannot find shares message from member: [%v]", commitmentsMessage.senderID, ) } @@ -431,7 +431,7 @@ func (cvm *CommitmentsVerifyingMember) isValidMemberCommitmentsMessage( // constant coefficient. It implicates the same count of commitments. expectedCommitmentsCount := cvm.group.DishonestThreshold() + 1 if len(message.commitments) != expectedCommitmentsCount { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] sent a message with a wrong number "+ "of commitments: [%v] instead of expected [%v]", cvm.ID, @@ -457,7 +457,7 @@ func (cvm *CommitmentsVerifyingMember) isValidPeerSharesMessage( } if _, ok := message.shares[memberID]; !ok { - logger.Warningf( + logger.Warnf( "[member:%v] peer shares message from member [%v] does not "+ "contain shares for member [%v]", cvm.ID, @@ -581,7 +581,7 @@ func (sjm *SharesJustifyingMember) ResolveSecretSharesAccusationsMessages( } if !accuserPublicKey.IsKeyMatching(revealedAccuserPrivateKey) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "revealing private key not matching the public key", sjm.ID, @@ -617,7 +617,7 @@ func (sjm *SharesJustifyingMember) ResolveSecretSharesAccusationsMessages( accuserID, ) if accusedPublicKey == nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because could not "+ "recover symmetric key; accused member [%v] is already "+ "marked as inactive or disqualified ", @@ -640,7 +640,7 @@ func (sjm *SharesJustifyingMember) ResolveSecretSharesAccusationsMessages( // accusation. accusedSharesMessage := sjm.evidenceLog.peerSharesMessage(accusedID) if accusedSharesMessage == nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because could not "+ "get peer shares message from evidence log; "+ "accused member [%v] is already marked as inactive", @@ -664,7 +664,7 @@ func (sjm *SharesJustifyingMember) ResolveSecretSharesAccusationsMessages( symmetricKey, ) if err != nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of sending "+ "to member [%v] shares that could not be decrypted", sjm.ID, @@ -681,7 +681,7 @@ func (sjm *SharesJustifyingMember) ResolveSecretSharesAccusationsMessages( sjm.receivedPeerCommitments[accusedID], // C_m accuserID, // j ) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "false accusation against member [%v] ", sjm.ID, @@ -691,7 +691,7 @@ func (sjm *SharesJustifyingMember) ResolveSecretSharesAccusationsMessages( sjm.group.MarkMemberAsDisqualified(accuserID) sjm.discardReceivedShares(accuserID) } else { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "confirmed misbehaviour against member [%v] ", sjm.ID, @@ -754,7 +754,7 @@ func findPublicKey( ) *ephemeral.PublicKey { ephemeralPublicKeyMessage := evidenceLog.ephemeralPublicKeyMessage(senderID) if ephemeralPublicKeyMessage == nil { - logger.Warningf( + logger.Warnf( "no ephemeral public key message for sender %v", senderID, ) @@ -763,7 +763,7 @@ func findPublicKey( senderPublicKey, ok := ephemeralPublicKeyMessage.ephemeralPublicKeys[receiverID] if !ok { - logger.Warningf( + logger.Warnf( "no ephemeral public key generated for receiver %v", receiverID, ) @@ -831,7 +831,7 @@ func (sm *SharingMember) VerifyPublicKeySharePoints( // where: j is sender's ID, i is current member ID, T is dishonest threshold. for _, message := range messages { if !sm.isValidMemberPublicKeySharePointsMessage(message) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "sending invalid member public key share points message", sm.ID, @@ -846,7 +846,7 @@ func (sm *SharingMember) VerifyPublicKeySharePoints( sm.receivedQualifiedSharesS[message.senderID], message.publicKeySharePoints, ) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "invalid public key share points", sm.ID, @@ -878,7 +878,7 @@ func (sm *SharingMember) isValidMemberPublicKeySharePointsMessage( // public key share points. expectedPointsCount := sm.group.DishonestThreshold() + 1 if len(message.publicKeySharePoints) != expectedPointsCount { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] sent a message with a wrong number "+ "of public key share points: [%v] instead of expected [%v]", sm.ID, @@ -1016,7 +1016,7 @@ func (pjm *PointsJustifyingMember) ResolvePublicKeySharePointsAccusationsMessage } if !accuserPublicKey.IsKeyMatching(revealedAccuserPrivateKey) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "revealing private key not matching the public key", pjm.ID, @@ -1051,7 +1051,7 @@ func (pjm *PointsJustifyingMember) ResolvePublicKeySharePointsAccusationsMessage accuserID, ) if accusedPublicKey == nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because could not "+ "recover symmetric key; accused member [%v] is already "+ "marked as inactive or disqualified ", @@ -1073,7 +1073,7 @@ func (pjm *PointsJustifyingMember) ResolvePublicKeySharePointsAccusationsMessage // accusation. accusedSharesMessage := evidenceLog.peerSharesMessage(accusedID) if accusedSharesMessage == nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because could not "+ "get peer shares message from evidence log; "+ "accused member [%v] is already marked as inactive", @@ -1098,7 +1098,7 @@ func (pjm *PointsJustifyingMember) ResolvePublicKeySharePointsAccusationsMessage recoveredSymmetricKey, ) if err != nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of sending "+ "shares that could not be decrypted; "+ "member [%v] disqualified because did not complain "+ @@ -1117,7 +1117,7 @@ func (pjm *PointsJustifyingMember) ResolvePublicKeySharePointsAccusationsMessage shareS, pjm.receivedValidPeerPublicKeySharePoints[accusedID], ) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "false accusation against member [%v] ", pjm.ID, @@ -1126,7 +1126,7 @@ func (pjm *PointsJustifyingMember) ResolvePublicKeySharePointsAccusationsMessage ) pjm.group.MarkMemberAsDisqualified(accuserID) } else { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "confirmed misbehaviour against member [%v] ", pjm.ID, @@ -1218,7 +1218,7 @@ func (rm *ReconstructingMember) ReconstructMisbehavedIndividualKeys( // Validate received message. If message is invalid, sender should // be considered as misbehaving and marked as disqualified. if !rm.isValidMisbehavedEphemeralKeysMessage(message) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "sending invalid misbehaved ephemeral keys message", rm.ID, @@ -1355,7 +1355,7 @@ func (rm *ReconstructingMember) recoverMisbehavedShares( } if !revealingMemberPublicKey.IsKeyMatching(revealedPrivateKey) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of "+ "revealing private key not matching the public key", rm.ID, @@ -1394,7 +1394,7 @@ func (rm *ReconstructingMember) recoverMisbehavedShares( revealingMemberID, ) if misbehavedMemberPublicKey == nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because could not "+ "recover symmetric key; misbehaved member [%v] is "+ "already marked as inactive or disqualified in phase 2", @@ -1417,7 +1417,7 @@ func (rm *ReconstructingMember) recoverMisbehavedShares( // disqualified in phase 4 does not belong to QUAL set. misbehavedMemberSharesMessage := rm.evidenceLog.peerSharesMessage(misbehavedMemberID) if misbehavedMemberSharesMessage == nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of revealing "+ "private key of a member which did not provide shares in phase 3", rm.ID, @@ -1438,7 +1438,7 @@ func (rm *ReconstructingMember) recoverMisbehavedShares( recoveredSymmetricKey, ) if err != nil { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of not "+ "reporting protocol violation in phase 3 by member [%v] - "+ "shares can not be decrypted", @@ -1464,7 +1464,7 @@ func (rm *ReconstructingMember) recoverMisbehavedShares( // key has been revealed as disqualified earlier, in phase 5. // Not reporting misbehavior is also a protocol violation, so we // disqualify the revealing member. - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] disqualified because of not "+ "reporting protocol violation in phase 3 by member [%v] - "+ "shares are inconsistent", @@ -1496,7 +1496,7 @@ func (rm *ReconstructingMember) isValidMisbehavedEphemeralKeysMessage( } if !isKeyForMemberRevealed { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] sent message which does not "+ "reveal private key of inactive/disqualified QUAL member [%v]", rm.ID, @@ -1509,7 +1509,7 @@ func (rm *ReconstructingMember) isValidMisbehavedEphemeralKeysMessage( for memberID := range message.privateKeys { if rm.group.IsOperating(memberID) { - logger.Warningf( + logger.Warnf( "[member:%v] member [%v] sent message which reveals "+ "private key of an operating member [%v]", rm.ID, diff --git a/pkg/beacon/relay/group/message_filter.go b/pkg/beacon/relay/group/message_filter.go index 9e255016d5..4a4eef28a3 100644 --- a/pkg/beacon/relay/group/message_filter.go +++ b/pkg/beacon/relay/group/message_filter.go @@ -1,7 +1,7 @@ package group import ( - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" ) var logger = log.Logger("keep-message-filter") @@ -78,7 +78,7 @@ func (mf *InactiveMemberFilter) FlushInactiveMembers() { for _, operatingMemberID := range mf.group.OperatingMemberIDs() { if !isActive(operatingMemberID) { - logger.Warningf( + logger.Warnf( "[member:%v] marking member [%v] as inactive", mf.selfMemberID, operatingMemberID, diff --git a/pkg/beacon/relay/groupselection/groupselection.go b/pkg/beacon/relay/groupselection/groupselection.go index 77b1fb664e..19a1690abc 100644 --- a/pkg/beacon/relay/groupselection/groupselection.go +++ b/pkg/beacon/relay/groupselection/groupselection.go @@ -8,7 +8,7 @@ import ( "math/big" "sort" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" relaychain "github.com/keep-network/keep-core/pkg/beacon/relay/chain" "github.com/keep-network/keep-core/pkg/beacon/relay/config" diff --git a/pkg/beacon/relay/registry/registry.go b/pkg/beacon/relay/registry/registry.go index b5e7d4896f..d66b4dcb14 100644 --- a/pkg/beacon/relay/registry/registry.go +++ b/pkg/beacon/relay/registry/registry.go @@ -1,5 +1,5 @@ package registry -import "github.com/ipfs/go-log" +import "github.com/ipfs/go-log/v2" var logger = log.Logger("keep-registry") diff --git a/pkg/beacon/relay/relay.go b/pkg/beacon/relay/relay.go index cdc592265d..5f1c4ad33e 100644 --- a/pkg/beacon/relay/relay.go +++ b/pkg/beacon/relay/relay.go @@ -1,7 +1,7 @@ package relay import ( - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/beacon/relay/group" relayChain "github.com/keep-network/keep-core/pkg/beacon/relay/chain" @@ -70,7 +70,7 @@ func (n *Node) MonitorRelayEntry( case blockNumber := <-timeoutWaiterChannel: subscription.Unsubscribe() close(onEntrySubmittedChannel) - logger.Warningf( + logger.Warnf( "relay entry was not submitted on time, reporting timeout at block [%v]", blockNumber, ) diff --git a/pkg/beacon/relay/state/state.go b/pkg/beacon/relay/state/state.go index 08d3d8364c..293efcc1b0 100644 --- a/pkg/beacon/relay/state/state.go +++ b/pkg/beacon/relay/state/state.go @@ -3,7 +3,7 @@ package state import ( "context" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/beacon/relay/group" "github.com/keep-network/keep-core/pkg/net" diff --git a/pkg/chain/ethereum/ethereum.go b/pkg/chain/ethereum/ethereum.go index 962d151aa5..07e1a912da 100644 --- a/pkg/chain/ethereum/ethereum.go +++ b/pkg/chain/ethereum/ethereum.go @@ -5,7 +5,7 @@ import ( "math/big" "time" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/pkg/chain/local/local.go b/pkg/chain/local/local.go index 0282a1bf39..0376c52f81 100644 --- a/pkg/chain/local/local.go +++ b/pkg/chain/local/local.go @@ -11,7 +11,7 @@ import ( "sort" "sync" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" crand "crypto/rand" diff --git a/pkg/net/libp2p/channel.go b/pkg/net/libp2p/channel.go index 70a6154b85..27cf2a571b 100644 --- a/pkg/net/libp2p/channel.go +++ b/pkg/net/libp2p/channel.go @@ -210,7 +210,7 @@ func (c *channel) subscriptionWorker(ctx context.Context) { select { case c.incomingMessageQueue <- message: default: - logger.Warningf("consumers too slow, dropping message") + logger.Warnf("consumers too slow, dropping message") } } } @@ -316,7 +316,7 @@ func (c *channel) deliver(message net.Message) { select { case handler.channel <- message: default: - logger.Warningf("handler too slow, dropping message") + logger.Warnf("handler too slow, dropping message") } } } @@ -334,7 +334,7 @@ func createTopicValidator(filter net.BroadcastChannelFilter) pubsub.Validator { return func(_ context.Context, _ peer.ID, message *pubsub.Message) bool { authorPublicKey, err := extractPublicKey(message.GetFrom()) if err != nil { - logger.Warningf( + logger.Warnf( "could not retrieve message author public key: [%v]", err, ) diff --git a/pkg/net/libp2p/libp2p.go b/pkg/net/libp2p/libp2p.go index d2f0154c21..7727ee7f7c 100644 --- a/pkg/net/libp2p/libp2p.go +++ b/pkg/net/libp2p/libp2p.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/net" "github.com/keep-network/keep-core/pkg/net/key" @@ -376,7 +376,7 @@ func parseMultiaddresses(addresses []string) []ma.Multiaddr { for _, address := range addresses { multiaddress, err := ma.NewMultiaddr(address) if err != nil { - logger.Warningf( + logger.Warnf( "could not parse address string [%v]: [%v]", address, err, diff --git a/pkg/net/local/broadcast_channel.go b/pkg/net/local/broadcast_channel.go index 5b7de5d22f..ba6b71eedf 100644 --- a/pkg/net/local/broadcast_channel.go +++ b/pkg/net/local/broadcast_channel.go @@ -85,7 +85,7 @@ func (lc *localChannel) deliver(message net.Message) { select { case handler.channel <- message: default: - logger.Warningf("handler too slow, dropping message") + logger.Warnf("handler too slow, dropping message") } } } diff --git a/pkg/net/local/local.go b/pkg/net/local/local.go index c20c3df481..5a998ab3fd 100644 --- a/pkg/net/local/local.go +++ b/pkg/net/local/local.go @@ -8,7 +8,7 @@ import ( "crypto/ecdsa" "sync" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/net" "github.com/keep-network/keep-core/pkg/net/key" ) diff --git a/pkg/net/retransmission/retransmission.go b/pkg/net/retransmission/retransmission.go index cbd13f0175..07697f3950 100644 --- a/pkg/net/retransmission/retransmission.go +++ b/pkg/net/retransmission/retransmission.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/net" ) diff --git a/pkg/net/watchtower/watchtower.go b/pkg/net/watchtower/watchtower.go index 40c4247734..1e5b64d955 100644 --- a/pkg/net/watchtower/watchtower.go +++ b/pkg/net/watchtower/watchtower.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/ipfs/go-log" + "github.com/ipfs/go-log/v2" "github.com/keep-network/keep-core/pkg/net" "github.com/keep-network/keep-core/pkg/net/key" @@ -117,7 +117,7 @@ func (g *Guard) checkFirewallRules(peer string) { if err := g.firewall.Validate(peerPublicKey); err != nil { - logger.Warningf( + logger.Warnf( "dropping the connection; firewal rules not satisfied for peer [%v]: [%v] ", peer, err,