Skip to content

Revert implicit hash changes #134

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

Open
cboh4 wants to merge 6 commits into
base: secret-0.38.x
Choose a base branch
from
Open

Revert implicit hash changes #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2017d36
Revert "Merge pull request #133 from scrtlabs/add-implicit-hash-to-he…
cboh4 Nov 13, 2025
a483034
Revert "Merge pull request #132 from scrtlabs/add-implicit-hash-to-he…
cboh4 Nov 13, 2025
ec621a7
Revert "Merge pull request #131 from scrtlabs/add-implicit-hash-to-he…
cboh4 Nov 13, 2025
98084c0
retrieve implicit txs from the tm-secret-enclave
cboh4 Nov 17, 2025
2813e66
extend requestFinalizeBlock
cboh4 Nov 17, 2025
845abc9
remove panic
cboh4 Dec 28, 2025
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
2,644 changes: 470 additions & 2,174 deletions abci/types/types.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/rs/cors v1.11.1
github.com/sasha-s/go-deadlock v0.3.5
github.com/scrtlabs/tm-secret-enclave v1.13.0
github.com/scrtlabs/tm-secret-enclave v1.13.0-beta
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
github.com/spf13/cobra v1.9.1
github.com/spf13/viper v1.19.0
Expand All @@ -45,9 +45,10 @@ require (
golang.org/x/sync v0.11.0
gonum.org/v1/gonum v0.15.1
google.golang.org/grpc v1.70.0
google.golang.org/protobuf v1.36.5
)

require google.golang.org/protobuf v1.36.4

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/scrtlabs/tm-secret-enclave v1.13.0 h1:a2xH0G96chEM8Ntwlq/Fh36r4dg0ijKWTaOy0oqFsqg=
github.com/scrtlabs/tm-secret-enclave v1.13.0/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME=
github.com/scrtlabs/tm-secret-enclave v1.13.0-beta h1:9IqEHQ/GSaRzcgqrFkxoLd/5ejOgLSezduz75VKCsZg=
github.com/scrtlabs/tm-secret-enclave v1.13.0-beta/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
Expand Down Expand Up @@ -508,8 +508,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand Down
56 changes: 2 additions & 54 deletions proto/tendermint/abci/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import "tendermint/crypto/proof.proto";
import "tendermint/crypto/keys.proto";
import "tendermint/types/params.proto";
import "tendermint/types/types.proto";
import "tendermint/types/validator.proto";
import "tendermint/version/types.proto";
import "tendermint/types/validator.proto";
import "google/protobuf/timestamp.proto";
import "gogoproto/gogo.proto";

Expand Down Expand Up @@ -141,22 +141,6 @@ message RequestPrepareProposal {
bytes next_validators_hash = 7;
// address of the public key of the validator proposing the block.
bytes proposer_address = 8;
// scheduled_msgs_hash
tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false];
tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false];
bytes data_hash = 11;
bytes last_commit_hash = 12; // commit from validators from the last block
bytes validators_hash = 13; // validators for the current block
bytes consensus_hash = 14; // consensus params for current block
bytes last_results_hash = 15; // root hash of all results from the txs from the previous block

// consensus info
bytes evidence_hash = 16; // evidence included in the block
// encrypted random
tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts

// scheduled_msgs_hash
bytes implicit_hash = 18;
}

message RequestProcessProposal {
Expand All @@ -170,22 +154,6 @@ message RequestProcessProposal {
bytes next_validators_hash = 7;
// address of the public key of the original proposer of the block.
bytes proposer_address = 8;
// scheduled_msgs_hash
tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false];
tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false];
bytes data_hash = 11;
bytes last_commit_hash = 12; // commit from validators from the last block
bytes validators_hash = 13; // validators for the current block
bytes consensus_hash = 14; // consensus params for current block
bytes last_results_hash = 15; // root hash of all results from the txs from the previous block

// consensus info
bytes evidence_hash = 16; // evidence included in the block
// encrypted random
tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts

// scheduled_msgs_hash
bytes implicit_hash = 18;
}

// Extends a vote with application-injected data
Expand All @@ -202,22 +170,6 @@ message RequestExtendVote {
bytes next_validators_hash = 7;
// address of the public key of the original proposer of the block.
bytes proposer_address = 8;
// scheduled_msgs_hash
tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false];
tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false];
bytes data_hash = 11;
bytes last_commit_hash = 12; // commit from validators from the last block
bytes validators_hash = 13; // validators for the current block
bytes consensus_hash = 14; // consensus params for current block
bytes last_results_hash = 15; // root hash of all results from the txs from the previous block

// consensus info
bytes evidence_hash = 16; // evidence included in the block
// encrypted random
tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts

// scheduled_msgs_hash
bytes implicit_hash = 18;
}

// Verify the vote extension
Expand Down Expand Up @@ -245,16 +197,12 @@ message RequestFinalizeBlock {
tendermint.types.Commit commit = 10;
tendermint.version.Consensus version = 11 [(gogoproto.nullable) = false];
tendermint.types.BlockID last_block_id = 12 [(gogoproto.nullable) = false];
bytes data_hash = 13; // commit from validators from the last block
bytes data_hash = 13;
bytes last_commit_hash = 14; // commit from validators from the last block
bytes validators_hash = 15; // validators for the current block
bytes consensus_hash = 16; // consensus params for current block
bytes last_results_hash = 17; // root hash of all results from the txs from the previous block

// consensus info
bytes evidence_hash = 18; // evidence included in the block
// scheduled_msgs_hash
bytes implicit_hash = 19;
}

//----------------------------------------
Expand Down
Loading
Loading