Merge pull request #1111 from TRON-US/v1.5.2-release

V1.5.2 release
TRON-US · Aug 19, 2021 · 89a173d · 89a173d
2 parents 208e586 + 7c9305a
commit 89a173d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 242 deletions.
diff --git a/cmd/btfs/send_error_test.go b/cmd/btfs/send_error_test.go
@@ -6,7 +6,7 @@ import (
 
 // function to send error message to status server
 func TestSendError(t *testing.T) {
-	err := SendError("Send Error", "http://db.btfs.io", "my peer id", "my HValue")
+	err := SendError("Send Error", "https://status.btfs.io", "my peer id", "my HValue")
 	if err != nil {
 		t.Errorf("Send error message to status server failed, reason: %v", err)
 	} else {

diff --git a/core/bootstrap/bootstrap.go b/core/bootstrap/bootstrap.go
@@ -54,7 +54,7 @@ type BootstrapConfig struct {
 
 // DefaultBootstrapConfig specifies default sane parameters for bootstrapping.
 var DefaultBootstrapConfig = BootstrapConfig{
-	MinPeerThreshold:  4,
+	MinPeerThreshold:  10,
 	Period:            30 * time.Second,
 	ConnectionTimeout: (30 * time.Second) / 3, // Perod / 3
 }

diff --git a/core/commands/storage/upload/upload/init.go b/core/commands/storage/upload/upload/init.go
@@ -249,12 +249,12 @@ func challengeShard(ctxParams *uh.ContextParams, fileHash string, isRepair bool,
 	in.Signature = sign
 	// Need to renew another 6 mins due to downloading shard could have already made
 	// req.Context obsolete
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 	defer cancel()
 	var question *guardpb.RequestChallengeQuestion
 	err = grpc.GuardClient(ctxParams.Cfg.Services.GuardDomain).WithContext(ctx,
 		func(ctx context.Context, client guardpb.GuardServiceClient) error {
-			for i := 0; i < 3; i++ {
+			for i := 0; i < 20; i++ {
 				question, err = client.RequestChallenge(ctx, in)
 				if err == nil {
 					break

diff --git a/core/hub/settings_test.go b/core/hub/settings_test.go
@@ -14,7 +14,7 @@ func TestGetSettings(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defNs := &nodepb.Node_Settings{StoragePriceAsk: 250000, StorageTimeMin: 30, StoragePriceDefault: 250000}
+	defNs := &nodepb.Node_Settings{StoragePriceAsk: 125000, StorageTimeMin: 30, StoragePriceDefault: 125000}
 	if !reflect.DeepEqual(ns, defNs) {
 		t.Fatal("default settings not equal")
 	}

diff --git a/core/wallet/transaction.go b/core/wallet/transaction.go
@@ -134,7 +134,8 @@ func ConfirmDepositProcess(ctx context.Context, n *core.IpfsNode, prepareRespons
 	log.Debug(fmt.Sprintf("[Id:%d] ConfirmDepositProcess begin.", prepareResponse.GetId()))
 
 	// Continuous call ConfirmDeposit until it responses a FAILED or SUCCESS.
-	for time.Now().UnixNano()/1e6 < (prepareResponse.GetTronTransaction().GetRawData().GetExpiration() + 480*1000) {
+	now := time.Now().UnixNano() / 1e6
+	for time.Now().UnixNano()/1e6 < (now + 7*86400*1000) {
 		time.Sleep(5 * time.Second)
 
 		// ConfirmDeposit after 1min, because watcher need wait for 1min to confirm tron transaction.

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/TRON-US/go-btfs-api v0.3.0
 	github.com/TRON-US/go-btfs-chunker v0.3.0
 	github.com/TRON-US/go-btfs-cmds v0.2.13
-	github.com/TRON-US/go-btfs-config v0.7.0
+	github.com/TRON-US/go-btfs-config v0.11.1
 	github.com/TRON-US/go-btfs-files v0.2.0
 	github.com/TRON-US/go-btfs-pinner v0.1.1
 	github.com/TRON-US/go-btns v0.1.1
@@ -72,7 +72,7 @@ require (
 	github.com/libp2p/go-libp2p v0.11.0
 	github.com/libp2p/go-libp2p-circuit v0.3.1
 	github.com/libp2p/go-libp2p-connmgr v0.2.4
-	github.com/libp2p/go-libp2p-core v0.6.1
+	github.com/libp2p/go-libp2p-core v0.9.0
 	github.com/libp2p/go-libp2p-crypto v0.1.0
 	github.com/libp2p/go-libp2p-discovery v0.5.0
 	github.com/libp2p/go-libp2p-http v0.1.5

diff --git a/go.sum b/go.sum
diff --git a/version.go b/version.go
@@ -4,7 +4,7 @@ package btfs
 var CurrentCommit string
 
 // CurrentVersionNumber is the current application's version literal
-const CurrentVersionNumber = "1.5.1"
+const CurrentVersionNumber = "1.5.2"
 
 const ApiVersion = "/go-btfs/" + CurrentVersionNumber + "/"