Merge pull request #39 from orbs-network/feature/support-refTime-proposer

support ref time and block proposer in tx/rx headers.

Author: noambergIL

src/codec/OpGetBlock.ts

@@ -40,6 +40,8 @@ export interface TransactionsBlockHeader {
   prevBlockHash: Uint8Array;
   timestamp: Date;
   numTransactions: number;
+  referenceTime: number;
+  blockProposerAddress: Uint8Array;
 }
 
 export interface ResultsBlockHeader {
@@ -50,6 +52,8 @@ export interface ResultsBlockHeader {
   timestamp: Date;
   transactionsBlockHash: Uint8Array;
   numTransactionReceipts: number;
+  referenceTime: number;
+  blockProposerAddress: Uint8Array;
 }
 
 export interface BlockTransaction {
@@ -182,6 +186,8 @@ export function decodeGetBlockResponse(buf: Uint8Array): GetBlockResponse {
       prevBlockHash: transactionsBlockHeaderMsg.getBytes(3),
       timestamp: Protocol.unixNanoToDate(transactionsBlockHeaderMsg.getUint64(4)),
       numTransactions: transactionsBlockHeaderMsg.getUint32(7),
+      referenceTime: transactionsBlockHeaderMsg.getUint32(9),
+      blockProposerAddress: transactionsBlockHeaderMsg.getBytes(8)
     },
     resultsBlockHash: Hash.calcSha256(resultsBlockHeaderMsg.rawBuffer()),
     resultsBlockHeader: {
@@ -192,6 +198,8 @@ export function decodeGetBlockResponse(buf: Uint8Array): GetBlockResponse {
       timestamp: Protocol.unixNanoToDate(resultsBlockHeaderMsg.getUint64(4)),
       transactionsBlockHash: resultsBlockHeaderMsg.getBytes(7),
       numTransactionReceipts: resultsBlockHeaderMsg.getUint32(9),
+      blockProposerAddress: resultsBlockHeaderMsg.getBytes(11),
+      referenceTime: resultsBlockHeaderMsg.getUint32(12)
     },
     transactions: transactions,
   };

src/codec/contract.test.ts

@@ -207,6 +207,8 @@ describe("Codec contract", () => {
             Timestamp: decoded.transactionsBlockHeader.timestamp.toISOString(),
             NumTransactions: decoded.transactionsBlockHeader.numTransactions.toString(),
             PrevBlockHash: jsonMarshalBase64Bytes(decoded.transactionsBlockHeader.prevBlockHash),
+            ReferenceTime: decoded.transactionsBlockHeader.referenceTime,
+            BlockProposerAddress: jsonMarshalBase64Bytes(decoded.transactionsBlockHeader.blockProposerAddress)
           },
           ResultsBlockHash: jsonMarshalBase64Bytes(decoded.resultsBlockHash),
           ResultsBlockHeader: {
@@ -217,6 +219,8 @@ describe("Codec contract", () => {
             NumTransactionReceipts: decoded.resultsBlockHeader.numTransactionReceipts.toString(),
             PrevBlockHash: jsonMarshalBase64Bytes(decoded.resultsBlockHeader.prevBlockHash),
             TransactionsBlockHash: jsonMarshalBase64Bytes(decoded.resultsBlockHeader.transactionsBlockHash),
+            ReferenceTime: decoded.resultsBlockHeader.referenceTime,
+            BlockProposerAddress: jsonMarshalBase64Bytes(decoded.resultsBlockHeader.blockProposerAddress)
           },
           Transactions: jsonMarshalBlockTransactions(decoded.transactions),
         };

src/protocol/Protocol.ts

@@ -10,7 +10,7 @@ import { BaseBuilder } from "./Base";
 import { FieldTypes } from "membuffers";
 
 // nanoNonce = nanoseconds in range 0 - 499,999 (that will still round down to 0 in milliseconds)
-//  used to give different timestamps to transactions created in the same millisecond 
+//  used to give different timestamps to transactions created in the same millisecond
 export function dateToUnixNano(date: Date, nanoNonce: number): bigint {
   if (nanoNonce < 0 || nanoNonce > 499999) throw new Error(`nanoNonce is ${nanoNonce} and must be 0 - 499,999`);
   return (BigInt(date.getTime()) * BigInt(1000000)) + BigInt(nanoNonce);
@@ -269,7 +269,18 @@ export class SignedQueryBuilder extends BaseBuilder {
 
 export const QueryResult_Scheme = [FieldTypes.TypeUint16, FieldTypes.TypeBytes, FieldTypes.TypeBytes];
 
-export const TransactionsBlockHeader_Scheme = [FieldTypes.TypeUint32, FieldTypes.TypeUint32, FieldTypes.TypeUint64, FieldTypes.TypeBytes, FieldTypes.TypeUint64, FieldTypes.TypeBytes, FieldTypes.TypeBytes, FieldTypes.TypeUint32];
+export const TransactionsBlockHeader_Scheme = [
+  FieldTypes.TypeUint32,
+  FieldTypes.TypeUint32,
+  FieldTypes.TypeUint64,
+  FieldTypes.TypeBytes,
+  FieldTypes.TypeUint64,
+  FieldTypes.TypeBytes,
+  FieldTypes.TypeBytes,
+  FieldTypes.TypeUint32,
+  FieldTypes.TypeBytes,
+  FieldTypes.TypeUint32
+];
 
 export const ResultsBlockHeader_Scheme = [
   FieldTypes.TypeUint32,
@@ -283,4 +294,6 @@ export const ResultsBlockHeader_Scheme = [
   FieldTypes.TypeBytes,
   FieldTypes.TypeUint32,
   FieldTypes.TypeUint32,
+  FieldTypes.TypeBytes,
+  FieldTypes.TypeUint32
 ];