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

Upgrade solana.py to 0.21.0, web3.py to 6.0.0b1 #2751

Merged
merged 32 commits into from
Mar 30, 2022
Merged

Conversation

csjiang
Copy link
Contributor

@csjiang csjiang commented Mar 24, 2022

Description

Upgrade solana.py version to a version compatible with anchor.py for tx parsing. Solana.py requires websockets >10.1 so we're also upgrading web3.py to a version compatible with websockets >10.1.

Tests

Fixing integration tests

How will this change be monitored? Are there sufficient logs?

N/A

@csjiang csjiang marked this pull request as ready for review March 25, 2022 18:58
@jowlee jowlee requested a review from dmanjunath March 28, 2022 19:30
Copy link
Contributor

@hareeshnagaraj hareeshnagaraj left a comment

Choose a reason for hiding this comment

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

Copy link
Contributor Author

@csjiang csjiang left a comment

Choose a reason for hiding this comment

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

LGTM - thanks so much for resolving on the deps level and testing 🙏

@@ -714,7 +749,7 @@ workflows:

- test-discovery-provider:
name: test-discovery-provider
- docker-build-and-push:
- docker-build-and-push-updated:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

can we leave it build-and-push bc we're replacing the old one?

Copy link
Contributor

Choose a reason for hiding this comment

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

The updated one uses a new base image - I didn't want to go through the process of updating the build for all the services Base image circleci/buildpack-deps:stretch => cimg/base:2022.03

@jowlee jowlee force-pushed the ASI-971_upgrade_solanapy branch 2 times, most recently from 1ccf953 to 39202d7 Compare March 29, 2022 14:58
Copy link
Contributor

@hareeshnagaraj hareeshnagaraj left a comment

Choose a reason for hiding this comment

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

Looks great, verified listens e2e on a local setup! Thanks for doing this

@@ -9,8 +9,7 @@ types-redis==3.5.4
types-requests==2.25.0
types-pytz==2021.1.2

# web3 used to be 5.11.0 but due to a build issue in docker, downgraded to 5.8.0
web3==5.8.0
web3==6.0.0b1
Copy link
Contributor

Choose a reason for hiding this comment

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

can we add some details as to why we are on 6.0.0.b1?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it is the only version that supports websockets v10.1 and that's the version of ws we need for solana-py version that is compatible w anchor py

@hareeshnagaraj
Copy link
Contributor

Can we try and absorb getTransaction here? instead of getConfirmedTransaction - https://michaelhly.github.io/solana-py/rpc/api/#solana.rpc.api.Client.get_transaction

https://docs.solana.com/developing/clients/jsonrpc-api#getconfirmedtransaction <-- being deprecated

This will be addressed in a follow up

@jowlee jowlee merged commit 3b4716a into master Mar 30, 2022
@jowlee jowlee deleted the ASI-971_upgrade_solanapy branch March 30, 2022 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants