From f47c4a4b27e97eb7d274af8e1083a38bdb45ee16 Mon Sep 17 00:00:00 2001 From: Mira Belenkiy Date: Mon, 20 Nov 2023 14:32:32 -0500 Subject: [PATCH] updated to tss-lib/v2 --- Makefile | 5 +- crypto/accmta/share_protocol.go | 8 +-- crypto/accmta/share_protocol_test.go | 14 ++--- crypto/zkproofs/aff_g_inv_proof.go | 6 +- crypto/zkproofs/aff_g_proof.go | 6 +- crypto/zkproofs/aff_g_proof_test.go | 6 +- crypto/zkproofs/aff_p_proof.go | 4 +- crypto/zkproofs/aff_p_proof_test.go | 5 +- crypto/zkproofs/dec_proof.go | 4 +- crypto/zkproofs/dec_proof_test.go | 4 +- crypto/zkproofs/enc_proof.go | 8 +-- crypto/zkproofs/enc_proof_test.go | 26 +------- crypto/zkproofs/logstar_proof.go | 6 +- crypto/zkproofs/logstar_proof_test.go | 6 +- crypto/zkproofs/mul_proof.go | 2 +- crypto/zkproofs/mul_proof_test.go | 4 +- crypto/zkproofs/mulstar_proof.go | 4 +- crypto/zkproofs/mulstar_proof_test.go | 8 +-- crypto/zkproofs/zkproofs.go | 2 +- crypto/zkproofs/zkproofs_test.go | 8 +-- ecdsa/cggplus/finalize.go | 6 +- ecdsa/cggplus/local_party.go | 10 ++-- ecdsa/cggplus/messages.go | 8 +-- ecdsa/cggplus/round_1.go | 10 ++-- ecdsa/cggplus/round_2.go | 8 +-- ecdsa/cggplus/round_3.go | 8 +-- ecdsa/cggplus/round_4.go | 8 +-- ecdsa/cggplus/round_5.go | 6 +- ecdsa/cggplus/round_test.go | 2 +- ecdsa/cggplus/round_test_util.go | 8 +-- ecdsa/cggplus/rounds.go | 6 +- ecdsa/keygen/save_data.go | 8 +-- go.mod | 16 +++++ go.sum | 85 +-------------------------- 34 files changed, 116 insertions(+), 209 deletions(-) diff --git a/Makefile b/Makefile index 90bd01e..ec2fb5e 100644 --- a/Makefile +++ b/Makefile @@ -33,10 +33,7 @@ test_unit: @echo "--> Running Unit Tests" @echo "!!! WARNING: This will take a long time :)" go clean -testcache - go test -timeout 60m github.com/bnb-chain/tss-lib/crypto/accmta - go test -timeout 60m github.com/bnb-chain/tss-lib/crypto/zkproofs - go test -timeout 60m github.com/bnb-chain/tss-lib/ecdsa/cggplus -# go test -timeout 60m $(PACKAGES) + go test -timeout 60m $(PACKAGES) test_unit_race: @echo "--> Running Unit Tests (with Race Detection)" diff --git a/crypto/accmta/share_protocol.go b/crypto/accmta/share_protocol.go index 89cf114..1bbc9a8 100644 --- a/crypto/accmta/share_protocol.go +++ b/crypto/accmta/share_protocol.go @@ -22,10 +22,10 @@ import ( "math/big" "sync" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/paillier" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" ) func AliceInit( diff --git a/crypto/accmta/share_protocol_test.go b/crypto/accmta/share_protocol_test.go index c3b6b77..0868253 100644 --- a/crypto/accmta/share_protocol_test.go +++ b/crypto/accmta/share_protocol_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/accmta" - "github.com/bnb-chain/tss-lib/crypto/paillier" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/ecdsa/keygen" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/accmta" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/ecdsa/keygen" + "github.com/bnb-chain/tss-lib/v2/tss" ) var ( diff --git a/crypto/zkproofs/aff_g_inv_proof.go b/crypto/zkproofs/aff_g_inv_proof.go index d72d6fb..0890c1d 100644 --- a/crypto/zkproofs/aff_g_inv_proof.go +++ b/crypto/zkproofs/aff_g_inv_proof.go @@ -36,9 +36,9 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" ) // Note: (z,u,v) are lowercase in aff-g from CGG21 Section 6.2 Figure 15. diff --git a/crypto/zkproofs/aff_g_proof.go b/crypto/zkproofs/aff_g_proof.go index 7f52d43..a80b348 100644 --- a/crypto/zkproofs/aff_g_proof.go +++ b/crypto/zkproofs/aff_g_proof.go @@ -33,9 +33,9 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" ) const ( diff --git a/crypto/zkproofs/aff_g_proof_test.go b/crypto/zkproofs/aff_g_proof_test.go index 799b7c2..dff0ac9 100644 --- a/crypto/zkproofs/aff_g_proof_test.go +++ b/crypto/zkproofs/aff_g_proof_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" ) func GenerateAffGData(t *testing.T) (*zkproofs.AffGWitness, *zkproofs.AffGStatement) { diff --git a/crypto/zkproofs/aff_p_proof.go b/crypto/zkproofs/aff_p_proof.go index bab0b7c..8b18762 100644 --- a/crypto/zkproofs/aff_p_proof.go +++ b/crypto/zkproofs/aff_p_proof.go @@ -37,8 +37,8 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" ) const ( diff --git a/crypto/zkproofs/aff_p_proof_test.go b/crypto/zkproofs/aff_p_proof_test.go index 9f22526..2bf8b0b 100644 --- a/crypto/zkproofs/aff_p_proof_test.go +++ b/crypto/zkproofs/aff_p_proof_test.go @@ -20,8 +20,9 @@ import ( "math/big" "testing" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/stretchr/testify/assert" ) diff --git a/crypto/zkproofs/dec_proof.go b/crypto/zkproofs/dec_proof.go index 41951c0..d7f99a6 100644 --- a/crypto/zkproofs/dec_proof.go +++ b/crypto/zkproofs/dec_proof.go @@ -27,8 +27,8 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" ) const ( diff --git a/crypto/zkproofs/dec_proof_test.go b/crypto/zkproofs/dec_proof_test.go index a1e5856..708a162 100644 --- a/crypto/zkproofs/dec_proof_test.go +++ b/crypto/zkproofs/dec_proof_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" ) func TestDecProof(t *testing.T) { diff --git a/crypto/zkproofs/enc_proof.go b/crypto/zkproofs/enc_proof.go index 01e74c3..4a5dc09 100644 --- a/crypto/zkproofs/enc_proof.go +++ b/crypto/zkproofs/enc_proof.go @@ -28,8 +28,8 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" ) const ( @@ -137,9 +137,9 @@ func (proof *EncProof) Verify(stmt *EncStatement, rp *RingPedersenParams) bool { // check (1+N0)^z1 * z2^N0 mod N02 == A * K^e mod N02 N02 := new(big.Int).Mul(stmt.N0, stmt.N0) pkN0 := &paillier.PublicKey{N: stmt.N0} - left1, err := pkN0.EncryptWithRandomness(proof.Z1, proof.Z2) + left1 := pkN0.EncryptWithRandomnessNoErrChk(proof.Z1, proof.Z2) right1 := ATimesBToTheCModN(proof.A, stmt.K, e, N02) - if err != nil || left1.Cmp(right1) != 0 { + if left1.Cmp(right1) != 0 { return false } diff --git a/crypto/zkproofs/enc_proof_test.go b/crypto/zkproofs/enc_proof_test.go index 6a7ac8b..e4be955 100644 --- a/crypto/zkproofs/enc_proof_test.go +++ b/crypto/zkproofs/enc_proof_test.go @@ -17,36 +17,14 @@ package zkproofs_test import ( - "math/big" "testing" "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" ) -func TestEncKnownInputProof(t *testing.T) { - k, _ := new(big.Int).SetString("114389473239505230491163146795412138983239597318806644445410158725115455132692", 0) - K, _ := new(big.Int).SetString("465731706496473911847378750369631955920537852546894056438324922002323832557052064091918779928998117741164270297323463208064330285407219572177029360826008098571725648121552938575861312248098147580091443066258128496730130821607283612246459392571020574355259214835267622850399259810669526425866890543731585668563000223903364750259693607987689860689205912013767228001149855306031477483177607033616664945169002738496514270876030965906518470081313910226789131722379851589407879764493910658365838303529011095873089917057785671727758265706395079059011018323942761921652586013265038187227881878435999741578132905577045639379857443750047257615234688808089465285800849341881615220067137051394879797468117924789386876077614815545558385023634752683865402913773342113237762409485419286550203760964443643787231978551910564595235133167072250444545071003504714377320420465772179408459459859448083450614589893581034041705745134325422367038213583684619090512936707235222566271258400064022000366699765004412201467436278215661566566076268380633299387576044688216534173466664307669004872674171324245476404394755604318512835901804601155380746059882379447729445237927082554648890833562174587009270444294220972401968147951439030634576490769491329725523066373", 0) - rho, _ := new(big.Int).SetString("1589242199014186642803401666691520301635771315788503864752220777217738751901654796434493911079208937341944417070764384236037629531669977085618074891575239323560840983052587886127349018243828507737099166737147980821930538648101089752705183504157416079572589094945765694857956926575398689326240518052796539017352391285840754641810683001857169286294137848743745186617946790757924489281977116077802106464822099774315121788634674603354884106884083707909112735182653869657570449994189127412585926110940250122589069694819774998940166052085553665809474348432193960236312713027489316513952283294330658069074266897280468237987", 0) - - witness := &zkproofs.EncWitness{ - K: k, - Rho: rho, - } - statement := &zkproofs.EncStatement{ - EC: ec, - N0: publicKey.N, - K: K, - } - proof, err := zkproofs.NewEncProof(witness, statement, ringPedersen) - assert.NoError(t, err) - assert.NotNil(t, proof, "proof is nil") - assert.False(t, proof.Nil(), "proof has nil fields") - assert.True(t, proof.Verify(statement, ringPedersen), "proof failed to verify") -} - func TestEncProof(t *testing.T) { setUp(t) diff --git a/crypto/zkproofs/logstar_proof.go b/crypto/zkproofs/logstar_proof.go index b64cca0..10fc78a 100644 --- a/crypto/zkproofs/logstar_proof.go +++ b/crypto/zkproofs/logstar_proof.go @@ -31,9 +31,9 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" ) const ( diff --git a/crypto/zkproofs/logstar_proof_test.go b/crypto/zkproofs/logstar_proof_test.go index cbd262d..427d907 100644 --- a/crypto/zkproofs/logstar_proof_test.go +++ b/crypto/zkproofs/logstar_proof_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" ) func TestLogStarProof(t *testing.T) { diff --git a/crypto/zkproofs/mul_proof.go b/crypto/zkproofs/mul_proof.go index 0f35ac9..2ba65e7 100644 --- a/crypto/zkproofs/mul_proof.go +++ b/crypto/zkproofs/mul_proof.go @@ -26,7 +26,7 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" + "github.com/bnb-chain/tss-lib/v2/common" ) const ( diff --git a/crypto/zkproofs/mul_proof_test.go b/crypto/zkproofs/mul_proof_test.go index a5e04c7..bb1e1e7 100644 --- a/crypto/zkproofs/mul_proof_test.go +++ b/crypto/zkproofs/mul_proof_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" ) func TestMulProof(t *testing.T) { diff --git a/crypto/zkproofs/mulstar_proof.go b/crypto/zkproofs/mulstar_proof.go index 868ecfe..93f09b9 100644 --- a/crypto/zkproofs/mulstar_proof.go +++ b/crypto/zkproofs/mulstar_proof.go @@ -31,8 +31,8 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" ) const ( diff --git a/crypto/zkproofs/mulstar_proof_test.go b/crypto/zkproofs/mulstar_proof_test.go index 76b912f..191eaf4 100644 --- a/crypto/zkproofs/mulstar_proof_test.go +++ b/crypto/zkproofs/mulstar_proof_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) func TestMulStarProof(t *testing.T) { diff --git a/crypto/zkproofs/zkproofs.go b/crypto/zkproofs/zkproofs.go index 3740224..943af79 100644 --- a/crypto/zkproofs/zkproofs.go +++ b/crypto/zkproofs/zkproofs.go @@ -22,7 +22,7 @@ import ( "math/big" "strconv" - "github.com/bnb-chain/tss-lib/common" + "github.com/bnb-chain/tss-lib/v2/common" ) type Proof interface { diff --git a/crypto/zkproofs/zkproofs_test.go b/crypto/zkproofs/zkproofs_test.go index d0c16a8..f9853f2 100644 --- a/crypto/zkproofs/zkproofs_test.go +++ b/crypto/zkproofs/zkproofs_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/crypto/paillier" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/ecdsa/keygen" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/ecdsa/keygen" + "github.com/bnb-chain/tss-lib/v2/tss" ) // Using a modulus length of 2048 is recommended in the GG18 spec diff --git a/ecdsa/cggplus/finalize.go b/ecdsa/cggplus/finalize.go index d35af66..e61d656 100644 --- a/ecdsa/cggplus/finalize.go +++ b/ecdsa/cggplus/finalize.go @@ -17,9 +17,9 @@ import ( "math/big" "sync" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) func (round *finalization) Start() *tss.Error { diff --git a/ecdsa/cggplus/local_party.go b/ecdsa/cggplus/local_party.go index 1a6f310..6d4f1a0 100644 --- a/ecdsa/cggplus/local_party.go +++ b/ecdsa/cggplus/local_party.go @@ -16,11 +16,11 @@ import ( "fmt" "math/big" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/ecdsa/keygen" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/ecdsa/keygen" + "github.com/bnb-chain/tss-lib/v2/tss" ) // Implements Party diff --git a/ecdsa/cggplus/messages.go b/ecdsa/cggplus/messages.go index 24aecbf..701a379 100644 --- a/ecdsa/cggplus/messages.go +++ b/ecdsa/cggplus/messages.go @@ -21,10 +21,10 @@ import ( "math/big" "strconv" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) var ( diff --git a/ecdsa/cggplus/round_1.go b/ecdsa/cggplus/round_1.go index 7d2e213..83245ec 100644 --- a/ecdsa/cggplus/round_1.go +++ b/ecdsa/cggplus/round_1.go @@ -15,11 +15,11 @@ import ( "errors" "fmt" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/accmta" - "github.com/bnb-chain/tss-lib/ecdsa/keygen" - "github.com/bnb-chain/tss-lib/ecdsa/signing" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/accmta" + "github.com/bnb-chain/tss-lib/v2/ecdsa/keygen" + "github.com/bnb-chain/tss-lib/v2/ecdsa/signing" + "github.com/bnb-chain/tss-lib/v2/tss" ) func newRound1(params *tss.Parameters, key *keygen.LocalPartySaveData, data *common.SignatureData, temp *localTempData, out chan<- tss.Message, end chan<- common.SignatureData) tss.Round { diff --git a/ecdsa/cggplus/round_2.go b/ecdsa/cggplus/round_2.go index 8968864..5adf658 100644 --- a/ecdsa/cggplus/round_2.go +++ b/ecdsa/cggplus/round_2.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/accmta" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/accmta" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) func (round *round2) Start() *tss.Error { diff --git a/ecdsa/cggplus/round_3.go b/ecdsa/cggplus/round_3.go index 756265f..41fc07d 100644 --- a/ecdsa/cggplus/round_3.go +++ b/ecdsa/cggplus/round_3.go @@ -21,10 +21,10 @@ import ( "math/big" "sync" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/accmta" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/accmta" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) func (round *round3) Start() *tss.Error { diff --git a/ecdsa/cggplus/round_4.go b/ecdsa/cggplus/round_4.go index 3e85612..d6c7e55 100644 --- a/ecdsa/cggplus/round_4.go +++ b/ecdsa/cggplus/round_4.go @@ -21,10 +21,10 @@ import ( "math/big" "sync" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) func (round *round4) Start() *tss.Error { diff --git a/ecdsa/cggplus/round_5.go b/ecdsa/cggplus/round_5.go index 5a6b899..f989ac1 100644 --- a/ecdsa/cggplus/round_5.go +++ b/ecdsa/cggplus/round_5.go @@ -21,9 +21,9 @@ import ( "math/big" "sync" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" + "github.com/bnb-chain/tss-lib/v2/tss" ) func (round *round5) Start() *tss.Error { diff --git a/ecdsa/cggplus/round_test.go b/ecdsa/cggplus/round_test.go index d56c471..22407fe 100644 --- a/ecdsa/cggplus/round_test.go +++ b/ecdsa/cggplus/round_test.go @@ -17,7 +17,7 @@ package cggplus import ( - // "github.com/bnb-chain/tss-lib/tss" + // "github.com/bnb-chain/tss-lib/v2/tss" // "sync" "testing" ) diff --git a/ecdsa/cggplus/round_test_util.go b/ecdsa/cggplus/round_test_util.go index 4d374ec..007300e 100644 --- a/ecdsa/cggplus/round_test_util.go +++ b/ecdsa/cggplus/round_test_util.go @@ -24,10 +24,10 @@ import ( "github.com/ipfs/go-log" "github.com/stretchr/testify/assert" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/ecdsa/keygen" - "github.com/bnb-chain/tss-lib/test" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/ecdsa/keygen" + "github.com/bnb-chain/tss-lib/v2/test" + "github.com/bnb-chain/tss-lib/v2/tss" ) const ( diff --git a/ecdsa/cggplus/rounds.go b/ecdsa/cggplus/rounds.go index a6f7697..0576efa 100644 --- a/ecdsa/cggplus/rounds.go +++ b/ecdsa/cggplus/rounds.go @@ -14,9 +14,9 @@ package cggplus import ( "errors" - "github.com/bnb-chain/tss-lib/common" - "github.com/bnb-chain/tss-lib/ecdsa/keygen" - "github.com/bnb-chain/tss-lib/tss" + "github.com/bnb-chain/tss-lib/v2/common" + "github.com/bnb-chain/tss-lib/v2/ecdsa/keygen" + "github.com/bnb-chain/tss-lib/v2/tss" ) const ( diff --git a/ecdsa/keygen/save_data.go b/ecdsa/keygen/save_data.go index bedf055..c6e4ec9 100644 --- a/ecdsa/keygen/save_data.go +++ b/ecdsa/keygen/save_data.go @@ -16,16 +16,10 @@ import ( "errors" "math/big" -<<<<<<< HEAD "github.com/bnb-chain/tss-lib/v2/crypto" "github.com/bnb-chain/tss-lib/v2/crypto/paillier" + "github.com/bnb-chain/tss-lib/v2/crypto/zkproofs" "github.com/bnb-chain/tss-lib/v2/tss" -======= - "github.com/bnb-chain/tss-lib/crypto" - "github.com/bnb-chain/tss-lib/crypto/paillier" - "github.com/bnb-chain/tss-lib/crypto/zkproofs" - "github.com/bnb-chain/tss-lib/tss" ->>>>>>> d8333a5 (Accountable CGG21 and GG18 (#6)) ) type ( diff --git a/go.mod b/go.mod index 674f6d9..3ba17e4 100644 --- a/go.mod +++ b/go.mod @@ -17,4 +17,20 @@ require ( google.golang.org/protobuf v1.31.0 ) +require ( + github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/ipfs/go-log/v2 v2.1.3 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.16.0 // indirect + golang.org/x/sys v0.12.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + replace github.com/agl/ed25519 => github.com/binance-chain/edwards25519 v0.0.0-20200305024217-f36fc4b53d43 diff --git a/go.sum b/go.sum index 1c7500c..35056e1 100644 --- a/go.sum +++ b/go.sum @@ -4,16 +4,10 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA github.com/binance-chain/edwards25519 v0.0.0-20200305024217-f36fc4b53d43 h1:Vkf7rtHx8uHx8gDfkQaCdVfc+gfrF9v6sR6xJy7RXNg= github.com/binance-chain/edwards25519 v0.0.0-20200305024217-f36fc4b53d43/go.mod h1:TnVqVdGEK8b6erOMkcyYGWzCQMw7HEMCOw3BgFYCFWs= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd v0.23.4 h1:IzV6qqkfwbItOS/sg/aDfPDsjPP8twrCOE2R93hxMlQ= github.com/btcsuite/btcd v0.23.4/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= -github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= -github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A= -github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= @@ -22,9 +16,7 @@ github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2ut github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= -github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -37,23 +29,11 @@ github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 h1:l/lhv2aJCUignzls81+wvga0TFlyoZ github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3/go.mod h1:AKpV6+wZ2MfPRJnTbQ6NPgWrKzbe9RCIlCF/FKzMtM8= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= -github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -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/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -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/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -67,7 +47,6 @@ github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JP github.com/ipfs/go-log/v2 v2.1.3 h1:1iS3IU7aXRlbgUpN8yTTpJ53NXYjAe37vcI5+5nYrzk= github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= 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= @@ -77,15 +56,9 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN 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/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= 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= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= @@ -105,20 +78,13 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/stretchr/objx v0.1.0/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/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -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.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= 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= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -134,66 +100,32 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/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.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= 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 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/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-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/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.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/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-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.3.0/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.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -201,21 +133,13 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a h1:CB3a9Nez8M13wwlr/E2YtwoU+qYHKfC+JrDa45RXXoQ= 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 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -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/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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= @@ -226,11 +150,8 @@ 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/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= 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.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -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= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=