Encode missing TxHash, GasUsed, and Logs fields for storage

dominant-strategies · Aug 26, 2024 · 34e2cd9 · 34e2cd9
1 parent a426b5d
commit 34e2cd9
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 39 deletions.
diff --git a/common/proto_common.pb.go b/common/proto_common.pb.go
diff --git a/core/rawdb/db.pb.go b/core/rawdb/db.pb.go
diff --git a/core/types/proto_block.pb.go b/core/types/proto_block.pb.go
diff --git a/core/types/proto_block.proto b/core/types/proto_block.proto
@@ -130,11 +130,11 @@ message ProtoAccessTuple {
 message ProtoReceiptForStorage {
   bytes post_state_or_status = 1;
   uint64 cumulative_gas_used = 2;
-  common.ProtoHash tx_hash = 3;
-  common.ProtoAddress contract_address = 4;
-  ProtoLogsForStorage logs = 5;
-  ProtoTransactions etxs = 6;
-  uint64 gas_used = 7;
+  ProtoLogsForStorage logs = 3;
+  common.ProtoHash tx_hash = 4;
+  common.ProtoAddress contract_address = 5;
+  uint64 gas_used = 6;
+  ProtoTransactions etxs = 7;
 }
 
 message ProtoReceiptsForStorage {

diff --git a/core/types/receipt.go b/core/types/receipt.go
@@ -241,7 +241,9 @@ func (r *ReceiptForStorage) ProtoEncode() (*ProtoReceiptForStorage, error) {
 	ProtoReceiptForStorage := &ProtoReceiptForStorage{
 		PostStateOrStatus: (*Receipt)(r).statusEncoding(),
 		CumulativeGasUsed: r.CumulativeGasUsed,
+		TxHash:            r.TxHash.ProtoEncode(),
 		ContractAddress:   r.ContractAddress.ProtoEncode(),
+		GasUsed:           r.GasUsed,
 	}
 	protoEtxs, err := r.Etxs.ProtoEncode()
 	if err != nil {
@@ -255,6 +257,7 @@ func (r *ReceiptForStorage) ProtoEncode() (*ProtoReceiptForStorage, error) {
 		protoLog := (*LogForStorage)(log).ProtoEncode()
 		protoLogs.Logs[i] = protoLog
 	}
+	ProtoReceiptForStorage.Logs = protoLogs
 	return ProtoReceiptForStorage, nil
 }
 

diff --git a/p2p/node/peerManager/peerdb/peer_info.pb.go b/p2p/node/peerManager/peerdb/peer_info.pb.go
diff --git a/p2p/pb/quai_messages.pb.go b/p2p/pb/quai_messages.pb.go