Merge pull request #116 from abhayks1/recovery_fixes

Recovery Interact Fixes
OpenST · Feb 25, 2019 · d9792b9 · d9792b9
2 parents 7d74770 + ec40ace
commit d9792b9
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/lib/ContractInteract/Recovery.js b/lib/ContractInteract/Recovery.js
@@ -396,16 +396,16 @@ class Recovery {
 
  const typedDataInput = {
  types: {
- EIP712Domain: [{ name: 'verifyingContract', type: 'address' }],
- SafeTx: [
+ EIP712Domain: [{ name: 'delayedRecoveryModule', type: 'address' }],
+ InitiateRecoveryStruct: [
  { name: 'prevOwner', type: 'address' },
  { name: 'oldOwner', type: 'address' },
  { name: 'newOwner', type: 'address' }
  ]
  },
  primaryType: 'InitiateRecoveryStruct',
  domain: {
- verifyingContract: this.delayedRecoveryAddress
+ delayedRecoveryModule: this.delayedRecoveryAddress
  },
  message: {
  prevOwner: prevOwner,
@@ -449,16 +449,16 @@ class Recovery {
 
  const typedDataInput = {
  types: {
- EIP712Domain: [{ name: 'verifyingContract', type: 'address' }],
- SafeTx: [
+ EIP712Domain: [{ name: 'delayedRecoveryModule', type: 'address' }],
+ InitiateRecoveryStruct: [
  { name: 'prevOwner', type: 'address' },
  { name: 'oldOwner', type: 'address' },
  { name: 'newOwner', type: 'address' }
  ]
  },
  primaryType: 'AbortRecoveryStruct',
  domain: {
- verifyingContract: this.delayedRecoveryAddress
+ delayedRecoveryModule: this.delayedRecoveryAddress
  },
  message: {
  prevOwner: prevOwner,
@@ -497,12 +497,15 @@ class Recovery {
 
  const typedDataInput = {
  types: {
- EIP712Domain: [{ name: 'verifyingContract', type: 'address' }],
- SafeTx: [{ name: 'oldRecoveryOwner', type: 'address' }, { name: 'newRecoveryOwner', type: 'address' }]
+ EIP712Domain: [{ name: 'delayedRecoveryModule', type: 'address' }],
+ InitiateRecoveryStruct: [
+ { name: 'oldRecoveryOwner', type: 'address' },
+ { name: 'newRecoveryOwner', type: 'address' }
+ ]
  },
  primaryType: 'ResetRecoveryOwnerStruct',
  domain: {
- verifyingContract: this.delayedRecoveryAddress
+ delayedRecoveryModule: this.delayedRecoveryAddress
  },
  message: {
  oldRecoveryOwner: oldRecoveryOwner,