Merge pull request #1755 from multiversx/returns_new_token_identifier…

…_fix fixed returnsNewTokenIdentifier interactor
multiversx · Aug 29, 2024 · 47b4357 · 47b4357
2 parents 02f3c9c + 0441536
commit 47b4357
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
@@ -103,25 +103,31 @@ fn process_new_deployed_address(tx: &TransactionOnNetwork) -> Option<Address> {
 }
 
 fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<String> {
+    let original_tx_data = String::from_utf8(base64_decode(tx.data.as_ref().unwrap())).unwrap();
+
     for scr in tx.smart_contract_results.iter() {
         if scr.sender.to_bech32_string().unwrap() != ESDTSystemSCAddress.to_bech32_string() {
             continue;
         }
 
-        let Some(prev_tx) = tx
+        let prev_tx_data: &str = if let Some(prev_tx) = tx
             .smart_contract_results
             .iter()
             .find(|e| e.hash == scr.prev_tx_hash)
-        else {
+        {
+            prev_tx.data.as_ref()
+        } else if &scr.prev_tx_hash == tx.hash.as_ref().unwrap() {
+            &original_tx_data
+        } else {
             continue;
         };
 
-        let is_issue_fungible = prev_tx.data.starts_with("issue@");
-        let is_issue_semi_fungible = prev_tx.data.starts_with("issueSemiFungible@");
-        let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@");
-        let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@");
+        let is_issue_fungible = prev_tx_data.starts_with("issue@");
+        let is_issue_semi_fungible = prev_tx_data.starts_with("issueSemiFungible@");
+        let is_issue_non_fungible = prev_tx_data.starts_with("issueNonFungible@");
+        let is_register_meta_esdt = prev_tx_data.starts_with("registerMetaESDT@");
         let is_register_and_set_all_roles_esdt =
-            prev_tx.data.starts_with("registerAndSetAllRoles@");
+            prev_tx_data.starts_with("registerAndSetAllRoles@");
 
         if !is_issue_fungible
             && !is_issue_semi_fungible
@@ -135,12 +141,11 @@ fn process_new_issued_token_identifier(tx: &TransactionOnNetwork) -> Option<Stri
         if scr.data.starts_with("ESDTTransfer@") {
             let encoded_tid = scr.data.split('@').nth(1);
             return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
-        } else if scr.data.starts_with("@00@") {
+        } else if scr.data.starts_with("@00@") || scr.data.starts_with("@6f6b@") {
             let encoded_tid = scr.data.split('@').nth(2);
             return Some(String::from_utf8(hex::decode(encoded_tid?).unwrap()).unwrap());
         }
     }
-
     None
 }
 

diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
@@ -14,6 +14,7 @@ impl GatewayProxy {
         let mut retries = 0;
         let mut backoff_delay = Duration::from_secs_f32(INITIAL_BACKOFF_DELAY);
         let start_time = Instant::now();
+        let mut issue_found = false;
 
         loop {
             match self.get_transaction_status(&tx_hash).await {
@@ -26,6 +27,22 @@ impl GatewayProxy {
                                 .get_transaction_info_with_results(&tx_hash)
                                 .await
                                 .unwrap();
+
+                            if !transaction_info_with_results
+                                .smart_contract_results
+                                .is_empty()
+                                && !issue_found
+                            {
+                                let first_scr =
+                                    &transaction_info_with_results.smart_contract_results[0];
+
+                                if GatewayProxy::is_issue_tx(&first_scr.data) {
+                                    issue_found = true;
+                                    tokio::time::sleep(Duration::from_secs(30)).await;
+                                    continue;
+                                }
+                            }
+
                             info!(
                                 "Transaction retrieved successfully, with status {}: {:#?}",
                                 status, transaction_info_with_results
@@ -60,4 +77,12 @@ impl GatewayProxy {
         );
         TransactionOnNetwork::default()
     }
+
+    fn is_issue_tx(data: &str) -> bool {
+        data.starts_with("issue@")
+            || data.starts_with("issueSemiFungible@")
+            || data.starts_with("issueNonFungible@")
+            || data.starts_with("registerMetaESDT@")
+            || data.starts_with("registerAndSetAllRoles@")
+    }
 }