Skip to content

Commit

Permalink
Merge pull request #720 from fei-protocol/release/2.5.2
Browse files Browse the repository at this point in the history
Release/2.5.2
  • Loading branch information
Joeysantoro authored Apr 21, 2022
2 parents e0c2b53 + ebd3372 commit 5068dad
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ export default {
chainId: 5777, // Any network (default: none)
forking: enableMainnetForking
? {
url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`
// blockNumber: 13968350
url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`,
blockNumber: 14551200
}
: undefined
},
Expand Down
4 changes: 3 additions & 1 deletion protocol-configuration/collateralizationOracle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const collateralizationAddresses = {
'rariPool72FeiPCVDepositWrapper',
'rariPool128FeiPCVDepositWrapper',
'rariPool22FeiPCVDepositWrapper',
'feiBuybackLensNoFee'
'feiBuybackLensNoFee',
'convexPoolPCVDepositWrapper',
'compoundPCVDepositWrapper'
],
lusd: [
'liquityFusePoolLusdPCVDeposit',
Expand Down
10 changes: 10 additions & 0 deletions protocol-configuration/mainnetAddresses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1855,6 +1855,16 @@ const MainnetAddresses: MainnetAddresses = {
artifactName: 'RariGovernanceTokenUniswapDistributor',
address: '0x1fa69a416bcf8572577d3949b742fbb0a9cd98c7',
category: AddressCategory.Governance
},
convexPoolPCVDepositWrapper: {
artifactName: 'PCVDepositWrapper',
address: '0x1370CA8655C255948d6c6110066d78680601B7c2',
category: AddressCategory.PCV
},
compoundPCVDepositWrapper: {
artifactName: 'PCVDepositWrapper',
address: '0xB80B3dc4F8B30589477b2bA0e4EF2b8224bDf0a5',
category: AddressCategory.PCV
}
};

Expand Down
14 changes: 1 addition & 13 deletions test/integration/proposals_config.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
import { ProposalCategory, ProposalsConfigMap } from '@custom-types/types';

import fip_94 from '@proposals/description/fip_94';

const proposals: ProposalsConfigMap = {
fip_94: {
deploy: false,
proposalId: null,
affectedContractSignoff: ['rariTimelock'],
deprecatedContractSignoff: [],
category: ProposalCategory.DAO,
totalValue: 0,
proposal: fip_94
}
};
const proposals: ProposalsConfigMap = {};

export default proposals;
2 changes: 1 addition & 1 deletion test/integration/tests/fip-38-tokemak.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const TOKEMAK_MANAGER_ROLLOVER_ADDRESS = '0x90b6C61B102eA260131aB48377E143D6EB3A
const TOKEMAK_MANAGER_ADDRESS = '0xa86e412109f77c45a3bc1c5870b880492fb86a14'; // tokemak manager
const IPFS_JSON_FILE_HASH = 'QmP4Vzg45jExr3mcNsx9xxV1fNft95uVzgZGeLtkBXgpkx';

describe.only('e2e-fip-38-tokemak', function () {
describe('e2e-fip-38-tokemak', function () {
let contracts: NamedContracts;
let deployAddress: string;
let e2eCoord: TestEndtoEndCoordinator;
Expand Down

0 comments on commit 5068dad

Please sign in to comment.