Merge branch 'master' into Write-a-README-for-factory-contract-and-cr…

…oss-contract-examples
near · Sep 18, 2024 · e21012e · e21012e
2 parents 80093eb + f179a28
commit e21012e
Show file tree

Hide file tree

Showing 20 changed files with 359 additions and 158 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -0,0 +1,55 @@
+name: Coverage
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+env:
+  RUSTFLAGS: "-D warnings"
+
+jobs:
+  coverage:
+    runs-on: ${{ matrix.platform }}
+    name: "${{ matrix.example }} - ${{ matrix.platform }}"
+    strategy:
+      matrix:
+        platform: [macos-latest]
+        toolchain: [stable]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Homebrew
+        run: |
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      - name: Install LLVM
+        run: brew install llvm
+      - name: Add LLVM to PATH
+        run: echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
+      - name: Install cargo-llvm-cov
+        run: brew install cargo-llvm-cov
+      - name: Llvm version
+        run: llvm-config --version
+      - name: Clang version
+        run: clang --version
+      - name: "${{ matrix.toolchain }} with rustfmt, and wasm32"
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.toolchain }}
+          target: wasm32-unknown-unknown
+      - name: Set Default Toolchain
+        run: rustup override set ${{ matrix.toolchain }}
+      - name: Rust version
+        run: rustc --version --verbose
+      - name: Add rust-src component
+        run: rustup component add rust-src --toolchain ${{ matrix.toolchain }}
+      - name: Verify Rust Toolchain
+        run: rustup show
+      - name: Generate code coverage
+        run: cargo +${{ matrix.toolchain }} llvm-cov --lcov --output-path llvm-cov-output.lcov
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          files: ./llvm-cov-output.lcov
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,11 +14,11 @@ jobs:
       matrix:
         platform:
           - os: ubuntu-latest
-            rs: 1.76.0
+            rs: 1.79
           - os: ubuntu-latest
             rs: stable
           - os: macos-latest
-            rs: 1.76.0
+            rs: 1.79
           - os: macos-latest
             rs: stable
         features: ['', '--features unstable,legacy,__abi-generate']

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,34 @@
 
 ## [Unreleased]
 
+## [5.5.0](https://github.com/near/near-sdk-rs/compare/near-sdk-v5.4.0...near-sdk-v5.5.0) - 2024-09-11
+
+### Other
+
+- Updated near-* dependendencies to v0.26.0. Migrated testing blockchain mock to C-unwind ([#1244](https://github.com/near/near-sdk-rs/pull/1244))
+
+## [5.4.0](https://github.com/near/near-sdk-rs/compare/near-sdk-v5.3.0...near-sdk-v5.4.0) - 2024-09-04
+
+### Other
+- updates near-* dependencies to 0.25.0 ([#1242](https://github.com/near/near-sdk-rs/pull/1242))
+- updates near-workspaces-rs ([#1239](https://github.com/near/near-sdk-rs/pull/1239))
+
+## [5.3.0](https://github.com/near/near-sdk-rs/compare/near-sdk-v5.2.1...near-sdk-v5.3.0) - 2024-08-13
+
+### Added
+- Introduced 'remove' method for 'near_sdk::store::Lazy' collection ([#1238](https://github.com/near/near-sdk-rs/pull/1238))
+- Allow store collection iterators to be cloned (this enables standard Iterator methods like `cycle()`) ([#1224](https://github.com/near/near-sdk-rs/pull/1224))
+
+### Fixed
+- Fix storage management error message with proper amount ([#1222](https://github.com/near/near-sdk-rs/pull/1222))
+- Fixed compilation errors after Rust 1.80 latest stable release ([#1227](https://github.com/near/near-sdk-rs/pull/1227))
+
+### Other
+- updates near-* dependencies to 0.24.0 ([#1237](https://github.com/near/near-sdk-rs/pull/1237))
+- Include all examples into CI testing suite ([#1228](https://github.com/near/near-sdk-rs/pull/1228))
+- Optimized up to 10% contract binary size by using `near_sdk::env::panic_str` instead of `expect` calls ([#1220](https://github.com/near/near-sdk-rs/pull/1220))
+- Fixed Rust 1.80 new warning by adding `cargo:rustc-check-cfg` for `__abi-embed-checked` feature in `near-sdk-macros` build.rs ([#1225](https://github.com/near/near-sdk-rs/pull/1225))
+
 ## [5.2.1](https://github.com/near/near-sdk-rs/compare/near-sdk-v5.2.0...near-sdk-v5.2.1) - 2024-07-05
 
 ### Fixed

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,10 @@
 [workspace]
 resolver = "2"
-members = [
-    "near-sdk",
-    "near-sdk-macros",
-    "near-contract-standards",
-    "near-sys",
-]
+members = ["near-sdk", "near-sdk-macros", "near-contract-standards", "near-sys"]
 exclude = ["examples/"]
 
 [workspace.package]
-version = "5.2.1"
+version = "5.5.0"
 
 # Special triple # comment for ci.
 [patch.crates-io]

diff --git a/examples/adder/Cargo.toml b/examples/adder/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 near-sdk = { path = "../../near-sdk" }
 
 [dev-dependencies]
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 tokio = { version = "1.14", features = ["full"] }
 anyhow = "1.0"
 near-abi = "0.4.0"

diff --git a/examples/callback-results/Cargo.toml b/examples/callback-results/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 near-sdk = { path = "../../near-sdk" }
 
 [dev-dependencies]
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 tokio = { version = "1.14", features = ["full"] }
 anyhow = "1.0"
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }

diff --git a/examples/cross-contract-calls/Cargo.toml b/examples/cross-contract-calls/Cargo.toml
@@ -9,7 +9,7 @@ anyhow = "1.0"
 near-sdk = { path = "../../near-sdk", features = ["default", "unit-testing"] }
 test-case = "2.0"
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 
 cross-contract-high-level = { path = "./high-level" }
 cross-contract-low-level = { path = "./low-level" }

diff --git a/examples/factory-contract/Cargo.toml b/examples/factory-contract/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 anyhow = "1.0"
 test-case = "2.0"
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
 
 [profile.release]

diff --git a/examples/fungible-token/Cargo.toml b/examples/fungible-token/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 anyhow = "1.0"
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 
 [profile.release]
 codegen-units = 1

diff --git a/examples/lockable-fungible-token/Cargo.toml b/examples/lockable-fungible-token/Cargo.toml
@@ -14,7 +14,7 @@ near-sdk = { path = "../../near-sdk", features = ["legacy"] }
 anyhow = "1.0"
 tokio = { version = "1.14", features = ["full"] }
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 
 [profile.release]
 codegen-units = 1

diff --git a/examples/non-fungible-token/Cargo.toml b/examples/non-fungible-token/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2021"
 [dev-dependencies]
 anyhow = "1.0"
 near-contract-standards = { path = "../../near-contract-standards" }
-near-sdk = { path = "../../near-sdk", features = ["unit-testing"]  }
+near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.11.0"
+near-workspaces = "0.14"
 
 [profile.release]
 codegen-units = 1

diff --git a/near-contract-standards/CHANGELOG.md b/near-contract-standards/CHANGELOG.md
@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.5.0](https://github.com/near/near-sdk-rs/compare/near-contract-standards-v5.4.0...near-contract-standards-v5.5.0) - 2024-09-11
+
+### Other
+
+- Updated near-* dependendencies to v0.26.0. Migrated testing blockchain mock to C-unwind ([#1244](https://github.com/near/near-sdk-rs/pull/1244))
+
+## [5.3.0](https://github.com/near/near-sdk-rs/compare/near-contract-standards-v5.2.1...near-contract-standards-v5.3.0) - 2024-08-13
+
+### Fixed
+- Fix storage management error message with proper amount ([#1222](https://github.com/near/near-sdk-rs/pull/1222))
+
 ## [5.2.0](https://github.com/near/near-sdk-rs/compare/near-contract-standards-v5.1.0...near-contract-standards-v5.2.0) - 2024-07-04
 
 ### Added

diff --git a/near-contract-standards/Cargo.toml b/near-contract-standards/Cargo.toml
@@ -13,10 +13,14 @@ NEAR smart contracts standard library.
 """
 
 [dependencies]
-near-sdk = { path = "../near-sdk", version = "~5.2.1", default-features = false, features = ["legacy"] }
+near-sdk = { path = "../near-sdk", version = "~5.5.0", default-features = false, features = [
+    "legacy",
+] }
 
 [dev-dependencies]
-near-sdk = { path = "../near-sdk", default-features = false, features = ["unit-testing"] }
+near-sdk = { path = "../near-sdk", default-features = false, features = [
+    "unit-testing",
+] }
 
 [features]
 default = []

diff --git a/near-contract-standards/src/non_fungible_token/core/core_impl.rs b/near-contract-standards/src/non_fungible_token/core/core_impl.rs
@@ -432,11 +432,7 @@ impl NonFungibleTokenResolver for NonFungibleToken {
         // Get whether token should be returned
         let must_revert = match env::promise_result(0) {
             PromiseResult::Successful(value) => {
-                if let Ok(yes_or_no) = near_sdk::serde_json::from_slice::<bool>(&value) {
-                    yes_or_no
-                } else {
-                    true
-                }
+                near_sdk::serde_json::from_slice::<bool>(&value).unwrap_or(true)
             }
             PromiseResult::Failed => true,
         };

diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml
@@ -21,18 +21,18 @@ required-features = ["abi", "unstable"]
 # Provide near_bidgen macros.
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-near-sdk-macros = { path = "../near-sdk-macros", version = "~5.2.1" }
+near-sdk-macros = { path = "../near-sdk-macros", version = "~5.5.0" }
 near-sys = { path = "../near-sys", version = "0.2.2" }
-base64 = "0.21"
+base64 = "0.22"
 borsh = { version = "1.0.0", features = ["derive"] }
 bs58 = "0.5"
 
 # Used for caching, might be worth porting only functionality needed.
 once_cell = { version = "1.17", default-features = false }
 
 near-account-id = { version = "1.0.0", features = ["serde", "borsh"] }
-near-gas = { version = "0.2.3", features = ["serde", "borsh"] }
-near-token = { version = "0.2.1", features = ["serde", "borsh"] }
+near-gas = { version = "0.3", features = ["serde", "borsh"] }
+near-token = { version = "0.3", features = ["serde", "borsh"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wee_alloc = { version = "0.4.5", default-features = false, optional = true }
@@ -42,11 +42,11 @@ schemars = { version = "0.8.8", optional = true }
 near-abi = { version = "0.4.0", features = [
     "__chunked-entries",
 ], optional = true }
-near-vm-runner = { version = "0.23", optional = true }
-near-primitives-core = { version = "0.23", optional = true }
-near-primitives = { version = "0.23", optional = true }
-near-crypto = { version = "0.23", default-features = false, optional = true }
-near-parameters = { version = "0.23", optional = true }
+near-vm-runner = { version = "0.26", optional = true }
+near-primitives-core = { version = "0.26", optional = true }
+near-primitives = { version = "0.26", optional = true }
+near-crypto = { version = "0.26", default-features = false, optional = true }
+near-parameters = { version = "0.26", optional = true }
 
 [dev-dependencies]
 near-sdk = { path = ".", features = ["legacy", "unit-testing"] }
@@ -63,7 +63,7 @@ rand_chacha = "0.3.1"
 near-rng = "0.1.1"
 near-abi = { version = "0.4.0", features = ["__chunked-entries"] }
 symbolic-debuginfo = "12"
-near-workspaces = { version = "0.10.1", features = ["unstable"] }
+near-workspaces = { version = "0.14", features = ["unstable"] }
 anyhow = "1.0"
 tokio = { version = "1", features = ["full"] }
 strum = "0.25.0"

diff --git a/near-sdk/compilation_tests/all.rs b/near-sdk/compilation_tests/all.rs
@@ -23,8 +23,9 @@ fn compilation_tests() {
     t.pass("compilation_tests/function_error.rs");
     t.pass("compilation_tests/enum_near_bindgen.rs");
     t.pass("compilation_tests/schema_derive.rs");
-    if rustversion::cfg!(since(1.78)) && std::env::consts::OS == "linux" {
-        // The compilation error output has slightly changed in 1.7x and between platforms,
+
+    if rustversion::cfg!(since(1.80)) && std::env::consts::OS == "linux" {
+        // The compilation error output has slightly changed in 1.7x and 1.8x and between platforms,
         // so we snapshoted this single version
         t.compile_fail("compilation_tests/schema_derive_invalids.rs");
     }