Merge pull request #18 from dharma-eng/coverage-improvements

v1.5.0 - DSWv7 & testing refactor

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "tabWidth": 4,
+  "semi": true,
+  "singleQuote": false
+}

.solcover.js

@@ -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',
@@ -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'
   ]
 }

.soliumignore

@@ -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
@@ -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