Update NEAR SDK (tests broken)

Author: tifrel

Cargo.lock

@@ -271,16 +271,17 @@ impl MintbaseStoreFactory {
             .add_full_access_key(self.admin_public_key.clone())
             .deploy_contract(include_bytes!("../../wasm/store.wasm").to_vec())
             .function_call("new".to_string(), init_args, 0, gas::CREATE_STORE)
-            .then(factory_self::on_create(
-                env::predecessor_account_id(),
-                metadata,
-                owner_id,
-                store_account_id,
-                env::attached_deposit().into(),
-                env::current_account_id(),
-                NO_DEPOSIT,
-                gas::ON_CREATE_CALLBACK,
-            ))
+            .then(
+                factory_self::ext(env::current_account_id())
+                    .with_static_gas(gas::ON_CREATE_CALLBACK)
+                    .on_create(
+                        env::predecessor_account_id(),
+                        metadata,
+                        owner_id,
+                        store_account_id,
+                        env::attached_deposit().into(),
+                    ),
+            )
     }
 }
 

factory/src/lib.rs

@@ -11,9 +11,19 @@ crate-type = ["rlib", "cdylib"]
 
 [dependencies]
 clap = { version = "3.0.0-beta.2", optional = true }
-near-sdk = { version = "4.0.0-pre.7", optional = true }
+# near-sdk = { version = "4.0.0-pre.7", optional = true }
+near-sdk = { version = "4.1.1", optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.81"
+# #
+ed25519-dalek = "1.0.0"
+
+# state     near-sdk        near-crypto         ed25519-dalek   works
+# gh        4.0.0-pre.7     0.{0,5,10,12}.0     1.0.1           yes
+#           4.1.1           0.{0,5,12,14}.0     1.0.1           no
+#
+#
+#
 
 [dependencies.near_events]
 git = "https://github.com/mintbase/near-events"

mintbase-deps/Cargo.toml

@@ -13,6 +13,8 @@ mod market_interfaces {
     use near_sdk::{
         self,
         ext_contract,
+        AccountId,
+        Promise,
     };
 
     use crate::common::TokenListing;
@@ -57,6 +59,8 @@ mod store_interfaces {
     use near_sdk::{
         self,
         ext_contract,
+        AccountId,
+        Promise,
     };
 
     /// Non-Fungible Token Approval NEP 178. Ref:
@@ -135,6 +139,7 @@ mod factory_interfaces {
     use near_sdk::{
         self,
         ext_contract,
+        AccountId,
     };
 
     use crate::common::NFTContractMetadata;

mintbase-deps/src/interfaces.rs

@@ -46,16 +46,10 @@ impl MintbaseStore {
         log_approve(token_idu64, approval_id, &account_id);
 
         if let Some(msg) = msg {
-            ext_on_approve::nft_on_approve(
-                token_id,
-                env::predecessor_account_id(),
-                approval_id,
-                msg,
-                account_id,
-                0,
-                gas::NFT_ON_APPROVE,
-            )
-            .into()
+            ext_on_approve::ext(account_id)
+                .with_static_gas(gas::NFT_ON_APPROVE)
+                .nft_on_approve(token_id, env::predecessor_account_id(), approval_id, msg)
+                .into()
         } else {
             None
         }
@@ -148,16 +142,11 @@ impl MintbaseStore {
         log_batch_approve(&token_ids, &approval_ids, &account_id);
 
         if let Some(msg) = msg {
-            ext_on_approve::nft_on_batch_approve(
-                token_ids,
-                approval_ids,
-                env::predecessor_account_id(),
-                msg,
-                account_id,
-                env::attached_deposit() - storage_stake,
-                gas::NFT_BATCH_APPROVE,
-            )
-            .into()
+            ext_on_approve::ext(account_id)
+                .with_attached_deposit(env::attached_deposit() - storage_stake)
+                .with_static_gas(gas::NFT_BATCH_APPROVE)
+                .nft_on_batch_approve(token_ids, approval_ids, env::predecessor_account_id(), msg)
+                .into()
         } else {
             None
         }

store/src/approvals.rs

@@ -1,10 +1,7 @@
 use std::collections::HashMap;
 use std::convert::TryFrom;
 
-use mintbase_deps::constants::{
-    gas,
-    NO_DEPOSIT,
-};
+use mintbase_deps::constants::gas;
 // contract interface modules
 use mintbase_deps::interfaces::ext_on_transfer;
 // logging functions
@@ -81,24 +78,14 @@ impl MintbaseStore {
         let owner_id = AccountId::new_unchecked(token.owner_id.to_string());
         self.lock_token(&mut token);
 
-        ext_on_transfer::nft_on_transfer(
-            pred,
-            owner_id.clone(),
-            token_id,
-            msg,
-            receiver_id.clone(),
-            NO_DEPOSIT,
-            gas::NFT_TRANSFER_CALL,
-        )
-        .then(store_self::nft_resolve_transfer(
-            owner_id,
-            receiver_id,
-            token_id.0.to_string(),
-            None,
-            env::current_account_id(),
-            NO_DEPOSIT,
-            gas::NFT_TRANSFER_CALL,
-        ))
+        ext_on_transfer::ext(receiver_id.clone())
+            .with_static_gas(gas::NFT_TRANSFER_CALL)
+            .nft_on_transfer(pred, owner_id.clone(), token_id, msg)
+            .then(
+                store_self::ext(env::current_account_id())
+                    .with_static_gas(gas::NFT_TRANSFER_CALL)
+                    .nft_resolve_transfer(owner_id, receiver_id, token_id.0.to_string(), None),
+            )
     }
 
     // -------------------------- view methods -----------------------------

store/src/core.rs

@@ -27,8 +27,8 @@ cargo check -p mintbase-deps --features store-wasm --message-format short || fai
 cargo check -p mintbase-deps --features factory-wasm --message-format short || fail "Checking factory"
 cargo check -p mintbase-deps --features helper-wasm --message-format short || fail "Checking helper"
 cargo check -p simple-market-contract --message-format short || fail "Checking market"
-cargo check -p mintbase-near-indexer --bin mintlake --features mintlake || fail "Checking mintlake"
-cargo check -p mintbase-near-indexer --bin p2p_indexer --features p2p_indexer || fail "Checking p2p indexer"
+# cargo check -p mintbase-near-indexer --bin mintlake --features mintlake || fail "Checking mintlake"
+# cargo check -p mintbase-near-indexer --bin p2p_indexer --features p2p_indexer || fail "Checking p2p indexer"
 
 build_wasm store
 build_wasm factory