Skip to content
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.

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

Update to hotshot rc-0.5.67 / marketplace #1784

Merged
merged 32 commits into from
Jul 30, 2024
Merged

Conversation

tbro
Copy link
Contributor

@tbro tbro commented Jul 25, 2024

Update to hotshot rc-0.5.66

Most changes are being brought in from #1696. Also includes changes
from #1781. Most compile errors are fixed. Depends on
hotshot-query-service pointing to the same hotshot tab (see
Cargo.toml patch).

tbro added 4 commits July 26, 2024 16:49
Most changes are being brought in from #1696. Also includes changes
from #1781. Most compile errors are fixed. Depends on
`hotshot-query-service` pointing to the same hotshot tab (see
Cargo.tmol patch).
@tbro tbro force-pushed the tb/marketplace/update-hotshot branch from 3214997 to f04b89f Compare July 26, 2024 14:34
@QuentinI QuentinI changed the title Update to hotshot rc-0.5.66 / marketplace Update to hotshot rc-0.5.67 / marketplace Jul 26, 2024
@shenkeyao shenkeyao marked this pull request as ready for review July 26, 2024 20:15
@shenkeyao shenkeyao marked this pull request as draft July 26, 2024 20:18
@tbro tbro marked this pull request as ready for review July 30, 2024 17:38
},
// TODO does this work? is there a better way?
Either::Right(c) => ResolvableChainConfig {
chain_config: Either::Right(Commitment::from_str(&c.to_string()).unwrap()),
Copy link
Contributor

Choose a reason for hiding this comment

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

I also haven't found a better way to handle this. maybe @jbearer would know

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this is ok to merge for now, but we try to figure out if there is a better way before we turn on marketplace.

fn default() -> Self {
Self {
chain_id: U256::from(35353).into(), // arbitrarily chosen chain ID
max_block_size: 10240.into(),
Copy link
Contributor

Choose a reason for hiding this comment

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

dev node test will fail. I had to change it to 30mb

fn default() -> Self {
Self {
chain_id: U256::from(35353).into(), // arbitrarily chosen chain ID
max_block_size: 10240.into(),
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

}
}

const SOLVER_URL: &str = "https://solver:1234";
Copy link
Contributor

Choose a reason for hiding this comment

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

this should come from env var?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes but it doesn't matter yet.

sequencer/Cargo.toml Outdated Show resolved Hide resolved
start_proposing_view = 5
stop_proposing_view = 15

[upgrade.marketplace]
Copy link
Contributor

Choose a reason for hiding this comment

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

we can remove it for now as UpgradeType changes are in integrations PR

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that toml parsing will fail so yeah needs to be removed

@@ -137,6 +150,9 @@ pub enum ExecutionError {
#[error("Could not resolve `ChainConfig`")]
/// Could not resolve `ChainConfig`.
UnresolvableChainConfig,
#[error("Bid ricipient not set on `ChainConfig`")]
Copy link
Contributor

Choose a reason for hiding this comment

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

typo here: Bid recipient

Copy link
Contributor

@imabdulbasit imabdulbasit left a comment

Choose a reason for hiding this comment

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

LGTM! left some minor comments.

@tbro tbro enabled auto-merge (squash) July 30, 2024 18:10
@tbro tbro merged commit 2b90834 into main Jul 30, 2024
15 checks passed
@tbro tbro deleted the tb/marketplace/update-hotshot branch July 30, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants