Merge pull request #153 from tonlabs/0.25.4-rc

### Fixed- `waitForTransaction` didn't use prev_alt_ref for block walking
everx-labs · Aug 10, 2020 · 98c9774 · 98c9774
2 parents 422c971 + 0e78a9d
commit 98c9774
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Release Notes
 All notable changes to this project will be documented in this file.
 
+## 0.25.4 Aug 5, 2020
+### Fixed
+- `waitForTransaction` didn't use prev_alt_ref for block walking
+
 ## 0.25.3 Jul 30, 2020
 ### New
 - All methods that require contract's code/data can use field `boc` 

diff --git a/ton_client/client/Cargo.toml b/ton_client/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ton_client"
-version = "0.25.3"
+version = "0.25.4"
 authors = ["Michael Vlasov"]
 edition = "2018"
 license = "Apache-2.0"

diff --git a/ton_sdk/src/block.rs b/ton_sdk/src/block.rs
@@ -97,7 +97,7 @@ impl Block {
                     None)
                     .await
                     .map_err(|err|  match err.downcast_ref::<SdkError>() {
-                        Some(SdkError::WaitForTimeout) => 
+                        Some(SdkError::WaitForTimeout) =>
                             SdkError::NotFound(format!(
                                 "No blocks for workchain {} found", workchain)).into(),
                         _ => err
@@ -142,12 +142,12 @@ impl Block {
                 if shard_block.is_null() {
                     fail!(SdkError::NotFound(format!("No matching shard for account {}", address)));
                 }
-                
+
                 shard_block["descr"]["root_hash"]
                     .as_str()
                     .map(|val| val.to_owned().into())
                     .ok_or(SdkError::InvalidData {
-                        msg: "No `root_hash` field in shard descr".to_owned() }.into()) 
+                        msg: "No `root_hash` field in shard descr".to_owned() }.into())
             }
         }
     }
@@ -160,11 +160,16 @@ impl Block {
             &json!({
                 "prev_ref": {
                     "root_hash": { "eq": current.to_string() }
+                },
+                "OR": {
+                    "prev_alt_ref": {
+                        "root_hash": { "eq": current.to_string() }
+                    }
                 }
             }).to_string(),
             BLOCK_FIELDS,
             timeout).await?;
-        debug!("{}: block recieved {:#}", crate::Contract::now(), block);
+        debug!("{}: block received {:#}", crate::Contract::now(), block);
 
         if block["after_split"] == true && !Contract::check_shard_match(block.clone(), address)? {
             client.wait_for(
@@ -183,4 +188,4 @@ impl Block {
             serde_json::from_value(block).map_err(|err| err.into())
         }
     }
-}
+}