From 9f48dbea7fbf8539f909de0a00b09337ada1d5cf Mon Sep 17 00:00:00 2001 From: Milosz Muszynski Date: Fri, 5 Jan 2024 15:45:06 +0100 Subject: [PATCH] transfer-contract: moved state to transfer-data contract --- Cargo.toml | 1 + contracts/Makefile | 2 +- contracts/stake/tests/stake.rs | 13 +- contracts/transfer-data/Cargo.toml | 18 + contracts/transfer-data/LICENSE | 373 ++++++++++++++++++ contracts/transfer-data/Makefile | 28 ++ contracts/transfer-data/rustfmt.toml | 2 + contracts/transfer-data/src/lib.rs | 158 ++++++++ contracts/transfer-data/src/state.rs | 281 +++++++++++++ .../{transfer => transfer-data}/src/tree.rs | 6 +- contracts/transfer/src/lib.rs | 7 +- contracts/transfer/src/state.rs | 298 +++++++------- contracts/transfer/tests/transfer.rs | 13 +- rusk-abi/src/lib.rs | 2 + rusk-recovery/src/state.rs | 25 +- 15 files changed, 1048 insertions(+), 179 deletions(-) create mode 100644 contracts/transfer-data/Cargo.toml create mode 100644 contracts/transfer-data/LICENSE create mode 100644 contracts/transfer-data/Makefile create mode 100644 contracts/transfer-data/rustfmt.toml create mode 100644 contracts/transfer-data/src/lib.rs create mode 100644 contracts/transfer-data/src/state.rs rename contracts/{transfer => transfer-data}/src/tree.rs (95%) diff --git a/Cargo.toml b/Cargo.toml index 92a61ddccf..9bc2ac28f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ members = [ "contracts/stake-types", "contracts/governance", "contracts/transfer", + "contracts/transfer-data", "contracts/transfer-types", "contracts/license", diff --git a/contracts/Makefile b/contracts/Makefile index 3ba77ac8d8..00699e47f1 100644 --- a/contracts/Makefile +++ b/contracts/Makefile @@ -1,4 +1,4 @@ -SUBDIRS := stake-types transfer-types alice bob transfer stake governance license +SUBDIRS := stake-types transfer-types alice bob transfer transfer-data stake governance license all: $(SUBDIRS) ## Build all the contracts diff --git a/contracts/stake/tests/stake.rs b/contracts/stake/tests/stake.rs index 09608c3d7e..b5e04188c1 100644 --- a/contracts/stake/tests/stake.rs +++ b/contracts/stake/tests/stake.rs @@ -20,7 +20,7 @@ use rand::rngs::StdRng; use rand::{CryptoRng, RngCore, SeedableRng}; use rusk_abi::dusk::{dusk, LUX}; use rusk_abi::{CallReceipt, ContractData, ContractError, Error, Session, VM}; -use rusk_abi::{STAKE_CONTRACT, TRANSFER_CONTRACT}; +use rusk_abi::{STAKE_CONTRACT, TRANSFER_CONTRACT, TRANSFER_DATA_CONTRACT}; use stake_contract_types::{ allow_signature_message, stake_signature_message, unstake_signature_message, withdraw_signature_message, Allow, Stake, @@ -50,6 +50,9 @@ fn instantiate( psk: &PublicSpendKey, pk: &PublicKey, ) -> Session { + let transfer_data_bytecode = include_bytes!( + "../../../target/wasm64-unknown-unknown/release/transfer_data_contract.wasm" + ); let transfer_bytecode = include_bytes!( "../../../target/wasm64-unknown-unknown/release/transfer_contract.wasm" ); @@ -59,6 +62,14 @@ fn instantiate( let mut session = rusk_abi::new_genesis_session(vm); + session + .deploy( + transfer_data_bytecode, + ContractData::builder(OWNER).contract_id(TRANSFER_DATA_CONTRACT), + POINT_LIMIT, + ) + .expect("Deploying the transfer contract should succeed"); + session .deploy( transfer_bytecode, diff --git a/contracts/transfer-data/Cargo.toml b/contracts/transfer-data/Cargo.toml new file mode 100644 index 0000000000..70d13808ee --- /dev/null +++ b/contracts/transfer-data/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "transfer-data-contract" +version = "0.10.1" +edition = "2021" + +[lib] +crate-type = ["cdylib", "rlib"] + +[dependencies] +dusk-bls12_381 = { version = "0.12", default-features = false, features = ["rkyv-impl"] } +dusk-bytes = "0.1" +dusk-pki = { version = "0.13", default-features = false, features = ["rkyv-impl"] } +poseidon-merkle = { version = "0.3", features = ["rkyv-impl"] } +phoenix-core = { version = "0.21", default-features = false, features = ["rkyv-impl", "alloc"] } +rkyv = { version = "0.7", default-features = false, features = ["size_32"] } + +[target.'cfg(target_family = "wasm")'.dependencies] +rusk-abi = { version = "0.12.0-rc", path = "../../rusk-abi" } diff --git a/contracts/transfer-data/LICENSE b/contracts/transfer-data/LICENSE new file mode 100644 index 0000000000..a612ad9813 --- /dev/null +++ b/contracts/transfer-data/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/contracts/transfer-data/Makefile b/contracts/transfer-data/Makefile new file mode 100644 index 0000000000..9850cbcc9d --- /dev/null +++ b/contracts/transfer-data/Makefile @@ -0,0 +1,28 @@ +all: ## Build the transfer contract + @cargo build --release + +help: ## Display this help screen + @grep -h \ + -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \ + awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' + +check: wasm ## Run the Rust check on the project features + @cargo check --target wasm32-unknown-unknown + @cargo check + +test: wasm ## Perform the contract tests defined in the host module + @cargo test --release + +wasm: ## Build the WASM files + @RUSTFLAGS="$(RUSTFLAGS) --remap-path-prefix $(HOME)= -C link-args=-zstack-size=65536" \ + cargo build \ + --release \ + --color=always \ + -Z build-std=core,alloc \ + --target wasm64-unknown-unknown + +clippy: ## Run clippy + @cargo clippy --all-features --release -- -D warnings + @cargo clippy -Z build-std=core,alloc --release --target wasm32-unknown-unknown -- -D warnings + +.PHONY: all check test wasm help diff --git a/contracts/transfer-data/rustfmt.toml b/contracts/transfer-data/rustfmt.toml new file mode 100644 index 0000000000..3450fc407a --- /dev/null +++ b/contracts/transfer-data/rustfmt.toml @@ -0,0 +1,2 @@ +max_width = 80 +wrap_comments = true diff --git a/contracts/transfer-data/src/lib.rs b/contracts/transfer-data/src/lib.rs new file mode 100644 index 0000000000..05fce74402 --- /dev/null +++ b/contracts/transfer-data/src/lib.rs @@ -0,0 +1,158 @@ +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +// Copyright (c) DUSK NETWORK. All rights reserved. + +#![cfg_attr(target_family = "wasm", no_std)] +#![cfg(target_family = "wasm")] +#![feature(arbitrary_self_types)] + +extern crate alloc; + +mod state; +mod tree; + +use rusk_abi::ContractId; +use state::TransferState; + +#[no_mangle] +static SELF_ID: ContractId = ContractId::uninitialized(); + +static mut STATE: TransferState = TransferState::new(); + +// Queries + +#[no_mangle] +unsafe fn root(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |_: ()| STATE.root()) +} + +#[no_mangle] +unsafe fn module_balance(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |module| STATE.balance(&module)) +} + +#[no_mangle] +unsafe fn message(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(module, pk)| STATE.message(&module, &pk)) +} + +#[no_mangle] +unsafe fn opening(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |pos| STATE.opening(pos)) +} + +#[no_mangle] +unsafe fn existing_nullifiers(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |nullifiers| { + STATE.existing_nullifiers(nullifiers) + }) +} + +#[no_mangle] +unsafe fn any_nullifier_exists(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |nullifiers| { + STATE.any_nullifier_exists(nullifiers) + }) +} + +#[no_mangle] +unsafe fn extend_nullifiers(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |nullifiers| { + STATE.extend_nullifiers(nullifiers) + }) +} + +#[no_mangle] +unsafe fn take_message_from_address_key(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(module, pk)| { + STATE.take_message_from_address_key(&module, &pk) + }) +} + +#[no_mangle] +unsafe fn root_exists(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |root| STATE.root_exists(&root)) +} + +#[no_mangle] +unsafe fn push_message(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(module, stealth_address, message)| { + STATE.push_message(module, stealth_address, message) + }) +} + +#[no_mangle] +unsafe fn take_crossover(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |_: ()| STATE.take_crossover()) +} + +#[no_mangle] +unsafe fn set_crossover(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(crossover, address)| { + STATE.set_crossover(crossover, address) + }) +} + +#[no_mangle] +unsafe fn get_crossover(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |_: ()| STATE.get_crossover()) +} + +#[no_mangle] +unsafe fn extend_notes(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(height, notes)| { + STATE.extend_notes(height, notes) + }) +} + +#[no_mangle] +unsafe fn sub_balance(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(module, value)| { + STATE.sub_balance(module, value) + }) +} + +// "Feeder" queries + +#[no_mangle] +unsafe fn leaves_from_height(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |height| STATE.leaves_from_height(height)) +} + +#[no_mangle] +unsafe fn leaves_from_pos(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |pos| STATE.leaves_from_pos(pos)) +} + +// "Management" transactions + +#[no_mangle] +unsafe fn push_note(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(block_height, note)| { + STATE.push_note(block_height, note) + }) +} + +#[no_mangle] +unsafe fn get_note(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |pos| STATE.get_note(pos)) +} + +#[no_mangle] +unsafe fn update_root(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |_: ()| STATE.update_root()) +} + +#[no_mangle] +unsafe fn add_module_balance(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |(module, value)| { + STATE.add_balance(module, value) + }) +} + +#[no_mangle] +unsafe fn get_module_balance(arg_len: u32) -> u32 { + rusk_abi::wrap_call(arg_len, |module| STATE.balance(&module)) +} diff --git a/contracts/transfer-data/src/state.rs b/contracts/transfer-data/src/state.rs new file mode 100644 index 0000000000..687fd383ef --- /dev/null +++ b/contracts/transfer-data/src/state.rs @@ -0,0 +1,281 @@ +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +// Copyright (c) DUSK NETWORK. All rights reserved. + +use crate::tree::Tree; + +use alloc::collections::btree_map::Entry; +use alloc::collections::{BTreeMap, BTreeSet}; +use alloc::vec::Vec; + +use dusk_bls12_381::BlsScalar; +use dusk_bytes::Serializable; +use dusk_pki::{PublicKey, StealthAddress}; +use phoenix_core::transaction::*; +use phoenix_core::{Crossover, Message, Note}; +use poseidon_merkle::Opening as PoseidonOpening; +use rusk_abi::ContractId; + +/// Arity of the transfer tree. +pub const A: usize = 4; + +pub struct TransferState { + tree: Tree, + nullifiers: BTreeSet, + roots: BTreeSet, + balances: BTreeMap, + message_mapping: + BTreeMap>, + message_mapping_set: BTreeMap, + var_crossover: Option, + var_crossover_addr: Option, +} + +impl TransferState { + pub const fn new() -> TransferState { + TransferState { + tree: Tree::new(), + nullifiers: BTreeSet::new(), + roots: BTreeSet::new(), + balances: BTreeMap::new(), + message_mapping: BTreeMap::new(), + message_mapping_set: BTreeMap::new(), + var_crossover: None, + var_crossover_addr: None, + } + } + + /// Push a note to the contract's state with the given block height + /// + /// Note: the method `update_root` needs to be called after the last note is + /// pushed. + pub fn push_note(&mut self, block_height: u64, note: Note) -> u64 { + let tree_leaf = TreeLeaf { block_height, note }; + self.tree.push(tree_leaf) + } + + /// Feeds the host with the leaves in the tree, starting from the given + /// height. + pub fn leaves_from_height(&self, height: u64) { + for leaf in self.tree.leaves(height) { + rusk_abi::feed(leaf.clone()); + } + } + + /// Feeds the host with the leaves in the tree, starting from the given + /// position. + pub fn leaves_from_pos(&self, pos: u64) { + for leaf in self.tree.leaves_pos(pos) { + rusk_abi::feed(leaf.clone()); + } + } + + /// Update the root for of the tree. + pub fn update_root(&mut self) { + let root = self.tree.root(); + self.roots.insert(root); + } + + /// Get the root of the tree. + pub fn root(&self) -> BlsScalar { + self.tree.root() + } + + /// Get the opening + pub fn opening( + &self, + pos: u64, + ) -> Option> { + self.tree.opening(pos) + } + + /// Takes some nullifiers and returns a vector containing the ones that + /// already exists in the contract + pub fn existing_nullifiers( + &self, + nullifiers: Vec, + ) -> Vec { + nullifiers + .into_iter() + .filter_map(|n| self.nullifiers.get(&n).map(|_| n)) + .collect() + } + + /// Return the balance of a given contract. + pub fn balance(&self, contract_id: &ContractId) -> u64 { + self.balances.get(contract_id).copied().unwrap_or_default() + } + + /// Add balance to the given contract + pub fn add_balance(&mut self, contract: ContractId, value: u64) { + match self.balances.entry(contract) { + Entry::Vacant(ve) => { + ve.insert(value); + } + Entry::Occupied(mut oe) => { + let v = oe.get_mut(); + *v += value + } + } + } + + pub fn message( + &self, + contract: &ContractId, + pk: &PublicKey, + ) -> Option { + let map = self.message_mapping.get(contract)?; + let message = map.get(&pk.to_bytes())?; + + Some(*message) + } + + pub fn any_nullifier_exists(&self, nullifiers: Vec) -> bool { + for ref nullifier in nullifiers { + if self.nullifiers.contains(nullifier) { + return true; + } + } + + false + } + + pub fn extend_nullifiers(&mut self, nullifiers: Vec) { + self.nullifiers.extend(&nullifiers); + } + + pub fn take_message_from_address_key( + &mut self, + contract: &ContractId, + pk: &PublicKey, + ) -> Option { + self.message_mapping + .get_mut(contract)? + .remove(&pk.to_bytes()) + } + + pub fn root_exists(&self, root: &BlsScalar) -> bool { + self.roots.get(root).is_some() + } + + pub fn get_note(&self, pos: u64) -> Option { + self.tree.get(pos).map(|l| l.note) + } + + pub fn sub_balance( + &mut self, + address: ContractId, + value: u64, + ) -> Option<()> { + match self.balances.get_mut(&address) { + Some(balance) => { + let (bal, underflow) = balance.overflowing_sub(value); + + if underflow { + None + } else { + *balance = bal; + + Some(()) + } + } + + _ => None, + } + } + + pub fn push_message( + &mut self, + address: ContractId, + message_address: StealthAddress, + message: Message, + ) { + let mut to_insert: Option> = + None; + + match self.message_mapping.get_mut(&address) { + Some(map) => { + map.insert(message_address.pk_r().to_bytes(), message); + } + + None => { + let mut map: BTreeMap<[u8; PublicKey::SIZE], Message> = + BTreeMap::default(); + map.insert(message_address.pk_r().to_bytes(), message); + to_insert.replace(map); + } + } + + if let Some(map) = to_insert { + self.message_mapping.insert(address, map); + } + + self.message_mapping_set.insert(address, message_address); + } + + pub fn take_crossover(&mut self) -> Option<(Crossover, StealthAddress)> { + let crossover = self.var_crossover.take()?; + + let sa = self.var_crossover_addr.take()?; + + Some((crossover, sa)) + } + + pub fn set_crossover( + &mut self, + crossover: Option, + stealth_address: Option, + ) { + self.var_crossover = crossover; + self.var_crossover_addr = stealth_address; + } + + pub fn get_crossover( + &mut self, + ) -> (Option, Option) { + (self.var_crossover, self.var_crossover_addr) + } + + pub fn extend_notes(&mut self, block_height: u64, notes: Vec) { + self.tree.extend_notes(block_height, notes); + } +} + +#[cfg(test)] +mod test_transfer { + use super::*; + + #[test] + fn find_existing_nullifiers() { + let mut transfer = TransferState::new(); + + let (zero, one, two, three, ten, eleven) = ( + BlsScalar::from(0), + BlsScalar::from(1), + BlsScalar::from(2), + BlsScalar::from(3), + BlsScalar::from(10), + BlsScalar::from(11), + ); + + let existing = transfer + .existing_nullifiers(vec![zero, one, two, three, ten, eleven]); + + assert_eq!(existing.len(), 0); + + for i in 1..10 { + transfer.nullifiers.insert(BlsScalar::from(i)); + } + + let existing = transfer + .existing_nullifiers(vec![zero, one, two, three, ten, eleven]); + + assert_eq!(existing.len(), 3); + + assert!(existing.contains(&one)); + assert!(existing.contains(&two)); + assert!(existing.contains(&three)); + } +} diff --git a/contracts/transfer/src/tree.rs b/contracts/transfer-data/src/tree.rs similarity index 95% rename from contracts/transfer/src/tree.rs rename to contracts/transfer-data/src/tree.rs index f35239af9b..ad9c8c5858 100644 --- a/contracts/transfer/src/tree.rs +++ b/contracts/transfer-data/src/tree.rs @@ -50,11 +50,7 @@ impl Tree { pos } - pub fn extend_notes>( - &mut self, - block_height: u64, - notes: I, - ) { + pub fn extend_notes(&mut self, block_height: u64, notes: Vec) { for note in notes { let leaf = TreeLeaf { block_height, note }; self.push(leaf); diff --git a/contracts/transfer/src/lib.rs b/contracts/transfer/src/lib.rs index 68f7fa2019..7000f1e660 100644 --- a/contracts/transfer/src/lib.rs +++ b/contracts/transfer/src/lib.rs @@ -13,15 +13,14 @@ extern crate alloc; mod circuits; mod error; mod state; -mod tree; use rusk_abi::ContractId; -use state::TransferState; +use state::TransferOps; #[no_mangle] static SELF_ID: ContractId = ContractId::uninitialized(); -static mut STATE: TransferState = TransferState::new(); +static mut STATE: TransferOps = TransferOps {}; // Transactions @@ -100,7 +99,7 @@ unsafe fn opening(arg_len: u32) -> u32 { #[no_mangle] unsafe fn existing_nullifiers(arg_len: u32) -> u32 { rusk_abi::wrap_call(arg_len, |nullifiers| { - STATE.existing_nullifiers(nullifiers) + STATE.existing_nullifiers(&nullifiers) }) } diff --git a/contracts/transfer/src/state.rs b/contracts/transfer/src/state.rs index 9405538415..6b82de0486 100644 --- a/contracts/transfer/src/state.rs +++ b/contracts/transfer/src/state.rs @@ -6,14 +6,11 @@ use crate::circuits::*; use crate::error::Error; -use crate::tree::Tree; -use alloc::collections::btree_map::Entry; -use alloc::collections::{BTreeMap, BTreeSet}; use alloc::vec::Vec; use dusk_bls12_381::BlsScalar; -use dusk_bytes::{DeserializableSlice, Serializable}; +use dusk_bytes::DeserializableSlice; use dusk_jubjub::{JubJubAffine, JubJubExtended}; use dusk_pki::{Ownable, PublicKey, StealthAddress}; use phoenix_core::transaction::*; @@ -21,38 +18,16 @@ use phoenix_core::{Crossover, Fee, Message, Note}; use poseidon_merkle::Opening as PoseidonOpening; use rusk_abi::{ ContractError, ContractId, PaymentInfo, PublicInput, STAKE_CONTRACT, + TRANSFER_DATA_CONTRACT, }; use transfer_contract_types::{Mint, Stct, Wfco, WfcoRaw, Wfct, Wfctc}; /// Arity of the transfer tree. pub const A: usize = 4; -pub struct TransferState { - tree: Tree, - nullifiers: BTreeSet, - roots: BTreeSet, - balances: BTreeMap, - message_mapping: - BTreeMap>, - message_mapping_set: BTreeMap, - var_crossover: Option, - var_crossover_addr: Option, -} - -impl TransferState { - pub const fn new() -> TransferState { - TransferState { - tree: Tree::new(), - nullifiers: BTreeSet::new(), - roots: BTreeSet::new(), - balances: BTreeMap::new(), - message_mapping: BTreeMap::new(), - message_mapping_set: BTreeMap::new(), - var_crossover: None, - var_crossover_addr: None, - } - } +pub struct TransferOps; +impl TransferOps { pub fn mint(&mut self, mint: Mint) -> bool { // Only the stake contract can mint notes to a particular stealth // address. This happens when the reward for staking and participating @@ -330,12 +305,23 @@ impl TransferState { } // 2. ν[] !∈ Nullifiers - if self.any_nullifier_exists(&tx.nullifiers) { + let nullifier_exists = rusk_abi::call::, bool>( + TRANSFER_DATA_CONTRACT, + "any_nullifier_exists", + &tx.nullifiers, + ) + .expect("nullifiers query should succeed"); + if nullifier_exists { panic!("A provided nullifier already exists!"); } // 3. Nullifiers.append(ν[]) - self.nullifiers.extend(&tx.nullifiers); + rusk_abi::call::, ()>( + TRANSFER_DATA_CONTRACT, + "extend_nullifiers", + &tx.nullifiers, + ) + .expect("extending nullifiers should succeed"); // 4. if |C|=0 then set C ← (0,0,0) // Crossover is received as option @@ -343,7 +329,12 @@ impl TransferState { // 5. N↦.append((No.R[], No.pk[]) // 6. Notes.append(No[]) let block_height = rusk_abi::block_height(); - self.tree.extend_notes(block_height, tx.outputs.clone()); + rusk_abi::call::<(u64, Vec), ()>( + TRANSFER_DATA_CONTRACT, + "extend_notes", + &(block_height, tx.outputs.clone()), + ) + .expect("extending notes should succeed"); // 7. g_l < 2^64 // 8. g_pmin < g_p @@ -354,8 +345,12 @@ impl TransferState { } // 11. if ∣k∣≠0 then call(k) - self.var_crossover = tx.crossover; - self.var_crossover_addr.replace(*tx.fee.stealth_address()); + rusk_abi::call::<(Option, Option), ()>( + TRANSFER_DATA_CONTRACT, + "set_crossover", + &(tx.crossover, Some(*tx.fee.stealth_address())), + ) + .expect("set_crossover call should succeed"); let mut result = Ok(Vec::new()); @@ -389,7 +384,15 @@ impl TransferState { self.push_note(block_height, remainder); } - if let Some(crossover) = self.var_crossover { + let (crossover, _) = rusk_abi::call::< + (), + (Option, Option), + >( + TRANSFER_DATA_CONTRACT, "get_crossover", &() + ) + .expect("get_crossover call should succeed"); + + if let Some(crossover) = crossover { let note = Note::from((fee, crossover)); self.push_note(block_height, note); } @@ -400,8 +403,13 @@ impl TransferState { /// Note: the method `update_root` needs to be called after the last note is /// pushed. pub fn push_note(&mut self, block_height: u64, note: Note) -> Note { + let pos = rusk_abi::call::<(u64, Note), u64>( + TRANSFER_DATA_CONTRACT, + "push_note", + &(block_height, note), + ) + .expect("add_balance call should succeed"); let tree_leaf = TreeLeaf { block_height, note }; - let pos = self.tree.push(tree_leaf.clone()); rusk_abi::emit("TREE_LEAF", (pos, tree_leaf)); self.get_note(pos) .expect("There should be a note that was just inserted") @@ -410,28 +418,35 @@ impl TransferState { /// Feeds the host with the leaves in the tree, starting from the given /// height. pub fn leaves_from_height(&self, height: u64) { - for leaf in self.tree.leaves(height) { - rusk_abi::feed(leaf.clone()); - } + rusk_abi::call::( + TRANSFER_DATA_CONTRACT, + "leaves_from_height", + &height, + ) + .expect("leaves_from_height2 query should succeed"); } /// Feeds the host with the leaves in the tree, starting from the given /// position. pub fn leaves_from_pos(&self, pos: u64) { - for leaf in self.tree.leaves_pos(pos) { - rusk_abi::feed(leaf.clone()); - } + rusk_abi::call::( + TRANSFER_DATA_CONTRACT, + "leaves_from_pos", + &pos, + ) + .expect("leaves_from_pos2 query should succeed"); } - /// Update the root for of the tree. + /// Update the root of the tree. pub fn update_root(&mut self) { - let root = self.tree.root(); - self.roots.insert(root); + rusk_abi::call::<(), ()>(TRANSFER_DATA_CONTRACT, "update_root", &()) + .expect("update_root call should succeed"); } /// Get the root of the tree. pub fn root(&self) -> BlsScalar { - self.tree.root() + rusk_abi::call::<(), BlsScalar>(TRANSFER_DATA_CONTRACT, "root", &()) + .expect("root query should succeed") } /// Get the opening @@ -439,37 +454,46 @@ impl TransferState { &self, pos: u64, ) -> Option> { - self.tree.opening(pos) + rusk_abi::call::>>( + TRANSFER_DATA_CONTRACT, + "opening", + &pos, + ) + .expect("opening query should succeed") } /// Takes some nullifiers and returns a vector containing the ones that /// already exists in the contract pub fn existing_nullifiers( &self, - nullifiers: Vec, + nullifiers: &Vec, ) -> Vec { - nullifiers - .into_iter() - .filter_map(|n| self.nullifiers.get(&n).map(|_| n)) - .collect() + rusk_abi::call::, Vec>( + TRANSFER_DATA_CONTRACT, + "existing_nullifiers", + nullifiers, + ) + .expect("calling existing nullifiers should succeed") } /// Return the balance of a given contract. pub fn balance(&self, contract_id: &ContractId) -> u64 { - self.balances.get(contract_id).copied().unwrap_or_default() + rusk_abi::call( + TRANSFER_DATA_CONTRACT, + "get_module_balance", + contract_id, + ) + .expect("balance query should succeed") } /// Add balance to the given contract pub fn add_balance(&mut self, contract: ContractId, value: u64) { - match self.balances.entry(contract) { - Entry::Vacant(ve) => { - ve.insert(value); - } - Entry::Occupied(mut oe) => { - let v = oe.get_mut(); - *v += value - } - } + rusk_abi::call::<(ContractId, u64), ()>( + TRANSFER_DATA_CONTRACT, + "add_module_balance", + &(contract, value), + ) + .expect("add_balance call should succeed"); } pub fn message( @@ -477,24 +501,21 @@ impl TransferState { contract: &ContractId, pk: &PublicKey, ) -> Option { - let map = self.message_mapping.get(contract)?; - let message = map.get(&pk.to_bytes())?; - - Some(*message) + rusk_abi::call::<(ContractId, PublicKey), Option>( + TRANSFER_DATA_CONTRACT, + "message", + &(*contract, *pk), + ) + .expect("message call should succeed") } fn get_note(&self, pos: u64) -> Option { - self.tree.get(pos).map(|l| l.note) - } - - fn any_nullifier_exists(&self, nullifiers: &[BlsScalar]) -> bool { - for nullifier in nullifiers { - if self.nullifiers.contains(nullifier) { - return true; - } - } - - false + rusk_abi::call::>( + TRANSFER_DATA_CONTRACT, + "get_note", + &pos, + ) + .expect("get_note query should succeed") } fn take_message_from_address_key( @@ -502,15 +523,23 @@ impl TransferState { contract: &ContractId, pk: &PublicKey, ) -> Result { - self.message_mapping - .get_mut(contract) - .ok_or(Error::MessageNotFound)? - .remove(&pk.to_bytes()) - .ok_or(Error::MessageNotFound) + let message = + rusk_abi::call::<(ContractId, PublicKey), Option>( + TRANSFER_DATA_CONTRACT, + "take_message_from_address_key", + &(*contract, *pk), + ) + .expect("take_message_from_address_key call should succeed"); + message.ok_or(Error::MessageNotFound) } fn root_exists(&self, root: &BlsScalar) -> bool { - self.roots.get(root).is_some() + rusk_abi::call::( + TRANSFER_DATA_CONTRACT, + "root_exists", + root, + ) + .expect("root_exists query should succeed") } fn push_note_current_height(&mut self, note: Note) -> Note { @@ -523,21 +552,14 @@ impl TransferState { address: &ContractId, value: u64, ) -> Result<(), Error> { - match self.balances.get_mut(address) { - Some(balance) => { - let (bal, underflow) = balance.overflowing_sub(value); - - if underflow { - Err(Error::NotEnoughBalance) - } else { - *balance = bal; - - Ok(()) - } - } - - _ => Err(Error::NotEnoughBalance), - } + let result: Result, ContractError> = rusk_abi::call( + TRANSFER_DATA_CONTRACT, + "sub_balance", + &(*address, value), + ); + result + .expect("sub_balance call should succeed") + .ok_or(Error::NotEnoughBalance) } fn push_message( @@ -546,39 +568,22 @@ impl TransferState { message_address: StealthAddress, message: Message, ) { - let mut to_insert: Option> = - None; - - match self.message_mapping.get_mut(&address) { - Some(map) => { - map.insert(message_address.pk_r().to_bytes(), message); - } - - None => { - let mut map: BTreeMap<[u8; PublicKey::SIZE], Message> = - BTreeMap::default(); - map.insert(message_address.pk_r().to_bytes(), message); - to_insert.replace(map); - } - } - - if let Some(map) = to_insert { - self.message_mapping.insert(address, map); - } - - self.message_mapping_set.insert(address, message_address); + rusk_abi::call::<(ContractId, StealthAddress, Message), ()>( + TRANSFER_DATA_CONTRACT, + "push_message", + &(address, message_address, message), + ) + .expect("push_message call should succeed"); } fn take_crossover(&mut self) -> Result<(Crossover, StealthAddress), Error> { - let crossover = - self.var_crossover.take().ok_or(Error::CrossoverNotFound)?; - - let sa = self - .var_crossover_addr - .take() - .ok_or(Error::CrossoverNotFound)?; - - Ok((crossover, sa)) + let result = rusk_abi::call::<(), Option<(Crossover, StealthAddress)>>( + TRANSFER_DATA_CONTRACT, + "take_crossover", + &(), + ) + .expect("take_crossover call should succeed"); + result.ok_or(Error::CrossoverNotFound) } fn assert_proof( @@ -628,40 +633,3 @@ fn verify_tx_proof(tx: &Transaction) -> bool { .to_vec(); rusk_abi::verify_proof(vd, tx.proof.clone(), pis) } - -#[cfg(test)] -mod test_transfer { - use super::*; - - #[test] - fn find_existing_nullifiers() { - let mut transfer = TransferState::new(); - - let (zero, one, two, three, ten, eleven) = ( - BlsScalar::from(0), - BlsScalar::from(1), - BlsScalar::from(2), - BlsScalar::from(3), - BlsScalar::from(10), - BlsScalar::from(11), - ); - - let existing = transfer - .existing_nullifiers(vec![zero, one, two, three, ten, eleven]); - - assert_eq!(existing.len(), 0); - - for i in 1..10 { - transfer.nullifiers.insert(BlsScalar::from(i)); - } - - let existing = transfer - .existing_nullifiers(vec![zero, one, two, three, ten, eleven]); - - assert_eq!(existing.len(), 3); - - assert!(existing.contains(&one)); - assert!(existing.contains(&two)); - assert!(existing.contains(&three)); - } -} diff --git a/contracts/transfer/tests/transfer.rs b/contracts/transfer/tests/transfer.rs index cb2b7b16f6..3ea17d5a3a 100644 --- a/contracts/transfer/tests/transfer.rs +++ b/contracts/transfer/tests/transfer.rs @@ -19,7 +19,7 @@ use rand::{CryptoRng, RngCore, SeedableRng}; use rusk_abi::dusk::{dusk, LUX}; use rusk_abi::{ ContractData, ContractError, ContractId, Error, Session, TRANSFER_CONTRACT, - VM, + TRANSFER_DATA_CONTRACT, VM, }; use transfer_circuits::{ CircuitInput, CircuitInputSignature, DeriveKey, ExecuteCircuitOneTwo, @@ -57,6 +57,9 @@ fn instantiate( vm: &VM, psk: &PublicSpendKey, ) -> Session { + let transfer_data_bytecode = include_bytes!( + "../../../target/wasm64-unknown-unknown/release/transfer_data_contract.wasm" + ); let transfer_bytecode = include_bytes!( "../../../target/wasm64-unknown-unknown/release/transfer_contract.wasm" ); @@ -69,6 +72,14 @@ fn instantiate( let mut session = rusk_abi::new_genesis_session(vm); + session + .deploy( + transfer_data_bytecode, + ContractData::builder(OWNER).contract_id(TRANSFER_DATA_CONTRACT), + POINT_LIMIT, + ) + .expect("Deploying the transfer contract should succeed"); + session .deploy( transfer_bytecode, diff --git a/rusk-abi/src/lib.rs b/rusk-abi/src/lib.rs index 9ef908b9fc..d347231522 100644 --- a/rusk-abi/src/lib.rs +++ b/rusk-abi/src/lib.rs @@ -58,6 +58,8 @@ pub const TRANSFER_CONTRACT: ContractId = reserved(0x1); pub const STAKE_CONTRACT: ContractId = reserved(0x2); /// ID of the genesis license contract pub const LICENSE_CONTRACT: ContractId = reserved(0x3); +/// ID of the genesis transfer data contract +pub const TRANSFER_DATA_CONTRACT: ContractId = reserved(0x4); #[inline] const fn reserved(b: u8) -> ContractId { diff --git a/rusk-recovery/src/state.rs b/rusk-recovery/src/state.rs index 5e7539e3d4..bc7a113864 100644 --- a/rusk-recovery/src/state.rs +++ b/rusk-recovery/src/state.rs @@ -17,7 +17,9 @@ use rand::rngs::StdRng; use rand::SeedableRng; use rusk_abi::dusk::{dusk, Dusk}; use rusk_abi::{ContractData, ContractId, Session, VM}; -use rusk_abi::{LICENSE_CONTRACT, STAKE_CONTRACT, TRANSFER_CONTRACT}; +use rusk_abi::{ + LICENSE_CONTRACT, STAKE_CONTRACT, TRANSFER_CONTRACT, TRANSFER_DATA_CONTRACT, +}; use std::error::Error; use std::fs; use std::path::Path; @@ -204,6 +206,10 @@ fn generate_empty_state>( let vm = rusk_abi::new_vm(state_dir)?; let mut session = rusk_abi::new_genesis_session(&vm); + let transfer_data_code = include_bytes!( + "../../target/wasm64-unknown-unknown/release/transfer_data_contract.wasm" + ); + let transfer_code = include_bytes!( "../../target/wasm64-unknown-unknown/release/transfer_contract.wasm" ); @@ -216,6 +222,17 @@ fn generate_empty_state>( "../../target/wasm32-unknown-unknown/release/license_contract.wasm" ); + info!( + "{} Genesis Transfer Data Contract", + theme.action("Deploying") + ); + session.deploy( + transfer_data_code, + ContractData::builder(snapshot.owner()) + .contract_id(TRANSFER_DATA_CONTRACT), + u64::MAX, + )?; + info!("{} Genesis Transfer Contract", theme.action("Deploying")); session.deploy( transfer_code, @@ -239,13 +256,17 @@ fn generate_empty_state>( session .call::<_, ()>( - TRANSFER_CONTRACT, + TRANSFER_DATA_CONTRACT, "add_module_balance", &(STAKE_CONTRACT, 0u64), u64::MAX, ) .expect("stake contract balance to be set with provisioner stakes"); + session + .call::<_, ()>(TRANSFER_CONTRACT, "update_root", &(), u64::MAX) + .expect("stake contract balance to be set with provisioner stakes"); + session .call::<_, ()>(TRANSFER_CONTRACT, "update_root", &(), u64::MAX) .expect("root to be updated after pushing genesis note");