Skip to content

Commit 4d50316

Browse files
JoeysantoroJoeysantoro
authored
Merge pull request #276 from fei-protocol/feat/contract-dependencies
Add contract dependencies e2e test
2 parents 6630409 + a817df8 commit 4d50316

Some content is hidden

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

51 files changed

+344
-157
lines changed

‎contract-addresses/dependencies.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import { DependencyMap } from '@custom-types/types';
2+
3+
const dependencies: DependencyMap = {
4+
core: {
5+
fips: {
6+
fip_37: true
7+
},
8+
contractDependencies: [],
9+
externalDependencies: []
10+
},
11+
pcvEquityMinter: {
12+
fips: {
13+
fip_37: true
14+
},
15+
contractDependencies: [],
16+
externalDependencies: []
17+
},
18+
collateralizationOracleKeeper: {
19+
fips: {
20+
fip_37: true
21+
},
22+
contractDependencies: [],
23+
externalDependencies: []
24+
},
25+
feiTribeLBPSwapper: {
26+
fips: {
27+
fip_37: true
28+
},
29+
contractDependencies: [],
30+
externalDependencies: []
31+
},
32+
collateralizationOracle: {
33+
fips: {
34+
fip_37: true
35+
},
36+
contractDependencies: [],
37+
externalDependencies: []
38+
},
39+
collateralizationOracleWrapper: {
40+
fips: {
41+
fip_37: true
42+
},
43+
contractDependencies: [],
44+
externalDependencies: []
45+
},
46+
collateralizationOracleGuardian: {
47+
fips: {
48+
fip_37: true
49+
},
50+
contractDependencies: [],
51+
externalDependencies: []
52+
},
53+
optimisticTimelock: {
54+
fips: {
55+
fip_37: true
56+
},
57+
contractDependencies: [],
58+
externalDependencies: []
59+
}
60+
};
61+
62+
export default dependencies;

‎contract-addresses/mainnetAddresses.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,14 @@ const MainnetAddresses = {
367367
artifactName: 'ERC20CompoundPCVDeposit',
368368
address: '0x74B235Fef146cDB5BE0D3786a9f3774674b3615E'
369369
},
370-
rariPool72FeiPCVDeposit: { artifactName: 'ERC20CompoundPCVDeposit', address: '0x4A5Af5A124E672C156241b76CAd4E41D09dd4883' },
371-
rariPool79FeiPCVDeposit: { artifactName: 'ERC20CompoundPCVDeposit', address: '0x76dFcf06E7D7B8248094DC319b284fB244f06309' },
370+
rariPool72FeiPCVDeposit: {
371+
artifactName: 'ERC20CompoundPCVDeposit',
372+
address: '0x4A5Af5A124E672C156241b76CAd4E41D09dd4883'
373+
},
374+
rariPool79FeiPCVDeposit: {
375+
artifactName: 'ERC20CompoundPCVDeposit',
376+
address: '0x76dFcf06E7D7B8248094DC319b284fB244f06309'
377+
},
372378
rariPool8Comptroller: { artifactName: 'Unitroller', address: '0xc54172e34046c1653d1920d40333dd358c7a1af4' },
373379
rariPool8Dai: { artifactName: 'CErc20Delegator', address: '0x7e9cE3CAa9910cc048590801e64174957Ed41d43' },
374380
rariPool8DaiIrm: { artifactName: 'unknown', address: '0xede47399e2aa8f076d40dc52896331cba8bd40f7' },
@@ -400,7 +406,10 @@ const MainnetAddresses = {
400406
artifactName: 'ERC20CompoundPCVDeposit',
401407
address: '0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D'
402408
},
403-
rariPool91FeiPCVDeposit: { artifactName: 'ERC20CompoundPCVDeposit', address: '0x2296a2417D1f02d394ab22aF794a0f426eD53436' },
409+
rariPool91FeiPCVDeposit: {
410+
artifactName: 'ERC20CompoundPCVDeposit',
411+
address: '0x2296a2417D1f02d394ab22aF794a0f426eD53436'
412+
},
404413
rariRewardsDistributorDelegator: {
405414
artifactName: 'unknown',
406415
address: '0x73F16f0c0Cd1A078A54894974C5C054D8dC1A3d7'

proposals/dao/fip_34.ts renamed to proposals/dao/old/fip_34.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
SetupUpgradeFunc,
88
TeardownUpgradeFunc,
99
ValidateUpgradeFunc
10-
} from '../../types/types';
10+
} from '../../../types/types';
1111
import { FeiDAOTimelock } from '@custom-types/contracts';
1212
import { getImpersonatedSigner } from '@test/helpers';
1313

‎proposals/description/fip_37.json‎

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

‎proposals/description/fip_37.ts‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
import { ProposalDescription } from '@custom-types/types';
2+
3+
const fip_37: ProposalDescription = {
4+
title: 'FIP-37: TRIBE buybacks',
5+
commands: [
6+
{
7+
target: 'core',
8+
values: '0',
9+
method: 'grantMinter(address)',
10+
arguments: ['{pcvEquityMinter}'],
11+
description: 'Make PCV Equity Minter a minter'
12+
},
13+
{
14+
target: 'core',
15+
values: '0',
16+
method: 'grantMinter(address)',
17+
arguments: ['{collateralizationOracleKeeper}'],
18+
description: 'Make CR Oracle Keeper a minter'
19+
},
20+
{
21+
target: 'core',
22+
values: '0',
23+
method: 'allocateTribe(address,uint256)',
24+
arguments: ['{feiTribeLBPSwapper}', '50000000000000000000000'],
25+
description: 'Seed LBP Swapper with 50k TRIBE'
26+
},
27+
{
28+
target: 'core',
29+
values: '0',
30+
method: 'createRole(bytes32,bytes32)',
31+
arguments: [
32+
'0xc307c44629779eb8fc0b85f224c3d22f5876a6c84de0ee42d481eb7814f0d3a8',
33+
'0x899bd46557473cb80307a9dabc297131ced39608330a2d29b2d52b660c03923e'
34+
],
35+
description: 'Create ORACLE_ADMIN_ROLE role'
36+
},
37+
{
38+
target: 'collateralizationOracle',
39+
values: '0',
40+
method: 'setContractAdminRole(bytes32)',
41+
arguments: ['0xc307c44629779eb8fc0b85f224c3d22f5876a6c84de0ee42d481eb7814f0d3a8'],
42+
description: 'Set ORACLE_ADMIN_ROLE role to admin for CR Oracle'
43+
},
44+
{
45+
target: 'collateralizationOracleWrapper',
46+
values: '0',
47+
method: 'setContractAdminRole(bytes32)',
48+
arguments: ['0xc307c44629779eb8fc0b85f224c3d22f5876a6c84de0ee42d481eb7814f0d3a8'],
49+
description: 'Set ORACLE_ADMIN_ROLE role to admin for CR Oracle Wrapper'
50+
},
51+
{
52+
target: 'core',
53+
values: '0',
54+
method: 'grantRole(bytes32,address)',
55+
arguments: [
56+
'0xc307c44629779eb8fc0b85f224c3d22f5876a6c84de0ee42d481eb7814f0d3a8',
57+
'{collateralizationOracleGuardian}'
58+
],
59+
description: 'Grant Oracle Admin role to Collateralization Oracle Guardian'
60+
},
61+
{
62+
target: 'core',
63+
values: '0',
64+
method: 'createRole(bytes32,bytes32)',
65+
arguments: [
66+
'0x471cfe1a44bf1b786db7d7104d51e6728ed7b90a35394ad7cc424adf8ed16816',
67+
'0x899bd46557473cb80307a9dabc297131ced39608330a2d29b2d52b660c03923e'
68+
],
69+
description: 'Create SWAP_ADMIN_ROLE'
70+
},
71+
{
72+
target: 'core',
73+
values: '0',
74+
method: 'grantRole(bytes32,address)',
75+
arguments: ['0x471cfe1a44bf1b786db7d7104d51e6728ed7b90a35394ad7cc424adf8ed16816', '{pcvEquityMinter}'],
76+
description: 'Grant SWAP_ADMIN_ROLE to PCVEquityMinter'
77+
},
78+
{
79+
target: 'core',
80+
values: '0',
81+
method: 'grantRole(bytes32,address)',
82+
arguments: ['0xc307c44629779eb8fc0b85f224c3d22f5876a6c84de0ee42d481eb7814f0d3a8', '{optimisticTimelock}'],
83+
description: 'Grant ORACLE_ADMIN_ROLE to OA Timelock'
84+
}
85+
],
86+
description: 'buybacks!'
87+
};
88+
89+
export default fip_37;

‎proposals/description/fip_37.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎proposals/description/fip_x.json‎

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

‎proposals/description/fip_x.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { ProposalDescription } from '@custom-types/types';
2+
3+
const fip_x: ProposalDescription = {
4+
title: 'FIP-X: Title',
5+
commands: [
6+
{
7+
target: '',
8+
values: '',
9+
method: '',
10+
arguments: [],
11+
description: ''
12+
}
13+
],
14+
description: 'fip_x will change the game!'
15+
};
16+
17+
export default fip_x;

proposals/description/fip_10a.json renamed to proposals/description/old/fip_10a.json

File renamed without changes.

proposals/description/fip_11.json renamed to proposals/description/old/fip_11.json

File renamed without changes.

0 commit comments

Comments
 (0)