Skip to content

Commit 58970f5

Browse files
committed
C2tP + ZrowGz additions
1 parent cfd4eec commit 58970f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2307
-1595
lines changed

src/hardhat/contracts/Curve/FraxFamilialPitchGauge.sol

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,4 +386,4 @@ contract FraxFamilialPitchGauge is Owned {//, ReentrancyGuard {
386386
event FamilialRewardClaimed(address familial_gauge, uint256 reward_amount, uint256 weeks_elapsed);
387387
event ChildGaugeRewardDistributed(address gauge, uint256 reward_amount);
388388
event RecoveredERC20(address token, uint256 amount);
389-
}
389+
}

src/hardhat/contracts/Curve/FraxGaugeControllerV2.vy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @version 0.3.4
1+
# @version 0.3.7
22

33
"""
44
@title Gauge Controller

src/hardhat/contracts/Curve/IFraxFarm.sol

Lines changed: 0 additions & 203 deletions
This file was deleted.

src/hardhat/contracts/Curve/veFPIS.vy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,4 +1318,4 @@ def stakerSetProxy(_proxy: address):
13181318
# Set the proxy
13191319
self.staker_whitelisted_proxy[msg.sender] = _proxy
13201320

1321-
log StakerProxySet(_proxy)
1321+
log StakerProxySet(_proxy)

src/hardhat/contracts/ERC20/__CROSSCHAIN/CrossChainCanonicalV2.sol

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ERC20PermitPermissionedMint } from "../ERC20PermitPermissionedMint.sol"
2929

3030
contract CrossChainCanonicalV2 is ERC20PermitPermissionedMint {
3131
/* ========== CONSTRUCTOR ========== */
32-
constructor(
32+
constructor(
3333
address _creator_address,
3434
address _timelock_address,
3535
string memory _name,
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later
2+
pragma solidity >=0.8.0;
3+
4+
5+
6+
interface IBalancerVault {
7+
function WETH () external view returns (address);
8+
// function batchSwap (uint8 kind, tuple[] swaps, address[] assets, tuple funds, int256[] limits, uint256 deadline) external returns (int256[] assetDeltas);
9+
function deregisterTokens (bytes32 poolId, address[] memory tokens) external;
10+
// function exitPool (bytes32 poolId, address sender, address recipient, tuple request) external;
11+
function flashLoan (address recipient, address[] memory tokens, uint256[] memory amounts, bytes memory userData) external;
12+
function getActionId (bytes4 selector) external view returns (bytes32);
13+
function getAuthorizer () external view returns (address);
14+
function getDomainSeparator () external view returns (bytes32);
15+
function getInternalBalance (address user, address[] memory tokens) external view returns (uint256[] memory balances);
16+
function getNextNonce (address user) external view returns (uint256);
17+
function getPausedState () external view returns (bool paused, uint256 pauseWindowEndTime, uint256 bufferPeriodEndTime);
18+
function getPool (bytes32 poolId) external view returns (address, uint8);
19+
function getPoolTokenInfo (bytes32 poolId, address token) external view returns (uint256 cash, uint256 managed, uint256 lastChangeBlock, address assetManager);
20+
function getPoolTokens (bytes32 poolId) external view returns (address[] memory tokens, uint256[] memory balances, uint256 lastChangeBlock);
21+
function getProtocolFeesCollector () external view returns (address);
22+
function hasApprovedRelayer (address user, address relayer) external view returns (bool);
23+
// function joinPool (bytes32 poolId, address sender, address recipient, tuple request) external;
24+
// function managePoolBalance (tuple[] ops) external;
25+
// function manageUserBalance (tuple[] ops) external;
26+
// function queryBatchSwap (uint8 kind, tuple[] swaps, address[] assets, tuple funds) external returns (int256[]);
27+
function registerPool (uint8 specialization) external returns (bytes32);
28+
function registerTokens (bytes32 poolId, address[] memory tokens, address[] memory assetManagers) external;
29+
function setAuthorizer (address newAuthorizer) external;
30+
function setPaused (bool paused) external;
31+
function setRelayerApproval (address sender, address relayer, bool approved) external;
32+
// function swap (tuple singleSwap, tuple funds, uint256 limit, uint256 deadline) external returns (uint256 amountCalculated);
33+
}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later
2+
pragma solidity >=0.8.0;
3+
4+
5+
interface IStablePool {
6+
function DOMAIN_SEPARATOR () external view returns (bytes32);
7+
function allowance (address owner, address spender) external view returns (uint256);
8+
function approve (address spender, uint256 amount) external returns (bool);
9+
function balanceOf (address account) external view returns (uint256);
10+
function decimals () external view returns (uint8);
11+
function decreaseAllowance (address spender, uint256 amount) external returns (bool);
12+
function disableRecoveryMode () external;
13+
function enableRecoveryMode () external;
14+
function getActionId (bytes4 selector) external view returns (bytes32);
15+
function getAmplificationParameter () external view returns (uint256 value, bool isUpdating, uint256 precision);
16+
function getAuthorizer () external view returns (address);
17+
function getLastInvariant () external view returns (uint256 lastInvariant, uint256 lastInvariantAmp);
18+
function getOwner () external view returns (address);
19+
function getPausedState () external view returns (bool paused, uint256 pauseWindowEndTime, uint256 bufferPeriodEndTime);
20+
function getPoolId () external view returns (bytes32);
21+
function getRate () external view returns (uint256);
22+
function getScalingFactors () external view returns (uint256[] memory);
23+
function getSwapFeePercentage () external view returns (uint256);
24+
function getVault () external view returns (address);
25+
function inRecoveryMode () external view returns (bool);
26+
function increaseAllowance (address spender, uint256 addedValue) external returns (bool);
27+
function name () external view returns (string memory);
28+
function nonces (address owner) external view returns (uint256);
29+
function onExitPool (bytes32 poolId, address sender, address recipient, uint256[] memory balances, uint256 lastChangeBlock, uint256 protocolSwapFeePercentage, bytes memory userData) external returns (uint256[] memory, uint256[] memory);
30+
function onJoinPool (bytes32 poolId, address sender, address recipient, uint256[] memory balances, uint256 lastChangeBlock, uint256 protocolSwapFeePercentage, bytes memory userData) external returns (uint256[] memory, uint256[] memory);
31+
// function onSwap (tuple swapRequest, uint256[] balances, uint256 indexIn, uint256 indexOut) external returns (uint256);
32+
// function onSwap (tuple request, uint256 balanceTokenIn, uint256 balanceTokenOut) external returns (uint256);
33+
function pause () external;
34+
function permit (address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s) external;
35+
function queryExit (bytes32 poolId, address sender, address recipient, uint256[] memory balances, uint256 lastChangeBlock, uint256 protocolSwapFeePercentage, bytes memory userData) external returns (uint256 bptIn, uint256[] memory amountsOut);
36+
function queryJoin (bytes32 poolId, address sender, address recipient, uint256[] memory balances, uint256 lastChangeBlock, uint256 protocolSwapFeePercentage, bytes memory userData) external returns (uint256 bptOut, uint256[] memory amountsIn);
37+
function setAssetManagerPoolConfig (address token, bytes memory poolConfig) external;
38+
function setSwapFeePercentage (uint256 swapFeePercentage) external;
39+
function startAmplificationParameterUpdate (uint256 rawEndValue, uint256 endTime) external;
40+
function stopAmplificationParameterUpdate () external;
41+
function symbol () external view returns (string memory);
42+
function totalSupply () external view returns (uint256);
43+
function transfer (address recipient, uint256 amount) external returns (bool);
44+
function transferFrom (address sender, address recipient, uint256 amount) external returns (bool);
45+
function unpause () external;
46+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later
2+
pragma solidity >=0.8.0;
3+
4+
interface IBalancerOracle {
5+
function ago ( ) external view returns ( uint56 );
6+
function balancerTwapOracle ( ) external view returns ( address );
7+
function getPrice ( ) external view returns ( uint256 price );
8+
function minPrice ( ) external view returns ( uint128 );
9+
function multiplier ( ) external view returns ( uint16 );
10+
function owner ( ) external view returns ( address );
11+
function secs ( ) external view returns ( uint56 );
12+
function setParams ( uint16 multiplier_, uint56 secs_, uint56 ago_, uint128 minPrice_ ) external;
13+
function transferOwnership ( address newOwner ) external;
14+
}

0 commit comments

Comments
 (0)