rusk: remove economic protocol features

dusk-network · Jul 1, 2024 · 54d5dc8 · 54d5dc8
1 parent 2ce2e0e
commit 54d5dc8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 198 deletions.
diff --git a/rusk/CHANGELOG.md b/rusk/CHANGELOG.md
@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Remove economic protocol handling
 - Remove allowlist [#1257]
 - Remove STCO and WFCO [#1675]
 

diff --git a/rusk/src/lib/chain/rusk.rs b/rusk/src/lib/chain/rusk.rs
@@ -23,8 +23,8 @@ use execution_core::{
 use node_data::ledger::{SpentTransaction, Transaction};
 use rusk_abi::dusk::Dusk;
 use rusk_abi::{
-    CallReceipt, ContractError, ContractId, Error as PiecrustError, Event,
-    Session, STAKE_CONTRACT, TRANSFER_CONTRACT, VM,
+    CallReceipt, ContractError, Error as PiecrustError, Event, Session,
+    STAKE_CONTRACT, TRANSFER_CONTRACT, VM,
 };
 use rusk_profile::to_rusk_state_id_path;
 use tokio::sync::broadcast;
@@ -150,7 +150,6 @@ impl Rusk {
                     spent_txs.push(SpentTransaction {
                         inner: unspent_tx,
                         gas_spent,
-                        economic_mode: receipt.economic_mode,
                         block_height,
                         err,
                     });
@@ -439,7 +438,6 @@ fn accept(
         spent_txs.push(SpentTransaction {
             inner: unspent_tx.clone(),
             gas_spent,
-            economic_mode: receipt.economic_mode,
             block_height,
             // We're currently ignoring the result of successful calls
             err: receipt.data.err().map(|e| format!("{e}")),
@@ -500,25 +498,14 @@ fn execute(
         receipt.gas_spent = receipt.gas_limit;
     }
 
-    let contract_id = tx
-        .payload()
-        .contract_call
-        .clone()
-        .map(|call| ContractId::from_bytes(call.contract));
-
     // Refund the appropriate amount to the transaction. This call is guaranteed
     // to never error. If it does, then a programming error has occurred. As
     // such, the call to `Result::expect` is warranted.
     let refund_receipt = session
         .call::<_, ()>(
             TRANSFER_CONTRACT,
             "refund",
-            &(
-                tx.payload().fee,
-                receipt.gas_spent,
-                receipt.economic_mode.clone(),
-                contract_id,
-            ),
+            &(tx.payload().fee, receipt.gas_spent),
             u64::MAX,
         )
         .expect("Refunding must succeed");

diff --git a/rusk/tests/services/contract_pays.rs b/rusk/tests/services/contract_pays.rs
diff --git a/rusk/tests/services/gas_behavior.rs b/rusk/tests/services/gas_behavior.rs
@@ -25,8 +25,8 @@ const BLOCK_HEIGHT: u64 = 1;
 const BLOCK_GAS_LIMIT: u64 = 1_000_000_000_000;
 const INITIAL_BALANCE: u64 = 10_000_000_000;
 
-const GAS_LIMIT_0: u64 = 7_000_000;
-const GAS_LIMIT_1: u64 = 200_000_000;
+const GAS_LIMIT_0: u64 = 100_000_000;
+const GAS_LIMIT_1: u64 = 300_000_000;
 
 // Creates the Rusk initial state for the tests below
 fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {

diff --git a/rusk/tests/services/mod.rs b/rusk/tests/services/mod.rs
@@ -4,7 +4,6 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-pub mod contract_pays;
 pub mod gas_behavior;
 pub mod multi_transfer;
 pub mod stake;

diff --git a/rusk/tests/services/unspendable.rs b/rusk/tests/services/unspendable.rs
@@ -27,7 +27,7 @@ const INITIAL_BALANCE: u64 = 10_000_000_000;
 
 const GAS_LIMIT_0: u64 = 20_000_000; // Enough to spend, but OOG during ICC
 const GAS_LIMIT_1: u64 = 1_000; // Not enough to spend
-const GAS_LIMIT_2: u64 = 200_000_000; // All ok
+const GAS_LIMIT_2: u64 = 300_000_000; // All ok
 
 // Creates the Rusk initial state for the tests below
 fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {