Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.5.0 - DSWv7 & testing refactor #18

Merged
merged 54 commits into from
Feb 11, 2020
Merged

v1.5.0 - DSWv7 & testing refactor #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bf7f152
stub out new contracts
0age Jan 15, 2020
150b957
derive addresses and prep for dTokens
0age Jan 16, 2020
23fdd20
include ERC-1271 interface on DSWv7
0age Feb 2, 2020
4024a9a
begin dToken deployment
0age Feb 4, 2020
b624e52
finished initial dToken deployment
0age Feb 4, 2020
d8db2c3
add in dharma token v1 contracts
0age Feb 6, 2020
643e8f3
use defensive balanceOf and externalize revert reasons
0age Feb 6, 2020
a549025
get Dharma Dai (mock) and Dharma USD Coin set up
0age Feb 6, 2020
53f848e
refactor web3
Feb 6, 2020
ec47154
remove owner variables and start using tester class
Feb 6, 2020
2bb5714
remove all helpers from deploy file
Feb 6, 2020
407bfe3
use checkAndDeploy function
Feb 6, 2020
25097ee
use tester on deploy
Feb 7, 2020
113d6fc
start using tester on test
Feb 7, 2020
f0a3d90
fix revert reason helper metadata
Feb 7, 2020
c48870f
remove all helpers from test.js
Feb 7, 2020
5626874
move account recovery tests to new file
0age Feb 7, 2020
1c33d79
move beacon controller tests to new file
0age Feb 7, 2020
671ca4a
refactor indestructible registry
Feb 7, 2020
3789c00
use beacon controller test file
0age Feb 7, 2020
75c4d6c
Merge pull request #9 from dharma-eng/refactor-indestructible-registry
0age Feb 7, 2020
271d8f2
move beacon controller manager tests to new file
0age Feb 7, 2020
9971852
refactor multisig deployers
Feb 7, 2020
11a5065
Merge pull request #10 from dharma-eng/refactor-multisig-deployers
0age Feb 7, 2020
45613fa
move key registry tests to new file
0age Feb 7, 2020
e8b6534
refactor implementation upgrades
0age Feb 7, 2020
8fb7872
move unused contracts into extra-contracts
0age Feb 7, 2020
9a26c74
fix coverage
0age Feb 7, 2020
12c6c5a
refactor contracts and web3
Feb 8, 2020
486d4d4
add prettier
Feb 8, 2020
5b53bfb
add prettier
Feb 8, 2020
0479e7b
expand coverage on DSWv7
0age Feb 8, 2020
afb926a
add BalanceChecker and expand coverage
0age Feb 9, 2020
2647fca
refactor deployer setup
0age Feb 10, 2020
f945a16
implement withBalanceCheck wrapper
0age Feb 10, 2020
9343296
polish DSWv7 and add initial ERC1271 coverage
0age Feb 10, 2020
79d20d8
eexpand ERC-1271 test coverage
0age Feb 10, 2020
811431e
clean up DSWv7 comments
0age Feb 10, 2020
462e897
add withdrawDai check
Feb 10, 2020
10f32e0
Merge pull request #14 from dharma-eng/validation-improvements
Feb 10, 2020
8a6f82b
add withdrawEther test
Feb 10, 2020
dcb6871
add escape hatch
Feb 11, 2020
06048dd
add migrateCDaiToDDai and migrateCUSDCToDUSDC
Feb 11, 2020
16c1e67
Merge pull request #15 from dharma-eng/validation-improvements
Feb 11, 2020
7fbedca
update README with v6 & v7 information
0age Feb 11, 2020
f92ecac
Merge branch 'coverage-improvements' of https://github.com/dharma-eng…
0age Feb 11, 2020
44cce9e
migrateCSaiToDDai and small cDai mint failure
Feb 11, 2020
26aaf6b
typo
Feb 11, 2020
9906efd
Merge pull request #16 from dharma-eng/validation-improvements
Feb 11, 2020
25a04d8
approve
Feb 11, 2020
7b31030
allowance -> 0
Feb 11, 2020
9016a2f
hit require
Feb 11, 2020
f9357db
Merge pull request #17 from dharma-eng/validation-improvements
0age Feb 11, 2020
7e88ced
version 1.5.0
0age Feb 11, 2020
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
5 changes: 5 additions & 0 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"tabWidth": 4,
"semi": true,
"singleQuote": false
}
28 changes: 17 additions & 11 deletions .solcover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
module.exports = {
norpc: true,
testCommand: 'node --max-old-space-size=4096 ./scripts/test/testCoverage.js',
compileCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle compile',
compileCommand: 'node --max-old-space-size=8192 ../node_modules/.bin/truffle compile',
copyPackages: ['web3'],
skipFiles: [
'account-recovery/DharmaAccountRecoveryManager.sol',
//'account-recovery/DharmaAccountRecoveryManagerV2.sol',
'factories/key-ring/DharmaKeyRingFactoryV3.sol',
'factories/smart-wallet/DharmaSmartWalletFactoryV2.sol',
'helpers/CodeHashCache.sol',
'helpers/ECDSAGroup.sol',
'helpers/FactoryFactFinder.sol',
'helpers/ImmutableCreate2Factory.sol',
'helpers/IndestructibleRegistry.sol',
'helpers/SmartWalletRevertReasonHelperV1.sol',
'helpers/SmartWalletFactoryV1UserSigningKeyUpdater.sol',
//'helpers/Timelocker.sol',
//'helpers/TimelockerV2.sol',
//'implementations/key-ring/AdharmaKeyRingImplementation.sol',
'implementations/key-ring/DharmaKeyRingImplementationV0.sol',
'implementations/key-ring/DharmaKeyRingImplementationV2.sol',
//'implementations/smart-wallet/AdharmaSmartWalletImplementation.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV0.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV1.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV2.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV3.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV4.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV5.sol',
//'implementations/smart-wallet/DharmaSmartWalletImplementationV6.sol',
'implementations/smart-wallet/DharmaSmartWalletImplementationV6.sol',
//'implementations/smart-wallet/DharmaSmartWalletImplementationV7.sol'
'implementations/smart-wallet/DharmaSmartWalletImplementationVX.sol',
'implementations/token/MockDharmaDaiImplementationV1.sol',
'implementations/token/DharmaDaiInitializer.sol',
'implementations/token/DharmaTokenHelpers.sol',
'implementations/token/DharmaTokenOverrides.sol',
'implementations/token/DharmaTokenV1.sol',
'implementations/token/DharmaUSDCImplementationV1.sol',
'implementations/token/DharmaUSDCInitializer.sol',
'mock/MockSaiToDaiMigrator.sol',
'mock/MockCodeCheck.sol',
'mock/RelayContract.sol',
'mock/RelayContractV2.sol',
//'multisigs/DharmaUpgradeMultisig.sol',
//'multisigs/DharmaKeyRegistryMultisig.sol',
//'multisigs/DharmaAccountRecoveryOperatorMultisig.sol',
'openzeppelin-upgradeability/cryptography/ECDSA.sol',
'openzeppelin-upgradeability/ownership/Ownable.sol',
'openzeppelin-upgradeability/upgradeability/AdminUpgradeabilityProxy.sol',
Expand All @@ -44,14 +45,19 @@ module.exports = {
'openzeppelin-upgradeability/upgradeability/ProxyAdmin.sol',
'openzeppelin-upgradeability/upgradeability/UpgradeabilityProxy.sol',
'openzeppelin-upgradeability/utils/Address.sol',
'proxies/token/DharmaDai.sol',
'proxies/token/DharmaUSDC.sol',
'registries/DharmaKeyRegistryV1.sol',
'test/BadBeacon.sol',
'test/BadBeaconTwo.sol',
'test/BalanceChecker.sol',
'test/MockDharmaKeyRingFactory.sol',
'test/DharmaTestingMultisig.sol',
'test/MockAdharmaKeyRingFactory.sol',
'test/TimelockEdgecaseTester.sol',
'test/TimelockTwoStepOwnableTestContract.sol',
'test/UpgradeBeaconImplementationCheck.sol'
'test/UpgradeBeaconImplementationCheck.sol',
'upgradeability/token/DharmaDaiUpgradeBeacon.sol',
'upgradeability/token/DharmaUSDCUpgradeBeacon.sol'
]
}
7 changes: 5 additions & 2 deletions .soliumignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ contracts/mock/RelayContractV2.sol
interfaces/RelayContractInterface.sol

# disagree with indentation error
contracts/helpers/FactoryFactFinder.sol
contracts/helpers/SmartWalletFactoryV1UserSigningKeyUpdater.sol
extra-contracts/helpers/FactoryFactFinder.sol
contracts/upgradeability/DharmaUpgradeBeaconController.sol
contracts/implementations/smart-wallet/AdharmaSmartWalletImplementation.sol
contracts/implementations/token/DharmaTokenOverrides.sol

# parsing error due to dynamic abi.decode - try again in later version
contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV0.sol
Expand All @@ -18,8 +18,11 @@ contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV3.sol
contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV4.sol
contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV5.sol
contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV6.sol
contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV7.sol
contracts/implementations/smart-wallet/DharmaSmartWalletImplementationVX.sol

contracts/implementations/token/MockDharmaDaiImplementationV1.sol

extra-contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV0.sol
extra-contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV1.sol
extra-contracts/implementations/smart-wallet/DharmaSmartWalletImplementationV2.sol
Expand Down
Loading