Skip to content

Commit

Permalink
C2tP + ZrowGz additions
Browse files Browse the repository at this point in the history
  • Loading branch information
FortisFortuna committed Mar 14, 2023
1 parent cfd4eec commit 58970f5
Show file tree
Hide file tree
Showing 43 changed files with 2,307 additions and 1,595 deletions.
2 changes: 1 addition & 1 deletion src/hardhat/contracts/Curve/FraxFamilialPitchGauge.sol
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,4 @@ contract FraxFamilialPitchGauge is Owned {//, ReentrancyGuard {
event FamilialRewardClaimed(address familial_gauge, uint256 reward_amount, uint256 weeks_elapsed);
event ChildGaugeRewardDistributed(address gauge, uint256 reward_amount);
event RecoveredERC20(address token, uint256 amount);
}
}
2 changes: 1 addition & 1 deletion src/hardhat/contracts/Curve/FraxGaugeControllerV2.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version 0.3.4
# @version 0.3.7

"""
@title Gauge Controller
Expand Down
203 changes: 0 additions & 203 deletions src/hardhat/contracts/Curve/IFraxFarm.sol

This file was deleted.

2 changes: 1 addition & 1 deletion src/hardhat/contracts/Curve/veFPIS.vy
Original file line number Diff line number Diff line change
Expand Up @@ -1318,4 +1318,4 @@ def stakerSetProxy(_proxy: address):
# Set the proxy
self.staker_whitelisted_proxy[msg.sender] = _proxy

log StakerProxySet(_proxy)
log StakerProxySet(_proxy)
2 changes: 1 addition & 1 deletion src/hardhat/contracts/ERC20/__CROSSCHAIN/CrossChainCanonicalV2.sol
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { ERC20PermitPermissionedMint } from "../ERC20PermitPermissionedMint.sol"

contract CrossChainCanonicalV2 is ERC20PermitPermissionedMint {
/* ========== CONSTRUCTOR ========== */
constructor(
constructor(
address _creator_address,
address _timelock_address,
string memory _name,
Expand Down
33 changes: 33 additions & 0 deletions src/hardhat/contracts/Misc_AMOs/balancer/IBalancerVault.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity >=0.8.0;



interface IBalancerVault {
function WETH () external view returns (address);
// function batchSwap (uint8 kind, tuple[] swaps, address[] assets, tuple funds, int256[] limits, uint256 deadline) external returns (int256[] assetDeltas);
function deregisterTokens (bytes32 poolId, address[] memory tokens) external;
// function exitPool (bytes32 poolId, address sender, address recipient, tuple request) external;
function flashLoan (address recipient, address[] memory tokens, uint256[] memory amounts, bytes memory userData) external;
function getActionId (bytes4 selector) external view returns (bytes32);
function getAuthorizer () external view returns (address);
function getDomainSeparator () external view returns (bytes32);
function getInternalBalance (address user, address[] memory tokens) external view returns (uint256[] memory balances);
function getNextNonce (address user) external view returns (uint256);
function getPausedState () external view returns (bool paused, uint256 pauseWindowEndTime, uint256 bufferPeriodEndTime);
function getPool (bytes32 poolId) external view returns (address, uint8);
function getPoolTokenInfo (bytes32 poolId, address token) external view returns (uint256 cash, uint256 managed, uint256 lastChangeBlock, address assetManager);
function getPoolTokens (bytes32 poolId) external view returns (address[] memory tokens, uint256[] memory balances, uint256 lastChangeBlock);
function getProtocolFeesCollector () external view returns (address);
function hasApprovedRelayer (address user, address relayer) external view returns (bool);
// function joinPool (bytes32 poolId, address sender, address recipient, tuple request) external;
// function managePoolBalance (tuple[] ops) external;
// function manageUserBalance (tuple[] ops) external;
// function queryBatchSwap (uint8 kind, tuple[] swaps, address[] assets, tuple funds) external returns (int256[]);
function registerPool (uint8 specialization) external returns (bytes32);
function registerTokens (bytes32 poolId, address[] memory tokens, address[] memory assetManagers) external;
function setAuthorizer (address newAuthorizer) external;
function setPaused (bool paused) external;
function setRelayerApproval (address sender, address relayer, bool approved) external;
// function swap (tuple singleSwap, tuple funds, uint256 limit, uint256 deadline) external returns (uint256 amountCalculated);
}
46 changes: 46 additions & 0 deletions src/hardhat/contracts/Misc_AMOs/balancer/IStablePool.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity >=0.8.0;


interface IStablePool {
function DOMAIN_SEPARATOR () external view returns (bytes32);
function allowance (address owner, address spender) external view returns (uint256);
function approve (address spender, uint256 amount) external returns (bool);
function balanceOf (address account) external view returns (uint256);
function decimals () external view returns (uint8);
function decreaseAllowance (address spender, uint256 amount) external returns (bool);
function disableRecoveryMode () external;
function enableRecoveryMode () external;
function getActionId (bytes4 selector) external view returns (bytes32);
function getAmplificationParameter () external view returns (uint256 value, bool isUpdating, uint256 precision);
function getAuthorizer () external view returns (address);
function getLastInvariant () external view returns (uint256 lastInvariant, uint256 lastInvariantAmp);
function getOwner () external view returns (address);
function getPausedState () external view returns (bool paused, uint256 pauseWindowEndTime, uint256 bufferPeriodEndTime);
function getPoolId () external view returns (bytes32);
function getRate () external view returns (uint256);
function getScalingFactors () external view returns (uint256[] memory);
function getSwapFeePercentage () external view returns (uint256);
function getVault () external view returns (address);
function inRecoveryMode () external view returns (bool);
function increaseAllowance (address spender, uint256 addedValue) external returns (bool);
function name () external view returns (string memory);
function nonces (address owner) external view returns (uint256);
function onExitPool (bytes32 poolId, address sender, address recipient, uint256[] memory balances, uint256 lastChangeBlock, uint256 protocolSwapFeePercentage, bytes memory userData) external returns (uint256[] memory, uint256[] memory);
function onJoinPool (bytes32 poolId, address sender, address recipient, uint256[] memory balances, uint256 lastChangeBlock, uint256 protocolSwapFeePercentage, bytes memory userData) external returns (uint256[] memory, uint256[] memory);
// function onSwap (tuple swapRequest, uint256[] balances, uint256 indexIn, uint256 indexOut) external returns (uint256);
// function onSwap (tuple request, uint256 balanceTokenIn, uint256 balanceTokenOut) external returns (uint256);
function pause () external;
function permit (address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s) external;
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);
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);
function setAssetManagerPoolConfig (address token, bytes memory poolConfig) external;
function setSwapFeePercentage (uint256 swapFeePercentage) external;
function startAmplificationParameterUpdate (uint256 rawEndValue, uint256 endTime) external;
function stopAmplificationParameterUpdate () external;
function symbol () external view returns (string memory);
function totalSupply () external view returns (uint256);
function transfer (address recipient, uint256 amount) external returns (bool);
function transferFrom (address sender, address recipient, uint256 amount) external returns (bool);
function unpause () external;
}
14 changes: 14 additions & 0 deletions src/hardhat/contracts/Misc_AMOs/bunni/IBalancerOracle.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity >=0.8.0;

interface IBalancerOracle {
function ago ( ) external view returns ( uint56 );
function balancerTwapOracle ( ) external view returns ( address );
function getPrice ( ) external view returns ( uint256 price );
function minPrice ( ) external view returns ( uint128 );
function multiplier ( ) external view returns ( uint16 );
function owner ( ) external view returns ( address );
function secs ( ) external view returns ( uint56 );
function setParams ( uint16 multiplier_, uint56 secs_, uint56 ago_, uint128 minPrice_ ) external;
function transferOwnership ( address newOwner ) external;
}
Loading

0 comments on commit 58970f5

Please sign in to comment.