Skip to content

Commit

Permalink
release-gambit: Fix fee catchup after restart (#2166)
Browse files Browse the repository at this point in the history
This is a backport of #2160 to release-gambit. It is a separate PR
because it is not a clean cherry-pick. I recommend reviewing the `main`
PR first, and then you can just look at this one to convince yourself
it's doing the same thing.
  • Loading branch information
jbearer authored Oct 14, 2024
2 parents 59ce2d7 + 53e42a0 commit 40ca1d5
Show file tree
Hide file tree
Showing 23 changed files with 1,180 additions and 325 deletions.
78 changes: 39 additions & 39 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ time = "0.3"
trait-set = "0.3.0"

[patch."https://github.com/EspressoSystems/HotShot.git"]
hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.74-patch5" }
hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.74-patch5" }
hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", branch = "0.5.74-patch-consensus" }
hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", branch = "0.5.74-patch-consensus" }
14 changes: 14 additions & 0 deletions sequencer/api/catchup.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ the proof is a Merkle _non-membership_ proof.
```
"""

[route.accounts]
PATH = ["/:height/:view/accounts"]
":height" = "Integer"
":view" = "Integer"
METHOD = "POST"
DOC = """
Bulk version of `/:height:view/account`. The request body should be a JSON array consisting of
TaggedBase64-encoded fee accounts.
The response is a `FeeMerkleTree` containing sub-trees for each of the requested accounts, which is
a more condensed way to represent the union of account proofs for each requested account. Individual
Merkle proofs for each account can be extracted from this tree.
"""

[route.blocks]
PATH = ["/:height/:view/blocks"]
":height" = "Integer"
Expand Down
2 changes: 2 additions & 0 deletions sequencer/api/migrations/V38__add_quorum_proposal_hash.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE quorum_proposals
ADD COLUMN leaf_hash VARCHAR;
Loading

0 comments on commit 40ca1d5

Please sign in to comment.