Skip to content

Commit 1b86735

Browse files
authored
Merge pull request #13 from fei-protocol/OZ-Audit-New
OpenZeppelin New Audit
2 parents aa026f3 + f4bd67b commit 1b86735

File tree

470 files changed

+32391
-31903
lines changed

Some content is hidden

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

470 files changed

+32391
-31903
lines changed

.circleci/config.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ jobs:
3030
key: repo-{{ .Environment.CIRCLE_SHA1 }}
3131
paths:
3232
- ~/repo
33+
lint:
34+
working_directory: ~/repo
35+
docker:
36+
- image: circleci/node:12
37+
steps:
38+
- restore_cache:
39+
keys:
40+
- repo-{{ .Environment.CIRCLE_SHA1 }}
41+
- run:
42+
name: Run linter
43+
command: npm run lint
3344
test:
3445
working_directory: ~/repo
3546
docker:
@@ -42,10 +53,33 @@ jobs:
4253
name: Run tests
4354
command: npm run test
4455

56+
e2e-test:
57+
working_directory: ~/repo
58+
docker:
59+
- image: circleci/node:12
60+
steps:
61+
- restore_cache:
62+
keys:
63+
- repo-{{ .Environment.CIRCLE_SHA1 }}
64+
- run:
65+
name: Run end-to-end tests
66+
command: npm run test:e2e
67+
4568
workflows:
4669
main:
4770
jobs:
4871
- build
72+
- lint:
73+
requires:
74+
- build
4975
- test:
5076
requires:
5177
- build
78+
- e2e-test:
79+
requires:
80+
- build
81+
- lint
82+
- test
83+
filters:
84+
branches:
85+
only: master

.env.example

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
TESTNET_MODE=
2+
MAINNET_BONDING_CURVE_ORACLE=0x89714d3AC9149426219a3568543200D1964101C4
3+
MAINNET_CORE=0x8d5ED43dCa8C2F7dFB20CF7b53CC7E593635d7b9
4+
MAINNET_ETH_BONDING_CURVE=0xe1578B4a32Eaefcd563a9E6d0dc02a4213f673B7
5+
MAINNET_ETH_PCV_DRIPPER=0xDa079A280FC3e33Eb11A78708B369D5Ca2da54fE
6+
MAINNET_ETH_RESERVE_STABILIZER=0xa08A721dFB595753FFf335636674D76C455B275C
7+
MAINNET_ETH_UNISWAP_PCV_CONTROLLER=0x0760dfe09bd6d04d0df9a60c51f01ecedceb5132
8+
MAINNET_ETH_UNISWAP_PCV_CONTROLLER_01=0x7a165F8518A9Ec7d5DA15f4B77B1d7128B5D9188
9+
MAINNET_ETH_UNISWAP_PCV_DEPOSIT_01=0x9b0C6299D08fe823f2C0598d97A1141507e4ad86
10+
MAINNET_ETH_UNISWAP_PCV_DEPOSIT=0x5d6446880FCD004c851EA8920a628c70Ca101117
11+
MAINNET_FEI_ETH_PAIR=0x94B0A3d511b6EcDb17eBF877278Ab030acb0A878
12+
MAINNET_FEI_REWARDS_DISTRIBUTOR=0xEf1a94AF192A88859EAF3F3D8C1B9705542174C5
13+
MAINNET_FEI_ROUTER=0x9271D303b57c204636C38Df0eD339b18Bf98f909
14+
MAINNET_FEI_STAKING_REWARDS=0x18305DaAe09Ea2F4D51fAa33318be5978D251aBd
15+
MAINNET_FEI_TRIBE_PAIR=0x9928e4046d7c6513326cCeA028cD3e7a91c7590A
16+
MAINNET_FEI=0x956F47F50A910163D8BF957Cf5846D573E7f87CA
17+
MAINNET_GENESIS_GROUP=0xBFfB152b9392e38CdDc275D818a3Db7FE364596b
18+
MAINNET_GOVERNOR_ALPHA=0xE087F94c3081e1832dC7a22B48c6f2b5fAaE579B
19+
MAINNET_TIMELOCK=0x639572471f2f318464dc01066a56867130e45E25
20+
MAINNET_TRIBE=0xc7283b66Eb1EB5FB86327f08e1B5816b0720212B
21+
MAINNET_UNISWAP_INCENTIVE=0xfe5b6c2a87A976dCe20130c423C679f4d6044cD7
22+
MAINNET_UNISWAP_ORACLE=0x087F35bd241e41Fc28E43f0E8C58d283DD55bD65
23+
MAINNET_UNISWAP_ROUTER=0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D
24+
MAINNET_RATIO_PCV_CONTROLLER=0xfC1aD6eb84351597cD3b9B65179633697d65B920
25+
MAINNET_ETH_PCV_ADAPTER_TO_DEPOSIT=0x4c52aD4Ad171a58B57592893c37Cc81655e11611
26+
MAINNET_ETH_PCV_ADAPTER=0xB72dDeD4Fa321e093E2083B596404A56ffC5b574
27+
MAINNET_PROPOSER=0xe0ac4559739bd36f0913fb0a3f5bfc19bcbacd52
28+
MAINNET_VOTER=0xB8f482539F2d3Ae2C9ea6076894df36D1f632775
29+
MAINNET_WETH=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
30+
MAINNET_RARI_POOL_8_COMPTROLLER=0xc54172e34046c1653d1920d40333dd358c7a1af4
31+
MAINNET_RARI_POOL_8_FEI=0xd8553552f8868C1Ef160eEdf031cF0BCf9686945
32+
MAINNET_RARI_POOL_8_TRIBE=0xFd3300A9a74b3250F1b2AbC12B47611171910b07
33+
MAINNET_RARI_POOL_8_ETH=0xbB025D470162CC5eA24daF7d4566064EE7f5F111
34+
MAINNET_RARI_POOL_8_DAI=0x7e9cE3CAa9910cc048590801e64174957Ed41d43

.eslintignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
artifacts/
2+
build/
3+
cache/
4+
coverage/
5+
dist/
6+
lib/
7+
node_modules/

.eslintrc.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"commonjs": true,
5+
"es2021": true
6+
},
7+
"extends": ["airbnb-base"],
8+
"parserOptions": {
9+
"ecmaVersion": 12
10+
},
11+
"rules": {
12+
"prefer-arrow-callback": 0,
13+
"comma-dangle": 0,
14+
"func-names": 0,
15+
"space-before-function-paren": 0,
16+
"max-len": 1,
17+
"no-multi-spaces": 0,
18+
"no-trailing-spaces": 0,
19+
"object-curly-spacing": 0,
20+
"no-tabs": 0,
21+
"no-unused-expressions": 0,
22+
"no-sequences": 0,
23+
"no-mixed-spaces-and-tabs": 0,
24+
"no-await-in-loop": 0,
25+
"guard-for-in": 0,
26+
"no-restricted-syntax": 0,
27+
"no-underscore-dangle": 0
28+
},
29+
"globals": {
30+
"artifacts": "readonly",
31+
"describe": "readonly",
32+
"beforeEach": "readonly",
33+
"it": "readonly"
34+
}
35+
}

.gitbook.yaml

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

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ build/
66
coverage.json
77
coverage/
88
tenderly.yaml
9+
artifacts
10+
cache
11+
types

.solhint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"extends": "solhint:recommended",
33
"plugins": [],
44
"rules": {
5-
"max-line-length" : "off",
65
"compiler-version" : ["warn", "^0.6.0"],
6+
"not-rely-on-time" : "off",
77
"reason-string" : "off",
88
"no-empty-blocks" : "off"
99
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"core": "0x8d5ED43dCa8C2F7dFB20CF7b53CC7E593635d7b9",
3+
"tribe": "0xc7283b66Eb1EB5FB86327f08e1B5816b0720212B",
4+
"fei": "0x956F47F50A910163D8BF957Cf5846D573E7f87CA",
5+
"timelock": "0x639572471f2f318464dc01066a56867130e45E25",
6+
"uniswapPCVDeposit": "0x5d6446880fcd004c851ea8920a628c70ca101117",
7+
"uniswapPCVController": "0x0760dfe09bd6d04d0df9a60c51f01ecedceb5132",
8+
"bondingCurve": "0xe1578B4a32Eaefcd563a9E6d0dc02a4213f673B7",
9+
"chainlinkEthUsdOracle": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419",
10+
"chainlinkFeiEthOracle": "0x7F0D2c2838c6AC24443d13e23d99490017bDe370",
11+
"compositeOracle": "0x8721f9EAba0B9081069970bCBce38763D3D4f28E",
12+
"ethReserveStabilizer": "0xa08A721dFB595753FFf335636674D76C455B275C",
13+
"ratioPCVController": "0xfC1aD6eb84351597cD3b9B65179633697d65B920",
14+
"weth": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
15+
"uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
16+
"uniswapOracle": "0x087F35bd241e41Fc28E43f0E8C58d283DD55bD65",
17+
"feiEthPair": "0x94B0A3d511b6EcDb17eBF877278Ab030acb0A878",
18+
"feiRewardsDistributor": "0xEf1a94AF192A88859EAF3F3D8C1B9705542174C5",
19+
"multisig": "0xB8f482539F2d3Ae2C9ea6076894df36D1f632775"
20+
}

contracts/Migrations.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity >=0.4.22 <0.8.0;
2+
pragma solidity >=0.4.22 <0.9.0;
33

44
contract Migrations {
55
address public owner = msg.sender;

0 commit comments

Comments
 (0)