diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c786ea77f..413e674a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,6 +52,9 @@ jobs: toolchain: stable - uses: Swatinem/rust-cache@v1 - run: cargo check -p near-sdk --features unstable,legacy + - run: cargo check -p near-sdk --no-default-features + - run: cargo check -p near-sdk --no-default-features --features legacy + - run: cargo check -p near-sdk --no-default-features --features unstable - run: cargo check -p near-contract-standards audit: name: Audit diff --git a/CHANGELOG.md b/CHANGELOG.md index df72217fe..9c3b0abe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## [4.1.1] - 2022-11-10 + +### Fixed +- Fixed invalid import from "legacy" feature flag from stabilized collection. [PR 960](https://github.com/near/near-sdk-rs/pull/960) + ## [4.1.0] - 2022-11-09 ### Added @@ -367,7 +372,8 @@ impl StatusMessage { * Add account check to `get_balance` in fungible token https://github.com/near/near-sdk-rs/pull/175 * In fungible token remove account from storage if its balance is 0 https://github.com/near/near-sdk-rs/pull/179 -[Unreleased]: https://github.com/near/near-sdk-rs/compare/4.1.0...HEAD +[Unreleased]: https://github.com/near/near-sdk-rs/compare/4.1.1...HEAD +[4.1.1]: https://github.com/near/near-sdk-rs/compare/4.1.0...4.1.1 [4.1.0]: https://github.com/near/near-sdk-rs/compare/4.0.0-pre.3...4.1.0 [4.1.0-pre.3]: https://github.com/near/near-sdk-rs/compare/4.0.0-pre.2...4.1.0-pre.3 [4.1.0-pre.2]: https://github.com/near/near-sdk-rs/compare/4.0.0-pre.1...4.1.0-pre.2 diff --git a/examples/adder/Cargo.lock b/examples/adder/Cargo.lock index 4ef6c7bc5..18a682245 100644 --- a/examples/adder/Cargo.lock +++ b/examples/adder/Cargo.lock @@ -1525,7 +1525,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/callback-results/Cargo.lock b/examples/callback-results/Cargo.lock index 95eb181c0..2691d46f4 100644 --- a/examples/callback-results/Cargo.lock +++ b/examples/callback-results/Cargo.lock @@ -1503,7 +1503,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1524,7 +1524,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/cross-contract-calls/Cargo.lock b/examples/cross-contract-calls/Cargo.lock index a8429adaa..cccb7512e 100644 --- a/examples/cross-contract-calls/Cargo.lock +++ b/examples/cross-contract-calls/Cargo.lock @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1573,7 +1573,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/factory-contract/Cargo.lock b/examples/factory-contract/Cargo.lock index fda89f8e9..d83bd2fe6 100644 --- a/examples/factory-contract/Cargo.lock +++ b/examples/factory-contract/Cargo.lock @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1573,7 +1573,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/fungible-token/Cargo.lock b/examples/fungible-token/Cargo.lock index d3fc21b9d..a64765227 100644 --- a/examples/fungible-token/Cargo.lock +++ b/examples/fungible-token/Cargo.lock @@ -1397,7 +1397,7 @@ dependencies = [ [[package]] name = "near-contract-standards" -version = "4.1.0" +version = "4.1.1" dependencies = [ "near-sdk", "schemars", @@ -1673,7 +1673,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1694,7 +1694,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/lockable-fungible-token/Cargo.lock b/examples/lockable-fungible-token/Cargo.lock index c191b44bb..b5f043220 100644 --- a/examples/lockable-fungible-token/Cargo.lock +++ b/examples/lockable-fungible-token/Cargo.lock @@ -1642,7 +1642,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1663,7 +1663,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/mission-control/Cargo.lock b/examples/mission-control/Cargo.lock index a258ddb5e..7946fb2e3 100644 --- a/examples/mission-control/Cargo.lock +++ b/examples/mission-control/Cargo.lock @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/non-fungible-token/Cargo.lock b/examples/non-fungible-token/Cargo.lock index c34db09ad..ec178e6a1 100644 --- a/examples/non-fungible-token/Cargo.lock +++ b/examples/non-fungible-token/Cargo.lock @@ -1371,7 +1371,7 @@ dependencies = [ [[package]] name = "near-contract-standards" -version = "4.1.0" +version = "4.1.1" dependencies = [ "near-sdk", "schemars", @@ -1647,7 +1647,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -1668,7 +1668,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/status-message-collections/Cargo.lock b/examples/status-message-collections/Cargo.lock index ba7214b68..ed0e22ea3 100644 --- a/examples/status-message-collections/Cargo.lock +++ b/examples/status-message-collections/Cargo.lock @@ -579,7 +579,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -600,7 +600,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/status-message/Cargo.lock b/examples/status-message/Cargo.lock index 9573c20a0..c755c7a88 100644 --- a/examples/status-message/Cargo.lock +++ b/examples/status-message/Cargo.lock @@ -579,7 +579,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -600,7 +600,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/test-contract/Cargo.lock b/examples/test-contract/Cargo.lock index 06b60d888..6d637d1ee 100644 --- a/examples/test-contract/Cargo.lock +++ b/examples/test-contract/Cargo.lock @@ -579,7 +579,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -600,7 +600,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/examples/versioned/Cargo.lock b/examples/versioned/Cargo.lock index 919070653..ebcdbe657 100644 --- a/examples/versioned/Cargo.lock +++ b/examples/versioned/Cargo.lock @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" dependencies = [ "base64 0.13.0", "borsh", @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" dependencies = [ "Inflector", "proc-macro2", diff --git a/near-contract-standards/Cargo.toml b/near-contract-standards/Cargo.toml index 1aca8fd9f..8db8c158e 100644 --- a/near-contract-standards/Cargo.toml +++ b/near-contract-standards/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-contract-standards" -version = "4.1.0" +version = "4.1.1" authors = ["Near Inc "] edition = "2021" license = "MIT OR Apache-2.0" @@ -13,7 +13,7 @@ NEAR smart contracts standard library. """ [dependencies] -near-sdk = { path = "../near-sdk", version = "=4.1.0", default-features = false, features = ["legacy"] } +near-sdk = { path = "../near-sdk", version = "~4.1.1", default-features = false, features = ["legacy"] } serde = "1" serde_json = "1" schemars = "0.8" diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml index fc63285c6..99bb66368 100644 --- a/near-sdk-macros/Cargo.toml +++ b/near-sdk-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-sdk-macros" -version = "4.1.0" +version = "4.1.1" authors = ["Near Inc "] edition = "2021" license = "MIT OR Apache-2.0" diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml index b4797c453..ccf853574 100644 --- a/near-sdk/Cargo.toml +++ b/near-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-sdk" -version = "4.1.0" +version = "4.1.1" authors = ["Near Inc "] edition = "2021" license = "MIT OR Apache-2.0" @@ -21,7 +21,7 @@ required-features = ["abi", "unstable"] # Provide near_bidgen macros. serde = { version = "1", features = ["derive"] } serde_json = "1" -near-sdk-macros = { path = "../near-sdk-macros", version = "=4.1.0" } +near-sdk-macros = { path = "../near-sdk-macros", version = "~4.1.1" } near-sys = { path = "../sys", version = "0.2" } base64 = "0.13" borsh = { version = "0.9", features = ["const-generics"] } diff --git a/near-sdk/src/store/lazy/mod.rs b/near-sdk/src/store/lazy/mod.rs index e8a5bc6ac..9606d645b 100644 --- a/near-sdk/src/store/lazy/mod.rs +++ b/near-sdk/src/store/lazy/mod.rs @@ -9,8 +9,8 @@ mod impls; use borsh::{BorshDeserialize, BorshSerialize}; use once_cell::unsync::OnceCell; -use crate::collections::ERR_INCONSISTENT_STATE; use crate::env; +use crate::store::ERR_INCONSISTENT_STATE; use crate::utils::{CacheEntry, EntryState}; use crate::IntoStorageKey;