Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ package-lock.json
pnpm-lock.yaml
yarn.lock
deployments
.claude
Binary file modified bun.lockb
Binary file not shown.
13 changes: 4 additions & 9 deletions contracts/sPRL/sPRL1.sol
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@ contract sPRL1 is TimeLockPenaltyERC20 {
uint64 _timeLockDuration
)
TimeLockPenaltyERC20(
NAME,
SYMBOL,
_underlying,
_feeReceiver,
_accessManager,
_startPenaltyPercentage,
_timeLockDuration
NAME, SYMBOL, _underlying, _feeReceiver, _accessManager, _startPenaltyPercentage, _timeLockDuration
)
{ }

Expand Down Expand Up @@ -71,8 +65,9 @@ contract sPRL1 is TimeLockPenaltyERC20 {
nonReentrant
{
// @dev using try catch to avoid reverting the transaction in case of front-running
try IERC20Permit(address(underlying)).permit(msg.sender, address(this), _assetAmount, _deadline, _v, _r, _s) {
} catch { }
try IERC20Permit(address(underlying))
.permit(msg.sender, address(this), _assetAmount, _deadline, _v, _r, _s) { }
catch { }
underlying.safeTransferFrom(msg.sender, address(this), _assetAmount);
_deposit(_assetAmount);
}
Expand Down
10 changes: 2 additions & 8 deletions contracts/sPRL/sPRL2.sol
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ contract sPRL2 is TimeLockPenaltyERC20 {
string constant SYMBOL = "sPRL2";

/// @dev Aura Pool PID is hardcoded and must be updated before deploying
uint256 public constant AURA_POOL_PID = 244;
uint256 public constant AURA_POOL_PID = 258;

//-------------------------------------------
// Storage
Expand Down Expand Up @@ -117,13 +117,7 @@ contract sPRL2 is TimeLockPenaltyERC20 {
BPTConfigParams memory _configParams
)
TimeLockPenaltyERC20(
NAME,
SYMBOL,
_stakedAuraBPT,
_feeReceiver,
_accessManager,
_startPenaltyPercentage,
_timeLockDuration
NAME, SYMBOL, _stakedAuraBPT, _feeReceiver, _accessManager, _startPenaltyPercentage, _timeLockDuration
)
{
if (_configParams.rewardTokens.length == 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"isMainChainFeeDistributor": false,
"accessManager": "0xE2A0FA5A1e7315e6b89b12Ace2541A6a0d3E5370",
"wallets": {
"dao": "0x3676b6ed4ae0c9ce3E0034510719fdF5fd585d55"
"dao": "0x66CcEC236bbcE5f1bBd1b2fC0a4014e57A55ad02"
},
"tokens": {
"prl": "0x0F4DE51EF1E7611aD0A9181F2d62B9c8408EFfa2",
"paUSD": "0x0000000000000000000000000000000000000000",
"par": "0x78C48A7d7Fc69735fDab448fe6068bbA44a920E6",
"weth": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
},
Expand All @@ -30,8 +29,8 @@
"feeReceiver": "dao",
"startPenaltyPercentage": "1000000000000000000",
"timeLockDuration": 86400000,
"balancerV3Vault": "0x0000000000000000000000000000000000000000",
"auraVault": "0x0000000000000000000000000000000000000000",
"balancerV3Router": "0x0000000000000000000000000000000000000000",
"auraRewardsPool": "0x0000000000000000000000000000000000000000",
"auraBoosterLite": "0x0000000000000000000000000000000000000000",
"auraBPT": "0x0000000000000000000000000000000000000000",
"balancerBPT": "0x0000000000000000000000000000000000000000"
Expand Down
40 changes: 40 additions & 0 deletions deploy/config/base/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"isMainChainFeeDistributor": false,
"accessManager": "0x0e4e7Ca9D7b1e6293D0713EFEfB4BCA010DeBF46",
"wallets": {
"dao": "0xC5201FFE258a95Af986E7cD1fcaD54f3f63f2C95"
},
"tokens": {
"prl": "0xfD28f108e95f4D41daAE9dbfFf707D677985998E",
"par": "0x0000000000000000000000000000000000000000",
"weth": "0x0000000000000000000000000000000000000000"
},
"rewardMerkleDistributor": {
"token": "par",
"expiredRewardsRecipient": "dao"
},
"feeDistributor": {
"mainChain": "polygon",
"destinationReceiver": "0x0000000000000000000000000000000000000000",
"feeToken": "par",
"bridgeableToken": "0x0000000000000000000000000000000000000000"
},
"sprl1": {
"underlying": "prl",
"feeReceiver": "dao",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200
},
"sprl2": {
"feeReceiver": "dao",
"permit2": "0x0000000000000000000000000000000000000000",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200,
"balancerV3Router": "0x0000000000000000000000000000000000000000",
"auraRewardsPool": "0x0000000000000000000000000000000000000000",
"auraBoosterLite": "0x0000000000000000000000000000000000000000",
"auraBPT": "0x0000000000000000000000000000000000000000",
"balancerBPT": "0x0000000000000000000000000000000000000000",
"rewardsTokens": []
}
}
40 changes: 40 additions & 0 deletions deploy/config/mainnet/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"isMainChainFeeDistributor": false,
"accessManager": "0x94Ea8800444017695345156319e96bdB1E355F7a",
"wallets": {
"dao": "0x25Fc7ffa8f9da3582a36633d04804F0004706F9b"
},
"tokens": {
"prl": "0x6c0aeceeDc55c9d55d8B99216a670D85330941c3",
"par": "0x68037790a0229e9ce6eaa8a99ea92964106c4703",
"weth": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
},
"rewardMerkleDistributor": {
"token": "par",
"expiredRewardsRecipient": "dao"
},
"feeDistributor": {
"mainChain": "polygon",
"destinationReceiver": "0x90337e484B1Cb02132fc150d3Afa262147348545",
"feeToken": "par",
"bridgeableToken": "0x74e3f9D724Da6D7e4db8EcAb4f18e6ba44f60e30"
},
"sprl1": {
"underlying": "prl",
"feeReceiver": "dao",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200
},
"sprl2": {
"feeReceiver": "dao",
"permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 60,
"balancerV3Router": "0x5C6fb490BDFD3246EB0bB062c168DeCAF4bD9FDd",
"auraRewardsPool": "0x486Be73794Ec19f3e9cF57f06f03fDCf7F0A9da4",
"auraBoosterLite": "0xA57b8d98dAE62B26Ec3bcC4a365338157060B234",
"auraBPT": "0x486Be73794Ec19f3e9cF57f06f03fDCf7F0A9da4",
"balancerBPT": "0x1846C6cBE0D433e152fA358e5fF27968E18bcE7c",
"rewardsTokens": ["0xba100000625a3754423978a60c9317c58a424e3d", "0xC0c293ce456fF0ED870ADd98a0828Dd4d2903DBF"]
}
}
40 changes: 40 additions & 0 deletions deploy/config/polygon/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"isMainChainFeeDistributor": true,
"accessManager": "0x7Df74BBB6F82eC1BCB1562a30ef5Bf5c326e2811",
"wallets": {
"dao": "0x2046c0416A558C40cb112E5ebB0Ca764c3C5c32a"
},
"tokens": {
"prl": "0x7790dd69aa10eD3f1271E41CD7222D2a7d2D5948",
"par": "0xE2Aa7db6dA1dAE97C5f5C6914d285fBfCC32A128",
"weth": "0x0000000000000000000000000000000000000000"
},
"rewardMerkleDistributor": {
"token": "par",
"expiredRewardsRecipient": "dao"
},
"feeDistributor": {
"mainChain": "polygon",
"destinationReceiver": "0x0000000000000000000000000000000000000000",
"feeToken": "par",
"bridgeableToken": "0xE462Df8d4Aa7Db3aeCfe810ec8D1fa4f716BC9a8"
},
"sprl1": {
"underlying": "prl",
"feeReceiver": "dao",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200
},
"sprl2": {
"feeReceiver": "dao",
"permit2": "0x0000000000000000000000000000000000000000",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200,
"balancerV3Router": "0x0000000000000000000000000000000000000000",
"auraRewardsPool": "0x0000000000000000000000000000000000000000",
"auraBoosterLite": "0x0000000000000000000000000000000000000000",
"auraBPT": "0x0000000000000000000000000000000000000000",
"balancerBPT": "0x0000000000000000000000000000000000000000",
"rewardsTokens": []
}
}
10 changes: 4 additions & 6 deletions deploy/config/sepolia/config.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"isMainChainFeeDistributor": true,
"accessManager": "0xe29F44Aa83EB42BA823719EA1D2d84861f72A5D0",
"accessManager": "0xfD28f108e95f4D41daAE9dbfFf707D677985998E",
"wallets": {
"dao": "0x3676b6ed4ae0c9ce3E0034510719fdF5fd585d55"
"dao": "0x66CcEC236bbcE5f1bBd1b2fC0a4014e57A55ad02"
},
"tokens": {
"prl": "0xfaD382eE9B8229fb9B05DF9F9391baC5DD81f346",
"paUSD": "0x0000000000000000000000000000000000000000",
"par": "0x68E88c802F146eAD2f99F3A91Fb880D1A2509672",
"weth": "0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
},
Expand All @@ -30,9 +29,8 @@
"feeReceiver": "dao",
"startPenaltyPercentage": "1000000000000000000",
"timeLockDuration": 2419200,
"balancerV3Vault": "0x0000000000000000000000000000000000000000",
"auraVault": "0x0000000000000000000000000000000000000000",
"auraVaultRewardToken": "0x0000000000000000000000000000000000000000",
"balancerV3Router": "0x0000000000000000000000000000000000000000",
"auraRewardsPool": "0x0000000000000000000000000000000000000000",
"auraBoosterLite": "0x0000000000000000000000000000000000000000",
"auraBPT": "0x0000000000000000000000000000000000000000",
"balancerBPT": "0x0000000000000000000000000000000000000000"
Expand Down
40 changes: 40 additions & 0 deletions deploy/config/sonic/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"isMainChainFeeDistributor": false,
"accessManager": "0x8eFb3DED78FbaEF2a4eFe01E01BBD911E4094b78",
"wallets": {
"dao": "0xC5201FFE258a95Af986E7cD1fcaD54f3f63f2C95"
},
"tokens": {
"prl": "0xfD28f108e95f4D41daAE9dbfFf707D677985998E",
"par": "0x0000000000000000000000000000000000000000",
"weth": "0x0000000000000000000000000000000000000000"
},
"rewardMerkleDistributor": {
"token": "par",
"expiredRewardsRecipient": "dao"
},
"feeDistributor": {
"mainChain": "polygon",
"destinationReceiver": "0x0000000000000000000000000000000000000000",
"feeToken": "par",
"bridgeableToken": "0x0000000000000000000000000000000000000000"
},
"sprl1": {
"underlying": "prl",
"feeReceiver": "dao",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200
},
"sprl2": {
"feeReceiver": "dao",
"permit2": "0x0000000000000000000000000000000000000000",
"startPenaltyPercentage": "500000000000000000",
"timeLockDuration": 2419200,
"balancerV3Router": "0x0000000000000000000000000000000000000000",
"auraRewardsPool": "0x0000000000000000000000000000000000000000",
"auraBoosterLite": "0x0000000000000000000000000000000000000000",
"auraBPT": "0x0000000000000000000000000000000000000000",
"balancerBPT": "0x0000000000000000000000000000000000000000",
"rewardsTokens": []
}
}
4 changes: 1 addition & 3 deletions deploy/scripts/fees/MainFeeDistributor.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import assert from "assert";

import { ethers } from "ethers";
import { type DeployFunction } from "hardhat-deploy/types";

import { checkAddressValid, GAS, getTokenAddressFromConfig, isAddressValid } from "../../utils";
import { checkAddressValid, getTokenAddressFromConfig } from "../../utils";
import { readFileSync } from "fs";
import { ConfigData } from "../../utils/types";

Expand Down Expand Up @@ -34,7 +33,6 @@ const deploy: DeployFunction = async (hre) => {
args: [accessManager, bridgeableToken, feeToken],
log: true,
skipIfAlreadyDeployed: false,
...GAS,
});

console.log(`Deployed contract: ${contractName}, network: ${hre.network.name}, address: ${contract.address}`);
Expand Down
4 changes: 1 addition & 3 deletions deploy/scripts/fees/SideChainFeeCollector.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import assert from "assert";

import { ethers } from "ethers";
import { type DeployFunction } from "hardhat-deploy/types";

import { checkAddressValid, GAS, getLzEidReceiver, getTokenAddressFromConfig, isAddressValid } from "../../utils";
import { checkAddressValid, getLzEidReceiver, getTokenAddressFromConfig } from "../../utils";
import { readFileSync } from "fs";
import { ConfigData } from "../../utils/types";

Expand Down Expand Up @@ -36,7 +35,6 @@ const deploy: DeployFunction = async (hre) => {
args: [accessManager, lzEidReceiver, bridgeableToken, destinationReceiver, feeToken],
log: true,
skipIfAlreadyDeployed: false,
...GAS,
});

console.log(`Deployed contract: ${contractName}, network: ${hre.network.name}, address: ${contract.address}`);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import assert from "assert";

import { type DeployFunction } from "hardhat-deploy/types";

import { checkAddressValid, GAS, getTokenAddressFromConfig, getWalletAddressFromConfig } from "../../utils";
import { checkAddressValid, getTokenAddressFromConfig, getWalletAddressFromConfig } from "../../utils";
import { readFileSync } from "fs";
import { ConfigData } from "../../utils/types";

Expand Down Expand Up @@ -37,7 +37,6 @@ const deploy: DeployFunction = async (hre) => {
args: [accessManager, token, expiredRewardsRecipient],
log: true,
skipIfAlreadyDeployed: false,
...GAS,
});

console.log(`Deployed contract: ${contractName}, network: ${hre.network.name}, address: ${contract.address}`);
Expand Down
4 changes: 1 addition & 3 deletions deploy/scripts/sprl/sPRL1.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import assert from "assert";

import { ethers } from "ethers";
import { type DeployFunction } from "hardhat-deploy/types";

import { GAS, getTokenAddressFromConfig, getWalletAddressFromConfig, isAddressValid } from "../../utils";
import { getTokenAddressFromConfig, getWalletAddressFromConfig, isAddressValid } from "../../utils";
import { readFileSync } from "fs";
import { ConfigData } from "../../utils/types";

Expand Down Expand Up @@ -33,7 +32,6 @@ const deploy: DeployFunction = async (hre) => {
args: [underlying, feeReceiver, accessManager, sprl1Data.startPenaltyPercentage, sprl1Data.timeLockDuration],
log: true,
skipIfAlreadyDeployed: false,
...GAS,
});

console.log(`Deployed contract: ${contractName}, network: ${hre.network.name}, address: ${contract.address}`);
Expand Down
Loading
Loading