Merge pull request #87 from Relayz-io/silvestr/fix-nonce-update

Fix nonce update from the transaction outcome

near-rpc/src/client.rs

@@ -229,19 +229,7 @@ impl NearClient {
                     .map_err(Error::DeserializeExecutionOutcome)
             })?;
 
-        match execution_outcome.status {
-            FinalExecutionStatus::Failure(err) => Err(Error::TxExecution(err)),
-            FinalExecutionStatus::SuccessValue(data) => {
-                signer.update_nonce(execution_outcome.transaction.nonce);
-
-                Ok(Output {
-                    transaction: execution_outcome.transaction_outcome,
-                    logs: extract_logs(execution_outcome.receipts_outcome),
-                    data,
-                })
-            }
-            _ => Err(Error::TxNotStarted),
-        }
+        proceed_outcome(signer, execution_outcome)
     }
 
     /// Execute a transaction with a function call to the smart contract
@@ -441,6 +429,7 @@ pub struct FunctionCall<'a> {
 
 impl<'a> FunctionCall<'a> {
     /// Sends a transaction and waits until transaction is fully complete. (Has a 10 second timeout)
+    /// Also, possible that an output data will be empty if the transaction is still executing
     pub async fn commit(self, block_finality: Finality) -> Result<Output> {
         let transaction_bytes =
             serialize_transaction(&self.info, self.actions, block_finality).await?;
@@ -459,21 +448,7 @@ impl<'a> FunctionCall<'a> {
                     .map_err(Error::DeserializeExecutionOutcome)
             })?;
 
-        match execution_outcome.status {
-            FinalExecutionStatus::Failure(err) => Err(Error::TxExecution(err)),
-            FinalExecutionStatus::SuccessValue(data) => {
-                self.info
-                    .signer()
-                    .update_nonce(execution_outcome.transaction.nonce);
-
-                Ok(Output {
-                    transaction: execution_outcome.transaction_outcome,
-                    logs: extract_logs(execution_outcome.receipts_outcome),
-                    data,
-                })
-            }
-            _ => Err(Error::TxNotStarted),
-        }
+        proceed_outcome(self.info.signer(), execution_outcome)
     }
 
     /// Sends a transaction and immediately returns transaction hash.
@@ -493,3 +468,28 @@ impl<'a> FunctionCall<'a> {
             })
     }
 }
+
+#[allow(clippy::result_large_err)]
+pub(crate) fn proceed_outcome(
+    signer: &Signer,
+    execution_outcome: FinalExecutionOutcomeView,
+) -> Result<Output> {
+    signer.update_nonce(execution_outcome.transaction.nonce);
+    let transaction = execution_outcome.transaction_outcome;
+    let logs = extract_logs(execution_outcome.receipts_outcome);
+
+    match execution_outcome.status {
+        FinalExecutionStatus::Failure(err) => Err(Error::TxExecution(err)),
+        FinalExecutionStatus::SuccessValue(data) => Ok(Output {
+            transaction,
+            logs,
+            data,
+        }),
+        FinalExecutionStatus::NotStarted => Err(Error::TxNotStarted),
+        FinalExecutionStatus::Started => Ok(Output {
+            transaction,
+            logs,
+            data: vec![],
+        }),
+    }
+}

near-rpc/tests/rpc.rs

@@ -135,6 +135,43 @@ async fn contract_function_call() {
         .unwrap();
 }
 
+#[tokio::test]
+async fn contract_function_call_failed() {
+    let worker = workspaces::sandbox().await.unwrap();
+    let client = near_client(&worker);
+    let signer_account_id = AccountId::from_str("alice.test.near").unwrap();
+    let signer = create_signer(&worker, &client, &signer_account_id).await;
+    let wasm = download_contract().await;
+
+    client
+        .deploy_contract(&signer, &signer_account_id, wasm)
+        .commit(Finality::None)
+        .await
+        .unwrap();
+
+    assert!(client
+        .function_call(&signer, &signer_account_id, "new_default_meta")
+        .args(json!({
+            "owner_id": &signer_account_id,
+            "total_suppl": "100",
+        }))
+        .gas(near_units::parse_gas!("300 T") as u64)
+        .commit(Finality::None)
+        .await
+        .is_err());
+
+    client
+        .function_call(&signer, &signer_account_id, "new_default_meta")
+        .args(json!({
+            "owner_id": &signer_account_id,
+            "total_supply": "100",
+        }))
+        .gas(near_units::parse_gas!("300 T") as u64)
+        .commit(Finality::None)
+        .await
+        .unwrap();
+}
+
 #[tokio::test]
 async fn multiple_tests() {
     let worker = workspaces::sandbox().await.unwrap();