Merge pull request #463 from AztecProtocol/feat-fix-aztec-sig

feat(sdk): fix
AztecProtocol · Jan 31, 2020 · 8dea0a5 · 8dea0a5
2 parents 3cb88c7 + bde9d52
commit 8dea0a5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/packages/extension/src/client/services/MetaMaskService/registerExtension.js b/packages/extension/src/client/services/MetaMaskService/registerExtension.js
@@ -24,11 +24,16 @@ const AZTECAccount = [
         name: 'linkedPublicKey',
         type: 'bytes',
     },
+    {
+        name: 'AZTECaddress',
+        type: 'address',
+    },
 ];
 
 export default ({
     address,
     linkedPublicKey,
+    aliasAddress,
 }) => {
     const accountRegistryContract = Web3Service.contract('AccountRegistry');
 
@@ -40,6 +45,7 @@ export default ({
 
     const message = {
         account: address,
+        AZTECaddress: aliasAddress,
         linkedPublicKey,
     };
 
@@ -59,6 +65,7 @@ export default ({
 export const generateTypedData = ({
     address,
     linkedPublicKey,
+    aliasAddress,
 }) => {
     const accountRegistryContract = Web3Service.contract('AccountRegistry');
 
@@ -70,9 +77,18 @@ export const generateTypedData = ({
 
     const message = {
         account: address,
+        AZTECaddress: aliasAddress,
         linkedPublicKey,
     };
-
+    console.log({
+        types: {
+            EIP712Domain: domainParams,
+            AZTECAccount,
+        },
+        domain: domainData,
+        primaryType: 'AZTECAccount',
+        message,
+    });
     return {
         types: {
             EIP712Domain: domainParams,

diff --git a/packages/extension/src/ui/apis/auth/linkAccountToMetaMask.js b/packages/extension/src/ui/apis/auth/linkAccountToMetaMask.js
@@ -1,9 +1,20 @@
+import secp256k1 from '@aztec/secp256k1';
+import decodePrivateKey from '~/background/utils/decodePrivateKey';
+import AuthService from '~/background/services/AuthService';
 import ConnectionService from '~/ui/services/ConnectionService';
 
 export default async function linkAccountToMetaMask({
     address,
     linkedPublicKey,
 }) {
+    const keyStore = await AuthService.getKeyStore();
+    const {
+        pwDerivedKey,
+    } = await AuthService.getSession(address) || {};
+    const privateKey = '0x'.concat(decodePrivateKey(keyStore, pwDerivedKey));
+    const {
+        address: aliasAddress,
+    } = secp256k1.accountFromPrivateKey(privateKey);
     const {
         publicKey: spendingPublicKey,
         signature,
@@ -13,6 +24,7 @@ export default async function linkAccountToMetaMask({
         data: {
             address,
             linkedPublicKey,
+            aliasAddress,
         },
     }) || {};