fix destination address in DharmaAccountRecoveryMultisig.sol

neuromancer1729 · Nov 6, 2019 · 26a8a72 · 26a8a72
1 parent 9e640c0
commit 26a8a72
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/contracts/multisigs/DharmaAccountRecoveryMultisig.sol b/contracts/multisigs/DharmaAccountRecoveryMultisig.sol
@@ -21,7 +21,7 @@ contract DharmaAccountRecoveryMultisig {
 
   // The Account Recovery Manager is the only account the multisig can call.
   address private constant _DESTINATION = address(
-    0x00000000003709EDEA9182789f1153E59CFe849e
+    0x00000000004cDa75701EeA02D1F2F9BDcE54C10D
   );
 
   // The threshold is an exact number of valid signatures that must be supplied.

diff --git a/contracts/registries/DharmaKeyRegistryV2.sol b/contracts/registries/DharmaKeyRegistryV2.sol
@@ -17,8 +17,8 @@ import "../../interfaces/DharmaKeyRegistryInterface.sol";
  * Otherwise, it will return the specific signing key. Additional view functions
  * are also provided for retrieving public keys directly. Only the owner may
  * update these keys. Also, note that the V2 key registry includes an additional
- * mapping to track all global keys that have been used, and only allows a given
- * global key to be set one time.
+ * mapping to track all keys that have been used, and only allows a given key to
+ * be set one time.
  */
 contract DharmaKeyRegistryV2 is TwoStepOwnable, DharmaKeyRegistryInterface {
   using ECDSA for bytes32;

diff --git a/scripts/test/deploy.js b/scripts/test/deploy.js
@@ -20,6 +20,8 @@ let DharmaKeyRingFactoryV2Artifact;
 const DharmaUpgradeMultisigArtifact = require('../../build/contracts/DharmaUpgradeMultisig.json')
 const DharmaAccountRecoveryMultisigArtifact = require('../../build/contracts/DharmaAccountRecoveryMultisig.json')
 const DharmaKeyRegistryMultisigArtifact = require('../../build/contracts/DharmaKeyRegistryMultisig.json')
+const DharmaTestingMultisigArtifact = require('../../build/contracts/DharmaTestingMultisig.json')
+
 
 const DharmaSmartWalletImplementationV0Artifact = require('../../build/contracts/DharmaSmartWalletImplementationV0.json')
 const DharmaSmartWalletImplementationV1Artifact = require('../../build/contracts/DharmaSmartWalletImplementationV1.json')
@@ -213,6 +215,13 @@ module.exports = {test: async function (provider, testingContext) {
     DharmaKeyRegistryMultisigArtifact.bytecode
   )
 
+  const DharmaTestingMultisigDeployer = new web3.eth.Contract(
+    DharmaTestingMultisigArtifact.abi
+  )
+  DharmaTestingMultisigDeployer.options.data = (
+    DharmaTestingMultisigArtifact.bytecode
+  )
+
   const DharmaUpgradeBeaconControllerDeployer = new web3.eth.Contract(
     DharmaUpgradeBeaconControllerArtifact.abi
   )