Upgrade to [email protected]

contract-helpers/src/lib.rs

@@ -4,7 +4,6 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-#![feature(lang_items)]
 #![no_std]
 
 extern crate alloc;

contracts/governance/src/state.rs

@@ -145,7 +145,7 @@ impl GovernanceState {
         // If the broker was already set we need to recoup the memory, otherwise
         // we will leak memory.
         if last_broker != ptr::null_mut() {
-            unsafe { Box::from_raw(last_broker) };
+            let _ = unsafe { Box::from_raw(last_broker) };
         }
     }
 
@@ -162,7 +162,7 @@ impl GovernanceState {
         // If the authority was already set we need to recoup the memory,
         // otherwise we will leak memory.
         if last_authority != ptr::null_mut() {
-            unsafe { Box::from_raw(last_authority) };
+            let _ = unsafe { Box::from_raw(last_authority) };
         }
     }
 

contracts/stake/tests/stake.rs

@@ -19,7 +19,7 @@ use poseidon_merkle::Opening as PoseidonOpening;
 use rand::rngs::StdRng;
 use rand::{CryptoRng, RngCore, SeedableRng};
 use rusk_abi::dusk::{dusk, LUX};
-use rusk_abi::{ContractData, ContractError, Error, RawResult, Session, VM};
+use rusk_abi::{ContractData, ContractError, Error, Session, VM};
 use rusk_abi::{STAKE_CONTRACT, TRANSFER_CONTRACT};
 use transfer_circuits::{
     CircuitInput, CircuitInputSignature, ExecuteCircuitOneTwo,
@@ -164,14 +164,14 @@ fn filter_notes_owned_by<I: IntoIterator<Item = Note>>(
 
 /// Executes a transaction, returning the gas spent.
 fn execute(session: &mut Session, tx: Transaction) -> Result<u64> {
-    let receipt = session.call::<_, Result<RawResult, ContractError>>(
+    let receipt = session.call::<_, Result<Vec<u8>, ContractError>>(
         TRANSFER_CONTRACT,
         "spend_and_execute",
         &tx,
         tx.fee.gas_limit,
     )?;
 
-    let gas_spent = receipt.points_spent;
+    let gas_spent = receipt.gas_spent;
 
     session
         .call::<_, ()>(

contracts/transfer/src/state.rs

@@ -20,8 +20,7 @@ use phoenix_core::transaction::*;
 use phoenix_core::{Crossover, Fee, Message, Note};
 use poseidon_merkle::Opening as PoseidonOpening;
 use rusk_abi::{
-    ContractError, ContractId, PaymentInfo, PublicInput, RawCall, RawResult,
-    STAKE_CONTRACT,
+    ContractError, ContractId, PaymentInfo, PublicInput, STAKE_CONTRACT,
 };
 
 /// Arity of the transfer tree.
@@ -292,7 +291,7 @@ impl TransferState {
     pub fn spend_and_execute(
         &mut self,
         tx: Transaction,
-    ) -> Result<RawResult, ContractError> {
+    ) -> Result<Vec<u8>, ContractError> {
         //  1. α ∈ R
         if !self.root_exists(&tx.anchor) {
             panic!("Anchor not found in the state!");
@@ -326,12 +325,13 @@ impl TransferState {
         self.var_crossover = tx.crossover;
         self.var_crossover_addr.replace(*tx.fee.stealth_address());
 
-        let mut result = Ok(RawResult::new(&[]));
+        let mut result = Ok(Vec::new());
 
         if let Some((contract_id, fn_name, fn_args)) = tx.call {
             result = rusk_abi::call_raw(
                 ContractId::from_bytes(contract_id),
-                &RawCall::from_parts(&fn_name, fn_args),
+                &fn_name,
+                &fn_args,
             );
         }
 

contracts/transfer/tests/transfer.rs

@@ -18,8 +18,8 @@ use rand::rngs::StdRng;
 use rand::{CryptoRng, RngCore, SeedableRng};
 use rusk_abi::dusk::{dusk, LUX};
 use rusk_abi::{
-    ContractData, ContractError, ContractId, Error, RawResult, Session,
-    TRANSFER_CONTRACT, VM,
+    ContractData, ContractError, ContractId, Error, Session, TRANSFER_CONTRACT,
+    VM,
 };
 use transfer_circuits::{
     CircuitInput, CircuitInputSignature, DeriveKey, ExecuteCircuitOneTwo,
@@ -211,14 +211,14 @@ fn filter_notes_owned_by<I: IntoIterator<Item = Note>>(
 
 /// Executes a transaction, returning the gas spent.
 fn execute(session: &mut Session, tx: Transaction) -> Result<u64> {
-    let receipt = session.call::<_, Result<RawResult, ContractError>>(
+    let receipt = session.call::<_, Result<Vec<u8>, ContractError>>(
         TRANSFER_CONTRACT,
         "spend_and_execute",
         &tx,
         u64::MAX,
     )?;
 
-    let gas_spent = receipt.points_spent;
+    let gas_spent = receipt.gas_spent;
 
     session
         .call::<_, ()>(

rusk-abi/Cargo.toml

@@ -22,7 +22,7 @@ dusk-bytes = "0.1"
 bytecheck = { version = "0.6", default-features = false }
 dusk-plonk = { version = "0.16", default-features = false, features = ["rkyv-impl", "alloc"] }
 
-piecrust-uplink = "0.8"
+piecrust-uplink = "0.9.0-rc"
 piecrust = { version = "0.14.0-rc", optional = true }
 
 # These are patches since these crates don't seem to like semver.

rusk-abi/src/types.rs

@@ -16,17 +16,17 @@ use rkyv::{Archive, Deserialize, Serialize};
 pub(crate) enum Query {}
 
 impl Query {
-    pub const HASH: &str = "hash";
-    pub const POSEIDON_HASH: &str = "poseidon_hash";
-    pub const VERIFY_PROOF: &str = "verify_proof";
-    pub const VERIFY_SCHNORR: &str = "verify_schnorr";
-    pub const VERIFY_BLS: &str = "verify_bls";
+    pub const HASH: &'static str = "hash";
+    pub const POSEIDON_HASH: &'static str = "poseidon_hash";
+    pub const VERIFY_PROOF: &'static str = "verify_proof";
+    pub const VERIFY_SCHNORR: &'static str = "verify_schnorr";
+    pub const VERIFY_BLS: &'static str = "verify_bls";
 }
 
 pub(crate) enum Metadata {}
 
 impl Metadata {
-    pub const BLOCK_HEIGHT: &str = "block_height";
+    pub const BLOCK_HEIGHT: &'static str = "block_height";
 }
 
 /// Enum representing all possible payment configurations.

rusk-abi/tests/contracts/host_fn/src/lib.rs

@@ -5,7 +5,7 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 #![no_std]
-#![feature(core_intrinsics, lang_items, alloc_error_handler)]
+#![feature(core_intrinsics, alloc_error_handler)]
 #![deny(clippy::all)]
 
 extern crate alloc;

rusk/src/lib/lib.rs

@@ -40,8 +40,7 @@ use rkyv::{Archive, Deserialize, Infallible, Serialize};
 use rusk_abi::dusk::{dusk, Dusk};
 use rusk_abi::{
     CallReceipt, ContractError, ContractId, Error as PiecrustError, Event,
-    RawResult, Session, StandardBufSerializer, STAKE_CONTRACT,
-    TRANSFER_CONTRACT, VM,
+    Session, StandardBufSerializer, STAKE_CONTRACT, TRANSFER_CONTRACT, VM,
 };
 use rusk_profile::to_rusk_state_id_path;
 use sha3::{Digest, Sha3_256};
@@ -134,7 +133,7 @@ impl Rusk {
             let tx = unspent_tx.inner.clone();
             match execute(&mut session, &tx) {
                 Ok(receipt) => {
-                    let gas_spent = receipt.points_spent;
+                    let gas_spent = receipt.gas_spent;
 
                     // If the transaction went over the block gas limit we
                     // re-execute all spent transactions. We don't discard the
@@ -169,7 +168,7 @@ impl Rusk {
                         block_height,
                         // We're currently ignoring the result of successful
                         // calls
-                        err: receipt.data.err().map(|e| format!("{e:?}")),
+                        err: receipt.data.err().map(|e| format!("{e}")),
                     });
                 }
                 Err(_) => {
@@ -631,7 +630,7 @@ fn accept(
         for event in receipt.events {
             update_hasher(&mut event_hasher, event);
         }
-        let gas_spent = receipt.points_spent;
+        let gas_spent = receipt.gas_spent;
 
         dusk_spent += gas_spent * tx.fee.gas_price;
         block_gas_left = block_gas_left
@@ -643,7 +642,7 @@ fn accept(
             gas_spent,
             block_height,
             // We're currently ignoring the result of successful calls
-            err: receipt.data.err().map(|e| format!("{e:?}")),
+            err: receipt.data.err().map(|e| format!("{e}")),
         });
     }
 
@@ -675,10 +674,10 @@ fn accept(
 fn execute(
     session: &mut Session,
     tx: &PhoenixTransaction,
-) -> Result<CallReceipt<Result<RawResult, ContractError>>, PiecrustError> {
+) -> Result<CallReceipt<Result<Vec<u8>, ContractError>>, PiecrustError> {
     // Spend the inputs and execute the call. If this errors the transaction is
     // unspendable.
-    let mut receipt = session.call::<_, Result<RawResult, ContractError>>(
+    let mut receipt = session.call::<_, Result<Vec<u8>, ContractError>>(
         TRANSFER_CONTRACT,
         "spend_and_execute",
         tx,
@@ -687,7 +686,7 @@ fn execute(
 
     // Ensure all gas is consumed if there's an error in the contract call
     if receipt.data.is_err() {
-        receipt.points_spent = receipt.points_limit;
+        receipt.gas_spent = receipt.gas_limit;
     }
 
     // Refund the appropriate amount to the transaction. This call is guaranteed
@@ -697,7 +696,7 @@ fn execute(
         .call::<_, ()>(
             TRANSFER_CONTRACT,
             "refund",
-            &(tx.fee, receipt.points_spent),
+            &(tx.fee, receipt.gas_spent),
             u64::MAX,
         )
         .expect("Refunding must succeed");

rusk/tests/services/stake.rs

@@ -181,7 +181,7 @@ fn wallet_reward(
     let tx = wallet
         .execute(
             &mut rng,
-            rusk_abi::STAKE_CONTRACT,
+            rusk_abi::STAKE_CONTRACT.to_bytes().into(),
             String::from("reward"),
             reward_calldata,
             0,