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

Feature/lender commitment groups #137

Open
wants to merge 147 commits into
base: feature/optimize-market-registry-terms
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
f00a686
draft contract compiles
ethereumdegen Oct 20, 2023
f68881c
add
ethereumdegen Oct 20, 2023
e0bb718
compiles
ethereumdegen Oct 20, 2023
bfaf344
commment
ethereumdegen Oct 20, 2023
8a5df19
add
ethereumdegen Oct 24, 2023
d165dd1
drafting smart commitment forwarder
ethereumdegen Oct 26, 2023
e988712
compiles
ethereumdegen Oct 26, 2023
8e49cba
writing new group contract
ethereumdegen Oct 26, 2023
25738d6
simplified math
ethereumdegen Oct 26, 2023
9e85e5d
math is way simpler
ethereumdegen Oct 26, 2023
2f5fd5e
add fn
ethereumdegen Oct 26, 2023
3fe036f
adding to collector
ethereumdegen Oct 26, 2023
610ffb1
adding draft code
ethereumdegen Oct 31, 2023
9bd7171
addingn otes
ethereumdegen Oct 31, 2023
ef6e7cf
fixing build
ethereumdegen Oct 31, 2023
5153d5f
fixing
ethereumdegen Nov 1, 2023
547729c
fixing compilation
ethereumdegen Nov 1, 2023
865cbf4
compiles but need to add in observer
ethereumdegen Nov 1, 2023
4646f47
add repayment callback
ethereumdegen Nov 1, 2023
bdee545
adding documentation
ethereumdegen Nov 2, 2023
9bf918f
fixing
ethereumdegen Nov 2, 2023
1c75722
compiles
ethereumdegen Nov 2, 2023
05ff6c8
todo
ethereumdegen Nov 2, 2023
e21092a
add fn for twap
ethereumdegen Nov 3, 2023
c8d7b6d
improving factory
ethereumdegen Nov 3, 2023
053c11b
adding
ethereumdegen Nov 3, 2023
7a3d1be
add test
ethereumdegen Nov 6, 2023
0382f26
update
ethereumdegen Nov 6, 2023
d921981
exchange rate based on interest collectd
ethereumdegen Nov 6, 2023
d7ca0a2
fix ratio
ethereumdegen Nov 6, 2023
4f0ddec
make test more clear
ethereumdegen Nov 6, 2023
1fc3f9c
adding to tests
ethereumdegen Nov 6, 2023
e3636ed
test no longer reverts
ethereumdegen Nov 7, 2023
cf44fa0
adding logic
ethereumdegen Nov 7, 2023
3e304f9
merge
ethereumdegen Nov 8, 2023
aeff817
fixing
ethereumdegen Nov 8, 2023
3caeebf
add
ethereumdegen Nov 8, 2023
3cf7885
tests work better
ethereumdegen Nov 8, 2023
b5bec6b
tests pass
ethereumdegen Nov 8, 2023
b7f640a
test for lender accept and fixes bugs
ethereumdegen Nov 9, 2023
a345567
fixing tests
ethereumdegen Nov 9, 2023
19ef9c6
add
ethereumdegen Nov 9, 2023
8ee2bfb
compiles
ethereumdegen Nov 9, 2023
36f4169
compiles
ethereumdegen Nov 9, 2023
b02da5a
adding price oracle
ethereumdegen Nov 9, 2023
efe9e5f
adding test for price oracle
ethereumdegen Nov 9, 2023
65610f7
fix logic for ratio
ethereumdegen Nov 10, 2023
d3b8a73
add notes
ethereumdegen Nov 10, 2023
3b1c296
deployed smart commitment forwarder
ethereumdegen Nov 24, 2023
e012115
compiles
ethereumdegen Nov 24, 2023
84422bd
add to depoy script
ethereumdegen Nov 24, 2023
743bb79
deployed smart group
ethereumdegen Nov 28, 2023
d4608e0
tests dont pass
ethereumdegen Nov 30, 2023
1eea2e3
tests pass
ethereumdegen Nov 30, 2023
990a4ef
fixed price calc
ethereumdegen Nov 30, 2023
234430f
fixed amth overflow issue
ethereumdegen Nov 30, 2023
3421be1
getting weird error
ethereumdegen Nov 30, 2023
479daea
cant do upgrade
ethereumdegen Nov 30, 2023
6dfcaae
callable not owner
ethereumdegen Nov 30, 2023
6a35114
push upgrade
ethereumdegen Nov 30, 2023
7dc24a2
fix div by zero issue
ethereumdegen Dec 5, 2023
31fe7f3
fixing approval issue
ethereumdegen Dec 5, 2023
5cb527e
compiles but test fail
ethereumdegen Dec 6, 2023
ac855db
fixing tests
ethereumdegen Dec 6, 2023
6ab40c2
tests compile
ethereumdegen Dec 6, 2023
edc5f9c
trying to verify
ethereumdegen Dec 6, 2023
c47e6fc
verif
ethereumdegen Dec 6, 2023
0a4a1cc
logic change for approval
ethereumdegen Dec 6, 2023
5d86212
Merge branch 'feature/lender-commitment-groups' of github.com:teller-…
ethereumdegen Dec 6, 2023
7935c66
tried to upgrade
ethereumdegen Dec 7, 2023
5af039d
updated sep
ethereumdegen Dec 7, 2023
aeaaca8
updating SCF
ethereumdegen Dec 7, 2023
b2a3d23
fmt
ethereumdegen Dec 7, 2023
040c04e
works
ethereumdegen Dec 7, 2023
3deeb7a
comments
ethereumdegen Dec 12, 2023
cd9cbd9
add notes
ethereumdegen Dec 15, 2023
269c881
adding method to LCF
ethereumdegen Dec 21, 2023
7b6f9c9
add skip to deploy scripts
ethereumdegen Dec 21, 2023
b093580
improve call flow
ethereumdegen Jan 4, 2024
fa69568
main contracts compile
ethereumdegen Jan 4, 2024
41f05f4
improving tests
ethereumdegen Jan 4, 2024
db029fd
fixed test
ethereumdegen Jan 4, 2024
6b78891
change v
ethereumdegen Jan 4, 2024
d0e6a47
add twap code
ethereumdegen Jan 4, 2024
c432260
twap code compiles
ethereumdegen Jan 4, 2024
990a8c4
improving test for observe twap
ethereumdegen Jan 5, 2024
2d77431
tests pas s
ethereumdegen Jan 5, 2024
c541099
deploy upgrade of group to sepolia
ethereumdegen Jan 31, 2024
d47775c
fixes to contract
ethereumdegen Jan 31, 2024
346ca02
fixing mock
ethereumdegen Feb 2, 2024
01bb42a
tests pass
ethereumdegen Feb 2, 2024
9aee2f5
twap interval is input
ethereumdegen Feb 2, 2024
54b35b7
redeploy lender group smart
ethereumdegen Feb 2, 2024
96b2ed7
update smart forwarder on sep
ethereumdegen Feb 2, 2024
c6ef88c
update group contract on sepolia
ethereumdegen Feb 2, 2024
f203e72
fixing with expansion
ethereumdegen Feb 2, 2024
0d93943
adding code for swap proposal
ethereumdegen Feb 5, 2024
e05b6aa
adding to swap
ethereumdegen Feb 5, 2024
bd8d85e
adding to swap auction
ethereumdegen Feb 6, 2024
b21c2bb
add nots
ethereumdegen Feb 6, 2024
6ab4464
add notes
ethereumdegen Feb 6, 2024
b2567d3
change share ratio c
ethereumdegen Feb 6, 2024
24c86d1
change logic of shares exang rate
ethereumdegen Feb 6, 2024
fb41392
add comments
ethereumdegen Feb 6, 2024
ddf55bd
adding liquidation w incentive
ethereumdegen Feb 7, 2024
bf69f1e
building fn for liquidate assist
ethereumdegen Feb 7, 2024
59d278a
adding to claim interface
ethereumdegen Feb 8, 2024
cb67692
fixing math in samrt
ethereumdegen Feb 8, 2024
267f7f0
fixing oimpl
ethereumdegen Feb 9, 2024
f3f2a44
tests compile
ethereumdegen Feb 9, 2024
1dc29a7
adding to interface
ethereumdegen Feb 9, 2024
76d0fcb
fixing div by 0 rrors
ethereumdegen Feb 9, 2024
efa3f4f
fixing tests
ethereumdegen Feb 9, 2024
7cabd4e
fixed tests
ethereumdegen Feb 12, 2024
f64dd4d
fixing up tests
ethereumdegen Feb 12, 2024
1e402b5
tests for calculations
ethereumdegen Feb 12, 2024
0e569e5
adding to contract
ethereumdegen Feb 13, 2024
7049206
add
ethereumdegen Feb 13, 2024
42884a9
adding many mock fns
ethereumdegen Feb 14, 2024
42f1399
initial tests for liquidate pass now
ethereumdegen Feb 14, 2024
761a2d7
add
ethereumdegen Feb 15, 2024
ae877e1
add to test
ethereumdegen Feb 15, 2024
5aaa20f
another test pass
ethereumdegen Feb 15, 2024
32f6d37
new tests pass and chck for values
ethereumdegen Feb 15, 2024
73c349e
negative test
ethereumdegen Feb 16, 2024
5c49e3a
add note
ethereumdegen Feb 16, 2024
fd10fc2
improve test
ethereumdegen Feb 16, 2024
b6e6657
add to tests
ethereumdegen Feb 16, 2024
69a5e19
smaller size for contract
ethereumdegen Feb 19, 2024
37319c6
deploy sep
ethereumdegen Feb 20, 2024
608f9ee
fix test
ethereumdegen Feb 22, 2024
d20fac2
respond to udai feedback
ethereumdegen Feb 23, 2024
09facf9
fix compilation
ethereumdegen Feb 23, 2024
809cef7
tests pass
ethereumdegen Feb 23, 2024
d6c34c5
add notes
ethereumdegen Feb 23, 2024
5c87a6f
fixing shares amt math
ethereumdegen Feb 23, 2024
37f86e9
add test
ethereumdegen Feb 23, 2024
2d43b2a
notes
ethereumdegen Feb 23, 2024
66c4f23
fixing fn
ethereumdegen Feb 26, 2024
df89b61
add
ethereumdegen Feb 27, 2024
afbfc9d
Merge branch 'feature/lender-commitment-groups' of github.com:teller-…
ethereumdegen Feb 27, 2024
0cb1b04
restructure tests
ethereumdegen Feb 27, 2024
1a0f9e4
clean comments
ethereumdegen Feb 27, 2024
82aab30
adding pauseable
ethereumdegen Feb 27, 2024
171c2db
expanding by uni exp factor now
ethereumdegen Feb 27, 2024
56718bd
unit tests
ethereumdegen Feb 27, 2024
0dcca27
add comment
ethereumdegen Mar 5, 2024
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
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
"eslint": "^7.32.0",
"husky": "^8.0.1",
"mustache": "^4.2.0",
"prettier": "^2.4.1",
"shx": "^0.3.3"
"prettier": "^3.0.3",
"prettier-plugin-solidity": "^1.2.0",
"shx": "^0.3.3",
"solhint": "^4.0.0"
}
}
202 changes: 202 additions & 0 deletions packages/contracts/.openzeppelin/polygon.json
Original file line number Diff line number Diff line change
Expand Up @@ -5219,6 +5219,208 @@
"storage": [],
"types": {}
}
},
"b901f7ff9c6f87ec2bf862e281e0e57d421afc472cab880785f45d90094c8ca5": {
"address": "0xf7B14778035fEAF44540A0bC1D4ED859bCB28229",
"txHash": "0x4a4d5dec624ae100331d2eb02206db791f915096a7983474c1af27e00a1d59d9",
"layout": {
"solcVersion": "0.8.9",
"storage": [
{
"label": "bundle",
"offset": 0,
"slot": "0",
"type": "t_mapping(t_uint256,t_struct(CollateralBundleInfo)33557_storage)",
"contract": "TokenBundle",
"src": "contracts/bundle/TokenBundle.sol:23"
},
{
"label": "bundleCount",
"offset": 0,
"slot": "1",
"type": "t_uint256",
"contract": "TokenBundle",
"src": "contracts/bundle/TokenBundle.sol:26"
},
{
"label": "_initialized",
"offset": 0,
"slot": "2",
"type": "t_uint8",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62",
"retypedFrom": "bool"
},
{
"label": "_initializing",
"offset": 1,
"slot": "2",
"type": "t_bool",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67"
},
{
"label": "__gap",
"offset": 0,
"slot": "3",
"type": "t_array(t_uint256)50_storage",
"contract": "ContextUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
},
{
"label": "__gap",
"offset": 0,
"slot": "53",
"type": "t_array(t_uint256)50_storage",
"contract": "ERC721HolderUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol:40"
},
{
"label": "__gap",
"offset": 0,
"slot": "103",
"type": "t_array(t_uint256)50_storage",
"contract": "ERC165Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
},
{
"label": "__gap",
"offset": 0,
"slot": "153",
"type": "t_array(t_uint256)50_storage",
"contract": "ERC1155ReceiverUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155ReceiverUpgradeable.sol:31"
},
{
"label": "__gap",
"offset": 0,
"slot": "203",
"type": "t_array(t_uint256)50_storage",
"contract": "ERC1155HolderUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol:48"
},
{
"label": "tellerV2",
"offset": 0,
"slot": "253",
"type": "t_contract(ITellerV2)35742",
"contract": "CollateralManagerV2",
"src": "contracts/CollateralManagerV2.sol:39"
},
{
"label": "_collateralBundleIdForBid",
"offset": 0,
"slot": "254",
"type": "t_mapping(t_uint256,t_uint256)",
"contract": "CollateralManagerV2",
"src": "contracts/CollateralManagerV2.sol:42"
},
{
"label": "_committedBidCollateral",
"offset": 0,
"slot": "255",
"type": "t_mapping(t_uint256,t_struct(CollateralBundleInfo)33557_storage)",
"contract": "CollateralManagerV2",
"src": "contracts/CollateralManagerV2.sol:46"
}
],
"types": {
"t_address": {
"label": "address",
"numberOfBytes": "20"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]",
"numberOfBytes": "1600"
},
"t_bool": {
"label": "bool",
"numberOfBytes": "1"
},
"t_contract(ITellerV2)35742": {
"label": "contract ITellerV2",
"numberOfBytes": "20"
},
"t_enum(CollateralType)33539": {
"label": "enum CollateralType",
"members": [
"ERC20",
"ERC721",
"ERC1155"
],
"numberOfBytes": "1"
},
"t_mapping(t_uint256,t_struct(Collateral)33549_storage)": {
"label": "mapping(uint256 => struct Collateral)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_struct(CollateralBundleInfo)33557_storage)": {
"label": "mapping(uint256 => struct ICollateralBundle.CollateralBundleInfo)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_uint256)": {
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32"
},
"t_struct(Collateral)33549_storage": {
"label": "struct Collateral",
"members": [
{
"label": "_collateralType",
"type": "t_enum(CollateralType)33539",
"offset": 0,
"slot": "0"
},
{
"label": "_amount",
"type": "t_uint256",
"offset": 0,
"slot": "1"
},
{
"label": "_tokenId",
"type": "t_uint256",
"offset": 0,
"slot": "2"
},
{
"label": "_collateralAddress",
"type": "t_address",
"offset": 0,
"slot": "3"
}
],
"numberOfBytes": "128"
},
"t_struct(CollateralBundleInfo)33557_storage": {
"label": "struct ICollateralBundle.CollateralBundleInfo",
"members": [
{
"label": "count",
"type": "t_uint256",
"offset": 0,
"slot": "0"
},
{
"label": "collaterals",
"type": "t_mapping(t_uint256,t_struct(Collateral)33549_storage)",
"offset": 0,
"slot": "1"
}
],
"numberOfBytes": "64"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
},
"t_uint8": {
"label": "uint8",
"numberOfBytes": "1"
}
},
"namespaces": {}
}
}
}
}
Loading
Loading