-
Notifications
You must be signed in to change notification settings - Fork 85
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
demo native marketplace #1944
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
bf83e3e
to
2820e0e
Compare
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 |
I wasn't aware I could do that. |
d14d4c9
to
ff65273
Compare
ff65273
to
d5433e5
Compare
- ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=1 | ||
- ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=3 | ||
|
||
submit-transactions-private-fallback: |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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) }
bef0a8a
to
02ed833
Compare
process-compose-mp.yml
Outdated
- ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE=4 | ||
- ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE=6 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
b37f7b2
to
6147358
Compare
Co-authored-by: Abdul Basit <[email protected]>
This reverts commit a766793.
'cause its important
This reverts commit ad6bc14.
ed571a0
to
ea281fb
Compare
The author forgot to finish the review.
@@ -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 { |
There was a problem hiding this comment.
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.
Adds a second demo-native workflow specifically for marketplace.
Note this is a
quickhack, in followups we should: