Skip to content

Commit

Permalink
Merge branch 'feature/swap-update' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
KONFeature committed Aug 31, 2023
2 parents 96547a3 + 2b522c8 commit 033cfc0
Show file tree
Hide file tree
Showing 20 changed files with 664 additions and 384 deletions.
43 changes: 22 additions & 21 deletions .gas-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ ContentPoolTest:test_fail_InitTwice() (gas: 15855)
ContentPoolTest:test_fail_addReward_ContractPaused() (gas: 44773)
ContentPoolTest:test_fail_addReward_NoReward() (gas: 30849)
ContentPoolTest:test_fail_addReward_NotAuthorized() (gas: 15442)
ContentPoolTest:test_fullProcess() (gas: 199323)
ContentPoolTest:test_fullProcess() (gas: 200143)
ContentPoolTest:test_transferFraktion() (gas: 858926)
ErrorGasUsageTest:testFail_RevertWithError() (gas: 5419)
ErrorGasUsageTest:testFail_RevertWithErrorAssembly() (gas: 5363)
ErrorGasUsageTest:testFail_RevertWithString() (gas: 5451)
EventGasUsageTest:test_event() (gas: 7243)
EventGasUsageTest:test_eventAssembly() (gas: 7183)
FrakTreasuryWalletTest:testFuzz_multicall(uint256,address,address) (runs: 2048, μ: 172940, ~: 173740)
FrakTreasuryWalletTest:testFuzz_transfer(address,uint96) (runs: 2048, μ: 143373, ~: 143100)
FrakTreasuryWalletTest:testFuzz_transferBatch(address,uint96) (runs: 2048, μ: 144830, ~: 144557)
FrakTreasuryWalletTest:testFuzz_multicall(uint256,address,address) (runs: 2048, μ: 172897, ~: 173740)
FrakTreasuryWalletTest:testFuzz_transfer(address,uint96) (runs: 2048, μ: 143377, ~: 143100)
FrakTreasuryWalletTest:testFuzz_transferBatch(address,uint96) (runs: 2048, μ: 144834, ~: 144557)
FrakTreasuryWalletTest:test_fail_initialize_CantInitTwice() (gas: 15876)
FrakTreasuryWalletTest:test_fail_multicall_NotAuthorized() (gas: 21060)
FrakTreasuryWalletTest:test_fail_transferBatch_ContractPaused() (gas: 43432)
Expand Down Expand Up @@ -40,9 +41,9 @@ FraktionTokensTest:test_fail_mint_NotAuthorized() (gas: 15570)
FraktionTokensTest:test_mint() (gas: 49772)
FraktionTokensTest:test_mintNewContent() (gas: 152698)
FraktionTokensTest:test_transfer() (gas: 113412)
FrkTokenL2Test:invariant_metadata() (runs: 256, calls: 3840, reverts: 3308)
FrkTokenL2Test:invariant_supplyCap() (runs: 256, calls: 3840, reverts: 3290)
FrkTokenL2Test:testFuzz_mint(uint256) (runs: 2048, μ: 65635, ~: 68609)
FrkTokenL2Test:invariant_metadata() (runs: 256, calls: 3840, reverts: 3302)
FrkTokenL2Test:invariant_supplyCap() (runs: 256, calls: 3840, reverts: 3287)
FrkTokenL2Test:testFuzz_mint(uint256) (runs: 2048, μ: 65596, ~: 68609)
FrkTokenL2Test:testFuzz_transfer(address,uint256) (runs: 2048, μ: 73360, ~: 76781)
FrkTokenL2Test:test_approve_increase_decrease() (gas: 49570)
FrkTokenL2Test:test_balanceOf() (gas: 55824)
Expand All @@ -54,17 +55,17 @@ FrkTokenL2Test:test_fail_initialize_CantInitTwice() (gas: 15898)
FrkTokenL2Test:test_fail_mint_Addr0() (gas: 23001)
FrkTokenL2Test:test_fail_mint_NotMinter() (gas: 15681)
FrkTokenL2Test:test_fail_mint_TooLarge() (gas: 22838)
FrkTokenL2Test:test_fail_permit_InvalidAddress() (gas: 44482)
FrkTokenL2Test:test_fail_permit_InvalidSigner() (gas: 44272)
FrkTokenL2Test:test_fail_permit_InvalidAddress() (gas: 44471)
FrkTokenL2Test:test_fail_permit_InvalidSigner() (gas: 44261)
FrkTokenL2Test:test_fail_permit_PermitDelayExpired() (gas: 18484)
FrkTokenL2Test:test_fail_transfer_InvalidAddress() (gas: 68746)
FrkTokenL2Test:test_fail_transfer_NotEnoughBalance() (gas: 68938)
FrkTokenL2Test:test_name() (gas: 14755)
FrkTokenL2Test:test_permit() (gas: 69813)
FrkTokenL2Test:test_permit() (gas: 69802)
FrkTokenL2Test:test_symbol() (gas: 14796)
FrkTokenL2Test:test_totalSupply() (gas: 55308)
FrkTokenL2Test:test_transfer() (gas: 83142)
FrkTokenL2Test:test_transferFrom(uint256) (runs: 2048, μ: 90499, ~: 94316)
FrkTokenL2Test:test_transferFrom(uint256) (runs: 2048, μ: 90524, ~: 94316)
IsZeroGasUsageTest:test_isZero() (gas: 5440)
IsZeroGasUsageTest:test_isZeroAssembly() (gas: 5419)
LoopUsageTest:test() (gas: 15621)
Expand All @@ -78,21 +79,21 @@ MinterTest:test_fail_increaseSupply_ContractPaused() (gas: 44811)
MinterTest:test_fail_increaseSupply_NotAuthorized() (gas: 15536)
MinterTest:test_fail_increaseSupply_RemainingSupply() (gas: 285155)
MinterTest:test_fail_increaseSupply_SupplyUpdateNotAllowed() (gas: 288632)
MinterTest:test_fail_mintFractionForUser_InvalidSigner() (gas: 414564)
MinterTest:test_fail_mintFractionForUser_InvalidSigner() (gas: 414553)
MinterTest:test_fail_mintFraktionForUser_ContractPaused() (gas: 402386)
MinterTest:test_fail_mintFraktionForUser_InsuficiantSupply() (gas: 448810)
MinterTest:test_fail_mintFraktionForUser_InsuficiantSupply() (gas: 448799)
MinterTest:test_fail_mintFraktionForUser_InvalidFraktionType() (gas: 383555)
MinterTest:test_fail_mintFraktionForUser_NotAuthorized() (gas: 378904)
MinterTest:test_fail_mintFraktion_ContractPaused() (gas: 401832)
MinterTest:test_fail_mintFraktion_TooManyFraktion() (gas: 481354)
MinterTest:test_fail_mintFraktion_TooManyFraktion() (gas: 481343)
MinterTest:test_fail_mintFreeFraktionForUser_AlreadyHaveFreeFraktion() (gas: 337978)
MinterTest:test_fail_mintFreeFraktionForUser_ContractPaused() (gas: 44913)
MinterTest:test_fail_mintFreeFraktionForUser_ExpectingOnlyFreeFraktion() (gas: 303290)
MinterTest:test_fail_mintFreeFraktionForUser_NotAuthorized() (gas: 15637)
MinterTest:test_fail_multicall_NotAuthorized() (gas: 22840)
MinterTest:test_increaseSupply() (gas: 306392)
MinterTest:test_mintFraktion() (gas: 478281)
MinterTest:test_mintFraktionForUser() (gas: 478835)
MinterTest:test_mintFraktion() (gas: 478270)
MinterTest:test_mintFraktionForUser() (gas: 478824)
MinterTest:test_mintFreeFraktionForUser() (gas: 334215)
MinterTest:test_multicall() (gas: 1270178)
MultiVestingWalletsTest:test_availableReserve() (gas: 89161)
Expand Down Expand Up @@ -121,10 +122,10 @@ MultiVestingWalletsTest:test_name() (gas: 12064)
MultiVestingWalletsTest:test_symbol() (gas: 12073)
MultiVestingWalletsTest:test_transfer() (gas: 226663)
MultiVestingWalletsTest:test_transferAvailableReserve() (gas: 98509)
RewarderPayTest:testFuzz_payUser(uint16) (runs: 2048, μ: 202474, ~: 202740)
RewarderPayTest:testFuzz_payUser_WithFraktions(uint16) (runs: 2048, μ: 803921, ~: 804192)
RewarderPayTest:testFuzz_payUser_WithFraktionsAndLoadOfState(uint16) (runs: 2048, μ: 3063281, ~: 3063549)
RewarderPayTest:testFuzz_payUser_WithFraktions_ClaimRewards(uint16) (runs: 2048, μ: 862247, ~: 862497)
RewarderPayTest:testFuzz_payUser(uint16) (runs: 2048, μ: 202481, ~: 202740)
RewarderPayTest:testFuzz_payUser_WithFraktions(uint16) (runs: 2048, μ: 806063, ~: 806338)
RewarderPayTest:testFuzz_payUser_WithFraktionsAndLoadOfState(uint16) (runs: 2048, μ: 3074002, ~: 3074279)
RewarderPayTest:testFuzz_payUser_WithFraktions_ClaimRewards(uint16) (runs: 2048, μ: 864763, ~: 865012)
RewarderPayTest:test_fail_payCreatorDirectlyBatch_ContractPaused() (gas: 111777)
RewarderPayTest:test_fail_payCreatorDirectlyBatch_EmptyAmount() (gas: 87549)
RewarderPayTest:test_fail_payCreatorDirectlyBatch_InvalidArray() (gas: 85953)
Expand All @@ -145,7 +146,7 @@ RewarderPayTest:test_fail_payUser_TooLargeArray() (gas: 89512)
RewarderPayTest:test_payCreatorDirectlyBatch() (gas: 145597)
RewarderPayTest:test_payUser() (gas: 192709)
RewarderPayTest:test_payUserDirectly() (gas: 114246)
RewarderPayTest:test_payUser_LargeReward() (gas: 799519)
RewarderPayTest:test_payUser_LargeReward() (gas: 801665)
RewarderTest:test_fail_InitTwice() (gas: 16263)
RewarderTest:test_fail_multicall_NotAuthorized() (gas: 168325)
RewarderTest:test_fail_updateContentBadge_BadgeCapReached() (gas: 168150)
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ url = https://github.com/foundry-rs/forge-std
[submodule "lib/solady"]
path = lib/solady
url = https://github.com/vectorized/solady
[submodule "lib/singleton-swapper"]
path = lib/singleton-swapper
url = https://github.com/frak-id/singleton-swapper
[submodule "lib/swap-pool"]
path = lib/swap-pool
url = https://github.com/frak-id/swap-pool
Loading

0 comments on commit 033cfc0

Please sign in to comment.