[SC-809]: Feature: FM_BC_BondingSurface_Redeemable_Repayer_Seizable_v1 by Zitzak · Pull Request #666 · InverterNetwork/contracts

Zitzak · 2024-10-01T08:44:16Z

No description provided.

linear · 2024-10-01T08:44:19Z

SC-809 Task: Topos FM

…work/contracts into sc-213-reserve-vault

- Internal function to modifier - Trailing underscore to parameters - Gherkin to test - Cleaned up tests

…nding-manager

…anager

…nding-manager

marvinkruse · 2024-10-08T19:25:04Z

Regarding the failing CI test

Failing tests:
Encountered 1 failing test in test/modules/fundingManager/bondingCurve/FM_BC_BondingSurface_Redeeming_Restricted_Repayer_Seizable_v1.t.sol:FM_BC_BondingSurface_Redeeming_Restricted_Repayer_Seizable_v1Test
[FAIL: Module__InvalidAddress(); counterexample: calldata=0xfb2c297c00000000000000000000000003a6a84cd762d9707a21605b548aaab891562aab args=[0x03A6a84cD762D9707A21605b548aaaB891562aAb]] testSetTokenVault_worksGivenAddressIsNotZero(address) (runs: 676, μ: 18886, ~: 18886)

Encountered a total of 1 failing tests, 902 tests succeeded

I encountered this one before I started, so I don't think I introduced it, but who knows :D To me it looks like the test just assumes that any calls where newVault != address(0) will succeed, but the implementation actually also rejects any calls where newVault == address(this). So I assume the case that occurred here should be exactly that.

Edit:
Resolved this, should be fine now.

Was mismatched with implementation, didn't cover the address(this) case.

marvinkruse

Approved to be merged into feature branch, where it will be finalized

@dev

* [SC-213] Feat: Reserve Vault (#665) * Create Reservepool Contract * Rename and adapt * Create FM_EXT_ReservePool_v1.t.sol * Rename to TokenVault * Adapt to not send native token * Address comments * Add: - Internal function to modifier - Trailing underscore to parameters - Gherkin to test - Cleaned up tests * Update FM_EXT_TokenVault_v1.t.sol --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> Co-authored-by: Marvin <43185740+Zitzak@users.noreply.github.com> * Chore: Clean up TokenVault * Feat: Add FM_BC_BondingSurface_Redeemable_Repayer_Seizable_v1 (#666) * Create Reservepool Contract * Rename and adapt * Create FM_EXT_ReservePool_v1.t.sol * Topos FM * remove liquidity vault controller contracts * Rename to TokenVault * Adapt to not send native token * Rename to Token Vault * Address comments * Outcomment Burn tests for now * Create setTokenVault * Fix most Burn functions * AddSpentAllowance to ERC20Issuance * Add _spendAllowance to BondingCurveBase * Add _spendAllowance to BurnIssuanceFor * Fix Dependency Issue * Rename Redeemable to Redeeming * Create FM_BC_BondingSurface_Redeeming_v1.sol * WIP * Add: - Internal function to modifier - Trailing underscore to parameters - Gherkin to test - Cleaned up tests * restructure contracts * Add tag for testing file split * Setup seperate Tests * Update Base BondingSurface test * Rename Mock * Remove Tests that are included in the base contract * Remove parameters from BondingSurface Struct * Go over comments * Address comments * Address Comments * Adapt Naming of events * Adding Restricted to the name * Update comments * resolve comments in implementations * Fix: Finalize moving of error into funding manager base * Fix: Typos in ERC20Issuance * Chore: Start cleanup of FM_BC's * Fix: Resolve failing test Was mismatched with implementation, didn't cover the address(this) case. --------- Co-authored-by: FHieser <felix_hieser@web.de> Co-authored-by: Felix Hieser <47272854+FHieser@users.noreply.github.com> Co-authored-by: Marvin Kruse <marvinkruse@users.noreply.github.com> * Sc 720 expand unit tests for topos related modules (#676) * Add empty BondingSurface test file * Remove tokenVault from init The tokenvault cant be set during init because is created simultaneously to the BondingCurve contract. It has to be added via Dependency Injection * Remove unnecessary overrides * Add and adapt tests * Adapt inheritance of functions * Update Comments * Update Tests * Update fmt * Add event to projectFeeCollected * Address comments of PR --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> * Sc 828 address omega review comments (#680) * Add empty BondingSurface test file * Remove tokenVault from init The tokenvault cant be set during init because is created simultaneously to the BondingCurve contract. It has to be added via Dependency Injection * Remove unnecessary overrides * Add and adapt tests * Adapt inheritance of functions * Update Comments * Update Tests * Update fmt * Add event to projectFeeCollected * Address comments of PR * Revert if redeemamount reaches Min Reserve * Check for Min Reserve in TransferOrchestrator Token * Add MinReserveCheck to transferRepayment * Rename Modifier * Remove time casting * Enable BuyFee * Use function that can be overriden * Add gap * Make Min_Reserves variable based on Token Decimals * Use SpotPrice to get StaticPrice * adapt based on comments * Update FM_BC_BondingSurface_Redeeming_v1.t.sol --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> * Refactor Update the BondingSurface implementation to represent the code of conduct * Add empty BondingSurface test file * Remove tokenVault from init The tokenvault cant be set during init because is created simultaneously to the BondingCurve contract. It has to be added via Dependency Injection * Remove unnecessary overrides * Add and adapt tests * Adapt inheritance of functions * Update Comments * Update Tests * Update fmt * Add event to projectFeeCollected * Address comments of PR * Revert if redeemamount reaches Min Reserve * Check for Min Reserve in TransferOrchestrator Token * Add MinReserveCheck to transferRepayment * Rename Modifier * Remove time casting * Enable BuyFee * Use function that can be overriden * Add gap * Make Min_Reserves variable based on Token Decimals * Use SpotPrice to get StaticPrice * adapt based on comments * Update FM_BC_BondingSurface_Redeeming_v1.t.sol * WIP push * Rename seizable * Make state internal * Rename Parameters and Return Values * Rename Contracts * Adapt to code of conduct * Adapting Interfaces to have Contract Overview Documentation * Adapt Sectioning * Adapt Mocks and Tests to parameter conventions * Remove Todos/notes * Adapt merge aftermath * Update BondingSurface.sol * Rename to prevent shadow * Adapt remapping * Address comments * Adapt init * Update inverter standard versioning * Delete FM_BC_BondingSurface_RedeemingV1_exposed.sol * Adapt Contract Naming Standards * Fix naming references * Fix test * Update naming reference * Adapt modifier to call internal function * Adapt naming of internal function * update modifier Naming * Adapt tests * Adapt naming internal functions * Adapt Parameters * Adapt naming of function state * Adapt sections * Update Interface Inheritance * Update versioning * Update natspec to be rule compliant * Fix naming * Delete ILiquidityVaultProviderWhitelist_v1.sol * Remove Liquidity Vault Controller Interface * Rename Modifier * Add solmate as lib * Revert "Add solmate as lib" This reverts commit 050b9d2. * Remove comment * Adapt natspec * Apply comment suggestions from code review Co-authored-by: Marvin Kruse <marvinkruse@users.noreply.github.com> * Adapt internal function state * Add . to comments * Adapt spacing in natspec comments * Adapt spacing * Replace @dev with @notice * Adapt comment length * Adapt naming * Address Comments * Adapt Version * Reposition MIN_RESERVE * Adapt sectioning * Update more sectioning * Add title section and increment version --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> Co-authored-by: Marvin Kruse <marvinkruse@users.noreply.github.com> * Add before and afterSell functionalities * Add new contracts to scripts * Rename Files to contain .t * Add BondingSurface E2E * Use ModuleRole * Finish e2e tests * Add Documentation * Adapt the Deployment Parameters * Create Contract Template.md * 4/5 tests passing * Create BondingSurface.md * Fix missing tests * update comment about eror tolerance * refactor: resolve renaming mismatch in contracts * fix: resolve RPC issue on tests --------- Co-authored-by: Felix Hieser <47272854+FHieser@users.noreply.github.com> Co-authored-by: Zitzak <marvin88gr@gmail.com> Co-authored-by: Marvin <43185740+Zitzak@users.noreply.github.com> Co-authored-by: FHieser <felix_hieser@web.de> Co-authored-by: 0xNuggan <82726722+0xNuggan@users.noreply.github.com>

@dev

* [SC-213] Feat: Reserve Vault (#665) * Create Reservepool Contract * Rename and adapt * Create FM_EXT_ReservePool_v1.t.sol * Rename to TokenVault * Adapt to not send native token * Address comments * Add: - Internal function to modifier - Trailing underscore to parameters - Gherkin to test - Cleaned up tests * Update FM_EXT_TokenVault_v1.t.sol --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> Co-authored-by: Marvin <43185740+Zitzak@users.noreply.github.com> * Chore: Clean up TokenVault * Feat: Add FM_BC_BondingSurface_Redeemable_Repayer_Seizable_v1 (#666) * Create Reservepool Contract * Rename and adapt * Create FM_EXT_ReservePool_v1.t.sol * Topos FM * remove liquidity vault controller contracts * Rename to TokenVault * Adapt to not send native token * Rename to Token Vault * Address comments * Outcomment Burn tests for now * Create setTokenVault * Fix most Burn functions * AddSpentAllowance to ERC20Issuance * Add _spendAllowance to BondingCurveBase * Add _spendAllowance to BurnIssuanceFor * Fix Dependency Issue * Rename Redeemable to Redeeming * Create FM_BC_BondingSurface_Redeeming_v1.sol * WIP * Add: - Internal function to modifier - Trailing underscore to parameters - Gherkin to test - Cleaned up tests * restructure contracts * Add tag for testing file split * Setup seperate Tests * Update Base BondingSurface test * Rename Mock * Remove Tests that are included in the base contract * Remove parameters from BondingSurface Struct * Go over comments * Address comments * Address Comments * Adapt Naming of events * Adding Restricted to the name * Update comments * resolve comments in implementations * Fix: Finalize moving of error into funding manager base * Fix: Typos in ERC20Issuance * Chore: Start cleanup of FM_BC's * Fix: Resolve failing test Was mismatched with implementation, didn't cover the address(this) case. --------- Co-authored-by: FHieser <felix_hieser@web.de> Co-authored-by: Felix Hieser <47272854+FHieser@users.noreply.github.com> Co-authored-by: Marvin Kruse <marvinkruse@users.noreply.github.com> * Sc 720 expand unit tests for topos related modules (#676) * Add empty BondingSurface test file * Remove tokenVault from init The tokenvault cant be set during init because is created simultaneously to the BondingCurve contract. It has to be added via Dependency Injection * Remove unnecessary overrides * Add and adapt tests * Adapt inheritance of functions * Update Comments * Update Tests * Update fmt * Add event to projectFeeCollected * Address comments of PR --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> * Sc 828 address omega review comments (#680) * Add empty BondingSurface test file * Remove tokenVault from init The tokenvault cant be set during init because is created simultaneously to the BondingCurve contract. It has to be added via Dependency Injection * Remove unnecessary overrides * Add and adapt tests * Adapt inheritance of functions * Update Comments * Update Tests * Update fmt * Add event to projectFeeCollected * Address comments of PR * Revert if redeemamount reaches Min Reserve * Check for Min Reserve in TransferOrchestrator Token * Add MinReserveCheck to transferRepayment * Rename Modifier * Remove time casting * Enable BuyFee * Use function that can be overriden * Add gap * Make Min_Reserves variable based on Token Decimals * Use SpotPrice to get StaticPrice * adapt based on comments * Update FM_BC_BondingSurface_Redeeming_v1.t.sol --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> * Refactor Update the BondingSurface implementation to represent the code of conduct * Add empty BondingSurface test file * Remove tokenVault from init The tokenvault cant be set during init because is created simultaneously to the BondingCurve contract. It has to be added via Dependency Injection * Remove unnecessary overrides * Add and adapt tests * Adapt inheritance of functions * Update Comments * Update Tests * Update fmt * Add event to projectFeeCollected * Address comments of PR * Revert if redeemamount reaches Min Reserve * Check for Min Reserve in TransferOrchestrator Token * Add MinReserveCheck to transferRepayment * Rename Modifier * Remove time casting * Enable BuyFee * Use function that can be overriden * Add gap * Make Min_Reserves variable based on Token Decimals * Use SpotPrice to get StaticPrice * adapt based on comments * Update FM_BC_BondingSurface_Redeeming_v1.t.sol * WIP push * Rename seizable * Make state internal * Rename Parameters and Return Values * Rename Contracts * Adapt to code of conduct * Adapting Interfaces to have Contract Overview Documentation * Adapt Sectioning * Adapt Mocks and Tests to parameter conventions * Remove Todos/notes * Adapt merge aftermath * Update BondingSurface.sol * Rename to prevent shadow * Adapt remapping * Address comments * Adapt init * Update inverter standard versioning * Delete FM_BC_BondingSurface_RedeemingV1_exposed.sol * Adapt Contract Naming Standards * Fix naming references * Fix test * Update naming reference * Adapt modifier to call internal function * Adapt naming of internal function * update modifier Naming * Adapt tests * Adapt naming internal functions * Adapt Parameters * Adapt naming of function state * Adapt sections * Update Interface Inheritance * Update versioning * Update natspec to be rule compliant * Fix naming * Delete ILiquidityVaultProviderWhitelist_v1.sol * Remove Liquidity Vault Controller Interface * Rename Modifier * Add solmate as lib * Revert "Add solmate as lib" This reverts commit 050b9d2. * Remove comment * Adapt natspec * Apply comment suggestions from code review Co-authored-by: Marvin Kruse <marvinkruse@users.noreply.github.com> * Adapt internal function state * Add . to comments * Adapt spacing in natspec comments * Adapt spacing * Replace @dev with @notice * Adapt comment length * Adapt naming * Address Comments * Adapt Version * Reposition MIN_RESERVE * Adapt sectioning * Update more sectioning * Add title section and increment version --------- Co-authored-by: Zitzak <marvin88gr@gmail.com> Co-authored-by: Marvin Kruse <marvinkruse@users.noreply.github.com> * Add before and afterSell functionalities * Add new contracts to scripts * Rename Files to contain .t * Add BondingSurface E2E * Use ModuleRole * Finish e2e tests * Add Documentation * Adapt the Deployment Parameters * Create Contract Template.md * 4/5 tests passing * Create BondingSurface.md * Fix missing tests * update comment about eror tolerance * refactor: resolve renaming mismatch in contracts * fix: resolve RPC issue on tests --------- Co-authored-by: Felix Hieser <47272854+FHieser@users.noreply.github.com> Co-authored-by: Zitzak <marvin88gr@gmail.com> Co-authored-by: Marvin <43185740+Zitzak@users.noreply.github.com> Co-authored-by: FHieser <felix_hieser@web.de> Co-authored-by: 0xNuggan <82726722+0xNuggan@users.noreply.github.com>

FHieser and others added 4 commits September 26, 2024 11:42

Create Reservepool Contract

26cb200

Rename and adapt

3520de3

Create FM_EXT_ReservePool_v1.t.sol

b5bbefb

Topos FM

e5ea4d4

FHieser and others added 21 commits October 1, 2024 10:45

Merge branch 'feature/ToposFundingManager' into sc-213-reserve-vault

414805d

remove liquidity vault controller contracts

bde8a1d

Rename to TokenVault

372a2e0

Merge branch 'sc-213-reserve-vault' of https://github.com/InverterNet…

f8f16dd

…work/contracts into sc-213-reserve-vault

Adapt to not send native token

4d6fd90

Rename to Token Vault

f738be3

Address comments

dbc0493

Outcomment Burn tests for now

ab94266

Create setTokenVault

e79d701

Fix most Burn functions

b1ab63a

AddSpentAllowance to ERC20Issuance

a345306

Add _spendAllowance to BondingCurveBase

7d90be7

Add _spendAllowance to BurnIssuanceFor

5978dc6

Fix Dependency Issue

aed82b4

Rename Redeemable to Redeeming

7c919f1

Create FM_BC_BondingSurface_Redeeming_v1.sol

6bf893b

WIP

8170f61

Add:

af5667c

- Internal function to modifier - Trailing underscore to parameters - Gherkin to test - Cleaned up tests

restructure contracts

f1f1f59

Add tag for testing file split

3d8c4c4

Setup seperate Tests

b7644d1

Zitzak force-pushed the sc-98-create-topos-funding-manager branch from dba918a to 3d8c4c4 Compare October 4, 2024 10:24

FHieser added 3 commits October 4, 2024 14:32

Update Base BondingSurface test

96f6376

Rename Mock

206b344

Remove Tests that are included in the base contract

ebfec61

FHieser and others added 8 commits October 4, 2024 15:01

Remove parameters from BondingSurface Struct

a29873a

Go over comments

66ec478

Address comments

072f4d0

Address Comments

8b9b2ed

Adapt Naming of events

83b4504

Adding Restricted to the name

718e8c9

Update comments

9a44f86

resolve comments in implementations

ebffdd7

Zitzak marked this pull request as ready for review October 8, 2024 15:09

Merge branch 'feature/ToposFundingManager' into sc-98-create-topos-fu…

2f7b0fd

…nding-manager

Zitzak force-pushed the sc-98-create-topos-funding-manager branch from 5b3df0e to 2f7b0fd Compare October 8, 2024 15:25

Zitzak and others added 6 commits October 8, 2024 17:26

Merge branch 'sc-213-reserve-vault' into sc-98-create-topos-funding-m…

e38249b

…anager

Merge branch 'feature/ToposFundingManager' into sc-98-create-topos-fu…

a872be4

…nding-manager

Fix: Finalize moving of error into funding manager base

222303e

Fix: Typos in ERC20Issuance

86471ae

Merge branch 'feature/ToposFundingManager' into sc-98-create-topos-fu…

7c9ba4c

…nding-manager

Chore: Start cleanup of FM_BC's

9168539

Fix: Resolve failing test

bc5c955

Was mismatched with implementation, didn't cover the address(this) case.

marvinkruse approved these changes Oct 8, 2024

View reviewed changes

marvinkruse merged commit db2525a into feature/ToposFundingManager Oct 9, 2024

marvinkruse deleted the sc-98-create-topos-funding-manager branch October 9, 2024 00:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[SC-809]: Feature: FM_BC_BondingSurface_Redeemable_Repayer_Seizable_v1#666

[SC-809]: Feature: FM_BC_BondingSurface_Redeemable_Repayer_Seizable_v1#666
marvinkruse merged 44 commits intofeature/ToposFundingManagerfrom
sc-98-create-topos-funding-manager

Zitzak commented Oct 1, 2024

Uh oh!

linear bot commented Oct 1, 2024 •

edited by Zitzak

Loading

Uh oh!

marvinkruse commented Oct 8, 2024 •

edited

Loading

Uh oh!

marvinkruse left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Zitzak commented Oct 1, 2024

Uh oh!

linear bot commented Oct 1, 2024 • edited by Zitzak Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marvinkruse commented Oct 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marvinkruse left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

linear bot commented Oct 1, 2024 •

edited by Zitzak

Loading

marvinkruse commented Oct 8, 2024 •

edited

Loading