Merge pull request #25 from bttcprotocol/release_1.0.2

Release 1.0.2
bttcprotocol · Sep 8, 2022 · fb5e133 · fb5e133
2 parents d07c458 + 8e497f8
commit fb5e133
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -44,7 +44,7 @@ import (
 
 const (
 	clientIdentifier     = "bor" // Client identifier to advertise over the network
-	repositoryIdentifier = "go-bor"
+	repositoryIdentifier = "go-bttc"
 )
 
 var (

diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go
@@ -45,6 +45,8 @@ const (
 	checkpointInterval = 1024 // Number of blocks after which to save the vote snapshot to the database
 	inmemorySnapshots  = 128  // Number of recent vote snapshots to keep in memory
 	inmemorySignatures = 4096 // Number of recent block signatures to keep in memory
+
+	allowFutureBlockTimeSeconds = int64(3) // Max seconds from current time to allow for blocks before they are considered as future blocks
 )
 
 // Bor protocol constants.
@@ -320,7 +322,7 @@ func (c *Bor) verifyHeader(chain consensus.ChainHeaderReader, header *types.Head
 	number := header.Number.Uint64()
 
 	// Don't waste time checking blocks from the future
-	if header.Time > uint64(time.Now().Unix()) {
+	if header.Time > uint64(time.Now().Unix()+allowFutureBlockTimeSeconds) {
 		return consensus.ErrFutureBlock
 	}
 

diff --git a/eth/backend.go b/eth/backend.go
@@ -290,7 +290,7 @@ func makeExtraData(extra []byte) []byte {
 		// create default extradata
 		extra, _ = rlp.EncodeToBytes([]interface{}{
 			uint(params.VersionMajor<<16 | params.VersionMinor<<8 | params.VersionPatch),
-			"bor",
+			"bttc",
 			runtime.Version(),
 			runtime.GOOS,
 		})

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -669,7 +669,7 @@ func (s *PublicBlockChainAPI) GetTransactionReceiptsByBlock(ctx context.Context,
 		if receipt.Logs == nil {
 			fields["logs"] = [][]*types.Log{}
 		}
-		if borReceipt != nil {
+		if borReceipt != nil && idx == len(receipts)-1 {
 			fields["transactionHash"] = txHash
 		}
 		// If the ContractAddress is 20 0x0 bytes, assume it is not a contract creation

diff --git a/params/version.go b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1        // Major version component of the current release
 	VersionMinor = 0        // Minor version component of the current release
-	VersionPatch = 1        // Patch version component of the current release
+	VersionPatch = 2        // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ import ( @@
     const (
     	clientIdentifier     = "bor" // Client identifier to advertise over the network
-    	repositoryIdentifier = "go-bor"
+    	repositoryIdentifier = "go-bttc"
     )
     var (
@@ Expand Down @@