From a0fec1957edea73edbd4bbd8aaede9b5f1814670 Mon Sep 17 00:00:00 2001 From: Pascal Eberlein Date: Thu, 26 Sep 2024 20:39:33 +0200 Subject: [PATCH 1/6] replace github.com/golang/protobuf with google.golang.org/protobuf --- api/common/helper.go | 7 +++---- api/websocket/server/relay.go | 2 +- api/websocket/server/server.go | 2 +- block/block.go | 2 +- block/header.go | 2 +- chain/blockvalidator.go | 2 +- chain/store/store.go | 2 +- consensus/message.go | 2 +- consensus/proposal.go | 2 +- consensus/state.go | 2 +- lnode/encryption.go | 2 +- lnode/info.go | 2 +- lnode/neighbor.go | 6 +++--- lnode/relay.go | 2 +- lnode/stateHandler.go | 2 +- lnode/syncblock.go | 2 +- lnode/syncrandaddr.go | 2 +- lnode/synctxnpool.go | 2 +- pb/transaction.go | 2 +- por/porpackage.go | 2 +- transaction/payload.go | 2 +- transaction/transaction.go | 2 +- util/bytes2sigchain/bytes2sigchain.go | 2 +- 23 files changed, 27 insertions(+), 28 deletions(-) diff --git a/api/common/helper.go b/api/common/helper.go index 7a0aba256..03021b2ee 100644 --- a/api/common/helper.go +++ b/api/common/helper.go @@ -5,11 +5,10 @@ import ( "context" "errors" "fmt" + "google.golang.org/protobuf/encoding/protowire" - "github.com/nknorg/nkn/v2/config" - - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" + "github.com/nknorg/nkn/v2/config" "github.com/nknorg/nkn/v2/transaction" "github.com/nknorg/nkn/v2/vault" ) @@ -197,7 +196,7 @@ func MakeGenerateIDTransaction(ctx context.Context, pubkey []byte, wallet *vault default: } - txn, err = transaction.NewGenerateIDTransaction(pubkey, sender, regFee, maxVersion, nonce, txnFee, proto.EncodeVarint(i)) + txn, err = transaction.NewGenerateIDTransaction(pubkey, sender, regFee, maxVersion, nonce, txnFee, protowire.AppendVarint(nil, i)) if err != nil { return nil, err } diff --git a/api/websocket/server/relay.go b/api/websocket/server/relay.go index fa9bdce75..4f1bd44e2 100644 --- a/api/websocket/server/relay.go +++ b/api/websocket/server/relay.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/por" "github.com/nknorg/nkn/v2/util/address" "github.com/nknorg/nkn/v2/util/log" + "google.golang.org/protobuf/proto" ) type sigChainInfo struct { diff --git a/api/websocket/server/server.go b/api/websocket/server/server.go index 0254a8e57..e0fdb0d22 100644 --- a/api/websocket/server/server.go +++ b/api/websocket/server/server.go @@ -18,7 +18,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" api "github.com/nknorg/nkn/v2/api/common" "github.com/nknorg/nkn/v2/api/common/errcode" "github.com/nknorg/nkn/v2/api/webrtc" @@ -34,6 +33,7 @@ import ( "github.com/nknorg/nkn/v2/util/address" "github.com/nknorg/nkn/v2/util/log" "github.com/nknorg/nkn/v2/vault" + "google.golang.org/protobuf/proto" "github.com/gorilla/websocket" ) diff --git a/block/block.go b/block/block.go index 82f4bb57f..6756fbd87 100644 --- a/block/block.go +++ b/block/block.go @@ -7,7 +7,6 @@ import ( "fmt" "io" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/common/serialization" "github.com/nknorg/nkn/v2/config" @@ -15,6 +14,7 @@ import ( "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/signature" "github.com/nknorg/nkn/v2/transaction" + "google.golang.org/protobuf/proto" ) type Block struct { diff --git a/block/header.go b/block/header.go index 0ddeec959..d2cea938e 100644 --- a/block/header.go +++ b/block/header.go @@ -9,12 +9,12 @@ import ( "github.com/nknorg/nkn/v2/crypto" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/common/serialization" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/program" "github.com/nknorg/nkn/v2/signature" + "google.golang.org/protobuf/proto" ) type Header struct { diff --git a/chain/blockvalidator.go b/chain/blockvalidator.go index 985b5255f..5781db978 100644 --- a/chain/blockvalidator.go +++ b/chain/blockvalidator.go @@ -11,7 +11,6 @@ import ( "github.com/nknorg/nkn/v2/chain/txvalidator" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/config" @@ -21,6 +20,7 @@ import ( "github.com/nknorg/nkn/v2/program" "github.com/nknorg/nkn/v2/transaction" "github.com/nknorg/nkn/v2/util" + "google.golang.org/protobuf/proto" ) const ( diff --git a/chain/store/store.go b/chain/store/store.go index fc086cb03..8fd100ca9 100644 --- a/chain/store/store.go +++ b/chain/store/store.go @@ -9,7 +9,6 @@ import ( "io" "sync" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/chain/db" "github.com/nknorg/nkn/v2/common" @@ -19,6 +18,7 @@ import ( "github.com/nknorg/nkn/v2/program" "github.com/nknorg/nkn/v2/transaction" "github.com/nknorg/nkn/v2/util/log" + "google.golang.org/protobuf/proto" ) const ( diff --git a/consensus/message.go b/consensus/message.go index 1bbf2bb64..2ebc04429 100644 --- a/consensus/message.go +++ b/consensus/message.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "fmt" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/node" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/transaction" + "google.golang.org/protobuf/proto" ) // NewVoteMessage creates a VOTE message diff --git a/consensus/proposal.go b/consensus/proposal.go index 5ac4a0aba..83528c327 100644 --- a/consensus/proposal.go +++ b/consensus/proposal.go @@ -9,7 +9,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/common" @@ -22,6 +21,7 @@ import ( "github.com/nknorg/nkn/v2/transaction" "github.com/nknorg/nkn/v2/util/log" "github.com/nknorg/nkn/v2/util/timer" + "google.golang.org/protobuf/proto" ) type requestProposalInfo struct { diff --git a/consensus/state.go b/consensus/state.go index 0b175e30a..0b563e7f8 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -4,7 +4,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/node" @@ -13,6 +12,7 @@ import ( "github.com/nknorg/nkn/v2/util" "github.com/nknorg/nkn/v2/util/log" "github.com/nknorg/nkn/v2/util/timer" + "google.golang.org/protobuf/proto" ) // startGettingNeighborConsensusState periodically checks neighbors' majority diff --git a/lnode/encryption.go b/lnode/encryption.go index e74620448..8191c444d 100644 --- a/lnode/encryption.go +++ b/lnode/encryption.go @@ -3,13 +3,13 @@ package lnode import ( "fmt" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/crypto/ed25519" "github.com/nknorg/nkn/v2/node" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/util/log" nnetnode "github.com/nknorg/nnet/node" "golang.org/x/crypto/nacl/box" + "google.golang.org/protobuf/proto" ) func (localNode *LocalNode) ComputeSharedKey(remotePublicKey []byte) (*[node.SharedKeySize]byte, error) { diff --git a/lnode/info.go b/lnode/info.go index da640c408..09212a13d 100644 --- a/lnode/info.go +++ b/lnode/info.go @@ -3,11 +3,11 @@ package lnode import ( "encoding/hex" "encoding/json" + "google.golang.org/protobuf/proto" "time" "github.com/nknorg/nkn/v2/node" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/util/log" nnetnode "github.com/nknorg/nnet/node" diff --git a/lnode/neighbor.go b/lnode/neighbor.go index 1317c8c76..efb738d09 100644 --- a/lnode/neighbor.go +++ b/lnode/neighbor.go @@ -4,6 +4,7 @@ import ( "bytes" "errors" "fmt" + pbnode "github.com/nknorg/nnet/protobuf/node" "math" "math/rand" "net" @@ -11,7 +12,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/config" "github.com/nknorg/nkn/v2/crypto" @@ -23,7 +23,7 @@ import ( "github.com/nknorg/nkn/v2/util/log" nnetnode "github.com/nknorg/nnet/node" "github.com/nknorg/nnet/overlay/chord" - nnetpb "github.com/nknorg/nnet/protobuf" + "google.golang.org/protobuf/proto" ) const ( @@ -312,7 +312,7 @@ func (localNode *LocalNode) GetVotingNeighbors(filter func(*node.RemoteNode) boo return localNode.getSampledNeighbors(localNode.votingNeighbors, config.VotingSampleChordNeighbor, config.VotingMinChordNeighbor, filter) } -func (localNode *LocalNode) shouldConnectToNode(n *nnetpb.Node) error { +func (localNode *LocalNode) shouldConnectToNode(n *pbnode.Node) error { if n.GetData() != nil { nodeData := &pb.NodeData{} err := proto.Unmarshal(n.Data, nodeData) diff --git a/lnode/relay.go b/lnode/relay.go index f69e4bbb4..ca19b1aff 100644 --- a/lnode/relay.go +++ b/lnode/relay.go @@ -8,7 +8,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/chain/txvalidator" @@ -23,6 +22,7 @@ import ( "github.com/nknorg/nkn/v2/util/address" "github.com/nknorg/nkn/v2/util/log" "github.com/nknorg/nkn/v2/vault" + "google.golang.org/protobuf/proto" ) const ( diff --git a/lnode/stateHandler.go b/lnode/stateHandler.go index f69df60a2..e8117cba4 100644 --- a/lnode/stateHandler.go +++ b/lnode/stateHandler.go @@ -3,13 +3,13 @@ package lnode import ( "errors" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/chain/store" "github.com/nknorg/nkn/v2/chain/trie" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/node" "github.com/nknorg/nkn/v2/pb" + "google.golang.org/protobuf/proto" ) var ( diff --git a/lnode/syncblock.go b/lnode/syncblock.go index ea2c5327c..c2e970ca1 100644 --- a/lnode/syncblock.go +++ b/lnode/syncblock.go @@ -6,7 +6,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/consequential" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/chain" @@ -15,6 +14,7 @@ import ( "github.com/nknorg/nkn/v2/node" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/util/log" + "google.golang.org/protobuf/proto" ) const ( diff --git a/lnode/syncrandaddr.go b/lnode/syncrandaddr.go index 6dd1739da..96c92345e 100644 --- a/lnode/syncrandaddr.go +++ b/lnode/syncrandaddr.go @@ -5,7 +5,6 @@ import ( "reflect" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/chain/pool" "github.com/nknorg/nkn/v2/common" @@ -15,6 +14,7 @@ import ( "github.com/nknorg/nkn/v2/transaction" "github.com/nknorg/nkn/v2/util" "github.com/nknorg/nkn/v2/util/log" + "google.golang.org/protobuf/proto" ) // Number of random neighbors to sync rand addr diff --git a/lnode/synctxnpool.go b/lnode/synctxnpool.go index fd2ee3fcc..ed7f28124 100644 --- a/lnode/synctxnpool.go +++ b/lnode/synctxnpool.go @@ -7,7 +7,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/chain/pool" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/config" @@ -16,6 +15,7 @@ import ( "github.com/nknorg/nkn/v2/transaction" "github.com/nknorg/nkn/v2/util" "github.com/nknorg/nkn/v2/util/log" + "google.golang.org/protobuf/proto" ) // Number of random neighbors to sync txn pool diff --git a/pb/transaction.go b/pb/transaction.go index 570777141..e8a076b59 100644 --- a/pb/transaction.go +++ b/pb/transaction.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/common/serialization" + "google.golang.org/protobuf/proto" ) // Serialize the Program diff --git a/por/porpackage.go b/por/porpackage.go index 4d1d9dba9..47591f168 100644 --- a/por/porpackage.go +++ b/por/porpackage.go @@ -4,11 +4,11 @@ import ( "bytes" "errors" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/config" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/transaction" + "google.golang.org/protobuf/proto" ) const ( diff --git a/transaction/payload.go b/transaction/payload.go index 762eda5e2..a928f0e37 100644 --- a/transaction/payload.go +++ b/transaction/payload.go @@ -3,9 +3,9 @@ package transaction import ( "errors" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/pb" + "google.golang.org/protobuf/proto" ) func Pack(plType pb.PayloadType, payload proto.Message) (*pb.Payload, error) { diff --git a/transaction/transaction.go b/transaction/transaction.go index acb03aa0f..530334fbf 100644 --- a/transaction/transaction.go +++ b/transaction/transaction.go @@ -7,12 +7,12 @@ import ( "errors" "io" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/common" "github.com/nknorg/nkn/v2/common/serialization" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/program" "github.com/nknorg/nkn/v2/signature" + "google.golang.org/protobuf/proto" ) type Transaction struct { diff --git a/util/bytes2sigchain/bytes2sigchain.go b/util/bytes2sigchain/bytes2sigchain.go index 5a66d9736..7489bdb02 100644 --- a/util/bytes2sigchain/bytes2sigchain.go +++ b/util/bytes2sigchain/bytes2sigchain.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/pb" + "google.golang.org/protobuf/proto" ) // Base64ToHex convert base64 string input to hex string output From a63ce7d45a42cfc69a93cec6e635adab837d96a2 Mon Sep 17 00:00:00 2001 From: Pascal Eberlein Date: Thu, 26 Sep 2024 20:39:57 +0200 Subject: [PATCH 2/6] regenerated with newer version --- pb/block.pb.go | 12 ++++---- pb/clientmessage.pb.go | 14 ++++----- pb/node.pb.go | 8 ++--- pb/nodemessage.pb.go | 66 +++++++++++++++++++++--------------------- pb/sigchain.pb.go | 10 +++---- pb/transaction.pb.go | 40 ++++++++++++------------- 6 files changed, 75 insertions(+), 75 deletions(-) diff --git a/pb/block.pb.go b/pb/block.pb.go index 30067f04e..e449b69be 100644 --- a/pb/block.pb.go +++ b/pb/block.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 +// protoc-gen-go v1.34.2 +// protoc v3.21.12 // source: pb/block.proto package pb @@ -370,7 +370,7 @@ func file_pb_block_proto_rawDescGZIP() []byte { var file_pb_block_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_pb_block_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_pb_block_proto_goTypes = []interface{}{ +var file_pb_block_proto_goTypes = []any{ (WinnerType)(0), // 0: pb.WinnerType (*UnsignedHeader)(nil), // 1: pb.UnsignedHeader (*Header)(nil), // 2: pb.Header @@ -396,7 +396,7 @@ func file_pb_block_proto_init() { } file_pb_transaction_proto_init() if !protoimpl.UnsafeEnabled { - file_pb_block_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pb_block_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*UnsignedHeader); i { case 0: return &v.state @@ -408,7 +408,7 @@ func file_pb_block_proto_init() { return nil } } - file_pb_block_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pb_block_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Header); i { case 0: return &v.state @@ -420,7 +420,7 @@ func file_pb_block_proto_init() { return nil } } - file_pb_block_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_pb_block_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*Block); i { case 0: return &v.state diff --git a/pb/clientmessage.pb.go b/pb/clientmessage.pb.go index 831b617ad..b209a4abc 100644 --- a/pb/clientmessage.pb.go +++ b/pb/clientmessage.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 +// protoc-gen-go v1.34.2 +// protoc v3.21.12 // source: pb/clientmessage.proto package pb @@ -466,7 +466,7 @@ func file_pb_clientmessage_proto_rawDescGZIP() []byte { var file_pb_clientmessage_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_pb_clientmessage_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_pb_clientmessage_proto_goTypes = []interface{}{ +var file_pb_clientmessage_proto_goTypes = []any{ (ClientMessageType)(0), // 0: pb.ClientMessageType (CompressionType)(0), // 1: pb.CompressionType (*ClientMessage)(nil), // 2: pb.ClientMessage @@ -490,7 +490,7 @@ func file_pb_clientmessage_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_pb_clientmessage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pb_clientmessage_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ClientMessage); i { case 0: return &v.state @@ -502,7 +502,7 @@ func file_pb_clientmessage_proto_init() { return nil } } - file_pb_clientmessage_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pb_clientmessage_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OutboundMessage); i { case 0: return &v.state @@ -514,7 +514,7 @@ func file_pb_clientmessage_proto_init() { return nil } } - file_pb_clientmessage_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_pb_clientmessage_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*InboundMessage); i { case 0: return &v.state @@ -526,7 +526,7 @@ func file_pb_clientmessage_proto_init() { return nil } } - file_pb_clientmessage_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_pb_clientmessage_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*Receipt); i { case 0: return &v.state diff --git a/pb/node.pb.go b/pb/node.pb.go index 2edf2ac2b..704be4721 100644 --- a/pb/node.pb.go +++ b/pb/node.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 +// protoc-gen-go v1.34.2 +// protoc v3.21.12 // source: pb/node.proto package pb @@ -284,7 +284,7 @@ func file_pb_node_proto_rawDescGZIP() []byte { var file_pb_node_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_pb_node_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_pb_node_proto_goTypes = []interface{}{ +var file_pb_node_proto_goTypes = []any{ (SyncState)(0), // 0: pb.SyncState (LedgerMode)(0), // 1: pb.LedgerMode (*NodeData)(nil), // 2: pb.NodeData @@ -304,7 +304,7 @@ func file_pb_node_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_pb_node_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pb_node_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*NodeData); i { case 0: return &v.state diff --git a/pb/nodemessage.pb.go b/pb/nodemessage.pb.go index 00bd8bebc..44463b65c 100644 --- a/pb/nodemessage.pb.go +++ b/pb/nodemessage.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 +// protoc-gen-go v1.34.2 +// protoc v3.21.12 // source: pb/nodemessage.proto package pb @@ -2826,7 +2826,7 @@ func file_pb_nodemessage_proto_rawDescGZIP() []byte { var file_pb_nodemessage_proto_enumTypes = make([]protoimpl.EnumInfo, 9) var file_pb_nodemessage_proto_msgTypes = make([]protoimpl.MessageInfo, 30) -var file_pb_nodemessage_proto_goTypes = []interface{}{ +var file_pb_nodemessage_proto_goTypes = []any{ (MessageType)(0), // 0: pb.MessageType (AllowedSignedMessageType)(0), // 1: pb.AllowedSignedMessageType (AllowedUnsignedMessageType)(0), // 2: pb.AllowedUnsignedMessageType @@ -2904,7 +2904,7 @@ func file_pb_nodemessage_proto_init() { file_pb_block_proto_init() file_pb_transaction_proto_init() if !protoimpl.UnsafeEnabled { - file_pb_nodemessage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*UnsignedMessage); i { case 0: return &v.state @@ -2916,7 +2916,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*SignedMessage); i { case 0: return &v.state @@ -2928,7 +2928,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*Vote); i { case 0: return &v.state @@ -2940,7 +2940,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*IHaveBlockProposal); i { case 0: return &v.state @@ -2952,7 +2952,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*RequestBlockProposal); i { case 0: return &v.state @@ -2964,7 +2964,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*RequestBlockProposalReply); i { case 0: return &v.state @@ -2976,7 +2976,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*RequestProposalTransactions); i { case 0: return &v.state @@ -2988,7 +2988,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*RequestProposalTransactionsReply); i { case 0: return &v.state @@ -3000,7 +3000,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*GetConsensusState); i { case 0: return &v.state @@ -3012,7 +3012,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*GetConsensusStateReply); i { case 0: return &v.state @@ -3024,7 +3024,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*GetBlockHeaders); i { case 0: return &v.state @@ -3036,7 +3036,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*GetBlockHeadersReply); i { case 0: return &v.state @@ -3048,7 +3048,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*GetBlocks); i { case 0: return &v.state @@ -3060,7 +3060,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*GetBlocksReply); i { case 0: return &v.state @@ -3072,7 +3072,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*StateRequest); i { case 0: return &v.state @@ -3084,7 +3084,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*StateNode); i { case 0: return &v.state @@ -3096,7 +3096,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*GetStates); i { case 0: return &v.state @@ -3108,7 +3108,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*GetStatesReply); i { case 0: return &v.state @@ -3120,7 +3120,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*Relay); i { case 0: return &v.state @@ -3132,7 +3132,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*Transactions); i { case 0: return &v.state @@ -3144,7 +3144,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*BacktrackSignatureChain); i { case 0: return &v.state @@ -3156,7 +3156,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*IHaveSignatureChainTransaction); i { case 0: return &v.state @@ -3168,7 +3168,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*RequestSignatureChainTransaction); i { case 0: return &v.state @@ -3180,7 +3180,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*RequestSignatureChainTransactionReply); i { case 0: return &v.state @@ -3192,7 +3192,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*PinSignatureChain); i { case 0: return &v.state @@ -3204,7 +3204,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[25].Exporter = func(v any, i int) any { switch v := v.(*SignatureChainObjectionUnsigned); i { case 0: return &v.state @@ -3216,7 +3216,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[26].Exporter = func(v any, i int) any { switch v := v.(*SignatureChainObjectionSigned); i { case 0: return &v.state @@ -3228,7 +3228,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[27].Exporter = func(v any, i int) any { switch v := v.(*TxnPoolHashAndCount); i { case 0: return &v.state @@ -3240,7 +3240,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[28].Exporter = func(v any, i int) any { switch v := v.(*AddrNonce); i { case 0: return &v.state @@ -3252,7 +3252,7 @@ func file_pb_nodemessage_proto_init() { return nil } } - file_pb_nodemessage_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_pb_nodemessage_proto_msgTypes[29].Exporter = func(v any, i int) any { switch v := v.(*RequestSyncTxnPool); i { case 0: return &v.state diff --git a/pb/sigchain.pb.go b/pb/sigchain.pb.go index e78db90fa..15a7f41ce 100644 --- a/pb/sigchain.pb.go +++ b/pb/sigchain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 +// protoc-gen-go v1.34.2 +// protoc v3.21.12 // source: pb/sigchain.proto package pb @@ -316,7 +316,7 @@ func file_pb_sigchain_proto_rawDescGZIP() []byte { var file_pb_sigchain_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_pb_sigchain_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_pb_sigchain_proto_goTypes = []interface{}{ +var file_pb_sigchain_proto_goTypes = []any{ (SigAlgo)(0), // 0: pb.SigAlgo (*SigChainElem)(nil), // 1: pb.SigChainElem (*SigChain)(nil), // 2: pb.SigChain @@ -337,7 +337,7 @@ func file_pb_sigchain_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_pb_sigchain_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pb_sigchain_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*SigChainElem); i { case 0: return &v.state @@ -349,7 +349,7 @@ func file_pb_sigchain_proto_init() { return nil } } - file_pb_sigchain_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pb_sigchain_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*SigChain); i { case 0: return &v.state diff --git a/pb/transaction.pb.go b/pb/transaction.pb.go index b4e68c2de..7d001b3b4 100644 --- a/pb/transaction.pb.go +++ b/pb/transaction.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.19.4 +// protoc-gen-go v1.34.2 +// protoc v3.21.12 // source: pb/transaction.proto package pb @@ -639,7 +639,7 @@ type Subscribe struct { Subscriber []byte `protobuf:"bytes,1,opt,name=subscriber,proto3" json:"subscriber,omitempty"` Identifier string `protobuf:"bytes,2,opt,name=identifier,proto3" json:"identifier,omitempty"` Topic string `protobuf:"bytes,3,opt,name=topic,proto3" json:"topic,omitempty"` - // Deprecated: Do not use. + // Deprecated: Marked as deprecated in pb/transaction.proto. Bucket uint32 `protobuf:"varint,4,opt,name=bucket,proto3" json:"bucket,omitempty"` Duration uint32 `protobuf:"varint,5,opt,name=duration,proto3" json:"duration,omitempty"` Meta []byte `protobuf:"bytes,6,opt,name=meta,proto3" json:"meta,omitempty"` @@ -698,7 +698,7 @@ func (x *Subscribe) GetTopic() string { return "" } -// Deprecated: Do not use. +// Deprecated: Marked as deprecated in pb/transaction.proto. func (x *Subscribe) GetBucket() uint32 { if x != nil { return x.Bucket @@ -1226,7 +1226,7 @@ func file_pb_transaction_proto_rawDescGZIP() []byte { var file_pb_transaction_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_pb_transaction_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_pb_transaction_proto_goTypes = []interface{}{ +var file_pb_transaction_proto_goTypes = []any{ (PayloadType)(0), // 0: pb.PayloadType (*UnsignedTx)(nil), // 1: pb.UnsignedTx (*Transaction)(nil), // 2: pb.Transaction @@ -1262,7 +1262,7 @@ func file_pb_transaction_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_pb_transaction_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*UnsignedTx); i { case 0: return &v.state @@ -1274,7 +1274,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Transaction); i { case 0: return &v.state @@ -1286,7 +1286,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*Program); i { case 0: return &v.state @@ -1298,7 +1298,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*Payload); i { case 0: return &v.state @@ -1310,7 +1310,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*Coinbase); i { case 0: return &v.state @@ -1322,7 +1322,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*SigChainTxn); i { case 0: return &v.state @@ -1334,7 +1334,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*RegisterName); i { case 0: return &v.state @@ -1346,7 +1346,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*TransferName); i { case 0: return &v.state @@ -1358,7 +1358,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*DeleteName); i { case 0: return &v.state @@ -1370,7 +1370,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*Subscribe); i { case 0: return &v.state @@ -1382,7 +1382,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*Unsubscribe); i { case 0: return &v.state @@ -1394,7 +1394,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*TransferAsset); i { case 0: return &v.state @@ -1406,7 +1406,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*GenerateID); i { case 0: return &v.state @@ -1418,7 +1418,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*NanoPay); i { case 0: return &v.state @@ -1430,7 +1430,7 @@ func file_pb_transaction_proto_init() { return nil } } - file_pb_transaction_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_pb_transaction_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*IssueAsset); i { case 0: return &v.state From e7309bcd1308c37f8ce1c0bea4bd36b056438dbc Mon Sep 17 00:00:00 2001 From: Pascal Eberlein Date: Thu, 26 Sep 2024 20:40:32 +0200 Subject: [PATCH 3/6] remove redundant alias --- common/uint160.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/uint160.go b/common/uint160.go index fe816c524..60d5d4745 100644 --- a/common/uint160.go +++ b/common/uint160.go @@ -9,7 +9,7 @@ import ( "io" "math/big" - base58 "github.com/itchyny/base58-go" + "github.com/itchyny/base58-go" ) // FOOLPROOFPREFIX used for fool-proof prefix From 2f371d0c40013b67de764a28b7cfd81062d25a6e Mon Sep 17 00:00:00 2001 From: Pascal Eberlein Date: Thu, 26 Sep 2024 20:42:05 +0200 Subject: [PATCH 4/6] adjust to nnet changes --- lnode/localnode.go | 8 ++++---- lnode/message.go | 22 +++++++++++----------- lnode/transaction.go | 6 +++--- node/node.go | 18 ++++++++---------- node/remotenode.go | 2 +- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/lnode/localnode.go b/lnode/localnode.go index 145c6b5bc..b14b6068e 100644 --- a/lnode/localnode.go +++ b/lnode/localnode.go @@ -5,13 +5,13 @@ import ( "encoding/json" "errors" "fmt" + nnetnode "github.com/nknorg/nnet/node" "net" "net/url" "sync" "sync/atomic" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/api/ratelimiter" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/chain/pool" @@ -22,11 +22,11 @@ import ( "github.com/nknorg/nkn/v2/util/log" "github.com/nknorg/nkn/v2/vault" "github.com/nknorg/nnet" - nnetnode "github.com/nknorg/nnet/node" "github.com/nknorg/nnet/overlay/chord" "github.com/nknorg/nnet/overlay/routing" - nnetpb "github.com/nknorg/nnet/protobuf" + pbnode "github.com/nknorg/nnet/protobuf/node" "golang.org/x/time/rate" + "google.golang.org/protobuf/proto" ) type LocalNode struct { @@ -112,7 +112,7 @@ func NewLocalNode(wallet *vault.Wallet, nn *nnet.NNet, ledgerMode pb.LedgerMode) return true, true }}) - nn.MustApplyMiddleware(nnetnode.WillConnectToNode{Func: func(n *nnetpb.Node) (bool, bool) { + nn.MustApplyMiddleware(nnetnode.WillConnectToNode{Func: func(n *pbnode.Node) (bool, bool) { err := localNode.shouldConnectToNode(n) if err != nil { log.Infof("stop connect to node because: %v", err) diff --git a/lnode/message.go b/lnode/message.go index ade7172e0..8dc00262d 100644 --- a/lnode/message.go +++ b/lnode/message.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/crypto" "github.com/nknorg/nkn/v2/node" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/util/log" nnetnode "github.com/nknorg/nnet/node" - nnetpb "github.com/nknorg/nnet/protobuf" + pbmsg "github.com/nknorg/nnet/protobuf/message" + "google.golang.org/protobuf/proto" ) func (localNode *LocalNode) SerializeMessage(unsignedMsg *pb.UnsignedMessage, sign bool) ([]byte, error) { @@ -42,7 +42,7 @@ func (localNode *LocalNode) SerializeMessage(unsignedMsg *pb.UnsignedMessage, si } func (localNode *LocalNode) remoteMessageRouted(remoteMessage *nnetnode.RemoteMessage, nnetLocalNode *nnetnode.LocalNode, remoteNodes []*nnetnode.RemoteNode) (*nnetnode.RemoteMessage, *nnetnode.LocalNode, []*nnetnode.RemoteNode, bool) { - if remoteMessage.Msg.MessageType == nnetpb.BYTES { + if remoteMessage.Msg.MessageType == pbmsg.MessageType_BYTES { err := localNode.maybeAddRemoteNode(remoteMessage.RemoteNode) if err != nil { log.Warningf("Add remote node error: %v", err) @@ -66,7 +66,7 @@ func (localNode *LocalNode) remoteMessageRouted(remoteMessage *nnetnode.RemoteMe return nil, nil, nil, false } - msgBody := &nnetpb.Bytes{} + msgBody := &pbmsg.Bytes{} err = proto.Unmarshal(remoteMessage.Msg.Message, msgBody) if err != nil { log.Errorf("Error unmarshal byte msg: %v", err) @@ -106,7 +106,7 @@ func (localNode *LocalNode) remoteMessageRouted(remoteMessage *nnetnode.RemoteMe } if len(signedMsg.Signature) > 0 { - if remoteMessage.Msg.RoutingType != nnetpb.DIRECT { + if remoteMessage.Msg.RoutingType != pbmsg.RoutingType_DIRECT { log.Errorf("Signature is only allowed on direct message") return nil, nil, nil, false } @@ -272,25 +272,25 @@ func checkMessageSigned(messageType pb.MessageType, signed bool) error { } // checkMessageRoutingType checks if a message type has the allowed routing type -func checkMessageRoutingType(messageType pb.MessageType, routingType nnetpb.RoutingType) error { +func checkMessageRoutingType(messageType pb.MessageType, routingType pbmsg.RoutingType) error { switch routingType { - case nnetpb.DIRECT: + case pbmsg.RoutingType_DIRECT: if _, ok := pb.AllowedDirectMessageType_name[int32(messageType)]; ok { return nil } - case nnetpb.RELAY: + case pbmsg.RoutingType_RELAY: if _, ok := pb.AllowedRelayMessageType_name[int32(messageType)]; ok { return nil } - case nnetpb.BROADCAST_PUSH: + case pbmsg.RoutingType_BROADCAST_PUSH: if _, ok := pb.AllowedBroadcastPushMessageType_name[int32(messageType)]; ok { return nil } - case nnetpb.BROADCAST_PULL: + case pbmsg.RoutingType_BROADCAST_PULL: if _, ok := pb.AllowedBroadcastPullMessageType_name[int32(messageType)]; ok { return nil } - case nnetpb.BROADCAST_TREE: + case pbmsg.RoutingType_BROADCAST_TREE: if _, ok := pb.AllowedBroadcastTreeMessageType_name[int32(messageType)]; ok { return nil } diff --git a/lnode/transaction.go b/lnode/transaction.go index 394bb4abd..71dc28bc3 100644 --- a/lnode/transaction.go +++ b/lnode/transaction.go @@ -4,9 +4,9 @@ import ( "bytes" "errors" "fmt" + pbmsg "github.com/nknorg/nnet/protobuf/message" "hash/fnv" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/block" "github.com/nknorg/nkn/v2/chain" "github.com/nknorg/nkn/v2/chain/pool" @@ -20,7 +20,7 @@ import ( "github.com/nknorg/nkn/v2/util" "github.com/nknorg/nkn/v2/util/log" nnetnode "github.com/nknorg/nnet/node" - nnetpb "github.com/nknorg/nnet/protobuf" + "google.golang.org/protobuf/proto" ) const ( @@ -459,7 +459,7 @@ func (localNode *LocalNode) BroadcastTransaction(txn *transaction.Transaction) e return err } - _, err = localNode.nnet.SendBytesBroadcastAsync(buf, nnetpb.BROADCAST_TREE) + _, err = localNode.nnet.SendBytesBroadcastAsync(buf, pbmsg.RoutingType_BROADCAST_TREE) if err != nil { return err } diff --git a/node/node.go b/node/node.go index c99840b74..61301eac7 100644 --- a/node/node.go +++ b/node/node.go @@ -4,19 +4,19 @@ package node import ( "encoding/hex" "encoding/json" + pbnode "github.com/nknorg/nnet/protobuf/node" "net/url" "sync" "time" - "github.com/golang/protobuf/jsonpb" "github.com/nknorg/nkn/v2/crypto" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/util" - nnetpb "github.com/nknorg/nnet/protobuf" + "google.golang.org/protobuf/encoding/protojson" ) type Node struct { - *nnetpb.Node + *pbnode.Node *pb.NodeData publicKey []byte StartTime time.Time @@ -29,14 +29,12 @@ type Node struct { func (n *Node) MarshalJSON() ([]byte, error) { var out map[string]interface{} - marshaler := &jsonpb.Marshaler{} - - s, err := marshaler.MarshalToString(n.Node) + s, err := protojson.Marshal(n.Node) if err != nil { return nil, err } - err = json.Unmarshal([]byte(s), &out) + err = json.Unmarshal(s, &out) if err != nil { return nil, err } @@ -44,12 +42,12 @@ func (n *Node) MarshalJSON() ([]byte, error) { delete(out, "data") out["id"] = hex.EncodeToString(n.Node.Id) - s, err = marshaler.MarshalToString(n.NodeData) + s, err = protojson.Marshal(n.NodeData) if err != nil { return nil, err } - err = json.Unmarshal([]byte(s), &out) + err = json.Unmarshal(s, &out) if err != nil { return nil, err } @@ -60,7 +58,7 @@ func (n *Node) MarshalJSON() ([]byte, error) { return json.Marshal(out) } -func NewNode(nnetNode *nnetpb.Node, nodeData *pb.NodeData) (*Node, error) { +func NewNode(nnetNode *pbnode.Node, nodeData *pb.NodeData) (*Node, error) { err := crypto.CheckPublicKey(nodeData.PublicKey) if err != nil { return nil, err diff --git a/node/remotenode.go b/node/remotenode.go index bcacdec9c..516a69eaf 100644 --- a/node/remotenode.go +++ b/node/remotenode.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/nknorg/nkn/v2/pb" "github.com/nknorg/nkn/v2/util/log" nnetnode "github.com/nknorg/nnet/node" + "google.golang.org/protobuf/proto" ) type RemoteNode struct { From dfbc9f2cf478e76ce7c6b47283db72fc9f12e147 Mon Sep 17 00:00:00 2001 From: Pascal Eberlein Date: Thu, 26 Sep 2024 20:46:25 +0200 Subject: [PATCH 5/6] dependency bumps --- go.mod | 123 ++++++++++---------- go.sum | 357 ++++++++++++++++++++++++--------------------------------- 2 files changed, 211 insertions(+), 269 deletions(-) diff --git a/go.mod b/go.mod index 97d2ba97f..b070d169b 100644 --- a/go.mod +++ b/go.mod @@ -1,103 +1,106 @@ module github.com/nknorg/nkn/v2 -go 1.19 +go 1.20 + +replace github.com/nknorg/nnet => ../nnet require ( github.com/emirpasic/gods v1.18.1 - github.com/gin-contrib/sessions v0.0.0-20190512062852-3cb4c4f2d615 - github.com/gin-gonic/gin v1.9.1 - github.com/go-acme/lego/v3 v3.8.0 - github.com/golang/protobuf v1.5.0 - github.com/gorilla/securecookie v1.1.1 - github.com/gorilla/websocket v1.4.2 - github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c - github.com/itchyny/base58-go v0.0.5 - github.com/nknorg/consequential v0.0.0-20190823093205-a45aff4a218a - github.com/nknorg/nnet v0.0.0-20220621093239-b22b80b04216 + github.com/gin-contrib/sessions v1.0.1 + github.com/gin-gonic/gin v1.10.0 + github.com/go-acme/lego/v3 v3.9.0 + github.com/gorilla/securecookie v1.1.2 + github.com/gorilla/websocket v1.5.3 + github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef + github.com/itchyny/base58-go v0.2.2 + github.com/nknorg/consequential v0.0.0-20191113113929-5fd13b7f5984 + github.com/nknorg/nnet v0.0.0-00010101000000-000000000000 github.com/nknorg/portmapper v0.0.0-20200114081049-1c03cdccc283 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/pbnjay/memory v0.0.0-20190104145345-974d429e7ae4 - github.com/pborman/uuid v1.2.0 + github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 + github.com/pborman/uuid v1.2.1 + github.com/pion/webrtc/v4 v4.0.0-beta.30 github.com/rdegges/go-ipify v0.0.0-20150526035502-2d94a6a86c40 - github.com/spf13/cobra v1.4.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 github.com/wk8/go-ordered-map v1.0.0 - golang.org/x/crypto v0.21.0 - golang.org/x/sys v0.18.0 // indirect - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 - google.golang.org/protobuf v1.33.0 + golang.org/x/crypto v0.27.0 + golang.org/x/time v0.6.0 + google.golang.org/protobuf v1.34.2 ) -require github.com/pion/webrtc/v4 v4.0.0-beta.17 - require ( - github.com/bytedance/sonic v1.9.1 // indirect + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cenkalti/backoff/v4 v4.0.0 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.0 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/goccy/go-json v0.10.2 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/snappy v0.0.1 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/gorilla/context v1.1.1 // indirect - github.com/gorilla/sessions v1.1.3 // indirect - github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect - github.com/huin/goupnp v1.0.0 // indirect - github.com/imdario/mergo v0.3.6 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jackpal/gateway v1.0.5 // indirect - github.com/jackpal/go-nat-pmp v1.0.1 // indirect + github.com/gorilla/context v1.1.2 // indirect + github.com/gorilla/sessions v1.2.2 // indirect + github.com/hashicorp/yamux v0.1.2 // indirect + github.com/huin/goupnp v1.3.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jackpal/gateway v1.0.11 // indirect + github.com/jackpal/go-nat-pmp v1.0.2 // indirect + github.com/jinzhu/copier v0.4.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid v1.2.1 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect - github.com/klauspost/reedsolomon v0.0.0-20190407153631-a373324398e4 // indirect - github.com/leodido/go-urn v1.2.4 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect + github.com/klauspost/reedsolomon v1.12.4 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/miekg/dns v1.1.27 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/nknorg/go-nat v1.0.1 // indirect + github.com/nxadm/tail v1.4.11 // indirect github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/pion/datachannel v1.5.6 // indirect - github.com/pion/dtls/v2 v2.2.10 // indirect - github.com/pion/ice/v3 v3.0.6 // indirect - github.com/pion/interceptor v0.1.29 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pion/datachannel v1.5.9 // indirect + github.com/pion/dtls/v3 v3.0.2 // indirect + github.com/pion/ice/v4 v4.0.1 // indirect + github.com/pion/interceptor v0.1.30 // indirect github.com/pion/logging v0.2.2 // indirect github.com/pion/mdns/v2 v2.0.7 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtcp v1.2.14 // indirect - github.com/pion/rtp v1.8.5 // indirect - github.com/pion/sctp v1.8.16 // indirect + github.com/pion/rtp v1.8.9 // indirect + github.com/pion/sctp v1.8.33 // indirect github.com/pion/sdp/v3 v3.0.9 // indirect - github.com/pion/srtp/v3 v3.0.1 // indirect - github.com/pion/stun/v2 v2.0.0 // indirect - github.com/pion/transport/v2 v2.2.4 // indirect - github.com/pion/transport/v3 v3.0.2 // indirect - github.com/pion/turn/v3 v3.0.2 // indirect + github.com/pion/srtp/v3 v3.0.3 // indirect + github.com/pion/stun/v3 v3.0.0 // indirect + github.com/pion/transport/v3 v3.0.7 // indirect + github.com/pion/turn/v4 v4.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect - github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b // indirect - github.com/tjfoc/gmsm v0.0.0-20190417070453-18fd8096dc8a // indirect + github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect + github.com/tjfoc/gmsm v1.4.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect - github.com/xtaci/kcp-go v4.3.1+incompatible // indirect - github.com/xtaci/smux v1.2.11 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + github.com/wlynxg/anet v0.0.3 // indirect + github.com/xtaci/kcp-go v5.4.20+incompatible // indirect + github.com/xtaci/smux v1.5.30 // indirect gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 // indirect gitlab.com/NebulousLabs/go-upnp v0.0.0-20181011194642-3a71999ed0d3 // indirect - golang.org/x/arch v0.3.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/term v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect gopkg.in/square/go-jose.v2 v2.3.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 22e6a3b24..124e024ad 100644 --- a/go.sum +++ b/go.sum @@ -40,7 +40,7 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.8/go.mod h1:aVvklgKsPENRkl29bNwrHISa1F+YLGTHArMxZMBqWM8= +github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.18/go.mod h1:L+HB2uBoDgi3+r1pJEJcbGwyyHhd2QXaGsKLbDwtm8Q= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/aliyun/alibaba-cloud-sdk-go v1.61.112/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA= @@ -49,28 +49,28 @@ github.com/aws/aws-sdk-go v1.30.20/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI= -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= -github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/cenkalti/backoff/v4 v4.0.0 h1:6VeaLF9aI+MAUQ95106HwWzYZgJJpZ4stumjj6RFYAU= github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cpu/goacmedns v0.0.2/go.mod h1:4MipLkI+qScwqtVxcNO6okBhbgRrr7/tKXUSgSL0teQ= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -83,27 +83,27 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sessions v0.0.0-20190512062852-3cb4c4f2d615 h1:2KRlm9Qh15+8BjkbOCcZtfC7aFVQd2mELjpHjrDmv1s= -github.com/gin-contrib/sessions v0.0.0-20190512062852-3cb4c4f2d615/go.mod h1:iziXm/6pvTtf7og1uxT499sel4h3S9DfwsrhNZ+REXM= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-contrib/sessions v1.0.1 h1:3hsJyNs7v7N8OtelFmYXFrulAf6zSR7nW/putcPEHxI= +github.com/gin-contrib/sessions v1.0.1/go.mod h1:ouxSFM24/OgIud5MJYQJLpy6AwxQ5EYO9yLhbtObGkM= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-acme/lego/v3 v3.8.0 h1:9OOEn54eZvEPRRdM7xiC5f7EBW0MlEeChr+kzlIhdN8= -github.com/go-acme/lego/v3 v3.8.0/go.mod h1:kYiHYgSRzb1l2NQPWvWvkVG5etNCusGFsZc2MTak3m0= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-acme/lego/v3 v3.9.0 h1:Kyvg2GGqRJHfK2Stu57M45TDTx0y1bsxLH7lpeP3n0A= +github.com/go-acme/lego/v3 v3.9.0/go.mod h1:va0cvQpxpJ3u2OA534L8TDn+lsr2oujLzPckLOLnUGQ= github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -117,8 +117,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= -github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -126,8 +126,6 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -149,22 +147,20 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -178,49 +174,51 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod h1:ozGNgr9KYOVATV5jsgHl/ceCDXGuguqOZAzoQ/2vcNM= +github.com/gophercloud/gophercloud v0.7.0/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss= +github.com/gophercloud/utils v0.0.0-20200508015959-b0167b94122c/go.mod h1:ehWUbLQJPqS0Ep+CxeD559hsm9pthPXadJNKwZkp43w= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o= +github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= -github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU= -github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= +github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= +github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY= +github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= +github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8= +github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= +github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef h1:A9HsByNhogrvm9cWb28sjiS3i7tcKCkflWFEkHfuAgM= +github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v0.0.0-20180415215157-1395d1447324/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag= -github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo= -github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= -github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= -github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/itchyny/base58-go v0.0.5 h1:uv3ieMgCtuE9HtN0Gux375+GOApFnifLkyvSseHBaH0= -github.com/itchyny/base58-go v0.0.5/go.mod h1:SrMWPE3DFuJJp1M/RUhu4fccp/y9AlB8AL3o3duPToU= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/itchyny/base58-go v0.2.2 h1:pswMT6rW2nRoELk5Mi8+xGLQPmDnlNnCwbfRCl2p7Mo= +github.com/itchyny/base58-go v0.2.2/go.mod h1:e7aEDHyQXm42jniwyoi+MaUeUdeWp58C5H20rTe52co= github.com/jackpal/gateway v1.0.4/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= -github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc= -github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= -github.com/jackpal/go-nat-pmp v1.0.1 h1:i0LektDkO1QlrTm/cSuP+PyBCDnYvjPLGl4LdWEMiaA= +github.com/jackpal/gateway v1.0.11 h1:XqCVFIyo2LtQYXjz9nis1WMTvAadJiFP/Zc04xmdEYE= +github.com/jackpal/gateway v1.0.11/go.mod h1:NqRwEsSP/DD8d4YXIsHEMNUSYetesFXjmL6QZFrul+M= github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= +github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= @@ -234,16 +232,13 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= -github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/klauspost/reedsolomon v0.0.0-20190407153631-a373324398e4 h1:nNpHdsitIhlNWAY3DkpFubu0n8ebuUOCsgWL/Sxm3O4= -github.com/klauspost/reedsolomon v0.0.0-20190407153631-a373324398e4/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/reedsolomon v1.12.4 h1:5aDr3ZGoJbgu/8+j45KtUJxzYm8k08JGtB9Wx1VQ4OA= +github.com/klauspost/reedsolomon v1.12.4/go.mod h1:d3CzOMOt0JXGIFZm1StgkyF14EYr3xneR2rNWo7NcMU= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -251,23 +246,21 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA= github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/linode/linodego v0.10.0/go.mod h1:cziNP7pbvE3mXIPneHj0oRY8L1WtGEIKlZ8LANE4eXA= github.com/liquidweb/liquidweb-go v1.6.0/go.mod h1:UDcVnAMDkZxpw4Y7NOHkqoeiGacVLEIG/i5J9cyixzQ= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc= github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -283,20 +276,20 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/nknorg/consequential v0.0.0-20190823093205-a45aff4a218a h1:DXTCQnVV2EsTWEVk/YhVGb2QxdgW8JzB2GEsNntDlaU= -github.com/nknorg/consequential v0.0.0-20190823093205-a45aff4a218a/go.mod h1:H7XeI/XOPpWVmqM+ScT75RLMn7jWnlZDwHRahSxNxo0= +github.com/nknorg/consequential v0.0.0-20191113113929-5fd13b7f5984 h1:VY7EXvgxCKlL2A6jF+qQspZtFBZo7PWiPY+YGDaCDlo= +github.com/nknorg/consequential v0.0.0-20191113113929-5fd13b7f5984/go.mod h1:H7XeI/XOPpWVmqM+ScT75RLMn7jWnlZDwHRahSxNxo0= github.com/nknorg/go-nat v1.0.1 h1:4dFK0oDyqkIE0it03Y4pMgBQpl1Y0mrYHEp+j/nZ910= github.com/nknorg/go-nat v1.0.1/go.mod h1:dblX1Ac2j08rTUGs5CKCAfjHGN5eDFhbeqt2rccSP3Y= -github.com/nknorg/nnet v0.0.0-20220621093239-b22b80b04216 h1:+5lcBTnhfQcVMtsY+CqcuaiJ3ebVYwrmYDnTabh/KBg= -github.com/nknorg/nnet v0.0.0-20220621093239-b22b80b04216/go.mod h1:rB1dMWGEjNncJjcmLVuXDXawGiD1gD/hwSR+vrr8Wp8= github.com/nknorg/portmapper v0.0.0-20200114081049-1c03cdccc283 h1:uS3/DvxCbi0zZau66ggQAgEjyGmql2mj77UQFgumq1I= github.com/nknorg/portmapper v0.0.0-20200114081049-1c03cdccc283/go.mod h1:dL4PQJ4670oTO6LqvkjrBQEkD+iMiOYjlKRBBw55Csg= github.com/nrdcg/auroradns v1.0.1/go.mod h1:y4pc0i9QXYlFCWrhWrUSIETnZgrf4KuwjDIWmmXo3JI= +github.com/nrdcg/desec v0.5.0/go.mod h1:2ejvMazkav1VdDbv2HeQO7w+Ta1CGHqzQr27ZBYTuEQ= github.com/nrdcg/dnspod-go v0.4.0/go.mod h1:vZSoFSFeQVm2gWLMkyX61LZ8HI3BaqtHZWgPTGKr6KQ= github.com/nrdcg/goinwx v0.7.0/go.mod h1:4tKJOCi/1lTxuw9/yB2Ez0aojwtUCSkckjc22eALpqE= github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= +github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -314,54 +307,45 @@ github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukw github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pbnjay/memory v0.0.0-20190104145345-974d429e7ae4 h1:MfIUBZ1bz7TgvQLVa/yPJZOGeKEgs6eTKUjz3zB4B+U= -github.com/pbnjay/memory v0.0.0-20190104145345-974d429e7ae4/go.mod h1:RMU2gJXhratVxBDTFeOdNhd540tG57lt9FIUV0YLvIQ= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= +github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pion/datachannel v1.5.6 h1:1IxKJntfSlYkpUj8LlYRSWpYiTTC02nUrOE8T3DqGeg= -github.com/pion/datachannel v1.5.6/go.mod h1:1eKT6Q85pRnr2mHiWHxJwO50SfZRtWHTsNIVb/NfGW4= -github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= -github.com/pion/dtls/v2 v2.2.10 h1:u2Axk+FyIR1VFTPurktB+1zoEPGIW3bmyj3LEFrXjAA= -github.com/pion/dtls/v2 v2.2.10/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE= -github.com/pion/ice/v3 v3.0.6 h1:UC5vZCMhmve7yv+Y6E5eTnRTl+t9LLtmeBYQ9038Zm8= -github.com/pion/ice/v3 v3.0.6/go.mod h1:4eMTUKQEjC1fGQGB6qUzy2ux9Pc1v9EsO3hNaii+kXI= -github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M= -github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4= +github.com/pion/datachannel v1.5.9 h1:LpIWAOYPyDrXtU+BW7X0Yt/vGtYxtXQ8ql7dFfYUVZA= +github.com/pion/datachannel v1.5.9/go.mod h1:kDUuk4CU4Uxp82NH4LQZbISULkX/HtzKa4P7ldf9izE= +github.com/pion/dtls/v3 v3.0.2 h1:425DEeJ/jfuTTghhUDW0GtYZYIwwMtnKKJNMcWccTX0= +github.com/pion/dtls/v3 v3.0.2/go.mod h1:dfIXcFkKoujDQ+jtd8M6RgqKK3DuaUilm3YatAbGp5k= +github.com/pion/ice/v4 v4.0.1 h1:2d3tPoTR90F3TcGYeXUwucGlXI3hds96cwv4kjZmb9s= +github.com/pion/ice/v4 v4.0.1/go.mod h1:2dpakjpd7+74L5j3TAe6gvkbI5UIzOgAnkimm9SuHvA= +github.com/pion/interceptor v0.1.30 h1:au5rlVHsgmxNi+v/mjOPazbW1SHzfx7/hYOEYQnUcxA= +github.com/pion/interceptor v0.1.30/go.mod h1:RQuKT5HTdkP2Fi0cuOS5G5WNymTjzXaGF75J4k7z2nc= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns/v2 v2.0.7 h1:c9kM8ewCgjslaAmicYMFQIde2H9/lrZpjBkN8VwoVtM= github.com/pion/mdns/v2 v2.0.7/go.mod h1:vAdSYNAT0Jy3Ru0zl2YiW3Rm/fJCwIeM0nToenfOJKA= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE= github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= -github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= -github.com/pion/rtp v1.8.5 h1:uYzINfaK+9yWs7r537z/Rc1SvT8ILjBcmDOpJcTB+OU= -github.com/pion/rtp v1.8.5/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= -github.com/pion/sctp v1.8.13/go.mod h1:YKSgO/bO/6aOMP9LCie1DuD7m+GamiK2yIiPM6vH+GA= -github.com/pion/sctp v1.8.16 h1:PKrMs+o9EMLRvFfXq59WFsC+V8mN1wnKzqrv+3D/gYY= -github.com/pion/sctp v1.8.16/go.mod h1:P6PbDVA++OJMrVNg2AL3XtYHV4uD6dvfyOovCgMs0PE= +github.com/pion/rtp v1.8.9 h1:E2HX740TZKaqdcPmf4pw6ZZuG8u5RlMMt+l3dxeu6Wk= +github.com/pion/rtp v1.8.9/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/sctp v1.8.33 h1:dSE4wX6uTJBcNm8+YlMg7lw1wqyKHggsP5uKbdj+NZw= +github.com/pion/sctp v1.8.33/go.mod h1:beTnqSzewI53KWoG3nqB282oDMGrhNxBdb+JZnkCwRM= github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY= github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M= -github.com/pion/srtp/v3 v3.0.1 h1:AkIQRIZ+3tAOJMQ7G301xtrD1vekQbNeRO7eY1K8ZHk= -github.com/pion/srtp/v3 v3.0.1/go.mod h1:3R3a1qIOIxBkVTLGFjafKK6/fJoTdQDhcC67HOyMbJ8= -github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0= -github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ= -github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= -github.com/pion/transport/v2 v2.2.4 h1:41JJK6DZQYSeVLxILA2+F4ZkKb4Xd/tFJZRFZQ9QAlo= -github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= -github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0= -github.com/pion/transport/v3 v3.0.2 h1:r+40RJR25S9w3jbA6/5uEPTzcdn7ncyU44RWCbHkLg4= -github.com/pion/transport/v3 v3.0.2/go.mod h1:nIToODoOlb5If2jF9y2Igfx3PFYWfuXi37m0IlWa/D0= -github.com/pion/turn/v3 v3.0.2 h1:iBonAIIKRwkVUJBFiFd/kSjytP7FlX0HwCyBDJPRDdU= -github.com/pion/turn/v3 v3.0.2/go.mod h1:vw0Dz420q7VYAF3J4wJKzReLHIo2LGp4ev8nXQexYsc= -github.com/pion/webrtc/v4 v4.0.0-beta.17 h1:KdAbozM+lQ3Dz1NJ0JATRDQ4W02WUhWwIkvjyBRODL0= -github.com/pion/webrtc/v4 v4.0.0-beta.17/go.mod h1:I/Z0MFtc6Ok7mN7kZmA1xqU7KA9ycZZx/6eXz5+yD+4= -github.com/pkg/errors v0.0.0-20190227000051-27936f6d90f9/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pion/srtp/v3 v3.0.3 h1:tRtEOpmR8NtsB/KndlKXFOj/AIIs6aPrCq4TlAatC4M= +github.com/pion/srtp/v3 v3.0.3/go.mod h1:Bp9ztzPCoE0ETca/R+bTVTO5kBgaQMiQkTmZWwazDTc= +github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw= +github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU= +github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0= +github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo= +github.com/pion/turn/v4 v4.0.0 h1:qxplo3Rxa9Yg1xXDxxH8xaqcyGUtbHYw4QSCvmFWvhM= +github.com/pion/turn/v4 v4.0.0/go.mod h1:MuPDkm15nYSklKpN8vWJ9W2M0PlyQZqYt1McGuxG7mA= +github.com/pion/webrtc/v4 v4.0.0-beta.30 h1:ztchBW2RZiiBflmoCIuViD/axDoNkEzoh0CqRWvf6dc= +github.com/pion/webrtc/v4 v4.0.0-beta.30/go.mod h1:V+nZxyUG8sIUb0uUYQEZzx1PvMPtHlRby4h3xhrjTsg= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -384,7 +368,6 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/quasoft/memstore v0.0.0-20180925164028-84a050167438/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg= github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rdegges/go-ipify v0.0.0-20150526035502-2d94a6a86c40 h1:31Y7UZ1yTYBU4E79CE52I/1IRi3TqiuwquXGNtZDXWs= @@ -401,14 +384,15 @@ github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:s github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -419,8 +403,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -428,32 +410,31 @@ github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 h1:xQdMZ1WLrgkk github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= -github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b h1:mnG1fcsIB1d/3vbkBak2MM0u+vhGhlQwpeimUi7QncM= -github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= +github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b h1:fj5tQ8acgNUr6O8LEplsxDhUIe2573iLkJc+PqnzZTI= +github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY= -github.com/tjfoc/gmsm v0.0.0-20190417070453-18fd8096dc8a h1:Js43XIYn4yVbKmHVAMMZlhSuNZljbA1hw1B73+ezJhU= -github.com/tjfoc/gmsm v0.0.0-20190417070453-18fd8096dc8a/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= +github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= +github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/transip/gotransip/v6 v6.0.2/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4qdgLdRzmtY+g= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vultr/govultr v0.4.2/go.mod h1:TUuUizMOFc7z+PNMssb6iGjKjQfpw5arIaOLfocVudQ= github.com/wk8/go-ordered-map v1.0.0 h1:BV7z+2PaK8LTSd/mWgY12HyMAo5CEgkHqbkVq2thqr8= github.com/wk8/go-ordered-map v1.0.0/go.mod h1:9ZIbRunKbuvfPKyBP1SIKLcXNlv74YCOZ3t3VTS6gRk= +github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg= +github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xtaci/kcp-go v4.3.1+incompatible h1:JU7DMiCsyj6S+LkR6/+tPQEgdwnihOgYtbUkdtvyUDc= -github.com/xtaci/kcp-go v4.3.1+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= -github.com/xtaci/smux v1.2.11 h1:QI4M2HgkkpsVU3Bfcmyx10qURBEeHfKi7xDhGEORfu0= -github.com/xtaci/smux v1.2.11/go.mod h1:f+nYm6SpuHMy/SH0zpbvAFHT1QoMcgLOsWcFip5KfPw= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/xtaci/kcp-go v5.4.20+incompatible h1:TN1uey3Raw0sTz0Fg8GkfM0uH3YwzhnZWQ1bABv5xAg= +github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= +github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 h1:EWU6Pktpas0n8lLQwDsRyZfmkPeRbdgPtW609es+/9E= +github.com/xtaci/smux v1.5.30 h1:LFxB7WSr0mbQhbdJzfbxnfCKVQKYzcyB+/8mXf2dTdQ= +github.com/xtaci/smux v1.5.30/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY= gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 h1:dizWJqTWjwyD8KGcMOwgrkqu1JIkofYgKkmDeNE7oAs= gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40/go.mod h1:rOnSnoRyxMI3fe/7KIbVcsHRGxe30OONv8dEgo+vCfA= gitlab.com/NebulousLabs/go-upnp v0.0.0-20181011194642-3a71999ed0d3 h1:qXqiXDgeQxspR3reot1pWme00CX1pXbxesdzND+EjbU= @@ -467,26 +448,22 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= -golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -516,15 +493,11 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -540,6 +513,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -548,18 +522,9 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -571,10 +536,9 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -582,9 +546,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -600,6 +562,7 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -612,47 +575,27 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -675,6 +618,7 @@ golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -686,14 +630,9 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -735,18 +674,19 @@ google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -754,8 +694,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -770,10 +708,10 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -784,6 +722,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= From f02cc91ed09597542d64f7ed9fca7b9f38914d8f Mon Sep 17 00:00:00 2001 From: Pascal Eberlein Date: Sat, 28 Sep 2024 10:41:38 +0200 Subject: [PATCH 6/6] use latest nnet --- go.mod | 4 +--- go.sum | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b070d169b..5c0cb89a5 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/nknorg/nkn/v2 go 1.20 -replace github.com/nknorg/nnet => ../nnet - require ( github.com/emirpasic/gods v1.18.1 github.com/gin-contrib/sessions v1.0.1 @@ -14,7 +12,7 @@ require ( github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef github.com/itchyny/base58-go v0.2.2 github.com/nknorg/consequential v0.0.0-20191113113929-5fd13b7f5984 - github.com/nknorg/nnet v0.0.0-00010101000000-000000000000 + github.com/nknorg/nnet v0.0.0-20240928081915-ecfc0d74d3b0 github.com/nknorg/portmapper v0.0.0-20200114081049-1c03cdccc283 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 diff --git a/go.sum b/go.sum index 124e024ad..35d0e7632 100644 --- a/go.sum +++ b/go.sum @@ -280,6 +280,8 @@ github.com/nknorg/consequential v0.0.0-20191113113929-5fd13b7f5984 h1:VY7EXvgxCK github.com/nknorg/consequential v0.0.0-20191113113929-5fd13b7f5984/go.mod h1:H7XeI/XOPpWVmqM+ScT75RLMn7jWnlZDwHRahSxNxo0= github.com/nknorg/go-nat v1.0.1 h1:4dFK0oDyqkIE0it03Y4pMgBQpl1Y0mrYHEp+j/nZ910= github.com/nknorg/go-nat v1.0.1/go.mod h1:dblX1Ac2j08rTUGs5CKCAfjHGN5eDFhbeqt2rccSP3Y= +github.com/nknorg/nnet v0.0.0-20240928081915-ecfc0d74d3b0 h1:GlTEPJWbE59LxAy3quWDP++RrU0wM7oxB+Ry0Wy2lVU= +github.com/nknorg/nnet v0.0.0-20240928081915-ecfc0d74d3b0/go.mod h1:xQBEGtRmEK3LwVNq92IzLqIDbmyILAnsqZO5uYF9Fek= github.com/nknorg/portmapper v0.0.0-20200114081049-1c03cdccc283 h1:uS3/DvxCbi0zZau66ggQAgEjyGmql2mj77UQFgumq1I= github.com/nknorg/portmapper v0.0.0-20200114081049-1c03cdccc283/go.mod h1:dL4PQJ4670oTO6LqvkjrBQEkD+iMiOYjlKRBBw55Csg= github.com/nrdcg/auroradns v1.0.1/go.mod h1:y4pc0i9QXYlFCWrhWrUSIETnZgrf4KuwjDIWmmXo3JI=