diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000..3e965520 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @dj8yfo @akorchyn @PolyProgrammist diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 374251c5..c1d31534 100644 --- 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 index eaf9c80d..a7eda8cd 100644 --- 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 index e4c9dc0d..837fb3e2 100644 --- 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 index 0cd2f914..dcf5f635 100644 --- a/workspaces/Cargo.toml +++ b/workspaces/Cargo.toml @@ -32,17 +32,17 @@ 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" @@ -50,7 +50,7 @@ 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 index 14dbe85a..2e6ef6d0 100644 --- 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 Query<'_, T> where T: ProcessQuery, { @@ -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 index b0e33e9c..d7dc96d0 100644 --- a/workspaces/src/types/chunk.rs +++ b/workspaces/src/types/chunk.rs @@ -55,7 +55,7 @@ impl From 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 index fe42914c..1d4deaef 100644 --- 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 index ef8526c0..73cf0d7f 100644 --- 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