Merge pull request #3234 from dusk-network/mocello/3197_core-without_…

…execute Rename `execution-core` to `dusk-core`
dusk-network · Dec 19, 2024 · f4f295d · f4f295d
2 parents 567c280 + c001ffa
commit f4f295d
Show file tree

Hide file tree

Showing 136 changed files with 339 additions and 367 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
     "contracts/stake",
     "contracts/transfer",
 
-    "execution-core",
+    "core",
     "wallet-core",
 
     "rusk-prover",
@@ -33,7 +33,7 @@ resolver = "2"
 [workspace.dependencies]
 # Workspace internal dependencies
 dusk-consensus = { version = "0.1.1-rc.3", path = "./consensus/" }
-execution-core = { version = "0.1.0", path = "./execution-core/" }
+dusk-core = { version = "0.1.0", path = "./core/" }
 node = { version = "0.1.0", path = "./node/" }
 node-data = { version = "0.1.0", path = "./node-data/" }
 rusk-abi = { version = "0.13.0-rc.0", path = "./rusk-abi/", default-features = false }

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ contracts: ## Execute the test for all contracts
 
 test: keys wasm ## Run the tests
 	$(MAKE) -C ./rusk-abi/ $@
-	$(MAKE) -C ./execution-core/ $@
+	$(MAKE) -C ./core/ $@
 	$(MAKE) state
 	$(MAKE) -j1 -C ./contracts $@
 	$(MAKE) -C ./rusk-recovery $@
@@ -36,7 +36,7 @@ test: keys wasm ## Run the tests
 	$(MAKE) -C ./rusk-wallet/ $@
 
 clippy: ## Run clippy
-	$(MAKE) -C ./execution-core/ $@
+	$(MAKE) -C ./core/ $@
 	$(MAKE) -j1 -C ./contracts $@
 	$(MAKE) -C ./rusk-abi $@
 	$(MAKE) -C ./rusk-profile $@
@@ -50,7 +50,7 @@ clippy: ## Run clippy
 	$(MAKE) -C ./rusk-wallet/ $@
 
 doc: ## Run doc gen
-	$(MAKE) -C ./execution-core/ $@
+	$(MAKE) -C ./core/ $@
 	$(MAKE) -C ./consensus $@
 	$(MAKE) -j1 -C ./contracts $@
 	$(MAKE) -C ./node $@

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -22,7 +22,7 @@ dusk-bytes = { workspace = true }
 async-trait = { workspace = true }
 anyhow = { workspace = true }
 node-data = { workspace = true }
-execution-core = { workspace = true, features = ["parallel"] }
+dusk-core = { workspace = true, features = ["parallel"] }
 dusk-merkle = { workspace = true, features = ["size_32"] }
 thiserror = { workspace = true }
 

diff --git a/consensus/src/aggregator.rs b/consensus/src/aggregator.rs
@@ -8,7 +8,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::fmt;
 
 use dusk_bytes::Serializable;
-use execution_core::signatures::bls::{
+use dusk_core::signatures::bls::{
     Error as BlsSigError, MultisigSignature as BlsMultisigSignature,
 };
 use node_data::bls::{PublicKey, PublicKeyBytes};
@@ -235,7 +235,7 @@ mod tests {
     use std::collections::HashMap;
 
     use dusk_bytes::DeserializableSlice;
-    use execution_core::signatures::bls::{
+    use dusk_core::signatures::bls::{
         PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
     };
     use hex::FromHex;

diff --git a/consensus/src/commons.rs b/consensus/src/commons.rs
@@ -10,7 +10,7 @@
 use std::collections::HashMap;
 use std::time::Duration;
 
-use execution_core::signatures::bls::SecretKey as BlsSecretKey;
+use dusk_core::signatures::bls::SecretKey as BlsSecretKey;
 use node_data::bls::PublicKey;
 use node_data::ledger::*;
 use node_data::message::{

diff --git a/consensus/src/errors.rs b/consensus/src/errors.rs
@@ -6,7 +6,7 @@
 
 use std::io;
 
-use execution_core::signatures::bls::Error as BlsSigError;
+use dusk_core::signatures::bls::Error as BlsSigError;
 use node_data::bls::PublicKeyBytes;
 use node_data::ledger::{Hash, InvalidFault};
 use node_data::message::payload::{RatificationResult, Vote};

diff --git a/consensus/src/quorum/verifiers.rs b/consensus/src/quorum/verifiers.rs
@@ -5,7 +5,7 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use dusk_bytes::Serializable as BytesSerializable;
-use execution_core::signatures::bls::{
+use dusk_core::signatures::bls::{
     MultisigPublicKey as BlsMultisigPublicKey,
     MultisigSignature as BlsMultisigSignature,
 };

diff --git a/consensus/src/user/provisioners.rs b/consensus/src/user/provisioners.rs
@@ -7,8 +7,8 @@
 use std::collections::BTreeMap;
 use std::mem;
 
-use execution_core::dusk;
-use execution_core::stake::MINIMUM_STAKE;
+use dusk_core::dusk;
+use dusk_core::stake::MINIMUM_STAKE;
 use node_data::bls::{PublicKey, PublicKeyBytes};
 use node_data::ledger::Seed;
 use node_data::StepName;

diff --git a/consensus/src/user/sortition.rs b/consensus/src/user/sortition.rs
@@ -95,7 +95,7 @@ pub fn generate_sortition_score(
 mod tests {
 
     use dusk_bytes::DeserializableSlice;
-    use execution_core::signatures::bls::{
+    use dusk_core::signatures::bls::{
         PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
     };
     use node_data::ledger::Seed;

diff --git a/contracts/alice/Cargo.toml b/contracts/alice/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-execution-core = { workspace = true }
+dusk-core = { workspace = true }
 rusk-abi = { workspace = true, features = ["abi", "dlmalloc"] }
diff --git a/contracts/alice/src/state.rs b/contracts/alice/src/state.rs
@@ -4,7 +4,7 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use execution_core::transfer::{
+use dusk_core::transfer::{
     withdraw::Withdraw, ContractToAccount, ContractToContract,
     TRANSFER_CONTRACT,
 };

diff --git a/contracts/bob/Cargo.toml b/contracts/bob/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-execution-core = { workspace = true }
+dusk-core = { workspace = true }
 rusk-abi = { workspace = true, features = ["abi", "dlmalloc"] }
 rkyv = { workspace = true, features = ["size_32"] }
 bytecheck = { workspace = true }

diff --git a/contracts/bob/src/state.rs b/contracts/bob/src/state.rs
@@ -8,7 +8,7 @@ extern crate alloc;
 use alloc::string::String;
 use bytecheck::CheckBytes;
 use dusk_bytes::Serializable;
-use execution_core::{
+use dusk_core::{
     signatures::bls::{PublicKey as BlsPublicKey, Signature as BlsSignature},
     transfer::ReceiveFromContract,
     ContractId,

diff --git a/contracts/charlie/Cargo.toml b/contracts/charlie/Cargo.toml
@@ -8,6 +8,6 @@ description = "A proxy staking contract used to test delegation and intermediary
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-execution-core = { workspace = true }
+dusk-core = { workspace = true }
 rusk-abi = { workspace = true, features = ["abi", "dlmalloc"] }
 rkyv = { workspace = true, features = ["size_32"] }
diff --git a/contracts/charlie/src/lib.rs b/contracts/charlie/src/lib.rs
@@ -7,7 +7,7 @@
 #![no_std]
 
 mod state;
-use execution_core::transfer::TRANSFER_CONTRACT;
+use dusk_core::transfer::TRANSFER_CONTRACT;
 use state::Charlie;
 
 #[no_mangle]

diff --git a/contracts/charlie/src/state.rs b/contracts/charlie/src/state.rs
@@ -6,10 +6,8 @@
 
 extern crate alloc;
 
-use execution_core::stake::{
-    Stake, Withdraw, WithdrawToContract, STAKE_CONTRACT,
-};
-use execution_core::transfer::{
+use dusk_core::stake::{Stake, Withdraw, WithdrawToContract, STAKE_CONTRACT};
+use dusk_core::transfer::{
     withdraw::Withdraw as TransferWithdraw, ContractToContract,
     ReceiveFromContract, TRANSFER_CONTRACT,
 };

diff --git a/contracts/host_fn/Cargo.toml b/contracts/host_fn/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-execution-core = { workspace = true }
+dusk-core = { workspace = true }
 dusk-bytes = { workspace = true }
 rusk-abi = { workspace = true, features = ["abi", "dlmalloc"]}
diff --git a/contracts/host_fn/src/lib.rs b/contracts/host_fn/src/lib.rs
@@ -12,7 +12,7 @@ extern crate alloc;
 use alloc::vec::Vec;
 
 use dusk_bytes::Serializable;
-use execution_core::{
+use dusk_core::{
     signatures::{
         bls::{
             MultisigSignature, PublicKey as BlsPublicKey,

diff --git a/contracts/stake/Cargo.toml b/contracts/stake/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-execution-core = { workspace = true }
+dusk-core = { workspace = true }
 dusk-bytes = { workspace = true }
 rkyv = { workspace = true, features = ["size_32"] }
 
@@ -16,7 +16,7 @@ rusk-abi = { workspace = true, features = ["abi", "dlmalloc"] }
 
 [dev-dependencies]
 rusk-abi = { workspace = true, features = ["host"] }
-execution-core = { workspace = true, features = ["zk"] }
+dusk-core = { workspace = true, features = ["zk"] }
 rusk-prover = { workspace = true }
 wallet-core = { workspace = true }
 rand = { workspace = true }

diff --git a/contracts/stake/benches/get_provisioners.rs b/contracts/stake/benches/get_provisioners.rs
@@ -5,7 +5,7 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use criterion::{criterion_group, criterion_main, Criterion};
-use execution_core::{
+use dusk_core::{
     stake::{StakeData, STAKE_CONTRACT},
     transfer::TRANSFER_CONTRACT,
     BlsPublicKey, BlsSecretKey,

diff --git a/contracts/stake/src/lib.rs b/contracts/stake/src/lib.rs
@@ -12,7 +12,7 @@
 
 extern crate alloc;
 
-use execution_core::transfer::TRANSFER_CONTRACT;
+use dusk_core::transfer::TRANSFER_CONTRACT;
 
 mod state;
 use state::StakeState;

diff --git a/contracts/stake/src/state.rs b/contracts/stake/src/state.rs
@@ -11,7 +11,7 @@ use core::cmp::min;
 
 use dusk_bytes::Serializable;
 
-use execution_core::{
+use dusk_core::{
     signatures::bls::PublicKey as BlsPublicKey,
     stake::{
         next_epoch, Reward, SlashEvent, Stake, StakeAmount, StakeData,

diff --git a/contracts/stake/tests/common/assert.rs b/contracts/stake/tests/common/assert.rs
@@ -5,13 +5,13 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use dusk_bytes::Serializable;
-use execution_core::signatures::bls::PublicKey as BlsPublicKey;
-use execution_core::stake::{
+use dusk_core::signatures::bls::PublicKey as BlsPublicKey;
+use dusk_core::stake::{
     Reward, SlashEvent, StakeData, StakeEvent, STAKE_CONTRACT,
 };
-use execution_core::transfer::moonlight::AccountData;
-use execution_core::transfer::TRANSFER_CONTRACT;
-use execution_core::Event;
+use dusk_core::transfer::moonlight::AccountData;
+use dusk_core::transfer::TRANSFER_CONTRACT;
+use dusk_core::Event;
 use rkyv::{check_archived_root, Deserialize, Infallible};
 use rusk_abi::Session;
 

diff --git a/contracts/stake/tests/common/init.rs b/contracts/stake/tests/common/init.rs
@@ -4,12 +4,12 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use execution_core::stake::STAKE_CONTRACT;
-use execution_core::transfer::{
+use dusk_core::stake::STAKE_CONTRACT;
+use dusk_core::transfer::{
     phoenix::{Note, PublicKey as PhoenixPublicKey},
     TRANSFER_CONTRACT,
 };
-use execution_core::JubJubScalar;
+use dusk_core::JubJubScalar;
 use ff::Field;
 use rand::{CryptoRng, RngCore};
 use rusk_abi::{ContractData, Session, VM};

diff --git a/contracts/stake/tests/common/utils.rs b/contracts/stake/tests/common/utils.rs
@@ -6,15 +6,14 @@
 
 use std::sync::mpsc;
 
-use execution_core::transfer::data::TransactionData;
-use execution_core::transfer::phoenix::{
+use dusk_core::transfer::data::TransactionData;
+use dusk_core::transfer::phoenix::{
     Note, NoteLeaf, NoteOpening, NoteTreeItem, PublicKey as PhoenixPublicKey,
     SecretKey as PhoenixSecretKey, Transaction as PhoenixTransaction,
     ViewKey as PhoenixViewKey,
 };
-use execution_core::transfer::{Transaction, TRANSFER_CONTRACT};
-use execution_core::LUX;
-use execution_core::{BlsScalar, ContractError};
+use dusk_core::transfer::{Transaction, TRANSFER_CONTRACT};
+use dusk_core::{BlsScalar, ContractError, LUX};
 use rand::rngs::StdRng;
 use rusk_abi::{CallReceipt, PiecrustError, Session};
 use rusk_prover::LocalProver;

diff --git a/contracts/stake/tests/events.rs b/contracts/stake/tests/events.rs
@@ -10,7 +10,7 @@ use common::assert::assert_slash_event;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 
-use execution_core::{
+use dusk_core::{
     dusk,
     signatures::bls::{PublicKey as BlsPublicKey, SecretKey as BlsSecretKey},
     stake::{

diff --git a/contracts/stake/tests/partial_stake.rs b/contracts/stake/tests/partial_stake.rs
@@ -4,12 +4,12 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use execution_core::dusk;
-use execution_core::signatures::bls::{
+use dusk_core::dusk;
+use dusk_core::signatures::bls::{
     PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
 };
-use execution_core::stake::{Reward, RewardReason, EPOCH, STAKE_CONTRACT};
-use execution_core::transfer::TRANSFER_CONTRACT;
+use dusk_core::stake::{Reward, RewardReason, EPOCH, STAKE_CONTRACT};
+use dusk_core::transfer::TRANSFER_CONTRACT;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use rusk_abi::{ContractData, PiecrustError, Session, VM};

diff --git a/contracts/stake/tests/stake.rs b/contracts/stake/tests/stake.rs
@@ -6,27 +6,25 @@
 
 pub mod common;
 
+use dusk_core::signatures::bls::{
+    PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
+};
+use dusk_core::stake::{
+    Reward, RewardReason, Stake, Withdraw as StakeWithdraw, STAKE_CONTRACT,
+};
+use dusk_core::transfer::data::ContractCall;
+use dusk_core::transfer::phoenix::{
+    PublicKey as PhoenixPublicKey, SecretKey as PhoenixSecretKey,
+    ViewKey as PhoenixViewKey,
+};
+use dusk_core::transfer::withdraw::{
+    Withdraw, WithdrawReceiver, WithdrawReplayToken,
+};
+use dusk_core::{dusk, JubJubScalar};
 use ff::Field;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 
-use execution_core::{
-    dusk,
-    signatures::bls::{PublicKey as BlsPublicKey, SecretKey as BlsSecretKey},
-    stake::{
-        Reward, RewardReason, Stake, Withdraw as StakeWithdraw, STAKE_CONTRACT,
-    },
-    transfer::{
-        data::ContractCall,
-        phoenix::{
-            PublicKey as PhoenixPublicKey, SecretKey as PhoenixSecretKey,
-            ViewKey as PhoenixViewKey,
-        },
-        withdraw::{Withdraw, WithdrawReceiver, WithdrawReplayToken},
-    },
-    JubJubScalar,
-};
-
 use crate::common::assert::{
     assert_reward_event, assert_stake, assert_stake_event,
 };

diff --git a/contracts/transfer/Cargo.toml b/contracts/transfer/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-execution-core = { workspace = true }
+dusk-core = { workspace = true }
 ringbuffer = { workspace = true }
 
 [target.'cfg(target_family = "wasm")'.dependencies]

diff --git a/contracts/transfer/src/error.rs b/contracts/transfer/src/error.rs
@@ -5,11 +5,11 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use core::fmt;
-use execution_core::Error as ExecutionError;
+use dusk_core::Error as ExecutionError;
 
 #[derive(Debug, Clone)]
 pub enum Error {
-    /// Wrapper of execution-core error type.
+    /// Wrapper of dusk-core error type.
     Execution(ExecutionError),
     /// A contract balance is not sufficient for the requested withdrawal
     NotEnoughBalance,