Merge pull request #261 from multiversx/merge_rc160_into_feat_refacto…

…r_eeh_2023.09.18 Merge rc160 into feat refactor eeh 2023.09.18
multiversx · Sep 18, 2023 · ea59ee0 · ea59ee0
2 parents e3ca86b + 8728c8a
commit ea59ee0
Show file tree

Hide file tree

Showing 3 changed files with 237 additions and 50 deletions.
diff --git a/data/alteredAccount/alteredAccount.pb.go b/data/alteredAccount/alteredAccount.pb.go
diff --git a/data/alteredAccount/alteredAccount.proto b/data/alteredAccount/alteredAccount.proto
@@ -44,4 +44,7 @@ message AdditionalAccountData {
   string CurrentOwner     = 3 [(gogoproto.jsontag) = "currentOwner,omitempty"];
   string UserName         = 4 [(gogoproto.jsontag) = "userName,omitempty"];
   string DeveloperRewards = 5 [(gogoproto.jsontag) = "developerRewards,omitempty"];
+  bytes  CodeHash         = 6 [(gogoproto.jsontag) = "codeHash,omitempty"];
+  bytes  RootHash         = 7 [(gogoproto.jsontag) = "rootHash,omitempty"];
+  bytes  CodeMetadata     = 8 [(gogoproto.jsontag) = "codeMetadata,omitempty"];
 }
diff --git a/data/api/apiBlock.go b/data/api/apiBlock.go
@@ -25,6 +25,13 @@ type Block struct {
 	Status                 string                 `json:"status,omitempty"`
 	RandSeed               string                 `json:"randSeed,omitempty"`
 	PrevRandSeed           string                 `json:"prevRandSeed,omitempty"`
+	PubKeyBitmap           string                 `json:"pubKeyBitmap"`
+	Signature              string                 `json:"signature,omitempty"`
+	LeaderSignature        string                 `json:"leaderSignature,omitempty"`
+	ChainID                string                 `json:"chainID,omitempty"`
+	SoftwareVersion        string                 `json:"softwareVersion,omitempty"`
+	ReceiptsHash           string                 `json:"receiptsHash,omitempty"`
+	Reserved               []byte                 `json:"reserved,omitempty"`
 	Timestamp              time.Duration          `json:"timestamp,omitempty"`
 	NotarizedBlocks        []*NotarizedBlock      `json:"notarizedBlocks,omitempty"`
 	MiniBlocks             []*MiniBlock           `json:"miniBlocks,omitempty"`