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.

Sign up for GitHub

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

feat: pack PortfolioPosition struct #254

Merged
merged 4 commits into from
Mar 8, 2023
Merged

feat: pack PortfolioPosition struct #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f901ed
chore: pack `PortfolioPosition` struct
TomAFrench Mar 6, 2023
75f299e
chore: update gas snapshot
TomAFrench Mar 6, 2023
659b7d9
Merge branch 'main' into struct-packing
TomAFrench Mar 8, 2023
adf2cb2
Merge branch 'main' into struct-packing
clemlak Mar 8, 2023
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
64 changes: 32 additions & 32 deletions .gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
TestRMM01:testFuzz_changeParameters(uint16,uint16,uint16) (runs: 10000, μ: 363353, ~: 363518)
TestRMM01:testFuzz_createPool(uint16,uint16,uint16,uint16,uint16,uint128,uint128) (runs: 10000, μ: 201124, ~: 190438)
TestRMM01:testFuzz_fund_then_draw(uint64) (runs: 10000, μ: 640450, ~: 640455)
TestRMM01:test_allocate_balances_increase() (gas: 765258)
TestRMM01:test_allocate_does_not_modify_timestamp() (gas: 738778)
TestRMM01:test_allocate_liquidity_overflow_reverts() (gas: 333599)
TestRMM01:test_allocate_modifies_liquidity() (gas: 748843)
TestRMM01:test_allocate_non_existent_pool_reverts() (gas: 46168)
TestRMM01:test_allocate_reserves_increase() (gas: 766533)
TestRMM01:test_allocate_reserves_increase_six_decimals() (gas: 766893)
TestRMM01:test_allocate_zero_liquidity_reverts() (gas: 333596)
TestRMM01:test_changeParameters_priority_fee_success() (gas: 363537)
TestRMM01:test_claim_credits_balance_asset() (gas: 1774764)
TestRMM01:test_claim_get_balance_returns_fee_amount_asset() (gas: 1162020)
TestRMM01:test_claim_get_balance_returns_fee_amount_quote() (gas: 1302233)
TestRMM01:test_claim_position_owed_amounts_returns_zero() (gas: 1173936)
TestRMM01:test_claim_small_liquidity_does_not_steal_fees() (gas: 1888245)
TestRMM01:test_claim_succeeds() (gas: 1588068)
TestRMM01:testFuzz_changeParameters(uint16,uint16,uint16) (runs: 10000, μ: 363403, ~: 363569)
TestRMM01:testFuzz_createPool(uint16,uint16,uint16,uint16,uint16,uint128,uint128) (runs: 10000, μ: 201103, ~: 190508)
TestRMM01:testFuzz_fund_then_draw(uint64) (runs: 10000, μ: 640777, ~: 640781)
TestRMM01:test_allocate_balances_increase() (gas: 748403)
TestRMM01:test_allocate_does_not_modify_timestamp() (gas: 721923)
TestRMM01:test_allocate_liquidity_overflow_reverts() (gas: 333650)
TestRMM01:test_allocate_modifies_liquidity() (gas: 731953)
TestRMM01:test_allocate_non_existent_pool_reverts() (gas: 46164)
TestRMM01:test_allocate_reserves_increase() (gas: 749678)
TestRMM01:test_allocate_reserves_increase_six_decimals() (gas: 750038)
TestRMM01:test_allocate_zero_liquidity_reverts() (gas: 333647)
TestRMM01:test_changeParameters_priority_fee_success() (gas: 363588)
TestRMM01:test_claim_credits_balance_asset() (gas: 1759736)
TestRMM01:test_claim_get_balance_returns_fee_amount_asset() (gas: 1145909)
TestRMM01:test_claim_get_balance_returns_fee_amount_quote() (gas: 1286120)
TestRMM01:test_claim_position_owed_amounts_returns_zero() (gas: 1157790)
TestRMM01:test_claim_small_liquidity_does_not_steal_fees() (gas: 1855273)
TestRMM01:test_claim_succeeds() (gas: 1572544)
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: 917955)
TestRMM01:test_createPool_non_controlled_default_jit() (gas: 183425)
TestRMM01:test_deallocate_max() (gas: 901011)
TestRMM01:test_deposit_ether_balance_equals_zero() (gas: 159157)
TestRMM01:test_deposit_ether_balance_of_weth_equals_msg_value() (gas: 159720)
TestRMM01:test_deposit_increases_user_weth_balance() (gas: 167642)
TestRMM01:test_deposit_reserve_equals_msg_value() (gas: 164274)
TestRMM01:test_deposit_weth_total_supply_equals_msg_value() (gas: 161498)
TestRMM01:test_draw_max_balance() (gas: 557796)
TestRMM01:test_draw_reduces_user_balance() (gas: 557882)
TestRMM01:test_draw_weth_transfers_ether() (gas: 242337)
TestRMM01:test_fund_increases_user_balance() (gas: 482522)
TestRMM01:test_fund_max_balance() (gas: 482521)
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: 336051)
TestRMM01:test_draw_max_balance() (gas: 558123)
TestRMM01:test_draw_reduces_user_balance() (gas: 558208)
TestRMM01:test_draw_weth_transfers_ether() (gas: 242623)
TestRMM01:test_fund_increases_user_balance() (gas: 482573)
TestRMM01:test_fund_max_balance() (gas: 482572)
TestRMM01:test_revert_changeParameters_invalid_fee() (gas: 349024)
TestRMM01:test_revert_changeParameters_invalid_jit() (gas: 348627)
TestRMM01:test_revert_changeParameters_not_controller() (gas: 347596)
TestRMM01:test_revert_changeParameters_priority_fee_above_max() (gas: 360184)
TestRMM01:test_revert_claim_no_position() (gas: 336125)
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: 346771)
Expand All @@ -47,6 +47,6 @@ TestRMM01:test_revert_createPool_above_max_pairs() (gas: 1033098)
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: 1142744)
TestRMM01:test_revert_draw_greater_than_balance() (gas: 339968)
TestRMM01:test_swap_increases_user_balance_token_out() (gas: 1126648)
TestRMM01:test_version() (gas: 6969)
5 changes: 2 additions & 3 deletions contracts/PortfolioLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,9 @@ struct PortfolioPool {
PortfolioPair pair; // Token pair data.
}

// todo: optimize slot
struct PortfolioPosition {
uint128 freeLiquidity;
uint256 lastTimestamp;
uint32 lastTimestamp;
uint256 invariantGrowthLast;
uint256 feeGrowthAssetLast;
uint256 feeGrowthQuoteLast;
Expand Down Expand Up @@ -199,7 +198,7 @@ function changePositionLiquidity(
uint256 timestamp,
int128 liquidityDelta
) {
self.lastTimestamp = timestamp;
self.lastTimestamp = uint32(timestamp);
self.freeLiquidity = AssemblyLib.addSignedDelta(
self.freeLiquidity,
liquidityDelta
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IPortfolio.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ interface IPortfolioGetters {
view
returns (
uint128 freeLiquidity,
uint256 lastTimestamp,
uint32 lastTimestamp,
uint256 invariantGrowthLast,
uint256 feeGrowthAssetLast,
uint256 feeGrowthQuoteLast,
Expand Down