update sdk to v0.2.9

cmd/cmd/run.go

@@ -12,6 +12,7 @@ import (
  "log"
  "os"
  "path/filepath"
+ "strings"
  "time"
 
  "github.com/CESSProject/DeOSS/configs"
@@ -24,23 +25,22 @@ import (
  sconfig "github.com/CESSProject/cess-go-sdk/config"
  "github.com/CESSProject/cess-go-sdk/core/pattern"
  sutils "github.com/CESSProject/cess-go-sdk/core/utils"
+ "github.com/CESSProject/p2p-go/config"
  "github.com/howeyc/gopass"
- "github.com/libp2p/go-libp2p/core/peer"
- ma "github.com/multiformats/go-multiaddr"
  "github.com/spf13/cobra"
 )
 
 // cmd_run_func is an implementation of the run command,
 // which is used to start the deoss service.
 func cmd_run_func(cmd *cobra.Command, args []string) {
  var (
- registerFlag bool
- err error
- logDir string
- dbDir string
- bootstrap = make([]string, 0)
- syncSt pattern.SysSyncState
- n = node.New()
+ registerFlag  bool
+ err  error
+ logDir  string
+ dbDir  string
+ protocolPrefix string
+ syncSt  pattern.SysSyncState
+ n  = node.New()
  )
 
  // Building Profile Instances
@@ -58,24 +58,22 @@ func cmd_run_func(cmd *cobra.Command, args []string) {
 
  n.SetSignkey(signKey)
 
- boot := n.Confile.GetBootNodes()
- for _, v := range boot {
- bootnodes, err := sutils.ParseMultiaddrs(v)
- if err != nil {
- continue
- }
- bootstrap = append(bootstrap, bootnodes...)
- for _, v := range bootnodes {
- log.Printf(fmt.Sprintf("bootstrap node: %v", v))
- addr, err := ma.NewMultiaddr(v)
- if err != nil {
- continue
- }
- addrInfo, err := peer.AddrInfoFromP2pAddr(addr)
- if err != nil {
- continue
- }
- n.SavePeer(addrInfo.ID.Pretty(), *addrInfo)
+ boots := n.GetBootNodes()
+ for _, v := range boots {
+ if strings.Contains(v, "testnet") {
+ log.Println("Test network")
+ protocolPrefix = config.TestnetProtocolPrefix
+ break
+ } else if strings.Contains(v, "mainnet") {
+ log.Println("Main network")
+ protocolPrefix = config.MainnetProtocolPrefix
+ break
+ } else if strings.Contains(v, "devnet") {
+ log.Println("Dev network")
+ protocolPrefix = config.DevnetProtocolPrefix
+ break
+ } else {
+ log.Println("Unknown network")
  }
  }
 
@@ -87,7 +85,8 @@ func cmd_run_func(cmd *cobra.Command, args []string) {
  sdkgo.TransactionTimeout(configs.TimeOut_WaitBlock),
  sdkgo.Workspace(n.GetWorkspace()),
  sdkgo.P2pPort(n.GetP2pPort()),
- sdkgo.Bootnodes(bootstrap),
+ sdkgo.Bootnodes(n.GetBootNodes()),
+ sdkgo.ProtocolPrefix(protocolPrefix),
  )
  if err != nil {
  log.Println(err)

go.mod

@@ -3,8 +3,9 @@ module github.com/CESSProject/DeOSS
 go 1.19
 
 require (
- github.com/CESSProject/cess-go-sdk v0.2.8
+ github.com/CESSProject/cess-go-sdk v0.2.9
  github.com/CESSProject/go-keyring v0.0.0-20220614131247-ee3a8da30fde
+ github.com/CESSProject/p2p-go v0.0.37
  github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
  github.com/bytedance/sonic v1.8.0
  github.com/cbergoon/merkletree v0.2.0
@@ -30,7 +31,6 @@ require (
 )
 
 require (
- github.com/CESSProject/p2p-go v0.0.36 // indirect
  github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
  github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
  github.com/benbjohnson/clock v1.3.0 // indirect

go.sum

@@ -46,12 +46,12 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CESSProject/cess-go-sdk v0.2.8 h1:Uw60WYYWEbPW54VA9qNbm2w0zevqew+gHxvAcbY5JXM=
-github.com/CESSProject/cess-go-sdk v0.2.8/go.mod h1:Mh6/k9aT4r58WHpmsY2Nw1QEzYLAhgC9XN2eptiTi+E=
+github.com/CESSProject/cess-go-sdk v0.2.9 h1:rbcJl1c80bb75718GBTND0vP7Sc+hlm4DIhe8etBOfY=
+github.com/CESSProject/cess-go-sdk v0.2.9/go.mod h1:ueHJuYJUNB8RrQUz5uWisCYO7jrQF/StI1TRXdZlMyM=
 github.com/CESSProject/go-keyring v0.0.0-20220614131247-ee3a8da30fde h1:5MDRjjtg6PEhqyVjupwaapN96cOZiddOGAYwKQeaTu0=
 github.com/CESSProject/go-keyring v0.0.0-20220614131247-ee3a8da30fde/go.mod h1:RUXBd3ROP98MYepEEa0Y0l/T0vQlIKqFJxI/ocdnRLM=
-github.com/CESSProject/p2p-go v0.0.36 h1:FyXwuE6nrfgsb32BdTgQdZeSUqLjI/KHchOTIFiLn8c=
-github.com/CESSProject/p2p-go v0.0.36/go.mod h1:MmuZ2UfXnEJMZMhOCC4Ec5QQUJCT7j2yg3Xk/oZ16yw=
+github.com/CESSProject/p2p-go v0.0.37 h1:FYlTPWAKMmRW/HxzXH1FD1ueGIT8kkvGCJQK0YRlBms=
+github.com/CESSProject/p2p-go v0.0.37/go.mod h1:MmuZ2UfXnEJMZMhOCC4Ec5QQUJCT7j2yg3Xk/oZ16yw=
 github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM=
 github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=