bump the go version to v1.20 and some libs to newer version (#1)

1. go 1.20 2. cosmos-sdk v0.45.1 to v0.46.8 3. go-libp2p v0.24.1 to v0.27.3 4. go-libp2p-kad-dht v0.19.0 to v0.23.0 5. protobuf v1.28.1 to v1.30.0 6. tss-lib v0.1.2 to v0.1.4
joltify-finance · May 30, 2023 · 0089d07 · 0089d07
1 parent 9e8084d
commit 0089d07
Show file tree

Hide file tree

Showing 15 changed files with 473 additions and 674 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: golang:1.15
+image: golang:1.20
 
 cache:
   paths:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.6-alpine AS builder
+FROM golang:1.20-alpine AS builder
 
 RUN apk update && apk add --no-cache git
 WORKDIR /go/src/app

diff --git a/cmd/tss/main.go b/cmd/tss/main.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/tendermint/tendermint/crypto/ed25519"
 	"log"
 	"os"
 	"os/signal"
@@ -14,7 +13,7 @@ import (
 	"time"
 
 	golog "github.com/ipfs/go-log"
-	"github.com/libp2p/go-libp2p-peerstore/addr"
+	"github.com/tendermint/tendermint/crypto/ed25519"
 	"gitlab.com/thorchain/binance-sdk/common/types"
 
 	"github.com/joltify-finance/tss/common"
@@ -86,7 +85,7 @@ func main() {
 
 	// init tss module
 	tss, err := tss.NewTss(
-		addr.AddrList(p2pConf.BootstrapPeers),
+		p2pConf.BootstrapPeers,
 		p2pConf.Port,
 		privKey,
 		p2pConf.RendezvousString,

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/keysign/keysign_test.go b/keysign/keysign_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/tendermint/tendermint/crypto/ed25519"
 	"io/ioutil"
 	"os"
 	"path"
@@ -15,16 +14,17 @@ import (
 	"testing"
 	"time"
 
+	"github.com/tendermint/tendermint/crypto/ed25519"
+
 	tsslibcommon "github.com/binance-chain/tss-lib/common"
 	btss "github.com/binance-chain/tss-lib/tss"
 	"github.com/ipfs/go-log"
-	"github.com/libp2p/go-libp2p-peerstore/addr"
 	zlog "github.com/rs/zerolog/log"
 
 	"github.com/joltify-finance/tss/conversion"
 
 	"github.com/libp2p/go-libp2p/core/peer"
-	maddr "github.com/multiformats/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 	tcrypto "github.com/tendermint/tendermint/crypto"
 	. "gopkg.in/check.v1"
 
@@ -86,11 +86,11 @@ func (m *MockLocalStateManager) GetLocalState(pubKey string) (storage.KeygenLoca
 	return state, nil
 }
 
-func (s *MockLocalStateManager) SaveAddressBook(address map[peer.ID]addr.AddrList) error {
+func (s *MockLocalStateManager) SaveAddressBook(address map[peer.ID][]ma.Multiaddr) error {
 	return nil
 }
 
-func (s *MockLocalStateManager) RetrieveP2PAddresses() (addr.AddrList, error) {
+func (s *MockLocalStateManager) RetrieveP2PAddresses() ([]ma.Multiaddr, error) {
 	return nil, os.ErrNotExist
 }
 
@@ -137,7 +137,7 @@ func (s *TssKeysignTestSuite) SetUpTest(c *C) {
 	s.comms = make([]*p2p.Communication, s.partyNum)
 	s.stateMgrs = make([]storage.LocalStateManager, s.partyNum)
 	bootstrapPeer := "/ip4/127.0.0.1/tcp/17666/p2p/12D3KooWJ9ne4fSbjE4bZdsikkmxZYurdDDr74Lx4Ghm73ZqSKwZ"
-	multiAddr, err := maddr.NewMultiaddr(bootstrapPeer)
+	multiAddr, err := ma.NewMultiaddr(bootstrapPeer)
 	c.Assert(err, IsNil)
 	for i := 0; i < s.partyNum; i++ {
 		buf, err := base64.StdEncoding.DecodeString(testPriKeyArr[i])
@@ -149,7 +149,7 @@ func (s *TssKeysignTestSuite) SetUpTest(c *C) {
 			s.comms[i] = comm
 			continue
 		}
-		comm, err := p2p.NewCommunication("asgard", []maddr.Multiaddr{multiAddr}, ports[i], "")
+		comm, err := p2p.NewCommunication("asgard", []ma.Multiaddr{multiAddr}, ports[i], "")
 		c.Assert(err, IsNil)
 		c.Assert(comm.Start(buf), IsNil)
 		s.comms[i] = comm

diff --git a/keysign/signature_notifier.go b/keysign/signature_notifier.go
@@ -8,13 +8,13 @@ import (
 
 	"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"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/joltify-finance/tss/messages"
 	"github.com/joltify-finance/tss/p2p"

diff --git a/messages/generate.sh b/messages/generate.sh
@@ -1,2 +1,3 @@
-
-protoc --go_out=. *.proto
+protoc --go_out=. --go_opt=paths=source_relative \
+    --go-grpc_out=. --go-grpc_opt=paths=source_relative \
+    *.proto
diff --git a/messages/join_party.pb.go b/messages/join_party.pb.go
diff --git a/messages/signature_notifier.pb.go b/messages/signature_notifier.pb.go
diff --git a/p2p/peer_address.go b/p2p/peer_address.go
@@ -1,14 +1,14 @@
 package p2p
 
 import (
-	"github.com/libp2p/go-libp2p-peerstore/addr"
 	"github.com/libp2p/go-libp2p/core/peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
-func (c *Communication) ExportPeerAddress() map[peer.ID]addr.AddrList {
+func (c *Communication) ExportPeerAddress() map[peer.ID][]ma.Multiaddr {
 	peerStore := c.dht.Host().Peerstore()
 	peers := peerStore.Peers()
-	addressBook := make(map[peer.ID]addr.AddrList)
+	addressBook := make(map[peer.ID][]ma.Multiaddr)
 	for _, el := range peers {
 		addrs := peerStore.Addrs(el)
 		addressBook[el] = addrs

diff --git a/storage/localstate_mgr.go b/storage/localstate_mgr.go
@@ -12,7 +12,6 @@ import (
 	"sync"
 
 	"github.com/binance-chain/tss-lib/ecdsa/keygen"
-	"github.com/libp2p/go-libp2p-peerstore/addr"
 	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
 
@@ -32,8 +31,8 @@ type KeygenLocalState struct {
 type LocalStateManager interface {
 	SaveLocalState(state KeygenLocalState) error
 	GetLocalState(pubKey string) (KeygenLocalState, error)
-	SaveAddressBook(addressBook map[peer.ID]addr.AddrList) error
-	RetrieveP2PAddresses() (addr.AddrList, error)
+	SaveAddressBook(addressBook map[peer.ID][]ma.Multiaddr) error
+	RetrieveP2PAddresses() ([]ma.Multiaddr, error)
 }
 
 // FileStateMgr save the local state to file
@@ -111,7 +110,7 @@ func (fsm *FileStateMgr) GetLocalState(pubKey string) (KeygenLocalState, error)
 	return localState, nil
 }
 
-func (fsm *FileStateMgr) SaveAddressBook(address map[peer.ID]addr.AddrList) error {
+func (fsm *FileStateMgr) SaveAddressBook(address map[peer.ID][]ma.Multiaddr) error {
 	if len(fsm.folder) < 1 {
 		return errors.New("base file path is invalid")
 	}
@@ -136,7 +135,7 @@ func (fsm *FileStateMgr) SaveAddressBook(address map[peer.ID]addr.AddrList) erro
 	return ioutil.WriteFile(filePathName, buf.Bytes(), 0o655)
 }
 
-func (fsm *FileStateMgr) RetrieveP2PAddresses() (addr.AddrList, error) {
+func (fsm *FileStateMgr) RetrieveP2PAddresses() ([]ma.Multiaddr, error) {
 	if len(fsm.folder) < 1 {
 		return nil, errors.New("base file path is invalid")
 	}

diff --git a/storage/localstate_mgr_test.go b/storage/localstate_mgr_test.go
@@ -1,18 +1,18 @@
 package storage
 
 import (
-	"github.com/joltify-finance/tss/conversion"
 	"os"
 	"path/filepath"
 	"reflect"
 	"testing"
 
 	"github.com/binance-chain/tss-lib/ecdsa/keygen"
-	"github.com/libp2p/go-libp2p-peerstore/addr"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	"github.com/libp2p/go-libp2p/core/peer"
-	maddr "github.com/multiformats/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 	. "gopkg.in/check.v1"
+
+	"github.com/joltify-finance/tss/conversion"
 )
 
 type FileStateMgrTestSuite struct{}
@@ -74,16 +74,16 @@ func (s *FileStateMgrTestSuite) TestSaveLocalState(c *C) {
 }
 
 func (s *FileStateMgrTestSuite) TestSaveAddressBook(c *C) {
-	testAddresses := make(map[peer.ID]addr.AddrList)
+	testAddresses := make(map[peer.ID][]ma.Multiaddr)
 	var t *testing.T
 	id1 := tnet.RandIdentityOrFatal(t)
 	id2 := tnet.RandIdentityOrFatal(t)
 	id3 := tnet.RandIdentityOrFatal(t)
-	mockAddr, err := maddr.NewMultiaddr("/ip4/192.168.3.5/tcp/6668")
+	mockAddr, err := ma.NewMultiaddr("/ip4/192.168.3.5/tcp/6668")
 	c.Assert(err, IsNil)
 	peers := []peer.ID{id1.ID(), id2.ID(), id3.ID()}
 	for _, each := range peers {
-		testAddresses[each] = []maddr.Multiaddr{mockAddr}
+		testAddresses[each] = []ma.Multiaddr{mockAddr}
 	}
 	folder := os.TempDir()
 	f := filepath.Join(folder, "test")

diff --git a/storage/mock_localstatemanager.go b/storage/mock_localstatemanager.go
@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/libp2p/go-libp2p-peerstore/addr"
 	"github.com/libp2p/go-libp2p/core/peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // MockLocalStateManager is a mock use for test purpose
@@ -17,10 +17,10 @@ func (s *MockLocalStateManager) GetLocalState(pubKey string) (KeygenLocalState,
 	return KeygenLocalState{}, nil
 }
 
-func (s *MockLocalStateManager) SaveAddressBook(address map[peer.ID]addr.AddrList) error {
+func (s *MockLocalStateManager) SaveAddressBook(address map[peer.ID][]ma.Multiaddr) error {
 	return nil
 }
 
-func (s *MockLocalStateManager) RetrieveP2PAddresses() (addr.AddrList, error) {
+func (s *MockLocalStateManager) RetrieveP2PAddresses() ([]ma.Multiaddr, error) {
 	return nil, nil
 }
diff --git a/tss/tss.go b/tss/tss.go
@@ -8,12 +8,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
-
 	bkeygen "github.com/binance-chain/tss-lib/ecdsa/keygen"
 	coskey "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
-	"github.com/libp2p/go-libp2p-peerstore/addr"
+	"github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
 	"github.com/libp2p/go-libp2p/core/peer"
+	ma "github.com/multiformats/go-multiaddr"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	tcrypto "github.com/tendermint/tendermint/crypto"
@@ -46,7 +45,7 @@ type TssServer struct {
 
 // NewTss create a new instance of Tss
 func NewTss(
-	cmdBootstrapPeers addr.AddrList,
+	cmdBootstrapPeers []ma.Multiaddr,
 	p2pPort int,
 	priKey tcrypto.PrivKey,
 	rendezvous,
@@ -69,7 +68,7 @@ func NewTss(
 		return nil, fmt.Errorf("fail to create file state manager")
 	}
 
-	var bootstrapPeers addr.AddrList
+	var bootstrapPeers []ma.Multiaddr
 	savedPeers, err := stateManager.RetrieveP2PAddresses()
 	if err != nil {
 		bootstrapPeers = cmdBootstrapPeers