Skip to content

Add message #1096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2018
Merged

Add message #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45b2de4
add message.
zhaohong Jun 24, 2018
6e3099d
add message.
zhaohong Jun 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/org/tron/core/capsule/BlockCapsule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public BlockCapsule(long number, Sha256Hash hash, long when, ByteString witnessA
initTxs();
}


public BlockCapsule(long timestamp, ByteString parentHash, long number,
List<Transaction> transactionList) {
// blockheader raw
Expand Down Expand Up @@ -248,6 +249,15 @@ public void setMerkleRoot() {
this.block = this.block.toBuilder().setBlockHeader(
this.block.getBlockHeader().toBuilder().setRawData(blockHeaderRaw)).build();
}
/* only for genisis */
public void setWitness(String witness) {
BlockHeader.raw blockHeaderRaw =
this.block.getBlockHeader().getRawData().toBuilder().setWitnessAddress(
ByteString.copyFrom(witness.getBytes())).build();

this.block = this.block.toBuilder().setBlockHeader(
this.block.getBlockHeader().toBuilder().setRawData(blockHeaderRaw)).build();
}

public Sha256Hash getMerkleRoot() {
return Sha256Hash.wrap(this.block.getBlockHeader().getRawData().getTxTrieRoot());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/tron/core/capsule/utils/BlockUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static BlockCapsule newGenesisBlockCapsule() {
BlockCapsule blockCapsule = new BlockCapsule(timestamp, parentHash, number, transactionList);

blockCapsule.setMerkleRoot();

blockCapsule.setWitness("A new system must allow existing systems to be linked together without requiring any central control or coordination");
blockCapsule.generatedByMyself = true;

return blockCapsule;
Expand Down