Skip to content

Commit ec621a7

Browse files
committed
Revert "Merge pull request #131 from scrtlabs/add-implicit-hash-to-header"
This reverts commit 26f71ad, reversing changes made to 90a50c0.
1 parent a483034 commit ec621a7

File tree

9 files changed

+638
-2976
lines changed

9 files changed

+638
-2976
lines changed

abci/types/types.pb.go

Lines changed: 540 additions & 2682 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb
329329
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
330330
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
331331
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
332-
github.com/scrtlabs/tm-secret-enclave v1.13.0 h1:a2xH0G96chEM8Ntwlq/Fh36r4dg0ijKWTaOy0oqFsqg=
333-
github.com/scrtlabs/tm-secret-enclave v1.13.0/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME=
332+
github.com/scrtlabs/tm-secret-enclave v1.12.2 h1:fl1rOFYB4+9orTzjAnp6r5EmIm5/6c78EERrWcgEWHA=
333+
github.com/scrtlabs/tm-secret-enclave v1.12.2/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME=
334334
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
335335
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
336336
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=

proto/tendermint/abci/types.proto

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import "tendermint/crypto/keys.proto";
1010
import "tendermint/types/params.proto";
1111
import "tendermint/types/types.proto";
1212
import "tendermint/types/validator.proto";
13-
import "tendermint/version/types.proto";
1413
import "google/protobuf/timestamp.proto";
1514
import "gogoproto/gogo.proto";
1615

@@ -141,22 +140,6 @@ message RequestPrepareProposal {
141140
bytes next_validators_hash = 7;
142141
// address of the public key of the validator proposing the block.
143142
bytes proposer_address = 8;
144-
// scheduled_msgs_hash
145-
tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false];
146-
tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false];
147-
bytes data_hash = 11;
148-
bytes last_commit_hash = 12; // commit from validators from the last block
149-
bytes validators_hash = 13; // validators for the current block
150-
bytes consensus_hash = 14; // consensus params for current block
151-
bytes last_results_hash = 15; // root hash of all results from the txs from the previous block
152-
153-
// consensus info
154-
bytes evidence_hash = 16; // evidence included in the block
155-
// encrypted random
156-
tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts
157-
158-
// scheduled_msgs_hash
159-
bytes implicit_hash = 18;
160143
}
161144

162145
message RequestProcessProposal {
@@ -170,22 +153,6 @@ message RequestProcessProposal {
170153
bytes next_validators_hash = 7;
171154
// address of the public key of the original proposer of the block.
172155
bytes proposer_address = 8;
173-
// scheduled_msgs_hash
174-
tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false];
175-
tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false];
176-
bytes data_hash = 11;
177-
bytes last_commit_hash = 12; // commit from validators from the last block
178-
bytes validators_hash = 13; // validators for the current block
179-
bytes consensus_hash = 14; // consensus params for current block
180-
bytes last_results_hash = 15; // root hash of all results from the txs from the previous block
181-
182-
// consensus info
183-
bytes evidence_hash = 16; // evidence included in the block
184-
// encrypted random
185-
tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts
186-
187-
// scheduled_msgs_hash
188-
bytes implicit_hash = 18;
189156
}
190157

191158
// Extends a vote with application-injected data
@@ -202,22 +169,6 @@ message RequestExtendVote {
202169
bytes next_validators_hash = 7;
203170
// address of the public key of the original proposer of the block.
204171
bytes proposer_address = 8;
205-
// scheduled_msgs_hash
206-
tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false];
207-
tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false];
208-
bytes data_hash = 11;
209-
bytes last_commit_hash = 12; // commit from validators from the last block
210-
bytes validators_hash = 13; // validators for the current block
211-
bytes consensus_hash = 14; // consensus params for current block
212-
bytes last_results_hash = 15; // root hash of all results from the txs from the previous block
213-
214-
// consensus info
215-
bytes evidence_hash = 16; // evidence included in the block
216-
// encrypted random
217-
tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts
218-
219-
// scheduled_msgs_hash
220-
bytes implicit_hash = 18;
221172
}
222173

223174
// Verify the vote extension
@@ -243,18 +194,6 @@ message RequestFinalizeBlock {
243194
bytes proposer_address = 8;
244195
tendermint.types.EncryptedRandom encrypted_random = 9; // a random number encrypted by the proposer to be used in contracts
245196
tendermint.types.Commit commit = 10;
246-
tendermint.version.Consensus version = 11 [(gogoproto.nullable) = false];
247-
tendermint.types.BlockID last_block_id = 12 [(gogoproto.nullable) = false];
248-
bytes data_hash = 13; // commit from validators from the last block
249-
bytes last_commit_hash = 14; // commit from validators from the last block
250-
bytes validators_hash = 15; // validators for the current block
251-
bytes consensus_hash = 16; // consensus params for current block
252-
bytes last_results_hash = 17; // root hash of all results from the txs from the previous block
253-
254-
// consensus info
255-
bytes evidence_hash = 18; // evidence included in the block
256-
// scheduled_msgs_hash
257-
bytes implicit_hash = 19;
258197
}
259198

260199
//----------------------------------------

0 commit comments

Comments
 (0)