Skip to content

Commit

Permalink
revert back to binance-chain/tss-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
@brewmaster012
brewmaster012 committed Jan 3, 2024
1 parent 250bbac commit 35850ed
Show file tree
Hide file tree
Showing 31 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion blame/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package blame
import (
"sync"

btss "github.com/binance-chain/tss-lib/tss"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
btss "github.com/zeta-chain/tss-lib/tss"
)

type Manager struct {
Expand Down
2 changes: 1 addition & 1 deletion blame/policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"errors"
"fmt"

btss "github.com/binance-chain/tss-lib/tss"
mapset "github.com/deckarep/golang-set"
"github.com/libp2p/go-libp2p/core/peer"
btss "github.com/zeta-chain/tss-lib/tss"

"github.com/zeta-chain/go-tss/conversion"
"github.com/zeta-chain/go-tss/messages"
Expand Down
4 changes: 2 additions & 2 deletions blame/policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"sync"
"testing"

bkg "github.com/binance-chain/tss-lib/ecdsa/keygen"
btss "github.com/binance-chain/tss-lib/tss"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/zeta-chain/go-tss/conversion"
"github.com/zeta-chain/go-tss/messages"
bkg "github.com/zeta-chain/tss-lib/ecdsa/keygen"
btss "github.com/zeta-chain/tss-lib/tss"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion blame/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"sync"

btss "github.com/zeta-chain/tss-lib/tss"
btss "github.com/binance-chain/tss-lib/tss"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions cmd/tss-benchgen/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"sync/atomic"
"time"

"github.com/binance-chain/tss-lib/common"
"github.com/binance-chain/tss-lib/ecdsa/keygen"
"github.com/binance-chain/tss-lib/test"
"github.com/binance-chain/tss-lib/tss"
"github.com/ipfs/go-log"
"github.com/pkg/errors"
"github.com/zeta-chain/tss-lib/common"
"github.com/zeta-chain/tss-lib/ecdsa/keygen"
"github.com/zeta-chain/tss-lib/test"
"github.com/zeta-chain/tss-lib/tss"
"golang.org/x/text/language"
"golang.org/x/text/message"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/tss-benchsign/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import (
"sync/atomic"
"time"

"github.com/binance-chain/tss-lib/common"
"github.com/binance-chain/tss-lib/ecdsa/keygen"
"github.com/binance-chain/tss-lib/ecdsa/signing"
"github.com/binance-chain/tss-lib/test"
"github.com/binance-chain/tss-lib/tss"
"github.com/btcsuite/btcd/btcec"
"github.com/ipfs/go-log"
"github.com/olekukonko/tablewriter"
"github.com/pkg/errors"
"github.com/zeta-chain/tss-lib/common"
"github.com/zeta-chain/tss-lib/ecdsa/keygen"
"github.com/zeta-chain/tss-lib/ecdsa/signing"
"github.com/zeta-chain/tss-lib/test"
"github.com/zeta-chain/tss-lib/tss"
"golang.org/x/text/language"
"golang.org/x/text/message"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tss-recovery/tool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"math/big"
"os"

"github.com/binance-chain/tss-lib/ecdsa/keygen"
"github.com/btcsuite/btcd/btcec"
coskey "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types"
bech32 "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
"github.com/zeta-chain/tss-lib/ecdsa/keygen"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion cmd/tss-recovery/tss-recovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"io/ioutil"
"os"

"github.com/binance-chain/tss-lib/crypto/vss"
. "github.com/decred/dcrd/dcrec/secp256k1"
"github.com/zeta-chain/tss-lib/crypto/vss"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion common/tss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"strings"
"sync"

btss "github.com/binance-chain/tss-lib/tss"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
tcrypto "github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/secp256k1"
btss "github.com/zeta-chain/tss-lib/tss"

"github.com/zeta-chain/go-tss/blame"
"github.com/zeta-chain/go-tss/conversion"
Expand Down
6 changes: 3 additions & 3 deletions common/tss_helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"os"
"strings"

"github.com/binance-chain/tss-lib/ecdsa/keygen"
"github.com/binance-chain/tss-lib/ecdsa/signing"
btss "github.com/binance-chain/tss-lib/tss"
"github.com/btcsuite/btcd/btcec"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
tcrypto "github.com/tendermint/tendermint/crypto"
"github.com/zeta-chain/tss-lib/ecdsa/keygen"
"github.com/zeta-chain/tss-lib/ecdsa/signing"
btss "github.com/zeta-chain/tss-lib/tss"

"github.com/zeta-chain/go-tss/blame"
"github.com/zeta-chain/go-tss/messages"
Expand Down
2 changes: 1 addition & 1 deletion common/tss_helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"math/big"
"path"

btss "github.com/binance-chain/tss-lib/tss"
sdk "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/tendermint/tendermint/crypto/secp256k1"
"github.com/zeta-chain/go-tss/blame"
"github.com/zeta-chain/go-tss/conversion"
"github.com/zeta-chain/go-tss/messages"
btss "github.com/zeta-chain/tss-lib/tss"
. "gopkg.in/check.v1"
)

Expand Down
4 changes: 2 additions & 2 deletions common/tss_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"testing"
"time"

btsskeygen "github.com/binance-chain/tss-lib/ecdsa/keygen"
btss "github.com/binance-chain/tss-lib/tss"
coskey "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
tcrypto "github.com/tendermint/tendermint/crypto"
Expand All @@ -20,8 +22,6 @@ import (
"github.com/zeta-chain/go-tss/conversion"
"github.com/zeta-chain/go-tss/messages"
"github.com/zeta-chain/go-tss/p2p"
btsskeygen "github.com/zeta-chain/tss-lib/ecdsa/keygen"
btss "github.com/zeta-chain/tss-lib/tss"
. "gopkg.in/check.v1"
)

Expand Down
4 changes: 2 additions & 2 deletions conversion/conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"strconv"
"strings"

"github.com/binance-chain/tss-lib/crypto"
btss "github.com/binance-chain/tss-lib/tss"
"github.com/btcsuite/btcd/btcec"
coskey "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
crypto2 "github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/zeta-chain/tss-lib/crypto"
btss "github.com/zeta-chain/tss-lib/tss"
"gitlab.com/thorchain/binance-sdk/common/types"

"github.com/zeta-chain/go-tss/messages"
Expand Down
2 changes: 1 addition & 1 deletion conversion/conversion_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"sort"
"testing"

"github.com/binance-chain/tss-lib/crypto"
"github.com/btcsuite/btcd/btcec"
coskey "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/zeta-chain/tss-lib/crypto"
. "gopkg.in/check.v1"
)

Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/zeta-chain/go-tss
go 1.17

require (
github.com/binance-chain/tss-lib v0.0.0-20201118045712-70b2cb4bf916
github.com/blang/semver v3.5.1+incompatible
github.com/btcsuite/btcd v0.22.1
github.com/cosmos/cosmos-sdk v0.45.1
Expand All @@ -22,7 +23,6 @@ require (
github.com/stretchr/testify v1.8.0
github.com/tendermint/btcd v0.1.1
github.com/tendermint/tendermint v0.34.14
github.com/zeta-chain/tss-lib v0.1.8-0.20240102220003-b406663f6e0f
gitlab.com/thorchain/binance-sdk v1.2.3-0.20210117202539-d569b6b9ba5d
go.uber.org/atomic v1.10.0
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
Expand Down Expand Up @@ -208,5 +208,6 @@ require (

replace (
github.com/agl/ed25519 => github.com/binance-chain/edwards25519 v0.0.0-20200305024217-f36fc4b53d43
github.com/binance-chain/tss-lib => gitlab.com/thorchain/tss/tss-lib v0.1.5
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
)
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1227,13 +1227,13 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/zeta-chain/tss-lib v0.1.8-0.20240102220003-b406663f6e0f h1:Lg8970wOkEdufgfdUKoLLqF+inATnp9KbG3D2g/ShdQ=
github.com/zeta-chain/tss-lib v0.1.8-0.20240102220003-b406663f6e0f/go.mod h1:/ZE/tsxvJrF07pMDb6DYYg3BE+yXM9CAmCRic+c3WWQ=
github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
github.com/zondax/ledger-go v0.12.1/go.mod h1:KatxXrVDzgWwbssUWsF5+cOJHXPvzQ09YSlzGNuhOEo=
gitlab.com/thorchain/binance-sdk v1.2.3-0.20210117202539-d569b6b9ba5d h1:GGPSI9gU22zW75m1YO7ZEMFtVEI5NgyK4g17CIXFjqI=
gitlab.com/thorchain/binance-sdk v1.2.3-0.20210117202539-d569b6b9ba5d/go.mod h1:SW01IZMpqlPNPdhHnn99qnJNvg8ll/agyyW7p85npwY=
gitlab.com/thorchain/tss/tss-lib v0.1.5 h1:L9MD+E3B4lJmadso69lTIP6s2Iks24fS7Ancs62LTZo=
gitlab.com/thorchain/tss/tss-lib v0.1.5/go.mod h1:pEM3W/1inIzmdQn9IY9pA0MkG1bTGKhsSivxizeyyt4=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
Expand Down
6 changes: 3 additions & 3 deletions keygen/keygen_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ import (
"testing"
"time"

"github.com/binance-chain/tss-lib/crypto"
"github.com/libp2p/go-libp2p/core/peer"
tcrypto "github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/secp256k1"
"github.com/zeta-chain/tss-lib/crypto"

btsskeygen "github.com/binance-chain/tss-lib/ecdsa/keygen"
btss "github.com/binance-chain/tss-lib/tss"
"github.com/ipfs/go-log"
maddr "github.com/multiformats/go-multiaddr"
"github.com/zeta-chain/go-tss/common"
"github.com/zeta-chain/go-tss/conversion"
"github.com/zeta-chain/go-tss/messages"
"github.com/zeta-chain/go-tss/p2p"
"github.com/zeta-chain/go-tss/storage"
btsskeygen "github.com/zeta-chain/tss-lib/ecdsa/keygen"
btss "github.com/zeta-chain/tss-lib/tss"
. "gopkg.in/check.v1"
)

Expand Down
6 changes: 3 additions & 3 deletions keygen/tss_keygen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"sync"
"time"

bcrypto "github.com/binance-chain/tss-lib/crypto"
bkg "github.com/binance-chain/tss-lib/ecdsa/keygen"
btss "github.com/binance-chain/tss-lib/tss"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
tcrypto "github.com/tendermint/tendermint/crypto"
bcrypto "github.com/zeta-chain/tss-lib/crypto"
bkg "github.com/zeta-chain/tss-lib/ecdsa/keygen"
btss "github.com/zeta-chain/tss-lib/tss"

"github.com/zeta-chain/go-tss/blame"
"github.com/zeta-chain/go-tss/common"
Expand Down
4 changes: 2 additions & 2 deletions keysign/keysign_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"testing"
"time"

tsslibcommon "github.com/binance-chain/tss-lib/common"
btss "github.com/binance-chain/tss-lib/tss"
maddr "github.com/multiformats/go-multiaddr"
zlog "github.com/rs/zerolog/log"
tsslibcommon "github.com/zeta-chain/tss-lib/common"
btss "github.com/zeta-chain/tss-lib/tss"

"github.com/zeta-chain/go-tss/conversion"

Expand Down
2 changes: 1 addition & 1 deletion keysign/notifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"math/big"

"github.com/binance-chain/tss-lib/common"
sdk "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
"github.com/tendermint/btcd/btcec"
"github.com/zeta-chain/tss-lib/common"
)

// Notifier is design to receive keysign signature, success or failure
Expand Down
4 changes: 2 additions & 2 deletions keysign/notifier_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"encoding/json"
"io/ioutil"

tsslibcommon "github.com/binance-chain/tss-lib/common"
"github.com/binance-chain/tss-lib/ecdsa/signing"
"github.com/zeta-chain/go-tss/common"
"github.com/zeta-chain/go-tss/conversion"
tsslibcommon "github.com/zeta-chain/tss-lib/common"
"github.com/zeta-chain/tss-lib/ecdsa/signing"
. "gopkg.in/check.v1"
)

Expand Down
4 changes: 2 additions & 2 deletions keysign/signature_notifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import (
"sync"
"time"

"github.com/binance-chain/tss-lib/common"
tsslibcommon "github.com/binance-chain/tss-lib/common"
"github.com/golang/protobuf/proto"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/zeta-chain/tss-lib/common"
tsslibcommon "github.com/zeta-chain/tss-lib/common"

"github.com/zeta-chain/go-tss/messages"
"github.com/zeta-chain/go-tss/p2p"
Expand Down
4 changes: 2 additions & 2 deletions keysign/signature_notifier_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"testing"
"time"

tsslibcommon "github.com/binance-chain/tss-lib/common"
"github.com/binance-chain/tss-lib/ecdsa/signing"
tnet "github.com/libp2p/go-libp2p-testing/net"
"github.com/libp2p/go-libp2p/core/peer"
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
"github.com/stretchr/testify/assert"
tsslibcommon "github.com/zeta-chain/tss-lib/common"
"github.com/zeta-chain/tss-lib/ecdsa/signing"

"github.com/zeta-chain/go-tss/common"
"github.com/zeta-chain/go-tss/p2p"
Expand Down
6 changes: 3 additions & 3 deletions keysign/tss_keysign.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"sync"
"time"

tsslibcommon "github.com/binance-chain/tss-lib/common"
"github.com/binance-chain/tss-lib/ecdsa/signing"
btss "github.com/binance-chain/tss-lib/tss"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
tcrypto "github.com/tendermint/tendermint/crypto"
tsslibcommon "github.com/zeta-chain/tss-lib/common"
"github.com/zeta-chain/tss-lib/ecdsa/signing"
btss "github.com/zeta-chain/tss-lib/tss"
"go.uber.org/atomic"

"github.com/zeta-chain/go-tss/blame"
Expand Down
2 changes: 1 addition & 1 deletion messages/p2p_message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package messages
import (
"fmt"

btss "github.com/binance-chain/tss-lib/tss"
"github.com/libp2p/go-libp2p/core/peer"
btss "github.com/zeta-chain/tss-lib/tss"
)

// THORChainTSSMessageType represent the messgae type used in THORChain TSS
Expand Down
2 changes: 1 addition & 1 deletion messages/p2p_message_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math/big"
"testing"

btss "github.com/zeta-chain/tss-lib/tss"
btss "github.com/binance-chain/tss-lib/tss"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion storage/localstate_mgr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"strings"
"sync"

"github.com/binance-chain/tss-lib/ecdsa/keygen"
"github.com/libp2p/go-libp2p/core/peer"
maddr "github.com/multiformats/go-multiaddr"
"github.com/zeta-chain/tss-lib/ecdsa/keygen"

"github.com/zeta-chain/go-tss/conversion"
"github.com/zeta-chain/go-tss/p2p"
Expand Down
Loading

0 comments on commit 35850ed

Please sign in to comment.