Add support for new block header: TxnRoot SHA256 (#989)

algorand · Aug 18, 2022 · 055a502 · 055a502
1 parent b129605
commit 055a502
Show file tree

Hide file tree

Showing 8 changed files with 404 additions and 380 deletions.
diff --git a/api/generated/common/routes.go b/api/generated/common/routes.go
diff --git a/api/generated/common/types.go b/api/generated/common/types.go
diff --git a/api/generated/v2/routes.go b/api/generated/v2/routes.go
diff --git a/api/generated/v2/types.go b/api/generated/v2/types.go
diff --git a/api/handlers.go b/api/handlers.go
@@ -1150,19 +1150,20 @@ func (si *ServerImplementation) fetchBlock(ctx context.Context, round uint64) (g
 		}
 
 		ret = generated.Block{
-			GenesisHash:        blockHeader.GenesisHash[:],
-			GenesisId:          blockHeader.GenesisID,
-			PreviousBlockHash:  blockHeader.Branch[:],
-			Rewards:            &rewards,
-			Round:              uint64(blockHeader.Round),
-			Seed:               blockHeader.Seed[:],
-			StateProofTracking: &trackingArray,
-			Timestamp:          uint64(blockHeader.TimeStamp),
-			Transactions:       nil,
-			TransactionsRoot:   blockHeader.TxnCommitments.NativeSha512_256Commitment[:],
-			TxnCounter:         uint64Ptr(blockHeader.TxnCounter),
-			UpgradeState:       &upgradeState,
-			UpgradeVote:        &upgradeVote,
+			GenesisHash:            blockHeader.GenesisHash[:],
+			GenesisId:              blockHeader.GenesisID,
+			PreviousBlockHash:      blockHeader.Branch[:],
+			Rewards:                &rewards,
+			Round:                  uint64(blockHeader.Round),
+			Seed:                   blockHeader.Seed[:],
+			StateProofTracking:     &trackingArray,
+			Timestamp:              uint64(blockHeader.TimeStamp),
+			Transactions:           nil,
+			TransactionsRoot:       blockHeader.TxnCommitments.NativeSha512_256Commitment[:],
+			TransactionsRootSha256: blockHeader.TxnCommitments.Sha256Commitment[:],
+			TxnCounter:             uint64Ptr(blockHeader.TxnCounter),
+			UpgradeState:           &upgradeState,
+			UpgradeVote:            &upgradeVote,
 		}
 
 		results := make([]generated.Transaction, 0)

diff --git a/api/indexer.oas2.json b/api/indexer.oas2.json
@@ -1452,6 +1452,7 @@
         "previous-block-hash",
         "seed",
         "transactions-root",
+        "transactions-root-sha256",
         "timestamp",
         "genesis-id",
         "genesis-hash"
@@ -1506,6 +1507,11 @@
           "type": "string",
           "format": "byte"
         },
+        "transactions-root-sha256": {
+          "description": "\\[txn256\\] TransactionsRootSHA256 is an auxiliary TransactionRoot, built using a vector commitment instead of a merkle tree, and SHA256 hash function instead of the default SHA512_256. This commitment can be used on environments where only the SHA256 function exists.",
+          "type": "string",
+          "format": "byte"
+        },
         "txn-counter": {
           "description": "\\[tc\\] TxnCounter counts the number of transactions committed in the ledger, from the time at which support for this feature was introduced.\n\nSpecifically, TxnCounter is the number of the next transaction that will be committed after this block.  It is 0 when no transactions have ever been committed (since TxnCounter started being supported).",
           "type": "integer"

diff --git a/api/indexer.oas3.yml b/api/indexer.oas3.yml
@@ -1176,6 +1176,12 @@
             "pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
             "type": "string"
           },
+          "transactions-root-sha256": {
+            "description": "\\[txn256\\] TransactionsRootSHA256 is an auxiliary TransactionRoot, built using a vector commitment instead of a merkle tree, and SHA256 hash function instead of the default SHA512_256. This commitment can be used on environments where only the SHA256 function exists.",
+            "format": "byte",
+            "pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
+            "type": "string"
+          },
           "txn-counter": {
             "description": "\\[tc\\] TxnCounter counts the number of transactions committed in the ledger, from the time at which support for this feature was introduced.\n\nSpecifically, TxnCounter is the number of the next transaction that will be committed after this block.  It is 0 when no transactions have ever been committed (since TxnCounter started being supported).",
             "type": "integer"
@@ -1194,7 +1200,8 @@
           "round",
           "seed",
           "timestamp",
-          "transactions-root"
+          "transactions-root",
+          "transactions-root-sha256"
         ],
         "type": "object"
       },

diff --git a/api/test_resources/stpf_block_response.json b/api/test_resources/stpf_block_response.json