feat(sdk): fix public key issues

AztecProtocol · Feb 1, 2020 · 2fb9413 · 2fb9413
1 parent 1a4fdd9
commit 2fb9413
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 48 deletions.
diff --git a/packages/extension/src/background/services/GraphQLService/resolvers/background.js b/packages/extension/src/background/services/GraphQLService/resolvers/background.js
@@ -1,4 +1,3 @@
-import EthCrypto from 'eth-crypto';
 import ClientSubscriptionService from '~/background/services/ClientSubscriptionService';
 import userModel from '~/database/models/user';
 import {
@@ -34,23 +33,9 @@ const backgroundResolvers = {
         fetchNotesFromBalance: ensureDomainPermission(async (_, args) => ({
             notes: await fetchNotesFromBalance(args),
         })),
-        account: ensureDomainPermission(async (_, args) => {
-            const { spendingPublicKey, ...rest } = await fetchAztecAccount({
-                address,
-            });
-            if (spendingPublicKey) {
-                const compressedPublicKey = EthCrypto.publicKey.compress(
-                    spendingPublicKey.slice(2),
-                );
-                return {
-                    ...rest,
-                    spendingPublicKey: `0x${compressedPublicKey}`,
-                };
-            }
-            return {
-                ...rest,
-            };
-        }),
+        account: ensureDomainPermission(async (_, args) => fetchAztecAccount({
+            address: args.currentAddress,
+        })),
         accounts: ensureDomainPermission(async (_, args, ctx) => ({
             accounts: await getAccounts(args, ctx),
         })),

diff --git a/packages/extension/src/background/services/GraphQLService/resolvers/ui.js b/packages/extension/src/background/services/GraphQLService/resolvers/ui.js
@@ -1,4 +1,3 @@
-import EthCrypto from 'eth-crypto';
 import userModel from '~/database/models/user';
 import fetchAsset from './utils/fetchAsset';
 import fetchAztecAccount from './utils/fetchAztecAccount';
@@ -27,23 +26,9 @@ const uiResolvers = {
             });
             return asset;
         },
-        account: async (_, { address }) => {
-            const { spendingPublicKey, ...rest } = await fetchAztecAccount({
-                address,
-            });
-            if (spendingPublicKey) {
-                const compressedPublicKey = EthCrypto.publicKey.compress(
-                    spendingPublicKey.slice(2),
-                );
-                return {
-                    ...rest,
-                    spendingPublicKey: `0x${compressedPublicKey}`,
-                };
-            }
-            return {
-                ...rest,
-            };
-        },
+        account: async (_, { address }) => await fetchAztecAccount({
+            address,
+        }),
         note: async (_, args) => {
             const {
                 note: noteResponse,

diff --git a/packages/extension/src/background/services/GraphQLService/resolvers/utils/getAccounts.js b/packages/extension/src/background/services/GraphQLService/resolvers/utils/getAccounts.js
@@ -1,4 +1,3 @@
-import EthCrypto from 'eth-crypto';
 import {
     argsError,
 } from '~/utils/error';
@@ -18,15 +17,9 @@ export default async function getAccounts(args) {
     })));
 
     accounts = accounts
-        .map(({ account }) => {
-            const compressedPublicKey = EthCrypto.publicKey.compress(
-                account.spendingPublicKey.slice(2),
-            );
-            return {
-                ...account,
-                spendingPublicKey: `0x${compressedPublicKey}`,
-            };
-        })
+        .map(({ account }) => ({
+            ...account,
+        }))
         .filter(a => a);
     const onChainAccounts = accounts || [];
     const invalidAddresses = addresses

diff --git a/packages/extension/src/ui/apis/proof/deposit.js b/packages/extension/src/ui/apis/proof/deposit.js
@@ -53,7 +53,6 @@ export default async function deposit({
                 ].filter((access, idx, arr) => idx === arr.findIndex(({
                     address,
                 }) => address === access.address));
-
             const notes = await createNotes(
                 noteValues,
                 spendingPublicKey,

diff --git a/packages/extension/src/utils/note/createNote.js b/packages/extension/src/utils/note/createNote.js
@@ -1,6 +1,7 @@
 import {
     note as noteUtils,
 } from 'aztec.js';
+import EthCrypto from 'eth-crypto';
 
 export default async function createNote(value, publicKey, owner, access) {
     let accessArr;
@@ -17,6 +18,9 @@ export default async function createNote(value, publicKey, owner, access) {
             accessArr = [access];
         }
     }
+    const compressedPublicKey = EthCrypto.publicKey.compress(
+        publicKey.slice(2),
+    );
 
-    return noteUtils.create(publicKey, value, accessArr, owner);
+    return noteUtils.create(`0x${compressedPublicKey}`, value, accessArr, owner);
 }