Merge branch 'dusk-network:master' into ffi-to-go-adoption

Author: gootsolution

.github/workflows/rusk_ci.yml

@@ -64,7 +64,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dsherret/rust-toolchain-file@v1
-      - uses: Swatinem/rust-cache@v2
       - run: make wasm
       - run: make clippy
 
@@ -76,5 +75,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dsherret/rust-toolchain-file@v1
-      - uses: Swatinem/rust-cache@v2
       - run: make test

Cargo.lock

@@ -117,7 +117,7 @@ hyper = "1.4.1"
 hyper-tungstenite = "0.13"
 hyper-util = "0.1.9"
 inquire = "0.7.5"
-k256 = "0.13"
+k256 = { version = "0.13", default-features = false, features = ["alloc"] }
 konst = "0.3.9"
 lazy_static = "1.5"
 lru = "0.12.4"

Cargo.toml

@@ -83,15 +83,6 @@ impl HostFnTest {
         abi::keccak256(bytes)
     }
 
-    pub fn verify_secp256k1(
-        &self,
-        msg: Vec<u8>,
-        pk: Vec<u8>,
-        sig: Vec<u8>,
-    ) -> bool {
-        abi::verify_secp256k1(msg, pk, sig)
-    }
-
     pub fn chain_id(&self) -> u8 {
         abi::chain_id()
     }
@@ -155,13 +146,6 @@ unsafe fn keccak256(arg_len: u32) -> u32 {
     abi::wrap_call(arg_len, |bytes| STATE.keccak256(bytes))
 }
 
-#[no_mangle]
-unsafe fn verify_secp256k1(arg_len: u32) -> u32 {
-    abi::wrap_call(arg_len, |(msg, pk, sig)| {
-        STATE.verify_secp256k1(msg, pk, sig)
-    })
-}
-
 #[no_mangle]
 unsafe fn chain_id(arg_len: u32) -> u32 {
     abi::wrap_call(arg_len, |_: ()| STATE.chain_id())

contracts/host_fn/src/lib.rs

@@ -46,8 +46,6 @@ impl Query {
     pub const VERIFY_BLS_MULTISIG: &'static str = "verify_bls_multisig";
     /// Host-function name to compute the keccak256 hash.
     pub const KECCAK256: &'static str = "keccak256";
-    /// Host-function name to verify secp256k1 signature.
-    pub const VERIFY_SECP256K1: &'static str = "verify_secp256k1";
 }
 
 #[cfg(feature = "abi")]
@@ -150,13 +148,6 @@ pub(crate) mod host_queries {
         host_query(Query::KECCAK256, bytes)
     }
 
-    /// Verify if a secp256k1 signature is valid for a given public key and
-    /// message
-    #[must_use]
-    pub fn verify_secp256k1(msg: Vec<u8>, pk: Vec<u8>, sig: Vec<u8>) -> bool {
-        host_query(Query::VERIFY_SECP256K1, (msg, pk, sig))
-    }
-
     /// Get the chain ID.
     ///
     /// # Panics

core/src/abi.rs

@@ -11,10 +11,12 @@ and this project adheres to
 ### Added
 
 - Add Tokens page [#3415]
+- Add support for transactions' blob hashes [#3804]
 
 ### Changed
 
 - Use supply.dusk.network for circulating supply [#3757]
+- The `from` and `to` fields are now always shown in moonlight transactions regardless of the transaction's type [#3804]
 
 ### Removed
 
@@ -261,6 +263,7 @@ and this project adheres to
 [#3720]: https://github.com/dusk-network/rusk/issues/3720
 [#3739]: https://github.com/dusk-network/rusk/issues/3739
 [#3757]: https://github.com/dusk-network/rusk/issues/3757
+[#3804]: https://github.com/dusk-network/rusk/issues/3804
 
 <!-- VERSIONS -->
 

explorer/CHANGELOG.md

@@ -36,6 +36,7 @@ VITE_RUSK_PATH="" # Optional, set to '/rusk' for dev mode
 VITE_STATS_REFETCH_INTERVAL=1000
 VITE_TRANSACTIONS_LIST_ENTRIES=100
 VITE_FEATURE_TOKENS=true
+VITE_FEATURE_BLOB_HASHES=true # requires node version >= 1.3.1-alpha.1
 ```
 
 ## Environment variables and dev mode

explorer/README.md

@@ -25,35 +25,45 @@ describe("transformBlock", () => {
     transactions: {
       data: [
         {
+          amount: undefined,
+          blobHashes: [],
           blockhash:
             "bd5c99bb720b03500e89f103fe66113ba62f2e124ed9651563f38fd15977719f",
           blockheight: 495868,
           date: new Date(blockData.transactions[0].blockTimestamp * 1000),
           feepaid: 290866,
+          from: undefined,
           gaslimit: 500000000,
           gasprice: 1,
           gasspent: 290866,
           memo: blockData.transactions[0].tx.memo,
           method: "transfer",
+          nonce: undefined,
           payload: {},
           success: true,
+          to: undefined,
           txerror: "",
           txid: "3a3f6f90a1012ae751b4448bcb8e98def0ba2b18170239bd69fcf8e2e37f0602",
           txtype: "Moonlight",
         },
         {
+          amount: undefined,
+          blobHashes: [],
           blockhash:
             "bd5c99bb720b03500e89f103fe66113ba62f2e124ed9651563f38fd15977719f",
           blockheight: 495868,
           date: new Date(blockData.transactions[1].blockTimestamp * 1000),
           feepaid: 289852,
+          from: undefined,
           gaslimit: 500000000,
           gasprice: 1,
           gasspent: 289852,
           memo: blockData.transactions[1].tx.memo,
           method: "transfer",
+          nonce: undefined,
           payload: {},
           success: true,
+          to: undefined,
           txerror: "",
           txid: "07bfabea1d94c16f2dc3697fa642f6cecea6e81bf76b9644efbb6e2723b76d00",
           txtype: "Phoenix",

explorer/src/lib/chain-info/__tests__/transformBlock.spec.js

@@ -8,6 +8,7 @@ describe("transformTransaction", () => {
   const tx = gqlTransaction.tx;
   const expectedTx = {
     amount: 9812378912731,
+    blobHashes: [],
     blockhash:
       "3c6e4018cfa86723e50644e33d3990bc27fc794f6b49fbf6290e4d308e07bd2d",
     blockheight: 487166,
@@ -83,7 +84,7 @@ describe("transformTransaction", () => {
         callData: {
           contractId:
             "0200000000000000000000000000000000000000000000000000000000000000",
-          fnName: "transfer",
+          fnName: "stake",
         },
         isDeploy: true,
       },
@@ -104,6 +105,32 @@ describe("transformTransaction", () => {
     expect(transformTransaction(dataB)).toStrictEqual(expected);
   });
 
+  it('should set the method to "blob" if the transaction has blob hashes, regardless of the `isDeploy` or the `callData.fnName` fields', () => {
+    const data = {
+      ...tx,
+      tx: {
+        ...tx.tx,
+        blobHashes: [
+          "3656d71948baff2091090423f3b07701223b00d1a10942e44afe644a30865423",
+          "d26d6ebba9bfb0504040eadec111627f9f562c358f40e035ea9011b48ed7b55b",
+        ],
+        callData: {
+          contractId:
+            "0200000000000000000000000000000000000000000000000000000000000000",
+          fnName: "stake",
+        },
+        isDeploy: true,
+      },
+    };
+    const expected = {
+      ...expectedTx,
+      blobHashes: data.tx.blobHashes,
+      method: "blob",
+    };
+
+    expect(transformTransaction(data)).toStrictEqual(expected);
+  });
+
   it("should set the success property to `false` if the an error is present and use the message in the `txerror` property", () => {
     const data = {
       ...tx,