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

Bump Rust dependencies to their latest version #635

Merged
merged 4 commits into from
May 5, 2023

Conversation

2opremio
Copy link
Contributor

@2opremio 2opremio commented May 5, 2023

What

Bump Rust dependencies to the latest release

Why

We want to use the latest and greatest

Known limitations

Unfortunately the update is causing a dependency conflict:

error: failed to select a version for `syn`.
    ... required by package `darling_core v0.20.0`
    ... which satisfies dependency `darling_core = "=0.20.0"` of package `darling v0.20.0`
    ... which satisfies dependency `darling = "^0.20.0"` of package `soroban-spec v0.8.0 (https://github.com/stellar/rs-soroban-sdk?rev=090f5c88e8f8b67f4d02010665aedfea6ee43db3#090f5c88)`
    ... which satisfies git dependency `soroban-spec` of package `soroban-cli v0.7.1 (/Users/alfonsoacosta/soroban-tools/cmd/soroban-cli)`
    ... which satisfies path dependency `soroban-cli` (locked to 0.7.1) of package `soroban-test v0.7.1 (/Users/alfonsoacosta/soroban-tools/cmd/crates/soroban-test)`
versions that meet the requirements `^2.0.15` are: 2.0.15

all possible versions conflict with previously selected packages.

  previously selected package `syn v2.0.8`
    ... which satisfies dependency `syn = "^2.0"` (locked to 2.0.8) of package `async-trait v0.1.67`
    ... which satisfies dependency `async-trait = "^0.1"` (locked to 0.1.67) of package `jsonrpsee-core v0.15.1`
    ... which satisfies dependency `jsonrpsee-core = "^0.15.1"` (locked to 0.15.1) of package `jsonrpsee-http-client v0.15.1`
    ... which satisfies dependency `jsonrpsee-http-client = "^0.15.1"` (locked to 0.15.1) of package `soroban-cli v0.7.1 (/Users/alfonsoacosta/soroban-tools/cmd/soroban-cli)`
    ... which satisfies path dependency `soroban-cli` (locked to 0.7.1) of package `soroban-test v0.7.1 (/Users/alfonsoacosta/soroban-tools/cmd/crates/soroban-test)`

failed to select a version for `syn` which could resolve this conflict

@2opremio
Copy link
Contributor Author

2opremio commented May 5, 2023

OK, it seems like the conflict comes from:

├── jsonrpsee-core v0.15.1
│   ├── anyhow v1.0.70
│   ├── async-trait v0.1.67 (proc-macro)
│   │   ├── proc-macro2 v1.0.53 (*)
│   │   ├── quote v1.0.26 (*)
│   │   └── syn v2.0.8 (*)

and serde?

@2opremio
Copy link
Contributor Author

2opremio commented May 5, 2023

Bumping the jsonrpsee dependency solved the problem

@tsachiherman tsachiherman self-requested a review May 5, 2023 12:34
@2opremio 2opremio merged commit 97493a2 into stellar:fees May 5, 2023
@2opremio 2opremio deleted the bump-rust-dependencies branch May 5, 2023 20:04
tsachiherman added a commit that referenced this pull request May 17, 2023
* Bump Rust dependencies to support fees (#625)

* soroban-rpc: update xdr (#627)

update

* soroban-rpc: Bump core dependencies supporting fees (#634)

* fees: Bump stellar/go dependency (#637)

* Bump Rust dependencies to their latest version (#635)

* port: merge soroban cli inspect from main (#639)

* Try new docker compose plugin (#631)

* Try new docker compose plugin

* Ok we need to add the docker apt repo :(

* Need an apt-get update

* Force-install docker-compose

* Remove old docker-compose first?

* try removing moby-compose

* Clean up workflow

* Add meta output to soroban-cli contract inspect output (#620)

* Add env_meta output to soroban-cli contract inspect output

* Output contract meta and improve contract inspect formatting

* Indent the docs to match

* rustfmt

* Improve function inspect output

* improving the inspect output formatting

* handle lib in inspect output

* Satiate clippy

---------

Co-authored-by: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com>

---------

Co-authored-by: Paul Bellamy <paul@stellar.org>

* soroban-rpc: Calculate soroban transaction data in libpreflight (#636)

* Create Skeletton to calculate soroban transaction data in libpreflight

* Calculate transaction data a minimum fee in libpreflight

* Calculate transaction data a minimum fee in libpreflight

* Make integration tests compilable again

* Assume missing entries from ledger storage are created

* Update simulate transaction integration tests

* Add TODOs for the integration tests to pass

* Make events global

* Address review feedback

* Add TODO about taking into account the Auth size

* Add a few more TODOs and debug info

* First attempt and preflighting all transactions

* Always take into account keys when computing unmodified ledgers

* Come up with the minimum fee to add in order to make it work

* Fix transaction_resources computation

* Remove debug printout

* Increase instruction leeway

* Fix the rest of the simulate transaction test

* Fix remaining intgeration tests

* Address review feedback

* Tweak the instruction estimation further

* Address review feedback

* Fix tests again

* Obtain auth data per function

* Take auth data into account for estimating envelope size

* Split up libpreflight in multiple modules and improve the storage code

* Fix TODO

* Remove another TODO

* Remove yet another TODO

* Appease clippy

* update

* update core version

* make sure to test multiple host functions invocations.

---------

Co-authored-by: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com>

* try to replace the dns servers to avoid stale addresses.

* rollback dns change

* Add handling for invalid toml file support in ConfigOption.setValue

* #519: fixed issue with file path configs being lost after re loading cli/env flags, ordering of config value application was modified to default->env/cli->file path.

---------

Co-authored-by: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com>
Co-authored-by: Paul Bellamy <paul@stellar.org>
Co-authored-by: Shawn Reuland <shawn@stellar.org>
paulbellamy pushed a commit that referenced this pull request May 22, 2023
* Bump Rust dependencies to support fees (#625)

* soroban-rpc: update xdr (#627)

update

* soroban-rpc: Bump core dependencies supporting fees (#634)

* fees: Bump stellar/go dependency (#637)

* Bump Rust dependencies to their latest version (#635)

* port: merge soroban cli inspect from main (#639)

* Try new docker compose plugin (#631)

* Try new docker compose plugin

* Ok we need to add the docker apt repo :(

* Need an apt-get update

* Force-install docker-compose

* Remove old docker-compose first?

* try removing moby-compose

* Clean up workflow

* Add meta output to soroban-cli contract inspect output (#620)

* Add env_meta output to soroban-cli contract inspect output

* Output contract meta and improve contract inspect formatting

* Indent the docs to match

* rustfmt

* Improve function inspect output

* improving the inspect output formatting

* handle lib in inspect output

* Satiate clippy

---------

Co-authored-by: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com>

---------

Co-authored-by: Paul Bellamy <paul@stellar.org>

* soroban-rpc: Calculate soroban transaction data in libpreflight (#636)

* Create Skeletton to calculate soroban transaction data in libpreflight

* Calculate transaction data a minimum fee in libpreflight

* Calculate transaction data a minimum fee in libpreflight

* Make integration tests compilable again

* Assume missing entries from ledger storage are created

* Update simulate transaction integration tests

* Add TODOs for the integration tests to pass

* Make events global

* Address review feedback

* Add TODO about taking into account the Auth size

* Add a few more TODOs and debug info

* First attempt and preflighting all transactions

* Always take into account keys when computing unmodified ledgers

* Come up with the minimum fee to add in order to make it work

* Fix transaction_resources computation

* Remove debug printout

* Increase instruction leeway

* Fix the rest of the simulate transaction test

* Fix remaining intgeration tests

* Address review feedback

* Tweak the instruction estimation further

* Address review feedback

* Fix tests again

* Obtain auth data per function

* Take auth data into account for estimating envelope size

* Split up libpreflight in multiple modules and improve the storage code

* Fix TODO

* Remove another TODO

* Remove yet another TODO

* Appease clippy

* update

* update core version

* make sure to test multiple host functions invocations.

---------

Co-authored-by: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com>

* try to replace the dns servers to avoid stale addresses.

* rollback dns change

* Add handling for invalid toml file support in ConfigOption.setValue

* update

* appease cargo fmt

* update

* update

* Add rpc::server.get_network

* Add rpc::server.prepare_transaction

* get prepare_transaction stuff compiling

* use prepare_transaction and simplify

* Add and use client.prepare_and_send_transaction

* appease cargo fmt

* update fix compilation.

* Improve output for failed txn submission

* Add missing field from getLedgerEntries response

* Add transaction::assemble unit tests based on js-soroban-client

* Clean up some leftover printlns

* We don't need to manually set transaction_data, it can come from the simulation

---------

Co-authored-by: Alfonso Acosta <alfonso@stellar.org>
Co-authored-by: Paul Bellamy <paul@stellar.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants