chore: update nitka

Cargo.toml

@@ -11,15 +11,14 @@ resolver = "2"
 [workspace.dependencies]
 tokio = "1.28.0"
 anyhow = "1.0.75"
-async-trait = "0.1.74"
 
 near-units = "0.2.0"
 near-workspaces = "0.10.0"
 
 near-sdk = { git = "https://github.com/sweatco/near-sdk-rs", rev = "d5e975e3b224b5758745ab46c25d586a8e0db473" }
 near-contract-standards = { git = "https://github.com/sweatco/near-sdk-rs", rev = "d5e975e3b224b5758745ab46c25d586a8e0db473" }
 
-nitka = "0.2.2"
-nitka-proc = "0.2.2"
+nitka = "0.3.0"
+nitka-proc = "0.3.0"
 
 sweat-model = { path = "model" }

integration-tests/Cargo.toml

@@ -9,7 +9,6 @@ name = "integration_tests"
 
 [dev-dependencies]
 near-workspaces = { workspace = true }
-near-sdk = { workspace = true }
 near-contract-standards = { workspace = true }
 anyhow = { workspace = true }
 tokio = { workspace = true }

integration-tests/src/callback_attack.rs

@@ -1,7 +1,9 @@
 #![cfg(test)]
 
-use near_sdk::{json_types::U128, serde_json::json};
-use nitka::misc::ToNear;
+use nitka::{
+    misc::ToNear,
+    near_sdk::{json_types::U128, serde_json::json},
+};
 use sweat_model::FungibleTokenCoreIntegration;
 
 use crate::{

integration-tests/src/formula.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use near_sdk::json_types::U64;
+use nitka::near_sdk::json_types::U64;
 use sweat_model::SweatApiIntegration;
 
 use crate::prepare::{prepare_contract, IntegrationContext};

integration-tests/src/interface/common.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use near_sdk::AccountId;
+use nitka::near_sdk::AccountId;
 use sweat_model::SweatContract;
 
 pub(crate) trait ContractAccount {

integration-tests/src/mint.rs

@@ -1,5 +1,7 @@
-use near_sdk::json_types::{U128, U64};
-use nitka::misc::ToNear;
+use nitka::{
+    misc::ToNear,
+    near_sdk::json_types::{U128, U64},
+};
 use sweat_model::{FungibleTokenCoreIntegration, Payout, SweatApiIntegration};
 
 use crate::prepare::{prepare_contract, IntegrationContext};

integration-tests/src/prepare.rs

@@ -1,8 +1,7 @@
 use anyhow::Result;
 use async_trait::async_trait;
-use near_sdk::serde_json::json;
 use near_workspaces::{Account, Contract};
-use nitka::misc::ToNear;
+use nitka::{misc::ToNear, near_sdk::serde_json::json};
 use sweat_model::{StorageManagementIntegration, SweatApiIntegration, SweatContract};
 
 const CLAIM_CONTRACT: &str = "sweat_claim";

integration-tests/src/transfer.rs

@@ -1,5 +1,4 @@
-use near_sdk::json_types::U128;
-use nitka::misc::ToNear;
+use nitka::{misc::ToNear, near_sdk::json_types::U128};
 use sweat_model::{FungibleTokenCoreIntegration, StorageManagementIntegration, SweatApiIntegration};
 
 use crate::prepare::{prepare_contract, IntegrationContext};

model/src/lib.rs

@@ -1,14 +1,12 @@
 #![allow(clippy::new_ret_no_self, clippy::wrong_self_convention)]
 
 use near_contract_standards::storage_management::{StorageBalance, StorageBalanceBounds};
-#[cfg(feature = "release-api")]
-use near_sdk::AccountId;
 use near_sdk::{
     json_types::{U128, U64},
-    NearToken, PromiseOrValue,
+    AccountId, NearToken,
 };
 #[cfg(feature = "integration-api")]
-use nitka::AccountId;
+use nitka::near_sdk;
 use nitka_proc::make_integration_version;
 
 #[cfg(feature = "integration-api")]
@@ -32,7 +30,11 @@ pub trait SweatApi {
 
 #[make_integration_version]
 pub trait SweatDefer {
-    fn defer_batch(&mut self, steps_batch: Vec<(AccountId, u32)>, holding_account_id: AccountId) -> PromiseOrValue<()>;
+    fn defer_batch(
+        &mut self,
+        steps_batch: Vec<(AccountId, u32)>,
+        holding_account_id: AccountId,
+    ) -> ::near_sdk::PromiseOrValue<()>;
 }
 
 /// Copy of near_sdk trait to use in integration tests
@@ -46,7 +48,7 @@ pub trait FungibleTokenCore {
         amount: U128,
         memo: Option<String>,
         msg: String,
-    ) -> PromiseOrValue<U128>;
+    ) -> ::near_sdk::PromiseOrValue<U128>;
     fn ft_total_supply(&self) -> U128;
     fn ft_balance_of(&self, account_id: AccountId) -> U128;
 }
@@ -56,7 +58,7 @@ pub trait FungibleTokenCore {
 pub trait StorageManagement {
     // if `registration_only=true` MUST refund above the minimum balance if the account didn't exist and
     //     refund full deposit if the account exists.
-    #[deposit_yocto = near_sdk::env::storage_byte_cost().checked_mul(125).unwrap().as_yoctonear()]
+    #[deposit_yocto = ::near_sdk::env::storage_byte_cost().checked_mul(125).unwrap().as_yoctonear()]
     fn storage_deposit(&mut self, account_id: Option<AccountId>, registration_only: Option<bool>) -> StorageBalance;
 
     /// Withdraw specified amount of available Ⓝ for predecessor account.

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.75"
+channel = "1.77"