From 87ffa163790d6b5f31a68510d2ed95ae573624ae Mon Sep 17 00:00:00 2001 From: notV4l Date: Tue, 13 Aug 2024 23:29:23 +0200 Subject: [PATCH] merge --- Scarb.lock | 16 ++++++++-------- Scarb.toml | 2 +- crates/algebra/src/matrix.cairo | 16 ++++++++-------- crates/algebra/src/vector.cairo | 6 +++--- .../src/systems/governor/contract.cairo | 4 +++- .../governance/src/systems/governor/tests.cairo | 4 +--- crates/governance/src/utils/testing.cairo | 8 +++++--- crates/governance/src/utils/world_utils.cairo | 2 +- .../tests/token/erc20/test_erc20_balance.cairo | 4 ++-- .../tests_enumerable_mintable_burnable.cairo | 6 +++++- .../presets/erc721/tests_mintable_burnable.cairo | 5 +++++ 11 files changed, 42 insertions(+), 31 deletions(-) diff --git a/Scarb.lock b/Scarb.lock index d71d451..74e2876 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -21,44 +21,44 @@ source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79 [[package]] name = "origami_algebra" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" dependencies = [ "cubit", ] [[package]] name = "origami_defi" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" dependencies = [ "cubit", ] [[package]] name = "origami_governance" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" dependencies = [ "dojo", ] [[package]] name = "origami_map" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" [[package]] name = "origami_random" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" [[package]] name = "origami_rating" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" [[package]] name = "origami_security" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" [[package]] name = "origami_token" -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" dependencies = [ "dojo", ] diff --git a/Scarb.toml b/Scarb.toml index c177e85..1a2e004 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -11,7 +11,7 @@ members = [ ] [workspace.package] -version = "1.0.0-alpha.4" +version = "1.0.0-alpha.5" [workspace.dependencies] dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.5" } diff --git a/crates/algebra/src/matrix.cairo b/crates/algebra/src/matrix.cairo index 763ca9d..6d4e952 100644 --- a/crates/algebra/src/matrix.cairo +++ b/crates/algebra/src/matrix.cairo @@ -34,9 +34,9 @@ impl MatrixImpl< +Mul, +Div, +Add, - +AddAssign, + +AddAssign, +Sub, - +SubAssign, + +SubAssign, +Neg, +Zeroable, +Copy, @@ -162,9 +162,9 @@ impl MatrixAdd< +Mul, +Div, +Add, - +AddAssign, + +AddAssign, +Sub, - +SubAssign, + +SubAssign, +Neg, +Zeroable, +Copy, @@ -194,9 +194,9 @@ impl MatrixSub< +Mul, +Div, +Add, - +AddAssign, + +AddAssign, +Sub, - +SubAssign, + +SubAssign, +Neg, +Zeroable, +Copy, @@ -226,9 +226,9 @@ impl MatrixMul< +Mul, +Div, +Add, - +AddAssign, + +AddAssign, +Sub, - +SubAssign, + +SubAssign, +Neg, +Zeroable, +Copy, diff --git a/crates/algebra/src/vector.cairo b/crates/algebra/src/vector.cairo index 013fa68..c69e4fc 100644 --- a/crates/algebra/src/vector.cairo +++ b/crates/algebra/src/vector.cairo @@ -20,7 +20,7 @@ trait VectorTrait { fn dot(self: Vector, vector: Vector) -> T; } -impl VectorImpl, +AddAssign, +Zeroable, +Copy, +Drop,> of VectorTrait { +impl VectorImpl, +AddAssign, +Zeroable, +Copy, +Drop,> of VectorTrait { fn new(data: Span) -> Vector { Vector { data } } @@ -51,7 +51,7 @@ impl VectorImpl, +AddAssign, +Zeroable, +Copy, +Drop,> } impl VectorAdd< - T, +Mul, +AddAssign, +Add, +Zeroable, +Copy, +Drop, + T, +Mul, +AddAssign, +Add, +Zeroable, +Copy, +Drop, > of Add> { fn add(mut lhs: Vector, mut rhs: Vector) -> Vector { // [Check] Dimesions are compatible @@ -71,7 +71,7 @@ impl VectorAdd< } impl VectorSub< - T, +Mul, +AddAssign, +Sub, +Zeroable, +Copy, +Drop, + T, +Mul, +AddAssign, +Sub, +Zeroable, +Copy, +Drop, > of Sub> { fn sub(mut lhs: Vector, mut rhs: Vector) -> Vector { // [Check] Dimesions are compatible diff --git a/crates/governance/src/systems/governor/contract.cairo b/crates/governance/src/systems/governor/contract.cairo index d1dff4d..bdd234a 100644 --- a/crates/governance/src/systems/governor/contract.cairo +++ b/crates/governance/src/systems/governor/contract.cairo @@ -286,7 +286,9 @@ mod governor { let queued_tx = get!(world, (target_selector, class_hash), QueuedTransactions).queued; assert!(!queued_tx, "Governor::queue_or_revert: proposal action already queued at eta"); - let (_, timelock_addr) = world_utils::get_contract_infos(world, get!(world, self.selector(), GovernorParams).timelock); + let (_, timelock_addr) = world_utils::get_contract_infos( + world, get!(world, self.selector(), GovernorParams).timelock + ); let timelock = ITimelockDispatcher { contract_address: timelock_addr }; timelock.que_transaction(target_selector, class_hash, eta); } diff --git a/crates/governance/src/systems/governor/tests.cairo b/crates/governance/src/systems/governor/tests.cairo index f7a2898..ac31e87 100644 --- a/crates/governance/src/systems/governor/tests.cairo +++ b/crates/governance/src/systems/governor/tests.cairo @@ -126,9 +126,6 @@ fn test_queue_proposal() { let proposal = get!(world, 1, Proposals).proposal; assert!(proposal.eta == 'ts1' + DELAY * 2 + PERIOD + 1, "eta is not correct"); } - - - // TODO: update later // #[test] // fn test_execute_proposal() { @@ -167,3 +164,4 @@ fn test_queue_proposal() { // IHelloStarknetUgradedDispatcher { contract_address: systems.mock.contract_address } // .decrease_balance(1000); // } + diff --git a/crates/governance/src/utils/testing.cairo b/crates/governance/src/utils/testing.cairo index 2eef2bd..e2af4e8 100644 --- a/crates/governance/src/utils/testing.cairo +++ b/crates/governance/src/utils/testing.cairo @@ -105,8 +105,6 @@ fn setup() -> (Systems, IWorldDispatcher) { let token_selector = IContractDispatcher { contract_address: token.contract_address } .selector(); - - // let selectors = array![ // selector_from_tag!("origami_governance-GovernorParams"), // selector_from_tag!("origami_governance-ProposalParams"), @@ -139,7 +137,11 @@ fn setup() -> (Systems, IWorldDispatcher) { mock.contract_address, ]; - world_utils::grant_writer(world, array![dojo::utils::bytearray_hash(@"origami_governance")].span(), contract_addresses.span()); + world_utils::grant_writer( + world, + array![dojo::utils::bytearray_hash(@"origami_governance")].span(), + contract_addresses.span() + ); // should use constructor now systems.governor.initialize(timelock_selector, token_selector, GOVERNOR()); diff --git a/crates/governance/src/utils/world_utils.cairo b/crates/governance/src/utils/world_utils.cairo index 8f183e3..319cdb8 100644 --- a/crates/governance/src/utils/world_utils.cairo +++ b/crates/governance/src/utils/world_utils.cairo @@ -1,5 +1,5 @@ -use starknet::{ClassHash, ContractAddress}; use dojo::world::{IWorldDispatcher, IWorldDispatcherTrait}; +use starknet::{ClassHash, ContractAddress}; pub fn get_contract_infos( world: IWorldDispatcher, resource: felt252 diff --git a/crates/token/src/components/tests/token/erc20/test_erc20_balance.cairo b/crates/token/src/components/tests/token/erc20/test_erc20_balance.cairo index 6b62ec1..ebcf262 100644 --- a/crates/token/src/components/tests/token/erc20/test_erc20_balance.cairo +++ b/crates/token/src/components/tests/token/erc20/test_erc20_balance.cairo @@ -222,7 +222,7 @@ fn test_transfer_from() { assert(erc20_balance_mock.balance_of(RECIPIENT()) == VALUE, 'Should eq amount'); assert(erc20_balance_mock.balance_of(OWNER()) == SUPPLY - VALUE, 'Should eq suppy - amount'); assert(erc20_balance_mock.allowance(OWNER(), SPENDER()) == 0, 'Should eq 0'); -// assert(erc20_balance_mock.total_supply() == SUPPLY, 'Total supply should not change'); + // assert(erc20_balance_mock.total_supply() == SUPPLY, 'Total supply should not change'); } #[test] @@ -291,5 +291,5 @@ fn test_transferFrom() { assert(erc20_balance_mock.balance_of(RECIPIENT()) == VALUE, 'Should eq amount'); assert(erc20_balance_mock.balance_of(OWNER()) == SUPPLY - VALUE, 'Should eq suppy - amount'); assert(erc20_balance_mock.allowance(OWNER(), SPENDER()) == 0, 'Should eq 0'); -// assert(erc20_balance_mock.total_supply() == SUPPLY, 'Total supply should not change'); + // assert(erc20_balance_mock.total_supply() == SUPPLY, 'Total supply should not change'); } diff --git a/crates/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo b/crates/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo index 2a77b56..c34ef12 100644 --- a/crates/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo +++ b/crates/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo @@ -82,7 +82,11 @@ fn setup_uninitialized() -> (IWorldDispatcher, IERC721EnumMintBurnPresetDispatch .deploy_contract('salt', ERC721EnumMintBurn::TEST_CLASS_HASH.try_into().unwrap()) }; - world.grant_owner(dojo::utils::bytearray_hash(@"origami_token"), erc721_enum_mint_burn_dispatcher.contract_address); + world + .grant_owner( + dojo::utils::bytearray_hash(@"origami_token"), + erc721_enum_mint_burn_dispatcher.contract_address + ); world.grant_owner(dojo::utils::bytearray_hash(@"origami_token"), OWNER()); (world, erc721_enum_mint_burn_dispatcher) diff --git a/crates/token/src/presets/erc721/tests_mintable_burnable.cairo b/crates/token/src/presets/erc721/tests_mintable_burnable.cairo index 87eea31..5ae621e 100644 --- a/crates/token/src/presets/erc721/tests_mintable_burnable.cairo +++ b/crates/token/src/presets/erc721/tests_mintable_burnable.cairo @@ -85,6 +85,11 @@ fn setup_uninitialized() -> (IWorldDispatcher, IERC721MintableBurnablePresetDisp .deploy_contract('salt', ERC721MintableBurnable::TEST_CLASS_HASH.try_into().unwrap()) }; + world + .grant_owner( + dojo::utils::bytearray_hash(@"origami_token"), + erc721_mintable_burnable_dispatcher.contract_address + ); (world, erc721_mintable_burnable_dispatcher) }