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

ProtocolFeeSplitter factory default #2133

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0d785e1
feat: add clearRevenueSharingFeePercentage, to revert to default reve…
EndymionJkb Dec 10, 2022
5075320
test: add tests for new feature; refactor generally
EndymionJkb Dec 10, 2022
1d31839
feat: add PoolRevenueShareCleared event
EndymionJkb Dec 10, 2022
7de3061
feat: add factory-specific default revenue share overrides
EndymionJkb Dec 10, 2022
250493b
feat: add getter for factory override
EndymionJkb Dec 10, 2022
5683f06
feat: add tests for factory overrides
EndymionJkb Dec 10, 2022
26e718a
refactor: remove double event
EndymionJkb Dec 10, 2022
d2a1273
Merge branch 'splitter-sentinel' into splitter-factory-default
EndymionJkb Dec 10, 2022
acfdfb0
lint
EndymionJkb Dec 10, 2022
0ac6a66
Merge branch 'splitter-sentinel' into splitter-factory-default
EndymionJkb Dec 10, 2022
6216495
lint
EndymionJkb Dec 10, 2022
722bcc2
Merge branch 'master' into splitter-factory-default
EndymionJkb Dec 13, 2022
64e4bfd
fix: merge conflict on comment
EndymionJkb Dec 13, 2022
c8845d2
fix: remove duplicated comment
EndymionJkb Dec 13, 2022
76e3585
Merge branch 'master' into splitter-factory-default
EndymionJkb Dec 13, 2022
646cc3d
Merge branch 'master' into splitter-beneficiary
EndymionJkb Dec 13, 2022
e272489
fix: merge conflict
EndymionJkb Dec 13, 2022
20a8da6
Merge branch 'master' into splitter-factory-default
EndymionJkb Jan 2, 2023
bfd9882
Merge branch 'master' into splitter-factory-default
EndymionJkb Jan 4, 2023
ee8bfd6
Merge branch 'master' into splitter-factory-default
EndymionJkb Jan 4, 2023
8ff3aa2
Merge branch 'master' into splitter-factory-default
EndymionJkb Jan 6, 2023
e95ce3d
Merge branch 'master' into splitter-factory-default
EndymionJkb Feb 15, 2023
1b72dfd
Merge branch 'master' into splitter-factory-default
EndymionJkb Feb 24, 2023
13e11fe
Merge branch 'master' into splitter-factory-default
EndymionJkb Mar 6, 2023
0b910d9
Merge branch 'master' into splitter-factory-default
EndymionJkb Mar 12, 2023
f07c49b
fix: adjust global permission signature
EndymionJkb Mar 12, 2023
53891fe
Merge branch 'master' into splitter-factory-default
EndymionJkb Mar 22, 2023
dd1568e
fix: adjust test for create2
EndymionJkb Mar 22, 2023
b5da1b9
Merge branch 'master' into splitter-factory-default
EndymionJkb Apr 15, 2023
a7498b7
Merge branch 'master' into splitter-factory-default
EndymionJkb Apr 25, 2023
b9b526f
Merge branch 'master' into splitter-factory-default
EndymionJkb Jun 9, 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
Prev Previous commit
Next Next commit
feat: add PoolRevenueShareCleared event
EndymionJkb committed Dec 10, 2022
commit 1d31839f450afd4aff14843e8da9946104e1c9b1
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ interface IProtocolFeeSplitter {
);

event PoolRevenueShareChanged(bytes32 indexed poolId, uint256 revenueSharePercentage);
event PoolRevenueShareCleared(bytes32 indexed poolId);
event PoolBeneficiaryChanged(bytes32 indexed poolId, address newBeneficiary);
event DefaultRevenueSharingFeePercentageChanged(uint256 revenueSharePercentage);
event TreasuryChanged(address newTreasury);
1 change: 1 addition & 0 deletions pkg/standalone-utils/contracts/ProtocolFeeSplitter.sol
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@ contract ProtocolFeeSplitter is IProtocolFeeSplitter, Authentication {
function clearRevenueSharingFeePercentage(bytes32 poolId) external override authenticate {
_poolSettings[poolId].overrideSet = false;

emit PoolRevenueShareCleared(poolId);
emit PoolRevenueShareChanged(poolId, _defaultRevenueSharingFeePercentage);
}

4 changes: 3 additions & 1 deletion pkg/standalone-utils/test/ProtocolFeeSplitter.test.ts
Original file line number Diff line number Diff line change
@@ -280,10 +280,12 @@ describe('ProtocolFeeSplitter', function () {
});

describe('disable revenue sharing', () => {
it('emits a PoolRevenueShareChanged event', async () => {
it('emits PoolRevenueShareCleared and PoolRevenueShareChanged events', async () => {
const receipt = await (
await protocolFeeSplitter.connect(admin).clearRevenueSharingFeePercentage(poolId)
).wait();

expectEvent.inReceipt(receipt, 'PoolRevenueShareCleared', { poolId });
expectEvent.inReceipt(receipt, 'PoolRevenueShareChanged', {
poolId,
revenueSharePercentage: defaultRevenueShare,