DERO-HE STARGATE Testnet Release37

deroproject · Jan 2, 2022 · 063b692 · 063b692
1 parent d2e9638
commit 063b692
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/config/version.go b/config/version.go
@@ -20,4 +20,4 @@ import "github.com/blang/semver/v4"
 
 // right now it has to be manually changed
 // do we need to include git commitsha??
-var Version = semver.MustParse("3.4.97-1.DEROHE.STARGATE+26112021")
+var Version = semver.MustParse("3.4.98-1.DEROHE.STARGATE+25112021")
diff --git a/p2p/chain_sync.go b/p2p/chain_sync.go
@@ -134,11 +134,11 @@ try_again:
 		switch {
 		case len(request.Block_list) < 20: // 20 blocks raw
 			i++
-		case len(request.Block_list) < 100: // 20 block with 5 steps
+		case len(request.Block_list) < 40: // 20 block with 5 steps
 			i += 5
-		case len(request.Block_list) < 1000: // 20 block with 50 steps
+		case len(request.Block_list) < 60: // 20 block with 50 steps
 			i += 50
-		case len(request.Block_list) < 10000: // 20 block with 500 steps
+		case len(request.Block_list) < 80: // 20 block with 500 steps
 			i += 500
 		default:
 			i = i * 2
@@ -212,7 +212,7 @@ try_again:
 				var orequest ObjectList
 				var oresponse Objects
 
-				//fmt.Printf("inserting blocks %d %x\n", (int64(i) + response.Start_topoheight), response.Block_list[i][:])
+				fmt.Printf("inserting blocks %d %x\n", (int64(i) + response.Start_topoheight), response.Block_list[i][:])
 				orequest.Block_list = append(orequest.Block_list, response.Block_list[i])
 				fill_common(&orequest.Common)
 				if err := connection.Client.Call("Peer.GetObject", orequest, &oresponse); err != nil {

diff --git a/vendor/github.com/deroproject/graviton/node_inner.go b/vendor/github.com/deroproject/graviton/node_inner.go
diff --git a/vendor/github.com/deroproject/graviton/tree.go b/vendor/github.com/deroproject/graviton/tree.go
diff --git a/walletapi/wallet_transfer.go b/walletapi/wallet_transfer.go
@@ -214,11 +214,15 @@ func (w *Wallet_Memory) TransferPayload0(transfers []rpc.Transfer, ringsize uint
 	topoheight := int64(-1)
 	var block_hash crypto.Hash
 
-	{ // if wallet has been recently used, increase probability  of user's tx being successfully mined
+	{ // if wallet has not been recently used, increase probability  of user's tx being successfully mined
 		var zeroscid crypto.Hash
-		if w.getEncryptedBalanceresult(zeroscid).Topoheight+3 < daemon_topoheight {
+		if w.getEncryptedBalanceresult(zeroscid).Topoheight+2 <= daemon_topoheight {
+			topoheight = daemon_topoheight - 2
+		}
+		if w.getEncryptedBalanceresult(zeroscid).Topoheight+3 <= daemon_topoheight {
 			topoheight = daemon_topoheight - 3
 		}
+
 	}
 
 	_, _, block_hash, self_e, _ := w.GetEncryptedBalanceAtTopoHeight(transfers[0].SCID, topoheight, w.GetAddress().String())