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

chore: update nearcore crates from 0.17 -> 0.20 #1130

Merged
merged 7 commits into from
Jan 16, 2024

Conversation

dj8yfo
Copy link
Collaborator

@dj8yfo dj8yfo commented Jan 12, 2024

No description provided.

@@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
toolchain: [stable, 1.69.0]
toolchain: [stable, 1.72.1]
Copy link
Collaborator Author

@dj8yfo dj8yfo Jan 12, 2024

Choose a reason for hiding this comment

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

error[E0659]: `opentelemetry` is ambiguous
  --> /home/user/.cargo/registry/src/index.crates.io-6f17d22bba15001f/near-o11y-0.19.0/src/lib.rs:6:9
   |
6  | pub use opentelemetry::OpenTelemetryLevel;
   |         ^^^^^^^^^^^^^ ambiguous name
   |
   = note: ambiguous because of multiple potential import sources
   = note: `opentelemetry` could refer to a crate passed with `--extern`
   = help: use `::opentelemetry` to refer to this crate unambiguously
note: `opentelemetry` could also refer to the module defined here
  --> /home/user/.cargo/registry/src/index.crates.io-6f17d22bba15001f/near-o11y-0.19.0/src/lib.rs:22:1
   |
22 | mod opentelemetry;
   | ^^^^^^^^^^^^^^^^^^
   = help: use `crate::opentelemetry` to refer to this module unambiguously
                                                                                                                                                                                    
For more information about this error, try `rustc --explain E0659`.
error: could not compile `near-o11y` (lib) due to previous error

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

near-sdk/Cargo.toml Outdated Show resolved Hide resolved
.github/workflows/test.yml Outdated Show resolved Hide resolved
near-sdk/src/promise.rs Outdated Show resolved Hide resolved
near-sdk/src/promise.rs Outdated Show resolved Hide resolved
@dj8yfo dj8yfo force-pushed the update_neacore_deps branch 3 times, most recently from 48f0934 to 91d786e Compare January 15, 2024 21:06
@dj8yfo dj8yfo marked this pull request as ready for review January 15, 2024 21:36
@dj8yfo dj8yfo changed the title chore: update nearcore crates from 0.17 -> 0.19 chore: update nearcore crates from 0.17 -> 0.20 Jan 16, 2024
frol
frol previously approved these changes Jan 16, 2024
Copy link
Collaborator

@frol frol left a comment

Choose a reason for hiding this comment

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

Overall, since it is already in a compilable state, I would merge it and iterate in a separate PR.

near-sdk/src/types/public_key.rs Outdated Show resolved Hide resolved
near-sdk/src/promise.rs Outdated Show resolved Hide resolved
struct GasWeightSer(u64);

#[derive(Debug, Clone, serde::Serialize, PartialEq, Eq)]
pub enum MockAction {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am trying to understand if receipt_index is actually necessary at this level, and if the types mismatch with the blockchain is justified... @dj8yfo What is your understanding here?

@austinabell Can you shed some light here by any chance?

Copy link
Contributor

Choose a reason for hiding this comment

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

I can't remember the context, and I don't know about the nearcore updates. I can think about it more another time, but I wouldn't wait on my response, sorry!

Copy link
Collaborator

@frol frol left a comment

Choose a reason for hiding this comment

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

@dj8yfo Great job! Thanks you for pulling it out. I plan to cut 5.0.0-alpha.2 after merging this one

@frol frol merged commit 9ce0cdc into near:master Jan 16, 2024
13 checks passed
This was referenced Jan 16, 2024
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.

3 participants