Update to [email protected]

contracts/alice/src/lib.rs

@@ -17,11 +17,6 @@ mod wasm {
     use super::*;
     use state::Alice;
 
-    use rusk_abi::ContractId;
-
-    #[no_mangle]
-    static SELF_ID: ContractId = ContractId::uninitialized();
-
     static mut STATE: Alice = state::Alice;
 
     #[no_mangle]

contracts/host_fn/src/lib.rs

@@ -16,10 +16,6 @@ use execution_core::{
     BlsPublicKey, BlsScalar, BlsSignature, PublicKey, SchnorrPublicKey,
     SchnorrSignature,
 };
-use rusk_abi::ContractId;
-
-#[no_mangle]
-static SELF_ID: ContractId = ContractId::uninitialized();
 
 static mut STATE: HostFnTest = HostFnTest;
 

contracts/license/src/lib.rs

@@ -38,12 +38,8 @@ pub const fn verifier_data_license_circuit() -> &'static [u8] {
 mod wasm {
     use super::*;
 
-    use rusk_abi::ContractId;
     use state::LicenseContractState;
 
-    #[no_mangle]
-    static SELF_ID: ContractId = ContractId::uninitialized();
-
     static mut STATE: LicenseContractState = LicenseContractState::new();
 
     #[no_mangle]

contracts/stake/src/lib.rs

@@ -18,11 +18,6 @@ use state::StakeState;
 /// The minimum amount of Dusk one can stake.
 pub const MINIMUM_STAKE: Dusk = dusk(1_000.0);
 
-use rusk_abi::ContractId;
-
-#[no_mangle]
-static SELF_ID: ContractId = ContractId::uninitialized();
-
 static mut STATE: StakeState = StakeState::new();
 
 // Transactions
@@ -135,8 +130,9 @@ unsafe fn set_burnt_amount(arg_len: u32) -> u32 {
 /// # Panics
 /// When the `caller` is not [`rusk_abi::TRANSFER_CONTRACT`].
 fn assert_transfer_caller() {
-    if rusk_abi::caller() != rusk_abi::TRANSFER_CONTRACT {
-        panic!("Can only be called from the transfer contract");
+    const PANIC_MSG: &str = "Can only be called from the transfer contract";
+    if rusk_abi::caller().expect(PANIC_MSG) != rusk_abi::TRANSFER_CONTRACT {
+        panic!("{PANIC_MSG}");
     }
 }
 
@@ -146,7 +142,7 @@ fn assert_transfer_caller() {
 /// # Panics
 /// When the `caller` is not "uninitialized".
 fn assert_external_caller() {
-    if !rusk_abi::caller().is_uninitialized() {
+    if rusk_abi::caller().is_some() {
         panic!("Can only be called from the outside the VM");
     }
 }

contracts/transfer/src/lib.rs

@@ -16,12 +16,9 @@ mod transitory;
 mod tree;
 mod verifier_data;
 
-use rusk_abi::{ContractId, STAKE_CONTRACT};
+use rusk_abi::STAKE_CONTRACT;
 use state::TransferState;
 
-#[no_mangle]
-static SELF_ID: ContractId = ContractId::uninitialized();
-
 static mut STATE: TransferState = TransferState::new();
 
 // Transactions
@@ -153,22 +150,27 @@ unsafe fn add_contract_balance(arg_len: u32) -> u32 {
 #[no_mangle]
 unsafe fn sub_contract_balance(arg_len: u32) -> u32 {
     rusk_abi::wrap_call(arg_len, |(module, value)| {
-        if rusk_abi::caller() != STAKE_CONTRACT {
-            panic!("Can only be called by the stake contract!")
-        }
+        assert_stake_caller();
         STATE
             .sub_contract_balance(&module, value)
             .expect("Cannot subtract balance")
     })
 }
 
+fn assert_stake_caller() {
+    const PANIC_MSG: &str = "Can only be called by the stake contract";
+    if rusk_abi::caller().expect(PANIC_MSG) != STAKE_CONTRACT {
+        panic!("{PANIC_MSG}");
+    }
+}
+
 /// Asserts the call is made "from the outside", meaning that it's not an
 /// inter-contract call.
 ///
 /// # Panics
 /// When the `caller` is not "uninitialized".
 fn assert_external_caller() {
-    if !rusk_abi::caller().is_uninitialized() {
+    if rusk_abi::caller().is_some() {
         panic!("Can only be called from the outside the VM");
     }
 }

contracts/transfer/src/state.rs

@@ -158,8 +158,9 @@ impl TransferState {
     /// We assume on trust that the value sent by the stake contract is
     /// according to consensus rules.
     pub fn mint(&mut self, mint: Withdraw) {
-        if rusk_abi::caller() != STAKE_CONTRACT {
-            panic!("Can only be called by the stake contract!")
+        const PANIC_MSG: &str = "Can only be called by the stake contract";
+        if rusk_abi::caller().expect(PANIC_MSG) != STAKE_CONTRACT {
+            panic!("{PANIC_MSG}")
         }
 
         let contract = mint.contract();
@@ -185,7 +186,9 @@ impl TransferState {
     pub fn withdraw(&mut self, withdraw: Withdraw) {
         let contract = ContractId::from_bytes(*withdraw.contract());
 
-        if contract != rusk_abi::caller() {
+        let caller = rusk_abi::caller()
+            .expect("A withdrawal must happen in the context of a transaction");
+        if contract != caller {
             panic!("The \"withdraw\" function can only be called by the contract specified in the payload");
         }
 
@@ -215,7 +218,9 @@ impl TransferState {
     pub fn convert(&mut self, convert: Withdraw) {
         // since each transaction only has, at maximum, a single contract call,
         // this check impliest that this is the first contract call.
-        if rusk_abi::caller() != TRANSFER_CONTRACT {
+        let caller = rusk_abi::caller()
+            .expect("A conversion must happen in the context of a transaction");
+        if caller != TRANSFER_CONTRACT {
             panic!("Only the first contract call can be a conversion");
         }
 
@@ -263,11 +268,8 @@ impl TransferState {
     /// This function will panic if there is no deposit on the state or the
     /// caller-id doesn't match the contract-id stored for the deposit.
     pub fn deposit(&mut self, value: u64) {
-        // check is the request comes from a contract
-        let caller = rusk_abi::caller();
-        if caller.is_uninitialized() {
-            panic!("Only a contract is authorized to claim a deposit.")
-        }
+        let caller = rusk_abi::caller()
+            .expect("A deposit must happen in the context of a transaction");
 
         let deposit = transitory::deposit_info_mut();
         match deposit {

rusk-abi/Cargo.toml

@@ -17,8 +17,8 @@ dusk-bytes = "0.1"
 bytecheck = { version = "0.6", default-features = false }
 dusk-plonk = { version = "0.19", default-features = false, features = ["rkyv-impl", "alloc"] }
 
-piecrust-uplink = { version = "0.15" }
-piecrust = { version = "0.22", optional = true }
+piecrust-uplink = { version = "0.16" }
+piecrust = { version = "0.23", optional = true }
 
 execution-core = { version = "0.1.0", path = "../execution-core" }