Skip to content

Lcfa pricing upgrade #209

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.

Sign up for GitHub

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

Open
ethereumdegen wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Lcfa pricing upgrade #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c53630a
added tests to repro the issue
ethereumdegen Mar 27, 2025
5107016
lcfa u2 tests pass
ethereumdegen Apr 3, 2025
634ef29
deploy script for lcfa v2
ethereumdegen Apr 3, 2025
498532a
prep for lcfaV2 deploy
ethereumdegen Apr 3, 2025
89d5c40
deployed LCFA v2 on mainnet
ethereumdegen Apr 3, 2025
c84f337
max principal
ethereumdegen Apr 4, 2025
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
**/node_modules


# rust target folders
**/target

packages/contracts/generated
packages/contracts/deployments/hardhat
packages/contracts/deployments/tenderly
Expand Down
342 changes: 342 additions & 0 deletions packages/contracts/.openzeppelin/mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@
"address": "0x7848585b707F54CcF7044F8C82CF53F43100dc83",
"txHash": "0x77123456f4eb954b2fe8c071fad7dbd8a5342902458f50aa50f61e9afd8e5eb8",
"kind": "transparent"
},
{
"address": "0x48EA70BCe76FE2F0c79B29Bf852a1DCF957982aa",
"txHash": "0xb07c28093b21124a67581081bfe249db62abbce021982702d82e3728320cc61b",
"kind": "transparent"
}
],
"impls": {
Expand Down Expand Up @@ -8997,6 +9002,343 @@
"types": {},
"namespaces": {}
}
},
"9b740c2b4e19814db8909083e4ca64fadf98da46629a44ad77352c135152b8ca": {
"address": "0xC764a44Faa62dB04310e0c8eA8d56FDC411e3e31",
"txHash": "0x96d48a50155390a266e4a0a77a9c909906d12a15d922e0245ec2684571e8fe85",
"layout": {
"solcVersion": "0.8.11",
"storage": [
{
"label": "userExtensions",
"offset": 0,
"slot": "0",
"type": "t_mapping(t_address,t_mapping(t_address,t_bool))",
"contract": "ExtensionsContextUpgradeable",
"src": "contracts/LenderCommitmentForwarder/extensions/ExtensionsContextUpgradeable.sol:12"
},
{
"label": "__gap",
"offset": 0,
"slot": "1",
"type": "t_array(t_uint256)49_storage",
"contract": "ExtensionsContextUpgradeable",
"src": "contracts/LenderCommitmentForwarder/extensions/ExtensionsContextUpgradeable.sol:61"
},
{
"label": "_initialized",
"offset": 0,
"slot": "50",
"type": "t_uint8",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62",
"retypedFrom": "bool"
},
{
"label": "_initializing",
"offset": 1,
"slot": "50",
"type": "t_bool",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67"
},
{
"label": "__gap",
"offset": 0,
"slot": "51",
"type": "t_array(t_uint256)50_storage",
"contract": "ContextUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
},
{
"label": "__gap",
"offset": 0,
"slot": "101",
"type": "t_array(t_uint256)50_storage",
"contract": "TellerV2MarketForwarder_G2",
"src": "contracts/TellerV2MarketForwarder_G2.sol:149"
},
{
"label": "commitments",
"offset": 0,
"slot": "151",
"type": "t_mapping(t_uint256,t_struct(Commitment)19680_storage)",
"contract": "LenderCommitmentForwarder_U2",
"src": "contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U2.sol:58"
},
{
"label": "commitmentCount",
"offset": 0,
"slot": "152",
"type": "t_uint256",
"contract": "LenderCommitmentForwarder_U2",
"src": "contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U2.sol:60"
},
{
"label": "commitmentBorrowersList",
"offset": 0,
"slot": "153",
"type": "t_mapping(t_uint256,t_struct(AddressSet)2837_storage)",
"contract": "LenderCommitmentForwarder_U2",
"src": "contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U2.sol:63"
},
{
"label": "commitmentPrincipalAccepted",
"offset": 0,
"slot": "154",
"type": "t_mapping(t_uint256,t_uint256)",
"contract": "LenderCommitmentForwarder_U2",
"src": "contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U2.sol:67"
},
{
"label": "commitmentUniswapPoolRoutes",
"offset": 0,
"slot": "155",
"type": "t_mapping(t_uint256,t_array(t_struct(PoolRouteConfig)20596_storage)dyn_storage)",
"contract": "LenderCommitmentForwarder_U2",
"src": "contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U2.sol:69"
},
{
"label": "commitmentPoolOracleLtvRatio",
"offset": 0,
"slot": "156",
"type": "t_mapping(t_uint256,t_uint16)",
"contract": "LenderCommitmentForwarder_U2",
"src": "contracts/LenderCommitmentForwarder/LenderCommitmentForwarder_U2.sol:71"
}
],
"types": {
"t_address": {
"label": "address",
"numberOfBytes": "20"
},
"t_array(t_bytes32)dyn_storage": {
"label": "bytes32[]",
"numberOfBytes": "32"
},
"t_array(t_struct(PoolRouteConfig)20596_storage)dyn_storage": {
"label": "struct IUniswapPricingLibrary.PoolRouteConfig[]",
"numberOfBytes": "32"
},
"t_array(t_uint256)49_storage": {
"label": "uint256[49]",
"numberOfBytes": "1568"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]",
"numberOfBytes": "1600"
},
"t_bool": {
"label": "bool",
"numberOfBytes": "1"
},
"t_bytes32": {
"label": "bytes32",
"numberOfBytes": "32"
},
"t_enum(CommitmentCollateralType)19656": {
"label": "enum ILenderCommitmentForwarder_U2.CommitmentCollateralType",
"members": [
"NONE",
"ERC20",
"ERC721",
"ERC1155",
"ERC721_ANY_ID",
"ERC1155_ANY_ID",
"ERC721_MERKLE_PROOF",
"ERC1155_MERKLE_PROOF"
],
"numberOfBytes": "1"
},
"t_mapping(t_address,t_bool)": {
"label": "mapping(address => bool)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_mapping(t_address,t_bool))": {
"label": "mapping(address => mapping(address => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_bytes32,t_uint256)": {
"label": "mapping(bytes32 => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_array(t_struct(PoolRouteConfig)20596_storage)dyn_storage)": {
"label": "mapping(uint256 => struct IUniswapPricingLibrary.PoolRouteConfig[])",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_struct(AddressSet)2837_storage)": {
"label": "mapping(uint256 => struct EnumerableSetUpgradeable.AddressSet)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_struct(Commitment)19680_storage)": {
"label": "mapping(uint256 => struct ILenderCommitmentForwarder_U2.Commitment)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_uint16)": {
"label": "mapping(uint256 => uint16)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_uint256)": {
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32"
},
"t_struct(AddressSet)2837_storage": {
"label": "struct EnumerableSetUpgradeable.AddressSet",
"members": [
{
"label": "_inner",
"type": "t_struct(Set)2522_storage",
"offset": 0,
"slot": "0"
}
],
"numberOfBytes": "64"
},
"t_struct(Commitment)19680_storage": {
"label": "struct ILenderCommitmentForwarder_U2.Commitment",
"members": [
{
"label": "maxPrincipal",
"type": "t_uint256",
"offset": 0,
"slot": "0"
},
{
"label": "expiration",
"type": "t_uint32",
"offset": 0,
"slot": "1"
},
{
"label": "maxDuration",
"type": "t_uint32",
"offset": 4,
"slot": "1"
},
{
"label": "minInterestRate",
"type": "t_uint16",
"offset": 8,
"slot": "1"
},
{
"label": "collateralTokenAddress",
"type": "t_address",
"offset": 10,
"slot": "1"
},
{
"label": "collateralTokenId",
"type": "t_uint256",
"offset": 0,
"slot": "2"
},
{
"label": "maxPrincipalPerCollateralAmount",
"type": "t_uint256",
"offset": 0,
"slot": "3"
},
{
"label": "collateralTokenType",
"type": "t_enum(CommitmentCollateralType)19656",
"offset": 0,
"slot": "4"
},
{
"label": "lender",
"type": "t_address",
"offset": 1,
"slot": "4"
},
{
"label": "marketId",
"type": "t_uint256",
"offset": 0,
"slot": "5"
},
{
"label": "principalTokenAddress",
"type": "t_address",
"offset": 0,
"slot": "6"
}
],
"numberOfBytes": "224"
},
"t_struct(PoolRouteConfig)20596_storage": {
"label": "struct IUniswapPricingLibrary.PoolRouteConfig",
"members": [
{
"label": "pool",
"type": "t_address",
"offset": 0,
"slot": "0"
},
{
"label": "zeroForOne",
"type": "t_bool",
"offset": 20,
"slot": "0"
},
{
"label": "twapInterval",
"type": "t_uint32",
"offset": 21,
"slot": "0"
},
{
"label": "token0Decimals",
"type": "t_uint256",
"offset": 0,
"slot": "1"
},
{
"label": "token1Decimals",
"type": "t_uint256",
"offset": 0,
"slot": "2"
}
],
"numberOfBytes": "96"
},
"t_struct(Set)2522_storage": {
"label": "struct EnumerableSetUpgradeable.Set",
"members": [
{
"label": "_values",
"type": "t_array(t_bytes32)dyn_storage",
"offset": 0,
"slot": "0"
},
{
"label": "_indexes",
"type": "t_mapping(t_bytes32,t_uint256)",
"offset": 0,
"slot": "1"
}
],
"numberOfBytes": "64"
},
"t_uint16": {
"label": "uint16",
"numberOfBytes": "2"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
},
"t_uint32": {
"label": "uint32",
"numberOfBytes": "4"
},
"t_uint8": {
"label": "uint8",
"numberOfBytes": "1"
}
},
"namespaces": {}
}
}
}
}
21 changes: 21 additions & 0 deletions packages/contracts/contracts/LenderCommitmentForwarder/LenderCommitmentForwarderV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.0;

import "./LenderCommitmentForwarder_U2.sol";

contract LenderCommitmentForwarderV2 is LenderCommitmentForwarder_U2 {
constructor(
address _tellerV2,
address _marketRegistry,
address _uniswapV3Factory
)
LenderCommitmentForwarder_U2(
_tellerV2,
_marketRegistry,
_uniswapV3Factory
)
{
// we only want this on an proxy deployment so it only affects the impl
_disableInitializers();
}
}
Loading