From cad7cd5d80d4934dbd5ed5d2cc5e83257d7d2ee7 Mon Sep 17 00:00:00 2001 From: 1HXb9KMAtwNJqz4egi6hJx08EQgJajiBTH <1HXb9KMAtwNJqz4egi6hJx08EQgJajiBTH@bitcoin.cash> Date: Wed, 18 Dec 2019 15:28:23 -0500 Subject: [PATCH] Manual commit. --- home.md | 5 +---- protocol/blockchain/block/merkle-tree.md | 2 +- .../blockchain/block/merkle-tree/partial-merkle-tree.md | 1 - protocol/blockchain/block/transaction-ordering.md | 8 ++++++++ 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 protocol/blockchain/block/merkle-tree/partial-merkle-tree.md create mode 100644 protocol/blockchain/block/transaction-ordering.md diff --git a/home.md b/home.md index 202f4cc..a186db6 100644 --- a/home.md +++ b/home.md @@ -13,10 +13,7 @@ - [Block](/protocol/blockchain/block) - [Header](/protocol/blockchain/block/block-header) - [Merkle Tree](/protocol/blockchain/block/merkle-tree) - - [Partial Merkle Tree](/protocol/blockchain/block/merkle-tree/partial-merkle-tree) - - Transactions - - Legacy Transaction Ordering - - Canonical Transaction Ordering (CTOR) + - [Transaction Ordering](/protocol/blockchain/block/transaction-ordering) - [Script](/protocol/blockchain/script) - Opcodes ... diff --git a/protocol/blockchain/block/merkle-tree.md b/protocol/blockchain/block/merkle-tree.md index e588140..c4d1782 100644 --- a/protocol/blockchain/block/merkle-tree.md +++ b/protocol/blockchain/block/merkle-tree.md @@ -6,4 +6,4 @@ In Bitcoin Cash, the transactions in a [block](/protocol/blockchain/block) are b Using a merkle tree to manage hashing the transactions in a block enables efficient addition of newly submitted transactions to a block being mined. Rather than re-hashing the entirety of the data of the transactions to be included in the block, the new transaction can be hash and then a small number of hashes can be recalculated, leading up to the merkle root. For large blocks this can heavily reduce the amount of data to be (re-)hashed. -Using merkle trees also allows for transferring only a subset of a block while still providing confidence that the data provided in fact appeared in the block in question. For more information, see [Partial Merkle Tree](/protocol/blockchain/block/merkle-tree/partial-merkle-tree). \ No newline at end of file +Using merkle trees also allows for transferring only a subset of a block while still providing confidence that the data provided in fact appeared in the block in question. For more information, see [Merkle Block](/protocol/network/messages/merkleblock). \ No newline at end of file diff --git a/protocol/blockchain/block/merkle-tree/partial-merkle-tree.md b/protocol/blockchain/block/merkle-tree/partial-merkle-tree.md deleted file mode 100644 index be92438..0000000 --- a/protocol/blockchain/block/merkle-tree/partial-merkle-tree.md +++ /dev/null @@ -1 +0,0 @@ -# Partial Merkle Tree diff --git a/protocol/blockchain/block/transaction-ordering.md b/protocol/blockchain/block/transaction-ordering.md new file mode 100644 index 0000000..8161d12 --- /dev/null +++ b/protocol/blockchain/block/transaction-ordering.md @@ -0,0 +1,8 @@ +# Transaction Ordering + + +## Canonical Transaction Ordering (CTOR) + + +## Legacy Transaction Ordering +