-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #432 from primitivefinance/v1.4.0-beta-release-prep
Deployment addresses, audit commits, updated docs
- Loading branch information
Showing
18 changed files
with
1,844 additions
and
513 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,32 @@ | ||
| TestRMM01:testFuzz_changeParameters(uint16,uint16,uint16) (runs: 10000, μ: 363354, ~: 363518) | ||
| TestRMM01:testFuzz_createPool(uint16,uint16,uint16,uint16,uint16,uint128,uint128) (runs: 10000, μ: 201062, ~: 190373) | ||
| TestRMM01:testFuzz_fund_then_draw(uint64) (runs: 10000, μ: 640427, ~: 640432) | ||
| TestRMM01:test_allocate_balances_increase() (gas: 747698) | ||
| TestRMM01:test_allocate_does_not_modify_timestamp() (gas: 721218) | ||
| TestRMM01:test_allocate_liquidity_overflow_reverts() (gas: 333599) | ||
| TestRMM01:test_allocate_modifies_liquidity() (gas: 731248) | ||
| TestRMM01:test_allocate_non_existent_pool_reverts() (gas: 46168) | ||
| TestRMM01:test_allocate_reserves_increase() (gas: 748973) | ||
| TestRMM01:test_allocate_reserves_increase_six_decimals() (gas: 749333) | ||
| TestRMM01:test_allocate_zero_liquidity_reverts() (gas: 333596) | ||
| TestRMM01:test_changeParameters_priority_fee_success() (gas: 363537) | ||
| TestRMM01:test_claim_credits_balance_asset() (gas: 1739536) | ||
| TestRMM01:test_claim_get_balance_returns_fee_amount_asset() (gas: 1126889) | ||
| TestRMM01:test_claim_get_balance_returns_fee_amount_quote() (gas: 1267102) | ||
| TestRMM01:test_claim_position_owed_amounts_returns_zero() (gas: 1138770) | ||
| TestRMM01:test_claim_small_liquidity_does_not_steal_fees() (gas: 1835588) | ||
| TestRMM01:test_claim_succeeds() (gas: 1552908) | ||
| TestRMM01:test_createPair_fetch_pair_data_returns_token_data() (gas: 1482969) | ||
| TestRMM01:test_createPair_fetch_pair_id_returns_non_zero() (gas: 1478372) | ||
| TestRMM01:test_createPair_nonce_increments_returns_one() (gas: 1478880) | ||
| TestRMM01:test_createPair_success() (gas: 1476912) | ||
| TestRMM01:test_createPool_non_controlled_default_jit() (gas: 183374) | ||
| TestRMM01:test_deallocate_max() (gas: 900263) | ||
| TestRMM01:test_deposit_ether_balance_equals_zero() (gas: 159134) | ||
| TestRMM01:test_deposit_ether_balance_of_weth_equals_msg_value() (gas: 159696) | ||
| TestRMM01:test_deposit_increases_user_weth_balance() (gas: 167619) | ||
| TestRMM01:test_deposit_reserve_equals_msg_value() (gas: 164251) | ||
| TestRMM01:test_deposit_weth_total_supply_equals_msg_value() (gas: 161475) | ||
| TestRMM01:test_draw_max_balance() (gas: 557773) | ||
| TestRMM01:test_draw_reduces_user_balance() (gas: 557859) | ||
| TestRMM01:test_draw_weth_transfers_ether() (gas: 242314) | ||
| TestRMM01:test_fund_increases_user_balance() (gas: 482493) | ||
| TestRMM01:test_fund_max_balance() (gas: 482492) | ||
| TestRMM01:test_revert_changeParameters_invalid_fee() (gas: 348973) | ||
| TestRMM01:test_revert_changeParameters_invalid_jit() (gas: 348576) | ||
| TestRMM01:test_revert_changeParameters_not_controller() (gas: 347545) | ||
| TestRMM01:test_revert_changeParameters_priority_fee_above_max() (gas: 360133) | ||
| TestRMM01:test_revert_claim_no_position() (gas: 336074) | ||
| TestRMM01:test_revert_createPair_asset_lower_decimal_bound() (gas: 1387955) | ||
| TestRMM01:test_revert_createPair_asset_upper_decimal_bound() (gas: 1388031) | ||
| TestRMM01:test_revert_createPair_exists() (gas: 346704) | ||
| TestRMM01:test_revert_createPair_quote_lower_decimal_bound() (gas: 1388035) | ||
| TestRMM01:test_revert_createPair_quote_upper_decimal_bound() (gas: 1388111) | ||
| TestRMM01:test_revert_createPair_same_token() (gas: 699838) | ||
| TestRMM01:test_revert_createPool_above_max_pairs() (gas: 1033031) | ||
| TestRMM01:test_revert_createPool_above_max_pools() (gas: 27892) | ||
| TestRMM01:test_revert_createPool_priority_fee_invalid_fee() (gas: 65236) | ||
| TestRMM01:test_revert_createPool_zero_price() (gas: 19257) | ||
| TestRMM01:test_revert_draw_greater_than_balance() (gas: 339917) | ||
| TestRMM01:test_swap_increases_user_balance_token_out() (gas: 1107628) | ||
| TestRMM01:test_version() (gas: 6969) | ||
| TestGas:test_gas_chain_allocate_deallocate_from_portfolio_balance() (gas: 155363) | ||
| TestGas:test_gas_chain_create_allocate_from_portfolio() (gas: 460784) | ||
| TestGas:test_gas_chain_swap_allocate_from_portfolio() (gas: 327801) | ||
| TestGas:test_gas_chain_swap_deallocate_create_allocate_from_portfolio() (gas: 470302) | ||
| TestGas:test_gas_create_pool_allocate_transfer_from_wallet() (gas: 460492) | ||
| TestGas:test_gas_multi_allocate_10() (gas: 853389) | ||
| TestGas:test_gas_multi_allocate_100() (gas: 7461628) | ||
| TestGas:test_gas_multi_allocate_2() (gas: 395302) | ||
| TestGas:test_gas_multi_allocate_25() (gas: 1769294) | ||
| TestGas:test_gas_multi_allocate_2_pairs() (gas: 515736) | ||
| TestGas:test_gas_multi_allocate_5() (gas: 564596) | ||
| TestGas:test_gas_multi_allocate_50() (gas: 3460599) | ||
| TestGas:test_gas_multi_create_pool_100() (gas: 264444) | ||
| TestGas:test_gas_multi_deallocate_10() (gas: 448246) | ||
| TestGas:test_gas_multi_deallocate_100() (gas: 4156306) | ||
| TestGas:test_gas_multi_deallocate_2() (gas: 264442) | ||
| TestGas:test_gas_multi_deallocate_25() (gas: 857111) | ||
| TestGas:test_gas_multi_deallocate_2_pool_2_pair() (gas: 365064) | ||
| TestGas:test_gas_multi_deallocate_5() (gas: 330573) | ||
| TestGas:test_gas_multi_deallocate_50() (gas: 1724360) | ||
| TestGas:test_gas_multi_swap_10() (gas: 1100287) | ||
| TestGas:test_gas_multi_swap_100() (gas: 12966986) | ||
| TestGas:test_gas_multi_swap_2() (gas: 389117) | ||
| TestGas:test_gas_multi_swap_25() (gas: 2788271) | ||
| TestGas:test_gas_multi_swap_5() (gas: 641773) | ||
| TestGas:test_gas_multi_swap_50() (gas: 5859558) | ||
| TestGas:test_gas_single_allocate() (gas: 339512) | ||
| TestGas:test_gas_single_allocate_from_portfolio_balance() (gas: 339459) | ||
| TestGas:test_gas_single_deallocate() (gas: 244731) | ||
| TestGas:test_gas_single_swap() (gas: 307095) | ||
| TestGas:test_gas_single_swap_from_portfolio_balance() (gas: 305376) | ||
| TestGas:test_gas_single_swap_from_wallet() (gas: 307011) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| pragma solidity ^0.8.4; | ||
|
|
||
| import "./interfaces/IERC20.sol"; | ||
| import "./interfaces/IPortfolioRegistry.sol"; | ||
| import "solmate/auth/Owned.sol"; | ||
|
|
||
| interface PortfolioLike { | ||
| function setProtocolFee(uint256) external; | ||
| function claimFee(address, uint256) external; | ||
| } | ||
|
|
||
| /// @dev Basic registry with a single owner. | ||
| contract PortfolioRegistry is IPortfolioRegistry, Owned { | ||
| constructor(address owner_) Owned(owner_) { } | ||
|
|
||
| function controller() external view returns (address) { | ||
| return owner; | ||
| } | ||
|
|
||
| function setFee(address portfolio, uint256 fee) external onlyOwner { | ||
| PortfolioLike(portfolio).setProtocolFee(fee); | ||
| } | ||
|
|
||
| function claimFee( | ||
| address portfolio, | ||
| address token, | ||
| uint256 amount | ||
| ) public onlyOwner { | ||
| PortfolioLike(portfolio).claimFee(token, amount); | ||
| } | ||
|
|
||
| function withdraw(address token, uint256 amount) external onlyOwner { | ||
| require(amount > 0, "SimpleRegistry/invalid-amount"); | ||
| require( | ||
| IERC20(token).transfer(msg.sender, amount), | ||
| "SimpleRegistry/transfer-failed" | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.