Skip to content

Commit 07236ce

Browse files
authored
Merge pull request #1096 from tronprotocol/add_message
Add message
2 parents c50e14f + 6e3099d commit 07236ce

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/main/java/org/tron/core/capsule/BlockCapsule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public BlockCapsule(long number, Sha256Hash hash, long when, ByteString witnessA
140140
initTxs();
141141
}
142142

143+
143144
public BlockCapsule(long timestamp, ByteString parentHash, long number,
144145
List<Transaction> transactionList) {
145146
// blockheader raw
@@ -248,6 +249,15 @@ public void setMerkleRoot() {
248249
this.block = this.block.toBuilder().setBlockHeader(
249250
this.block.getBlockHeader().toBuilder().setRawData(blockHeaderRaw)).build();
250251
}
252+
/* only for genisis */
253+
public void setWitness(String witness) {
254+
BlockHeader.raw blockHeaderRaw =
255+
this.block.getBlockHeader().getRawData().toBuilder().setWitnessAddress(
256+
ByteString.copyFrom(witness.getBytes())).build();
257+
258+
this.block = this.block.toBuilder().setBlockHeader(
259+
this.block.getBlockHeader().toBuilder().setRawData(blockHeaderRaw)).build();
260+
}
251261

252262
public Sha256Hash getMerkleRoot() {
253263
return Sha256Hash.wrap(this.block.getBlockHeader().getRawData().getTxTrieRoot());

src/main/java/org/tron/core/capsule/utils/BlockUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static BlockCapsule newGenesisBlockCapsule() {
5050
BlockCapsule blockCapsule = new BlockCapsule(timestamp, parentHash, number, transactionList);
5151

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

5656
return blockCapsule;

0 commit comments

Comments
 (0)