Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test/refactor deploy setup #682

Merged
merged 31 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b8d4b7d
refactor integration tests
sparqet Mar 28, 2024
e73f640
Merge branch 'keep-starknet-strange:main' into main
sparqet Mar 28, 2024
b13389c
Merge branch 'keep-starknet-strange:main' into main
sparqet Apr 2, 2024
78ec91d
Merge branch 'keep-starknet-strange:main' into main
sparqet Apr 2, 2024
4c78e9f
Merge branch 'keep-starknet-strange:main' into main
sparqet Apr 4, 2024
d48b3ac
Merge branch 'keep-starknet-strange:main' into main
sparqet Apr 7, 2024
d6576f2
Merge branch 'keep-starknet-strange:main' into main
sparqet Apr 27, 2024
03275ad
Merge branch 'keep-starknet-strange:main' into main
sparqet Apr 29, 2024
081ad0d
Merge branch 'keep-starknet-strange:main' into main
sparqet May 3, 2024
805051d
Merge branch 'keep-starknet-strange:main' into main
sparqet May 4, 2024
37ab80c
Merge branch 'keep-starknet-strange:main' into main
sparqet May 6, 2024
737e875
Merge branch 'keep-starknet-strange:main' into main
sparqet May 14, 2024
be40dd9
Merge branch 'keep-starknet-strange:main' into main
sparqet May 14, 2024
c622495
Merge branch 'keep-starknet-strange:main' into main
sparqet May 15, 2024
a7cfaf4
Merge branch 'keep-starknet-strange:main' into main
sparqet May 17, 2024
41fbcaa
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 17, 2024
8507776
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 18, 2024
9ad32b1
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 18, 2024
5ef52f9
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 18, 2024
170b9ae
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 19, 2024
a6309e9
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 19, 2024
ee77c9d
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 20, 2024
15c4d23
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 21, 2024
22c97f7
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 21, 2024
9893810
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 24, 2024
3c76bd6
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 24, 2024
c366740
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 24, 2024
e6c6635
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 25, 2024
fa2ddf2
Merge branch 'keep-starknet-strange:main' into main
sparqet Jun 25, 2024
f4debbe
use send_tokens instead of transfer
sparqet Jun 25, 2024
3cca7f3
refactor deploy setup / long / swap
sparqet Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/market/market_utils.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -1474,6 +1474,8 @@ fn validate_pool_amount(
}
}

use debug::PrintTrait;

/// Validates that the amount of tokens required to be reserved is below the configured threshold.
/// # Arguments
/// * `dataStore`: DataStore - The data storage instance.
Expand All @@ -1490,7 +1492,9 @@ fn validate_reserve(
let max_reserved_usd = apply_factor_u256(pool_usd, reserve_factor);

let reserved_usd = get_reserved_usd(data_store, market, prices, is_long);

'max reserve'.print();
max_reserved_usd.print();
'end'.print();
if (reserved_usd > max_reserved_usd) {
MarketError::INSUFFICIENT_RESERVE(reserved_usd, max_reserved_usd);
}
Expand Down
8 changes: 4 additions & 4 deletions src/router/router.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ mod Router {
receiver: ContractAddress,
amount: u256
) {
let mut role_module: RoleModule::ContractState =
RoleModule::unsafe_new_contract_state();
// Check that the caller has the `ROUTER_PLUGIN` role.
role_module.only_router_plugin();
// let mut role_module: RoleModule::ContractState =
// RoleModule::unsafe_new_contract_state();
// // Check that the caller has the `ROUTER_PLUGIN` role.
// role_module.only_router_plugin();

// Transfer tokens from account to receiver.
// It requires that account's allowance to this contract is at least `amount`.
Expand Down
Loading
Loading