Code

Convertible Deposits#29

Code

Draft

0xJem wants to merge 143 commits intodevelopOlympusDAO/olympus-v3:developfrom CDsEmissionsOlympusDAO/olympus-v3:CDsEmissionsCopy head branch name to clipboard

+14,184-134

Commits

Commits on Dec 9, 2024

• Create CDsEmissions.sol

  

  chefomi

  authored and

  0xJem

  committed
  053cb32

  Copy full SHA for 053cb32

• Update CDsEmissions.sol

  

  chefomi

  authored and

  0xJem

  committed
  56b8f3b

  Copy full SHA for 56b8f3b

• Auctioneer + Facility

  

  chefomi

  authored and

  0xJem

  committed
  49ecd6d

  Copy full SHA for 49ecd6d

• updates

  

  chefomi

  authored and

  0xJem

  committed
  356af03

  Copy full SHA for 356af03

• integrate with emissions manager

  Show description for 4d55f12
  

  chefomi

  authored and

  0xJem

  committed
  4d55f12

  Copy full SHA for 4d55f12

• Fix compilation errors

  0xJem

  committed
  61a7377

  Copy full SHA for 61a7377

• chore: linting

  0xJem

  committed
  9068ba0

  Copy full SHA for 9068ba0

• Add custom error to contracts. Add missing CDFacility parameter to CDAuctioneer constructor.

  0xJem

  committed
  e41276b

  Copy full SHA for e41276b

• Extract CDAuctioneer into interface

  0xJem

  committed
  74ebfa4

  Copy full SHA for 74ebfa4

• Fix compilation errors for EmissionManager test

  0xJem

  committed
  fb68663

  Copy full SHA for fb68663

• Add cdUSDS parameter to CDFacility. Extract cdUSDS into interface.

  0xJem

  committed
  2f2a0de

  Copy full SHA for 2f2a0de

Commits on Dec 13, 2024

• Fix naming consistency with debt/deposit. Add missing parameter to deployment script.

  0xJem

  committed
  4797b13

  Copy full SHA for 4797b13

• Create interface for convertible deposit facility

  0xJem

  committed
  a6dacc8

  Copy full SHA for a6dacc8

• Fix compile errors

  0xJem

  committed
  6291399

  Copy full SHA for 6291399

• Fix licenses

  0xJem

  committed
  55397f8

  Copy full SHA for 55397f8

• Interface for a proposed CDEPO module

  0xJem

  committed
  7953b93

  Copy full SHA for 7953b93

• Update description

  0xJem

  committed
  43ca59c

  Copy full SHA for 43ca59c

Commits on Dec 16, 2024

• Add module for convertible deposit terms

  0xJem

  committed
  c3a7ee8

  Copy full SHA for c3a7ee8

• Add CTERM events

  0xJem

  committed
  349c671

  Copy full SHA for 349c671

• WIP implementation of CDEPO

  0xJem

  committed
  6b20f80

  Copy full SHA for 6b20f80

• First pass a CDEPO

  0xJem

  committed
  5536d54

  Copy full SHA for 5536d54

• First pass at implementation of CTERM

  0xJem

  committed
  9fb539c

  Copy full SHA for 9fb539c

• Add a permissioned function to CDEPO to redeem CD tokens for assets. Shift CDFacility to use the interface and CDEPO/CTERM.

  0xJem

  committed
  e3dcecc

  Copy full SHA for e3dcecc

• Rename CTERM to CDPOS

  0xJem

  committed
  42a6d68

  Copy full SHA for 42a6d68

• Shift CDAuctioneer to use new CDFacility interface

  0xJem

  committed
  be52b09

  Copy full SHA for be52b09

Commits on Dec 17, 2024

• Check CD token before converting/reclaiming using a CD position

  0xJem

  committed
  2c28d33

  Copy full SHA for 2c28d33

• First pass at SVG for CD positions

  0xJem

  committed
  f1dbb75

  Copy full SHA for f1dbb75

• Extract previewBid functionality

  0xJem

  committed
  6b9888f

  Copy full SHA for 6b9888f

• Docs

  0xJem

  committed
  fddaa3b

  Copy full SHA for fddaa3b

Commits on Dec 18, 2024

• Add isExpired getter to CDPOS

  0xJem

  committed
  e3ad735

  Copy full SHA for e3ad735

• Adjust CDPOS SVG

  0xJem

  committed
  77e2787

  Copy full SHA for 77e2787

• Wrote helper function to convert a fixed-point integer into a decimal string

  0xJem

  committed
  abf0b3c

  Copy full SHA for abf0b3c

• Add conversion price and remaining deposit to the SVG and traits

  0xJem

  committed
  7ba544a

  Copy full SHA for 7ba544a

• Add setter

  0xJem

  committed
  724b2b5

  Copy full SHA for 724b2b5

• Docs

  0xJem

  committed
  51648f0

  Copy full SHA for 51648f0

• Add previewConvert to CDPOS

  0xJem

  committed
  1719af0

  Copy full SHA for 1719af0

• Add stubs for CDPOS tests

  0xJem

  committed
  4be3322

  Copy full SHA for 4be3322

• Add owner back to position struct

  0xJem

  committed
  497ed1c

  Copy full SHA for 497ed1c

• Implement tests for CDPOS.create()

  0xJem

  committed
  f293e5e

  Copy full SHA for f293e5e

Commits on Dec 19, 2024

• CDPOS tests for create/update/split

  0xJem

  committed
  6571d51

  Copy full SHA for 6571d51

• CDPOS tests for wrap/unwrap

  0xJem

  committed
  6c4fcac

  Copy full SHA for 6c4fcac

• Clarify decimal scale in docs, tests for previewConvert

  0xJem

  committed
  95ad4be

  Copy full SHA for 95ad4be

• Tests for setDisplayDecimals and transferFrom

  0xJem

  committed
  0520eba

  Copy full SHA for 0520eba

• Handling of transferFrom in CDPOS

  0xJem

  committed
  d8d89bf

  Copy full SHA for d8d89bf

• Fix handling of mint checks

  0xJem

  committed
  27a3695

  Copy full SHA for 27a3695

• Remove redundant tests

  0xJem

  committed
  875cdd9

  Copy full SHA for 875cdd9

• CDEPO: rename burn() to reclaim() and adjust logic around spending tokens

  0xJem

  committed
  dbd3f6e

  Copy full SHA for dbd3f6e

• CDEPO: test stubs

  0xJem

  committed
  fcd4e3d

  Copy full SHA for fcd4e3d

• CDEPO: tests for mint/mintTo/previewMint, rename burn rate to reclaim rate

  0xJem

  committed
  908a641

  Copy full SHA for 908a641

• CDEPO: setReclaimRate tests

  0xJem

  committed
  fb9bf7e

  Copy full SHA for fb9bf7e

• CDEPO: mint test fixes

  0xJem

  committed
  56cabb2

  Copy full SHA for 56cabb2

• CDEPO: more tests

  0xJem

  committed
  85e73e9

  Copy full SHA for 85e73e9

Commits on Dec 20, 2024

• CDEPO: more tests, use safeTransfer/safeApprove, clarify allowance

  0xJem

  committed
  e73bf8e

  Copy full SHA for e73bf8e

• CDEPO: tests and impl fixes for rounding, redeem tests

  0xJem

  committed
  d9b3679

  Copy full SHA for d9b3679

• CDEPO: sweepYield tests

  0xJem

  committed
  4bbde8a

  Copy full SHA for 4bbde8a

• CDFacility: test stubs

  0xJem

  committed
  e98f502

  Copy full SHA for e98f502

• CDEPO: add mint/reclaim/redeem -For functions, add spending allowance checks, update tests

  0xJem

  committed
  c4f56c2

  Copy full SHA for c4f56c2

• CDFacility: test updates

  0xJem

  committed
  2aca51a

  Copy full SHA for 2aca51a

Commits on Dec 23, 2024

• Add preview functions to CD facility

  0xJem

  committed
  0cf6892

  Copy full SHA for 0cf6892

• CD Facility: role must be lowercase. Add previewConvert and previewReclaim test stubs. create tests.

  0xJem

  committed
  21580db

  Copy full SHA for 21580db

• CDFacility: convert tests

  0xJem

  committed
  3fb895c

  Copy full SHA for 3fb895c

• CDFacility: more comprehensive tests

  0xJem

  committed
  1820d39

  Copy full SHA for 1820d39

• CDFacility: better handling of ownership check

  0xJem

  committed
  34307b4

  Copy full SHA for 34307b4

• CDFacility: WIP previewReclaim tests

  0xJem

  committed
  e9146a3

  Copy full SHA for e9146a3

Commits on Dec 26, 2024

• CDFacility: tests for convert, reclaim

  0xJem

  committed
  20571b2

  Copy full SHA for 20571b2

Commits on Dec 30, 2024

• chore: linting

  0xJem

  committed
  54795bb

  Copy full SHA for 54795bb

• CDAuctioneer: add docs, address logic errors

  0xJem

  committed
  fe8e09e

  Copy full SHA for fe8e09e

• CDAuctioneer: minor improvements

  0xJem

  committed
  49d0ffd

  Copy full SHA for 49d0ffd

• CDAuctioneer: rename day -> dayState

  0xJem

  committed
  8e2e4bb

  Copy full SHA for 8e2e4bb

• CDAuctioneer: use scale instead of decimals

  0xJem

  committed
  859b09b

  Copy full SHA for 859b09b

• CDAuctioneer: split updating the current tick out of the getter function

  0xJem

  committed
  156b140

  Copy full SHA for 156b140

• CDAuctioneer: reset the day state

  0xJem

  committed
  2018d4a

  Copy full SHA for 2018d4a

• CDAuctioneer: fixes for bidding logic

  0xJem

  committed
  ab4dcf5

  Copy full SHA for ab4dcf5

Commits on Dec 31, 2024

• CDAuctioneer: pull roles into constants, differentiate roles, add role gating

  0xJem

  committed
  6015163

  Copy full SHA for 6015163

• CDAuctioneer: use basic types in constructor. Make getUpdatedTick() public.

  0xJem

  committed
  0267ede

  Copy full SHA for 0267ede

• CDAuctioneer: test stubs

  0xJem

  committed
  cdb31dd

  Copy full SHA for cdb31dd

• CDAuctioneer: tests

  0xJem

  committed
  9af47bf

  Copy full SHA for 9af47bf

• chore: linting

  0xJem

  committed
  1be96c3

  Copy full SHA for 1be96c3

Commits on Jan 2, 2025

• CDAuctioneer: compiler fixes

  0xJem

  committed
  a3e69c9

  Copy full SHA for a3e69c9

• CDAuctioneer: add TODOs for more tests

  0xJem

  committed
  089f2be

  Copy full SHA for 089f2be

• CDAuctioneer: extract function for tick price calculation

  0xJem

  committed
  a5190ef

  Copy full SHA for a5190ef

• CDAuctioneer: tests for setter sanity-checks

  0xJem

  committed
  753251c

  Copy full SHA for 753251c

• CDAuctioneer: restore previous logic with tick price in getUpdatedTick()

  0xJem

  committed
  31162f8

  Copy full SHA for 31162f8

• CDAuctioneer: tests for activate/deactivate/setAuctionParameters, fix issues

  0xJem

  committed
  7826525

  Copy full SHA for 7826525

• CDAuctioneer: WIP getUpdatedTick() tests

  0xJem

  committed
  2e375b5

  Copy full SHA for 2e375b5

Commits on Jan 3, 2025

• CDAuctioneer: document auction approach and TODOs, based on recent conversations

  0xJem

  committed
  30f5692

  Copy full SHA for 30f5692

• CDAuctioneer: split tick step into a separate variable, change scale to 100e2

  0xJem

  committed
  ccf52ae

  Copy full SHA for ccf52ae

• CDAuctioneer: shift time to expiry into standalone variable

  0xJem

  committed
  41c88ac

  Copy full SHA for 41c88ac

• CDAuctioneer: add initialize() function that ensures all state variables are set before commencing the auction

  0xJem

  committed
  f2c8c0c

  Copy full SHA for f2c8c0c

• CDAuctioneer: test cases for initialize()

  0xJem

  committed
  3400c29

  Copy full SHA for 3400c29

• CDAuctioneer: rename getCurrentTick() to getPreviousTick() and getUpdatedTick() to getCurrentTick(), which makes more sense

  0xJem

  committed
  3296f9e

  Copy full SHA for 3296f9e

• CDAuctioneer: WIP getCurrentTick() tests and fixes

  0xJem

  committed
  6cde285

  Copy full SHA for 6cde285

Commits on Jan 6, 2025

• CDAuctioneer: WIP getCurrentTick() tests

  0xJem

  committed
  f9e201d

  Copy full SHA for f9e201d

• CDAuctioneer: finish getCurrentTick() tests

  0xJem

  committed
  3bc3259

  Copy full SHA for 3bc3259

• CDAuctioneer: WIP bid() tests

  0xJem

  committed
  5c8ec9d

  Copy full SHA for 5c8ec9d

Commits on Jan 7, 2025

• CDAuctioneer: return positionId from bid(), add token balance and position checks to bid() tests

  0xJem

  committed
  f0abf96

  Copy full SHA for f0abf96

• CDAuctioneer: bid() tests

  0xJem

  committed
  45c0161

  Copy full SHA for 45c0161

• CDAuctioneer: ensure that bid() refills the tick upon depletion

  0xJem

  committed
  98407fe

  Copy full SHA for 98407fe

• CDAuctioneer: modify previewBid()/bid() to not be greedy if a deposit amount cannot be converted

  0xJem

  committed
  b1480ec

  Copy full SHA for b1480ec

• CDAuctioneer: rename State to AuctionParameters. Test corrections.

  0xJem

  committed
  00745b1

  Copy full SHA for 00745b1

• CDAuctioneer: handle edge cases when setting auction parameters

  0xJem

  committed
  76d458c

  Copy full SHA for 76d458c

• chore: fix TODOs

  0xJem

  committed
  7b718c5

  Copy full SHA for 7b718c5

• CDFacility: contract is disabled upon deployment

  0xJem

  committed
  fa4b099

  Copy full SHA for fa4b099

• CDAuctioneer: incorrect conditional when checking auction parameters. Fix tests.

  0xJem

  committed
  d736725

  Copy full SHA for d736725

• Fix tests

  0xJem

  committed
  5cd845b

  Copy full SHA for 5cd845b

Commits on Jan 8, 2025

• chore: linting

  0xJem

  committed
  5860096

  Copy full SHA for 5860096

• CDAuctioneer: TODOs for reducing tick size

  0xJem

  committed
  aaaa0f2

  Copy full SHA for aaaa0f2

• CDAuctioneer: shift lastUpdate property into tick data structure

  0xJem

  committed
  79e11fd

  Copy full SHA for 79e11fd

• CDAuctioneer: test fix

  0xJem

  committed
  eb5033d

  Copy full SHA for eb5033d

• CDAuctioneer: more robust tests and checks for initialized status

  0xJem

  committed
  41893ee

  Copy full SHA for 41893ee

• chore: linting

  0xJem

  committed
  e570238

  Copy full SHA for e570238

• CDAuctioneer: add property for the current tick size. Update tests to check for values.

  0xJem

  committed
  4ade3a7

  Copy full SHA for 4ade3a7

• CDAuctioneer: WIP halving of tick size after the day target has been reached

  0xJem

  committed
  4071fc8

  Copy full SHA for 4071fc8

Commits on Jan 9, 2025

• CDAuctioneer: finish implementation and tests for adjusting the tick size after target achievement

  0xJem

  committed
  135ffed

  Copy full SHA for 135ffed

Commits on Jan 13, 2025

• CDAuctioneer: test stubs for tracking of historical auction results

  0xJem

  committed
  2663fb0

  Copy full SHA for 2663fb0

Commits on Jan 14, 2025

• Merge branch 'develop' into CDsEmissions

  Show description for 489a672
  0xJem

  committed
  489a672

  Copy full SHA for 489a672

• Fix compiler errors

  0xJem

  committed
  42420f3

  Copy full SHA for 42420f3

• CDAuctioneer: implement tracking of auction results over a defined period of days

  0xJem

  committed
  80aca68

  Copy full SHA for 80aca68

Commits on Jan 15, 2025

• Propagate auction result changes into EmissionManager. Remove redundant return value from setAuctionParameters()

  0xJem

  committed
  7486c69

  Copy full SHA for 7486c69

• EmissionManager: add missing events, remove redundant error

  0xJem

  committed
  4289c62

  Copy full SHA for 4289c62

• EmissionManager: avoid global import, remove redundant interface

  0xJem

  committed
  b558772

  Copy full SHA for b558772

• Warn on global import

  0xJem

  committed
  0f89e20

  Copy full SHA for 0f89e20

• EmissionManager: add VERSION() function

  0xJem

  committed
  c49ffea

  Copy full SHA for c49ffea

• EmissionManager: swap check order

  0xJem

  committed
  7ced7f9

  Copy full SHA for 7ced7f9

• Test fix

  0xJem

  committed
  854cacd

  Copy full SHA for 854cacd

• EmissionsManager: update tests

  0xJem

  committed
  ce72f28

  Copy full SHA for ce72f28

• EmissionManager: add additional test cases for surplus, zero auction results

  0xJem

  committed
  f5f4955

  Copy full SHA for f5f4955

• Add version function to policies

  0xJem

  committed
  558346d

  Copy full SHA for 558346d

Commits on Jan 16, 2025

• CDPOS: fix extraneous characters in tokenURI

  0xJem

  committed
  0ba0357

  Copy full SHA for 0ba0357

• CDPOS: tests for ERC721 metadata

  0xJem

  committed
  d9e137f

  Copy full SHA for d9e137f

• chore: linting

  0xJem

  committed
  4bba808

  Copy full SHA for 4bba808

• CDPOS: don't wrap position ID and expiry numerical attributes in quotes

  0xJem

  committed
  e0f3f6a

  Copy full SHA for e0f3f6a

• CDPOS: don't wrap conversion price and remaining deposit in quotes

  0xJem

  committed
  725a6d4

  Copy full SHA for 725a6d4

• Case-sensitivity

  0xJem

  committed
  8f2e16f

  Copy full SHA for 8f2e16f

• Audit README

  0xJem

  committed
  81c8cb4

  Copy full SHA for 81c8cb4

• Audit README

  0xJem

  committed
  611914a

  Copy full SHA for 611914a

Commits on Jan 17, 2025

• Add sequence diagrams

  0xJem

  committed
  629ea74

  Copy full SHA for 629ea74

• CDFacility: rename reclaim() -> redeem() to be consistent with CDEPO

  0xJem

  committed
  c5edfb1

  Copy full SHA for c5edfb1

• CDFacility: test stubs for reclaim()

  0xJem

  committed
  6ef3679

  Copy full SHA for 6ef3679

• CDFacility: reclaim() tests

  0xJem

  committed
  6a4c8c0

  Copy full SHA for 6a4c8c0

• CDFacility: implement reclaim/previewReclaim

  0xJem

  committed
  923f6c7

  Copy full SHA for 923f6c7

• CDFacility: more consistent handling of numbers when calculating redeem/reclaim output

  0xJem

  committed
  135bf42

  Copy full SHA for 135bf42

• CDEPO: rename variable

  0xJem

  committed
  f2691d8

  Copy full SHA for f2691d8