diff --git a/blame/manager.go b/blame/manager.go
index 0fbfe2b..0333a98 100644
--- a/blame/manager.go
+++ b/blame/manager.go
@@ -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 {
diff --git a/blame/policy.go b/blame/policy.go
index 66a552e..e01fa2f 100644
--- a/blame/policy.go
+++ b/blame/policy.go
@@ -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"
diff --git a/blame/policy_test.go b/blame/policy_test.go
index 772f6a8..f43553a 100644
--- a/blame/policy_test.go
+++ b/blame/policy_test.go
@@ -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"
 )
 
diff --git a/blame/types.go b/blame/types.go
index a72294a..30f032a 100644
--- a/blame/types.go
+++ b/blame/types.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"sync"
 
-	btss "github.com/zeta-chain/tss-lib/tss"
+	btss "github.com/binance-chain/tss-lib/tss"
 )
 
 const (
diff --git a/cmd/tss-benchgen/main.go b/cmd/tss-benchgen/main.go
index 9dd8b4a..4d01636 100644
--- a/cmd/tss-benchgen/main.go
+++ b/cmd/tss-benchgen/main.go
@@ -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"
 )
diff --git a/cmd/tss-benchsign/main.go b/cmd/tss-benchsign/main.go
index f426ed4..3460c3e 100644
--- a/cmd/tss-benchsign/main.go
+++ b/cmd/tss-benchsign/main.go
@@ -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"
 )
diff --git a/cmd/tss-recovery/tool.go b/cmd/tss-recovery/tool.go
index d8e6727..6a32c4e 100644
--- a/cmd/tss-recovery/tool.go
+++ b/cmd/tss-recovery/tool.go
@@ -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 (
diff --git a/cmd/tss-recovery/tss-recovery.go b/cmd/tss-recovery/tss-recovery.go
index 33d6054..7f3adab 100644
--- a/cmd/tss-recovery/tss-recovery.go
+++ b/cmd/tss-recovery/tss-recovery.go
@@ -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() {
diff --git a/common/tss.go b/common/tss.go
index dbbcb9a..35a5abc 100644
--- a/common/tss.go
+++ b/common/tss.go
@@ -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"
diff --git a/common/tss_helper.go b/common/tss_helper.go
index 31bb776..7690700 100644
--- a/common/tss_helper.go
+++ b/common/tss_helper.go
@@ -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"
diff --git a/common/tss_helper_test.go b/common/tss_helper_test.go
index 1bf54a7..0e962cc 100644
--- a/common/tss_helper_test.go
+++ b/common/tss_helper_test.go
@@ -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"
 )
 
diff --git a/common/tss_test.go b/common/tss_test.go
index 126e183..694238e 100644
--- a/common/tss_test.go
+++ b/common/tss_test.go
@@ -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"
@@ -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"
 )
 
diff --git a/conversion/conversion.go b/conversion/conversion.go
index 9136867..3d01ae9 100644
--- a/conversion/conversion.go
+++ b/conversion/conversion.go
@@ -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"
diff --git a/conversion/conversion_test.go b/conversion/conversion_test.go
index d35730f..5c2d17f 100644
--- a/conversion/conversion_test.go
+++ b/conversion/conversion_test.go
@@ -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"
 )
 
diff --git a/go.mod b/go.mod
index 9ec256a..84b1699 100644
--- a/go.mod
+++ b/go.mod
@@ -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
@@ -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
@@ -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
 )
diff --git a/go.sum b/go.sum
index fb220e2..062565f 100644
--- a/go.sum
+++ b/go.sum
@@ -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=
diff --git a/keygen/keygen_test.go b/keygen/keygen_test.go
index 89258da..7d37d19 100644
--- a/keygen/keygen_test.go
+++ b/keygen/keygen_test.go
@@ -14,11 +14,13 @@ 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"
@@ -26,8 +28,6 @@ import (
 	"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"
 )
 
diff --git a/keygen/tss_keygen.go b/keygen/tss_keygen.go
index c878d16..8ffb56e 100644
--- a/keygen/tss_keygen.go
+++ b/keygen/tss_keygen.go
@@ -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"
diff --git a/keysign/keysign_test.go b/keysign/keysign_test.go
index e63d3b8..db90015 100644
--- a/keysign/keysign_test.go
+++ b/keysign/keysign_test.go
@@ -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"
 
diff --git a/keysign/notifier.go b/keysign/notifier.go
index 6d43664..15f5b07 100644
--- a/keysign/notifier.go
+++ b/keysign/notifier.go
@@ -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
diff --git a/keysign/notifier_test.go b/keysign/notifier_test.go
index 309c55c..b56293b 100644
--- a/keysign/notifier_test.go
+++ b/keysign/notifier_test.go
@@ -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"
 )
 
diff --git a/keysign/signature_notifier.go b/keysign/signature_notifier.go
index 26cc9e1..ad11afe 100644
--- a/keysign/signature_notifier.go
+++ b/keysign/signature_notifier.go
@@ -6,6 +6,8 @@ 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"
@@ -13,8 +15,6 @@ import (
 	"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"
diff --git a/keysign/signature_notifier_test.go b/keysign/signature_notifier_test.go
index 1a70645..dcce1ae 100644
--- a/keysign/signature_notifier_test.go
+++ b/keysign/signature_notifier_test.go
@@ -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"
diff --git a/keysign/tss_keysign.go b/keysign/tss_keysign.go
index 7f76ca1..4bf025d 100644
--- a/keysign/tss_keysign.go
+++ b/keysign/tss_keysign.go
@@ -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"
diff --git a/messages/p2p_message.go b/messages/p2p_message.go
index 6c9ad83..6f7e545 100644
--- a/messages/p2p_message.go
+++ b/messages/p2p_message.go
@@ -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
diff --git a/messages/p2p_message_test.go b/messages/p2p_message_test.go
index b29a3b1..a0fdc64 100644
--- a/messages/p2p_message_test.go
+++ b/messages/p2p_message_test.go
@@ -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"
 )
 
diff --git a/storage/localstate_mgr.go b/storage/localstate_mgr.go
index d6d11f2..2d045f1 100644
--- a/storage/localstate_mgr.go
+++ b/storage/localstate_mgr.go
@@ -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"
diff --git a/storage/localstate_mgr_test.go b/storage/localstate_mgr_test.go
index e8b5f76..567cef6 100644
--- a/storage/localstate_mgr_test.go
+++ b/storage/localstate_mgr_test.go
@@ -7,12 +7,12 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/binance-chain/tss-lib/ecdsa/keygen"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	"github.com/libp2p/go-libp2p/core/peer"
 	maddr "github.com/multiformats/go-multiaddr"
 	"github.com/zeta-chain/go-tss/conversion"
 	"github.com/zeta-chain/go-tss/p2p"
-	"github.com/zeta-chain/tss-lib/ecdsa/keygen"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/tss/keysign.go b/tss/keysign.go
index d9c8b21..3477396 100644
--- a/tss/keysign.go
+++ b/tss/keysign.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
+	tsslibcommon "github.com/binance-chain/tss-lib/common"
 	"github.com/libp2p/go-libp2p/core/peer"
-	tsslibcommon "github.com/zeta-chain/tss-lib/common"
 
 	"github.com/zeta-chain/go-tss/blame"
 	"github.com/zeta-chain/go-tss/common"
diff --git a/tss/tss.go b/tss/tss.go
index df5dcf3..9ab15b8 100644
--- a/tss/tss.go
+++ b/tss/tss.go
@@ -7,13 +7,13 @@ import (
 	"strings"
 	"sync"
 
+	bkeygen "github.com/binance-chain/tss-lib/ecdsa/keygen"
 	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/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	tcrypto "github.com/tendermint/tendermint/crypto"
-	bkeygen "github.com/zeta-chain/tss-lib/ecdsa/keygen"
 
 	"github.com/zeta-chain/go-tss/common"
 	"github.com/zeta-chain/go-tss/conversion"
diff --git a/tss/tss_4nodes_test.go b/tss/tss_4nodes_test.go
index a4395ac..8fc0852 100644
--- a/tss/tss_4nodes_test.go
+++ b/tss/tss_4nodes_test.go
@@ -15,12 +15,12 @@ import (
 	"testing"
 	"time"
 
+	btsskeygen "github.com/binance-chain/tss-lib/ecdsa/keygen"
 	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/keygen"
 	"github.com/zeta-chain/go-tss/keysign"
-	btsskeygen "github.com/zeta-chain/tss-lib/ecdsa/keygen"
 	. "gopkg.in/check.v1"
 )