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

demo native marketplace #1944

Merged
merged 34 commits into from
Sep 5, 2024
Merged

demo native marketplace #1944

merged 34 commits into from
Sep 5, 2024

Conversation

tbro
Copy link
Contributor

@tbro tbro commented Aug 29, 2024

Adds a second demo-native workflow specifically for marketplace.

Note this is a quick hack, in followups we should:

@tbro tbro marked this pull request as ready for review August 29, 2024 15:42
Copy link
Member

@elliedavidson elliedavidson left a comment

Choose a reason for hiding this comment

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

LGTM!

@tbro tbro enabled auto-merge (squash) August 29, 2024 16:18
@tbro tbro force-pushed the tb/marketplace/demo-native-mp branch from bf83e3e to 2820e0e Compare August 29, 2024 17:52
@sveitser
Copy link
Collaborator

Looking at the diff of the two process compose files it seems that most of the changes can be done by setting some env vars and we add one service.

diff process-compose.yaml process-compose-mp.yml                                                 0.274s  tb/marketplace/demo-native-mp  ❄  15:32:26
8,9c8,9
<   - ESPRESSO_SEQUENCER_GENESIS_FILE=data/genesis/demo.toml
<   - ESPRESSO_BUILDER_GENESIS_FILE=data/genesis/demo.toml
---
>   - ESPRESSO_SEQUENCER_GENESIS_FILE=data/genesis/demo-marketplace.toml
>   - ESPRESSO_BUILDER_GENESIS_FILE=data/genesis/demo-marketplace.toml
370,371c370
<
<   # We use KeyDB (a Redis variant) to maintain consistency between
---
>   # We use KeyDB (a Redis variant) to maintain consistency between
459a459,460
>       - ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=1
>       - ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=6
479a481,502
>       - ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=1
>       - ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=3
>     depends_on:
>       sequencer0:
>         condition: process_healthy
>       permissionless-builder:
>         condition: process_healthy
>     readiness_probe:
>       http_get:
>         scheme: http
>         host: localhost
>         port: $ESPRESSO_SUBMIT_TRANSACTIONS_PRIVATE_PORT
>         path: /healthcheck
>       failure_threshold: 100
>
>   submit-transactions-private-fallback:
>     command: submit-transactions
>     environment:
>       - ESPRESSO_SUBMIT_TRANSACTIONS_PORT=$ESPRESSO_SUBMIT_TRANSACTIONS_PRIVATE_PORT
>       - ESPRESSO_SUBMIT_TRANSACTIONS_SUBMIT_URL=http://localhost:$ESPRESSO_FALLBACK_BUILDER_SERVER_PORT/txn_submit
>       - ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=4
>       - ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=6
494c517
<     disabled: true
---
>     # disabled: true
501d523
<       - ESPRESSO_MARKETPLACE_BUILDER_NAMESPACE=10000
504a527
>       - ESPRESSO_MARKETPLACE_BUILDER_NAMESPACE=1,2,3
519c542
<     disabled: true
---
>     # disabled: true
527d549
<       - ESPRESSO_MARKETPLACE_BUILDER_NAMESPACE=10000
544a567
>     disabled: true
667,668c690
<     command:
<       dev-rollup register --ns 1; dev-rollup register --ns 2; dev-rollup register --ns 3
---
>     command: dev-rollup register --ns 1; dev-rollup register --ns 2; dev-rollup register --ns 3
670a693
>       - ESPRESSO_MARKETPLACE_RESERVE_BUILDER_URL=http://localhost:$ESPRESSO_BUILDER_SERVER_PORT

Was wondering if you considered adding the difference as an override file: https://f1bonacc1.github.io/process-compose/configuration/#merge-2-or-more-configuration-files-with-override-values

@tbro
Copy link
Contributor Author

tbro commented Aug 30, 2024

Was wondering if you considered adding the difference as an override file

I wasn't aware I could do that.

@tbro tbro force-pushed the tb/marketplace/demo-native-mp branch from d14d4c9 to ff65273 Compare August 30, 2024 15:21
@tbro tbro force-pushed the tb/marketplace/demo-native-mp branch from ff65273 to d5433e5 Compare September 3, 2024 12:59
- ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=1
- ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=3

submit-transactions-private-fallback:
Copy link
Contributor

@imabdulbasit imabdulbasit Sep 3, 2024

Choose a reason for hiding this comment

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

I am thinking that if we also need another load generator for reserve builder? so the submit-transactions-private load generator is for legacy one.

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 something like 8e65d4a. I'm not sure of the namespaces though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

all the private load generators are currently failing, so looking into it. Maybe there's a wrong port somewhere:

│2024-09-03T20:33:25.558719Z ERROR submit_transactions: failed to submit     ││
││batch of 3 transactions err=Custom { message: "error sending request for    ││
││url (http://localhost:31003/txn_submit/batch): client error (Connect)",     ││
││status: StatusCode(500) }  

@sveitser sveitser linked an issue Sep 3, 2024 that may be closed by this pull request
4 tasks
process-compose-mp.yml Outdated Show resolved Hide resolved
process-compose-mp.yml Outdated Show resolved Hide resolved
process-compose-mp.yml Outdated Show resolved Hide resolved
process-compose-mp.yml Outdated Show resolved Hide resolved
@tbro tbro force-pushed the tb/marketplace/demo-native-mp branch from bef0a8a to 02ed833 Compare September 4, 2024 16:22
@tbro tbro disabled auto-merge September 4, 2024 18:06
Comment on lines 75 to 76
- ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=4
- ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=6
Copy link
Member

Choose a reason for hiding this comment

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

Looks like we set ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE and ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE to 1 and 3 for the reserve builder, and 4 and 6 for the fallback builder, but for either builder, ESPRESSO_MARKETPLACE_BUILDER_NAMESPACE is 10000. Can we change ESPRESSO_MARKETPLACE_BUILDER_NAMESPACE to 2 or maybe adjust the namespace range?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tbro tbro force-pushed the tb/marketplace/demo-native-mp branch from b37f7b2 to 6147358 Compare September 4, 2024 20:02
@tbro tbro force-pushed the tb/marketplace/demo-native-mp branch from ed571a0 to ea281fb Compare September 5, 2024 20:26
@tbro tbro enabled auto-merge (squash) September 5, 2024 20:33
@tbro tbro dismissed imabdulbasit’s stale review September 5, 2024 20:51

The author forgot to finish the review.

@tbro tbro merged commit 3c0db34 into main Sep 5, 2024
13 of 15 checks passed
@tbro tbro deleted the tb/marketplace/demo-native-mp branch September 5, 2024 21:45
@@ -60,8 +60,13 @@ impl Genesis {
let upgrades: Vec<&Upgrade> = self.upgrades.values().collect();

for upgrade in upgrades {
if let UpgradeType::Fee { chain_config } = upgrade.upgrade_type {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was the cause of the last time I saw txns not incrementing in marketplace demo.

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.

Jit Marketplace full integration
5 participants