Skip to content

Commit

Permalink
[mysticeti] Use committed subdag index (#14690)
Browse files Browse the repository at this point in the history
## Description 

As title

## Test Plan 

CI
---
If your changes are not user-facing and not a breaking change, you can
skip the following section. Otherwise, please indicate what changed, and
then add to the Release Notes section as highlighted during the release
process.

### Type of Change (Check all that apply)

- [ ] protocol change
- [ ] user-visible impact
- [ ] breaking change for a client SDKs
- [ ] breaking change for FNs (FN binary must upgrade)
- [ ] breaking change for validators or node operators (must upgrade
binaries)
- [ ] breaking change for on-chain data layout
- [ ] necessitate either a data wipe or data migration

### Release notes
  • Loading branch information
lxfind authored Nov 6, 2023
1 parent 42dc49e commit d1cf8e4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/sui-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ sui-storage.workspace = true
sui-types.workspace = true
workspace-hack.workspace = true
zeroize.workspace = true
mysticeti-core = { git = "https://github.com/MystenLabs/mysticeti", rev = "829665dccd53107d9445d4ad97c718e03e131780" }
mysticeti-core = { git = "https://github.com/MystenLabs/mysticeti", rev = "18b27ff27c160f7f3f9705bee1d7c501e46e6beb" }

[dev-dependencies]
clap.workspace = true
Expand Down
3 changes: 1 addition & 2 deletions crates/sui-core/src/consensus_types/consensus_output_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ impl ConsensusOutputAPI for mysticeti_core::consensus::linearizer::CommittedSubD
}

fn commit_sub_dag_index(&self) -> u64 {
// TODO: Mysticeti doesn't have this concept right now
self.anchor.round
self.height
}

fn transactions(&self) -> ConsensusOutputTransactions {
Expand Down
8 changes: 4 additions & 4 deletions crates/workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ merlin = { version = "3" }
migrations_internals = { version = "2", default-features = false }
mime = { version = "0.3", default-features = false }
mime_guess = { version = "2", default-features = false }
minibytes = { git = "https://github.com/MystenLabs/mysticeti", rev = "829665dccd53107d9445d4ad97c718e03e131780", default-features = false, features = ["frommmap"] }
minibytes = { git = "https://github.com/MystenLabs/mysticeti", rev = "18b27ff27c160f7f3f9705bee1d7c501e46e6beb", default-features = false, features = ["frommmap"] }
minimal-lexical = { version = "0.2", default-features = false, features = ["std"] }
miniz_oxide = { version = "0.6", default-features = false, features = ["with-alloc"] }
mio-c38e5c1d305a1b54 = { package = "mio", version = "0.8", features = ["net", "os-ext"] }
Expand Down Expand Up @@ -452,7 +452,7 @@ multer = { version = "2" }
multiaddr = { version = "0.17" }
multibase = { version = "0.9" }
multihash = { version = "0.17", default-features = false, features = ["identity", "multihash-impl", "std"] }
mysticeti-core = { git = "https://github.com/MystenLabs/mysticeti", rev = "829665dccd53107d9445d4ad97c718e03e131780", default-features = false }
mysticeti-core = { git = "https://github.com/MystenLabs/mysticeti", rev = "18b27ff27c160f7f3f9705bee1d7c501e46e6beb", default-features = false }
named-lock = { version = "0.2", default-features = false }
nested = { version = "0.1", default-features = false }
newline-converter = { version = "0.2", default-features = false }
Expand Down Expand Up @@ -1221,7 +1221,7 @@ migrations_internals = { version = "2", default-features = false }
migrations_macros = { version = "2" }
mime = { version = "0.3", default-features = false }
mime_guess = { version = "2", default-features = false }
minibytes = { git = "https://github.com/MystenLabs/mysticeti", rev = "829665dccd53107d9445d4ad97c718e03e131780", default-features = false, features = ["frommmap"] }
minibytes = { git = "https://github.com/MystenLabs/mysticeti", rev = "18b27ff27c160f7f3f9705bee1d7c501e46e6beb", default-features = false, features = ["frommmap"] }
minimal-lexical = { version = "0.2", default-features = false, features = ["std"] }
miniz_oxide = { version = "0.6", default-features = false, features = ["with-alloc"] }
mio-c38e5c1d305a1b54 = { package = "mio", version = "0.8", features = ["net", "os-ext"] }
Expand Down Expand Up @@ -1274,7 +1274,7 @@ multibase = { version = "0.9" }
multihash = { version = "0.17", default-features = false, features = ["identity", "multihash-impl", "std"] }
multihash-derive = { version = "0.8", default-features = false, features = ["std"] }
multimap = { version = "0.8", default-features = false }
mysticeti-core = { git = "https://github.com/MystenLabs/mysticeti", rev = "829665dccd53107d9445d4ad97c718e03e131780", default-features = false }
mysticeti-core = { git = "https://github.com/MystenLabs/mysticeti", rev = "18b27ff27c160f7f3f9705bee1d7c501e46e6beb", default-features = false }
named-lock = { version = "0.2", default-features = false }
nested = { version = "0.1", default-features = false }
newline-converter = { version = "0.2", default-features = false }
Expand Down

2 comments on commit d1cf8e4

@vercel
Copy link

@vercel vercel bot commented on d1cf8e4 Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on d1cf8e4 Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.