fix: avoid loading result on is_promise_success (#816)

near · May 24, 2022 · f4c6b61 · f4c6b61
1 parent 2751292
commit f4c6b61
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 6 deletions.
diff --git a/examples/callback-results/res/callback_results.wasm b/examples/callback-results/res/callback_results.wasm
diff --git a/examples/cross-contract-calls/res/cross_contract_high_level.wasm b/examples/cross-contract-calls/res/cross_contract_high_level.wasm
diff --git a/examples/cross-contract-calls/res/cross_contract_low_level.wasm b/examples/cross-contract-calls/res/cross_contract_low_level.wasm
diff --git a/examples/factory-contract/res/factory_contract_high_level.wasm b/examples/factory-contract/res/factory_contract_high_level.wasm
diff --git a/examples/factory-contract/res/factory_contract_low_level.wasm b/examples/factory-contract/res/factory_contract_low_level.wasm
diff --git a/examples/fungible-token/res/defi.wasm b/examples/fungible-token/res/defi.wasm
diff --git a/examples/fungible-token/res/fungible_token.wasm b/examples/fungible-token/res/fungible_token.wasm
diff --git a/examples/lockable-fungible-token/res/lockable_fungible_token.wasm b/examples/lockable-fungible-token/res/lockable_fungible_token.wasm
diff --git a/examples/mission-control/res/mission_control.wasm b/examples/mission-control/res/mission_control.wasm
diff --git a/examples/non-fungible-token/res/approval_receiver.wasm b/examples/non-fungible-token/res/approval_receiver.wasm
diff --git a/examples/non-fungible-token/res/non_fungible_token.wasm b/examples/non-fungible-token/res/non_fungible_token.wasm
diff --git a/examples/non-fungible-token/res/token_receiver.wasm b/examples/non-fungible-token/res/token_receiver.wasm
diff --git a/examples/status-message-collections/res/status_message_collections.wasm b/examples/status-message-collections/res/status_message_collections.wasm
diff --git a/examples/status-message/res/status_message.wasm b/examples/status-message/res/status_message.wasm
diff --git a/examples/test-contract/res/test_contract.wasm b/examples/test-contract/res/test_contract.wasm
diff --git a/examples/versioned/res/versioned.wasm b/examples/versioned/res/versioned.wasm
diff --git a/near-sdk/src/environment/env.rs b/near-sdk/src/environment/env.rs
@@ -13,7 +13,7 @@ use crate::mock::MockedBlockchain;
 use crate::types::{
     AccountId, Balance, BlockHeight, Gas, PromiseIndex, PromiseResult, PublicKey, StorageUsage,
 };
-use crate::GasWeight;
+use crate::{GasWeight, PromiseError};
 use near_sys as sys;
 
 const REGISTER_EXPECTED_ERR: &str =
@@ -609,13 +609,21 @@ pub fn promise_results_count() -> u64 {
 /// If the current function is invoked by a callback we can access the execution results of the
 /// promises that caused the callback.
 pub fn promise_result(result_idx: u64) -> PromiseResult {
-    match unsafe { sys::promise_result(result_idx, ATOMIC_OP_REGISTER) } {
-        0 => PromiseResult::NotReady,
-        1 => {
+    match promise_result_internal(result_idx) {
+        Err(PromiseError::NotReady) => PromiseResult::NotReady,
+        Ok(()) => {
             let data = expect_register(read_register(ATOMIC_OP_REGISTER));
             PromiseResult::Successful(data)
         }
-        2 => PromiseResult::Failed,
+        Err(PromiseError::Failed) => PromiseResult::Failed,
+    }
+}
+
+pub(crate) fn promise_result_internal(result_idx: u64) -> Result<(), PromiseError> {
+    match unsafe { sys::promise_result(result_idx, ATOMIC_OP_REGISTER) } {
+        0 => Err(PromiseError::NotReady),
+        1 => Ok(()),
+        2 => Err(PromiseError::Failed),
         _ => abort(),
     }
 }

diff --git a/near-sdk/src/utils/mod.rs b/near-sdk/src/utils/mod.rs
@@ -95,7 +95,8 @@ pub fn assert_one_yocto() {
 /// Returns true if promise was successful.
 /// Fails if called outside a callback that received 1 promise result.
 pub fn is_promise_success() -> bool {
-    promise_result_as_success().is_some()
+    require!(env::promise_results_count() == 1, "Contract expected a result on the callback");
+    env::promise_result_internal(0).is_ok()
 }
 
 /// Returns the result of the promise if successful. Otherwise returns None.