Merge branch 'near:main' into remove-using-tla-on-testnet

near · Dec 19, 2024 · 1b61afe · 1b61afe
2 parents 679d18e + 65c77d4
commit 1b61afe
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.16.0](https://github.com/near/near-workspaces-rs/compare/near-workspaces-v0.15.0...near-workspaces-v0.16.0) - 2024-12-18
+
+### Fixed
+
+- include fix from https://github.com/near/cargo-near/pull/266 (#395)
+
+### Other
+
+- [**breaking**] updates near-* dependencies to 0.28 release (#392)
+
 ## [0.15.0](https://github.com/near/near-workspaces-rs/compare/near-workspaces-v0.14.1...near-workspaces-v0.15.0) - 2024-11-18
 
 ### Other

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+* @dj8yfo @akorchyn @PolyProgrammist
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -9,8 +9,8 @@ anyhow = "1.0"
 maplit = "1.0"
 near-units = "0.2.0"
 near-gas = { version = "0.3", features = ["serde", "borsh", "schemars"] }
-near-jsonrpc-primitives = "0.27"
-near-primitives = "0.27"
+near-jsonrpc-primitives = "0.28"
+near-primitives = "0.28"
 serde = "1.0"
 serde_with = "3.4"
 serde_json = { version = "1.0" }

diff --git a/examples/noop-contract/Cargo.toml b/examples/noop-contract/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.6.0"
+near-sdk = "5.7.0"
 
 [profile.release]
 codegen-units = 1

diff --git a/examples/simple-contract/Cargo.toml b/examples/simple-contract/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.6.0"
+near-sdk = "5.7.0"
 
 [profile.release]
 codegen-units = 1

diff --git a/workspaces/Cargo.toml b/workspaces/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-workspaces"
-version = "0.15.0"
+version = "0.16.0"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
@@ -13,7 +13,7 @@ Library for automating workflows and testing NEAR smart contracts.
 async-trait = "0.1"
 base64 = "0.22"
 bs58 = "0.5"
-cargo-near-build = { version = "0.3.0", optional = true }
+cargo-near-build = { version = "0.4.1", optional = true }
 chrono = "0.4.19"
 fs2 = "0.4"
 rand = "0.8.4"
@@ -32,25 +32,25 @@ url = { version = "2.2.2", features = ["serde"] }
 near-abi-client = "0.1.1"
 near-gas = { version = "0.3", features = ["serde", "borsh", "schemars"] }
 near-token = { version = "0.3", features = ["serde"] }
-near-sdk = { version = "5.6", optional = true }
+near-sdk = { version = "5.7", optional = true }
 near-account-id = "1.0.0"
-near-crypto = "0.27"
-near-primitives = "0.27"
-near-jsonrpc-primitives = "0.27"
-near-jsonrpc-client = { version = "0.14", features = ["sandbox"] }
-near-sandbox-utils = "0.12"
-near-chain-configs = { version = "0.27", optional = true }
+near-crypto = "0.28"
+near-primitives = "0.28"
+near-jsonrpc-primitives = "0.28"
+near-jsonrpc-client = { version = "0.15", features = ["sandbox"] }
+near-sandbox-utils = "0.13"
+near-chain-configs = { version = "0.28", optional = true }
 
 [build-dependencies]
-near-sandbox-utils = "0.12"
+near-sandbox-utils = "0.13"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
 
 [dev-dependencies]
 anyhow = "1.0"
 futures = "0.3"
-near-sdk = "5.6"
+near-sdk = "5.7"
 test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
 tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }
 

diff --git a/workspaces/src/rpc/query.rs b/workspaces/src/rpc/query.rs
@@ -90,7 +90,7 @@ impl<'a, T> Query<'a, T> {
 }
 
 // Constrained to RpcQueryRequest, since methods like GasPrice only take block_id but not Finality.
-impl<'a, T> Query<'a, T>
+impl<T> Query<'_, T>
 where
     T: ProcessQuery<Method = methods::query::RpcQueryRequest>,
 {
@@ -428,7 +428,7 @@ impl<'a> QueryChunk<'a> {
     pub fn block_hash_and_shard(mut self, hash: CryptoHash, shard_id: ShardId) -> Self {
         self.chunk_ref = Some(ChunkReference::BlockShardId {
             block_id: BlockId::Hash(near_primitives::hash::CryptoHash(hash.0)),
-            shard_id,
+            shard_id: shard_id.into(),
         });
         self
     }
@@ -439,7 +439,7 @@ impl<'a> QueryChunk<'a> {
     pub fn block_height_and_shard(mut self, height: BlockHeight, shard_id: ShardId) -> Self {
         self.chunk_ref = Some(ChunkReference::BlockShardId {
             block_id: BlockId::Height(height),
-            shard_id,
+            shard_id: shard_id.into(),
         });
         self
     }
@@ -467,7 +467,7 @@ impl<'a> std::future::IntoFuture for QueryChunk<'a> {
                 let block_view = self.client.view_block(None).await?;
                 ChunkReference::BlockShardId {
                     block_id: BlockId::Hash(block_view.header.hash),
-                    shard_id: 0,
+                    shard_id: 0.into(),
                 }
             };
 

diff --git a/workspaces/src/types/chunk.rs b/workspaces/src/types/chunk.rs
@@ -55,7 +55,7 @@ impl From<ChunkHeaderView> for ChunkHeader {
             prev_block_hash: view.prev_block_hash.into(),
             height_created: view.height_created,
             height_included: view.height_included,
-            shard_id: view.shard_id,
+            shard_id: view.shard_id.into(),
             gas_used: NearGas::from_gas(view.gas_used),
             gas_limit: NearGas::from_gas(view.gas_limit),
             balance_burnt: NearToken::from_yoctonear(view.balance_burnt),

diff --git a/workspaces/tests/test-contracts/status-message/Cargo.toml b/workspaces/tests/test-contracts/status-message/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.6.0"
+near-sdk = "5.7.0"
 
 [profile.release]
 codegen-units = 1

diff --git a/workspaces/tests/test-contracts/type-serialize/Cargo.toml b/workspaces/tests/test-contracts/type-serialize/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 bs58 = "0.5"
-near-sdk = "5.6.0"
+near-sdk = "5.7.0"
 
 [profile.release]
 codegen-units = 1