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.

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

Jump to bottom

P2: Lila 5632/update redeemauto function to work like autoredeem2 in offsethelper #23

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

P2: Lila 5632/update redeemauto function to work like autoredeem2 in offsethelper #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b667db2
fix: move path an address types to address file
Oct 2, 2023
e93d9e4
refactor: call `autoRedeem` instead of `autoRedeem2`
Oct 2, 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
4 changes: 2 additions & 2 deletions contracts/OffsetHelper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import "./interfaces/IToucanContractRegistry.sol";
*
* Retiring carbon tokens requires multiple steps and interactions with
* Toucan Protocol's main contracts:
* 1. Obtain a Toucan pool token e.g., NCT (by performing a token
* 1. Obtain a pool token e.g., NCT (by performing a token
* swap on a DEX).
* 2. Redeem the pool token for a TCO2 token.
* 3. Retire the TCO2 token.
Expand Down Expand Up @@ -359,7 +359,7 @@ contract OffsetHelper is OffsetHelperStorage {
IToucanPoolToken PoolTokenImplementation = IToucanPoolToken(_fromToken);

// auto redeem pool token for TCO2; will transfer automatically picked TCO2 to this contract
(tco2s, amounts) = PoolTokenImplementation.redeemAuto2(_amount);
(tco2s, amounts) = PoolTokenImplementation.redeemAuto(_amount);

// update balances
balances[msg.sender][_fromToken] -= _amount;
Expand Down
23 changes: 13 additions & 10 deletions contracts/interfaces/IToucanPoolToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,27 @@ interface IToucanPoolToken is IERC20Upgradeable {

function checkEligible(address erc20Addr) external view returns (bool);

function checkAttributeMatching(address erc20Addr)
external
view
returns (bool);
function checkAttributeMatching(
address erc20Addr
) external view returns (bool);

function calculateRedeemFees(
address[] memory tco2s,
uint256[] memory amounts
) external view returns (uint256);

function redeemMany(address[] memory tco2s, uint256[] memory amounts)
external;
function redeemMany(
address[] memory tco2s,
uint256[] memory amounts
) external;

function redeemAuto(uint256 amount) external;
function redeemAuto(
uint256 amount
) external returns (address[] memory tco2s, uint256[] memory amounts);

function redeemAuto2(uint256 amount)
external
returns (address[] memory tco2s, uint256[] memory amounts);
function redeemAuto2(
uint256 amount
) external returns (address[] memory tco2s, uint256[] memory amounts);

function getRemaining() external view returns (uint256);

Expand Down
11 changes: 11 additions & 0 deletions utils/addresses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
interface IfcPoolAddresses {
BCT: string;
NCT: string;
}
interface IfcNetworkPoolAddresses {
celo: IfcPoolAddresses;
alfajores: IfcPoolAddresses;
polygon: IfcPoolAddresses;
mumbai: IfcPoolAddresses;
}

interface IfcOneNetworkAddresses {
BCT: string;
NCT: string;
Expand Down
15 changes: 5 additions & 10 deletions utils/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
interface IfcPoolAddresses {
BCT: string;
NCT: string;
}
interface IfcTokenAddresses {
mcUSD?: string[];
cUSD?: string[];
Expand All @@ -16,12 +12,6 @@ interface IfcNetworkTokenAddresses {
polygon: IfcTokenAddresses;
mumbai: IfcTokenAddresses;
}
interface IfcNetworkPoolAddresses {
celo: IfcPoolAddresses;
alfajores: IfcPoolAddresses;
polygon: IfcPoolAddresses;
mumbai: IfcPoolAddresses;
}

const paths: IfcNetworkTokenAddresses = {
celo: {
Expand Down Expand Up @@ -56,6 +46,11 @@ const paths: IfcNetworkTokenAddresses = {
"0x874069Fa1Eb16D44d622F2e0Ca25eeA172369bC1",
"0x71DB38719f9113A36e14F409bAD4F07B58b4730b",
],
WETH: [
"0x48D380cb7de1da5d4cA0DAA696480943fD93B9fF",
"0x874069Fa1Eb16D44d622F2e0Ca25eeA172369bC1",
"0x71DB38719f9113A36e14F409bAD4F07B58b4730b",
],
},
polygon: {
USDC: ["0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174"],
Expand Down
Loading