feat: protocol fee #228
Open
feat: protocol fee #228
Conversation
This file contains hidden or 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
- changes balance from uint256 -> uint128 so that entire Balance can be read or written with a single operation - moves Lock to library - simplifies lock checks
- removes RequestCancelled event, which was not great anyway because it is not emitted at the moment that the request is cancelled
- move all collateral calculatons to separate library
so that they can no longer be transfered within the vault
This state is no longer necessary, vault ensures that payouts happen only once. Hosts could bypass this state anyway by withdrawing from the vault directly.
- changes to marketplace constructor - we no longer have _marketplaceTotals - timestamps have their own type now - freeSlot no longer takes payout addresses - slot state 'Paid' no longer exists - freeSlot can be invoked more than once now - a failed request no longer ends immediately
No need to test the token itself
It is no longer a discount on the collateral, to simplify reasoning about collateral in the sales module of the codex node
markspanbroek
force-pushed
the
vault-integration
branch
from
b865da4 to
53679b4
Compare
markspanbroek
force-pushed
the
vault-integration
branch
from
53679b4 to
cfd30bf
Compare
emizzle
approved these changes
Mar 26, 2025
Comment on lines
+17
to
+21
| function maxPriceWithProtocolFee(request, config) { | ||
| return maxPrice(request) + protocolFee(request, config) | ||
| } | ||
|
|
||
| function maxPriceWithProtocolFee(request, config) { |
There was a problem hiding this comment.
Do these functions not have the exact same signature?
| @@ -149,6 +156,8 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian { | |||
| TokensPerSecond pricePerSecond = request.ask.pricePerSecond(); | |||
| uint128 price = pricePerSecond.accumulate(request.ask.duration); | |||
|
|
|||
| _collectProtocolFee(request.client, request.ask); | |||
There was a problem hiding this comment.
I'm assuming this function and _transferToVault(request.client, fund, account, price); would revert with "insufficient funds" if the user does not have enough funds to cover both the fee and the price?
| ) | ||
| }) | ||
|
|
||
| it("is not returned when request is cancelled", async function () { |
There was a problem hiding this comment.
Maybe we should add a similar test for failed? Since now I believe with the Vault the client gets refunded if the request fails...
2-towns
reviewed
Mar 27, 2025
| const startBalance = await token.balanceOf(client.address) | ||
| await marketplace.withdrawFunds(slot.request) | ||
| const endBalance = await token.balanceOf(client.address) | ||
| expect(endBalance - startBalance).to.equal( |
There was a problem hiding this comment.
Why we do not check the dead balance here ?
markspanbroek
force-pushed
the
vault-integration
branch
from
cfd30bf to
8a11e87
Compare
|
@AuHau let's get this updated so we can merge it please? |
|
It is based on Vault integration, which is not merged in yet so pretty pointless to update... 😉 |
|
But the Vault work was merged, no? |
|
Well yes and no ;-) |
markspanbroek
force-pushed
the
vault-integration
branch
from
55fb29f to
0bdefa7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #186
Based on the Vault integration worked.