Merge branch 'upstream/2.0' into cleanup-wallet-syncing

iotaledger · Apr 15, 2024 · ea08631 · ea08631
2 parents e91b2af + 950b332
commit ea08631
Show file tree

Hide file tree

Showing 62 changed files with 889 additions and 487 deletions.
diff --git a/.github/workflows/bindings-nodejs-publish.yml b/.github/workflows/bindings-nodejs-publish.yml
@@ -50,7 +50,7 @@ jobs:
         shell: sh
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: yarn publish --access public
+        run: yarn publish --access public --tag alpha
 
   nodejs-binding-prebuild:
     runs-on: ${{ matrix.os }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/core/Cargo.toml b/bindings/core/Cargo.toml
@@ -15,7 +15,7 @@ iota-sdk = { path = "../../sdk", default-features = false, features = [
     "tls",
 ] }
 
-backtrace = { version = "0.3.70", default-features = false, features = ["std"] }
+backtrace = { version = "0.3.71", default-features = false, features = ["std"] }
 derivative = { version = "2.2.0", default-features = false }
 fern-logger = { version = "0.5.0", default-features = false }
 futures = { version = "0.3.30", default-features = false }
@@ -30,7 +30,7 @@ packable = { version = "0.11.0", default-features = false, features = [
 prefix-hex = { version = "0.7.1", default-features = false }
 primitive-types = { version = "0.12.2", default-features = false }
 serde = { version = "1.0.197", default-features = false }
-serde_json = { version = "1.0.114", default-features = false }
+serde_json = { version = "1.0.115", default-features = false }
 strum = { version = "0.26.2", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.58", default-features = false }
 tokio = { version = "1.36.0", default-features = false }

diff --git a/bindings/core/src/method/utils.rs b/bindings/core/src/method/utils.rs
@@ -13,7 +13,7 @@ use iota_sdk::{
             dto::{SignedTransactionPayloadDto, TransactionDto},
             TransactionId,
         },
-        protocol::ProtocolParameters,
+        protocol::{ProtocolParameters, WorkScoreParameters},
         signature::Ed25519Signature,
         slot::{SlotCommitment, SlotIndex},
         unlock::Unlock,
@@ -187,4 +187,13 @@ pub enum UtilsMethod {
     },
     IotaMainnetProtocolParameters,
     ShimmerMainnetProtocolParameters,
+    /// Returns the work score of a block.
+    /// Expected response: [`WorkScore`](crate::Response::WorkScore)
+    #[serde(rename_all = "camelCase")]
+    BlockWorkScore {
+        /// Block
+        block: BlockDto,
+        /// Work score parameters
+        work_score_parameters: WorkScoreParameters,
+    },
 }
diff --git a/bindings/core/src/method_handler/utils.rs b/bindings/core/src/method_handler/utils.rs
@@ -13,9 +13,10 @@ use iota_sdk::{
             input::UtxoInput,
             output::{FoundryId, MinimumOutputAmount, Output, OutputId, TokenId},
             payload::{signed_transaction::Transaction, SignedTransactionPayload},
+            protocol::WorkScore,
             semantic::SemanticValidationContext,
             signature::SignatureError,
-            Block,
+            Block, BlockBody,
         },
         TryFromDto,
     },
@@ -169,6 +170,18 @@ pub(crate) fn call_utils_method_internal(method: UtilsMethod) -> Result<Response
         UtilsMethod::ShimmerMainnetProtocolParameters => Response::ProtocolParameters(
             iota_sdk::types::block::protocol::shimmer_mainnet_protocol_parameters().clone(),
         ),
+        UtilsMethod::BlockWorkScore {
+            block,
+            work_score_parameters,
+        } => {
+            let block = Block::try_from_dto(block)?;
+            let work_score = match block.body() {
+                BlockBody::Basic(basic) => basic.work_score(work_score_parameters),
+                // Validation blocks have a work score of 0.
+                BlockBody::Validation(_validation) => 0,
+            };
+            Response::WorkScore(work_score)
+        }
     };
 
     Ok(response)