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

rs: Bump crates and update bitcoin dependency #6726

Merged
merged 7 commits into from
Oct 23, 2023

Conversation

cdecker
Copy link
Member

@cdecker cdecker commented Sep 27, 2023

The Fedi project is asking for a new version, and hoping that we switch to bitcoin==0.30.1 to reduce their dependencies. Why not :-)

Fixes #6735

Changelog-None

@vincenzopalazzo vincenzopalazzo self-requested a review September 27, 2023 13:00
Copy link
Collaborator

@vincenzopalazzo vincenzopalazzo left a comment

Choose a reason for hiding this comment

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

There are two thinkg in this PR

Unfortunately rust-bitcoin introduce some braking changes like

cp tools/hsmtool tools/lightning-hsmtool
error[E0599]: no method named `to_vec` found for struct `Sha256` in the current scope
   --> cln-grpc/src/convert.rs:148:42
    |
148 |             payment_hash: c.payment_hash.to_vec(), // Rule #2 for type hash
    |                                          ^^^^^^ method not found in `Sha256`

error[E0599]: no method named `to_vec` found for struct `Sha256` in the current scope
   --> cln-grpc/src/convert.rs:165:48
    |
165 |             channel_id: c.channel_id.map(|v| v.to_vec()), // Rule #2 for type hash?
    |                                                ^^^^^^ method not found in `Sha256`

error[E0599]: no method named `to_vec` found for struct `Sha256` in the current scope
   --> cln-grpc/src/convert.rs:274:48
    |
274 |             channel_id: c.channel_id.map(|v| v.to_vec()), // Rule #2 for type hash?
    |                                                ^^^^^^ method not found in `Sha256`

Then lnprototest I started to fails and I am tracking it with #6727

@vincenzopalazzo vincenzopalazzo added the rust Issue related to rust label Sep 27, 2023
@vincenzopalazzo vincenzopalazzo force-pushed the 20230926-bump-cln-crates branch 2 times, most recently from 0ca2849 to 14917db Compare September 28, 2023 14:21
Copy link
Collaborator

@vincenzopalazzo vincenzopalazzo left a comment

Choose a reason for hiding this comment

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

Trivial Rebase

ACK 0ca2849

This build on my system, lets see if the CI is happy BTW

@vincenzopalazzo vincenzopalazzo added this to the v23.11 milestone Sep 28, 2023
@cdecker cdecker force-pushed the 20230926-bump-cln-crates branch from 14917db to d92ebde Compare September 29, 2023 12:35
@cdecker
Copy link
Member Author

cdecker commented Sep 29, 2023

Since I was at it I also added a fix for #6735

@cdecker cdecker force-pushed the 20230926-bump-cln-crates branch from 59dad0a to e76650a Compare September 29, 2023 15:22
@daywalker90
Copy link
Contributor

cln-rpc and cln-plugin 0.1.6 are already published

@kilrau
Copy link

kilrau commented Oct 3, 2023

Since I was at it I also added a fix for #6735

🙏

Some methods (`withdraw`) require their parameter to be in satoshis
rather than millisats. In order for us not to have to come up with yet
another triple of sat, sat_or_all, and sat_or_any, we just bolt it
onto the conversion.
@cdecker cdecker force-pushed the 20230926-bump-cln-crates branch from 19973b1 to df40ef5 Compare October 3, 2023 14:18
@cdecker cdecker force-pushed the 20230926-bump-cln-crates branch from df40ef5 to fac587b Compare October 3, 2023 14:18
@nepet
Copy link
Collaborator

nepet commented Oct 21, 2023

The Pre-build checks are still complaining about a mismatch in the compiled proto stubs and I don't understand why. CI uses grpcio_tools=1.59.0 and my local poetry shell also uses grpcio_tools=1.59.0 to compile the proto files and a local run of make check-gen-updated seems to be fine with the compiled stubs from 520cbbc

Hopefully this will fix the ci.

Signed-off-by: Peter Neuroth <[email protected]>
@nepet nepet requested a review from vincenzopalazzo October 23, 2023 16:57
Copy link
Collaborator

@vincenzopalazzo vincenzopalazzo left a comment

Choose a reason for hiding this comment

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

ACK 6802a44

@rustyrussell rustyrussell merged commit d89d4d5 into ElementsProject:master Oct 23, 2023
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rust Issue related to rust
Projects
None yet
Development

Successfully merging this pull request may close these issues.

waitblockheight rpc method missing in grpc
6 participants