Merge pull request #526 from AztecProtocol/feat/hot-fixes

ArnSch · web-flow · commit fed09a1d48fb · 2020-07-16T18:49:08.000+01:00
feat(sdk): return signature as well as proof with returnproof flag
diff --git a/packages/extension/src/background/services/ApiService/Prove/JoinSplit.js b/packages/extension/src/background/services/ApiService/Prove/JoinSplit.js
@@ -197,7 +197,7 @@ const getAccountMapping = async ({
             user: {
                 account,
                 error,
-            },
+            } = {},
         } = await query(request, userQuery(`
             address
             linkedPublicKey
@@ -208,6 +208,7 @@ const getAccountMapping = async ({
         }
     }));
 
+
     accounts.forEach((account) => {
         accountMapping[account.address] = account;
     });
diff --git a/packages/extension/src/background/services/ApiService/Prove/index.js b/packages/extension/src/background/services/ApiService/Prove/index.js
@@ -73,14 +73,14 @@ export default async function prove(query, connection) {
         data: {
             args,
         },
+        sender,
     } = query;
     const {
         proofType,
-        returnProof,
     } = args;
 
     let returnData = {};
-    if (!returnProof) {
+    if (sender === 'WEB_CLIENT') {
         returnData = await triggerProofUi(query, connection);
     } else {
         switch (proofType) {
diff --git a/packages/extension/src/background/services/ApiService/Prove/responseDataKeys.js b/packages/extension/src/background/services/ApiService/Prove/responseDataKeys.js
@@ -1,4 +1,9 @@
-const fetchOutputNotes = ({ proofData }) => {
+const fetchOutputNotes = ({
+    proofData,
+    proof,
+    signature,
+    signature2,
+}) => {
     const {
         outputNotes,
         remainderNote,
@@ -18,16 +23,28 @@ const fetchOutputNotes = ({ proofData }) => {
                 noteHash,
                 value,
             })),
+        proof,
+        signature,
+        signature2,
+
     };
 };
 
+const returnProof = ({ proof, signature, signature2 }) => ({
+    proof,
+    signature,
+    signature2,
+});
+
 export default {
     DEPOSIT_PROOF: [
         fetchOutputNotes,
+        returnProof,
     ],
     WITHDRAW_PROOF: [],
     TRANSFER_PROOF: [
         fetchOutputNotes,
+        returnProof,
     ],
     CREATE_NOTE_FROM_BALANCE_PROOF: [
         (data) => {
diff --git a/packages/extension/src/background/services/EventService/helpers/AssetsSyncManager/index.js b/packages/extension/src/background/services/EventService/helpers/AssetsSyncManager/index.js
@@ -14,6 +14,9 @@ class SyncManager {
     constructor() {
         this.config = {
             syncInterval: 5000, // ms
+            blocksPerRequest: 50, // ~ per 3 months (~6000 per day)
+            precisionDelta: 10, //
+            maxNumberOfAttempts: 5,
         };
         this.syncConfig = undefined;
         this.networks = new Map();
diff --git a/packages/extension/src/background/services/EventService/helpers/NotesSyncManager/factory.js b/packages/extension/src/background/services/EventService/helpers/NotesSyncManager/factory.js
@@ -5,7 +5,7 @@ class NotesSyncManagerFactory {
     managersByNetworks = {};
 
     config = {
-        blocksPerRequest: 5307319, // ~ per 3 months (~6000 per day)
+        blocksPerRequest: 100, // ~ per 3 months (~6000 per day)
         precisionDelta: 10, //
         networkId: null,
     };
diff --git a/packages/extension/src/background/services/EventService/helpers/NotesSyncManager/index.js b/packages/extension/src/background/services/EventService/helpers/NotesSyncManager/index.js
@@ -17,7 +17,12 @@ const infuraLimitError = {
     message: 'query returned more than 10000 results',
 };
 
-const isInfuraLimitError = error => error && error.code === infuraLimitError.code;
+
+const uriTooLong = {
+    code: -32603,
+};
+// eslint-disable-next-line
+const isInfuraLimitError = error => error && error.code === infuraLimitError.code || error.code === uriTooLong.code;
 
 const SYNCING_STATUS = {
     ACTIVE: 'ACTIVE',
@@ -30,7 +35,7 @@ const SYNCING_STATUS = {
 class SyncManager {
     constructor() {
         this.config = {
-            blocksPerRequest: 540000, // ~ per 3 months (~6000 per day)
+            blocksPerRequest: 6000 * 30, // ~ per 3 months (~6000 per day)
             precisionDelta: 10, //
             maxNumberOfAttempts: 5,
             networkId: null,
@@ -134,7 +139,7 @@ class SyncManager {
             lastSyncedBlock,
             assets,
             progressCallbacks,
-            retriedNumber = 0,
+            retriedNumber = 5,
         } = options;
 
         const syncAddress = this.addresses.get(address);
diff --git a/packages/extension/src/background/services/EventService/helpers/NotesWatcher/index.js b/packages/extension/src/background/services/EventService/helpers/NotesWatcher/index.js
@@ -242,6 +242,13 @@ class Watcher {
 
         return subscription;
     }
+
+    handleFetchError = (error) => {
+        errorLog('Failed to sync CreateNote / UpdateMetadata / DestroyNote with web3.', error);
+        if (process.env.NODE_ENV === 'development') {
+            this.paused = true;
+        }
+    };
 }
 
 export default Watcher;
diff --git a/packages/extension/src/background/services/EventService/utils/note/fetchNotes.js b/packages/extension/src/background/services/EventService/utils/note/fetchNotes.js
@@ -1,8 +1,10 @@
+import Web3 from 'web3';
 import Web3Service from '~/helpers/Web3Service';
 import {
     ZkAsset,
 } from '~/config/contracts';
 import decodeNoteLogs from './helpers/decodeNoteLogs';
+import { getProviderUrl } from '~/utils/network';
 
 export default async function fetchNotes({
     owner,
@@ -16,7 +18,9 @@ export default async function fetchNotes({
         ZkAsset.events.updateNoteMetaData,
     ],
 } = {}) {
-    const { abi, getPastLogs } = Web3Service.eth;
+    // TODO require network selection
+    const provider = new Web3.providers.HttpProvider(getProviderUrl(Web3Service.networkId));
+    const { abi, getPastLogs } = new Web3(provider).eth;
 
     const eventsTopics = events
         .map(e => ZkAsset.config.abi.find(({ name, type }) => name === e && type === 'event'))
diff --git a/packages/extension/src/background/services/EventService/utils/note/subscription.js b/packages/extension/src/background/services/EventService/utils/note/subscription.js
@@ -1,3 +1,4 @@
+import Web3 from 'web3';
 import Web3Service from '~/helpers/Web3Service';
 import {
     ZkAsset,
@@ -6,6 +7,7 @@ import {
     errorLog,
 } from '~/utils/log';
 import decodeNoteLogs from './helpers/decodeNoteLogs';
+import { getProviderUrl } from '~/utils/network';
 
 const subscribe = async ({
     owner,
@@ -18,10 +20,8 @@ const subscribe = async ({
         return null;
     }
 
-    const {
-        abi,
-        subscribe: subscribeOn,
-    } = Web3Service.eth;
+    const provider = getProviderUrl(Web3Service.networkId, true);
+    const { abi, subscribe: subscribeOn } = new Web3(provider).eth;
 
     const eventsTopics = [
         ZkAsset.events.createNote,
diff --git a/packages/extension/src/background/tasks/acceptConnection.js b/packages/extension/src/background/tasks/acceptConnection.js
@@ -14,7 +14,7 @@ import {
     errorLog,
 } from '~/utils/log';
 import Connection from '../utils/connection';
-import migrateIndexedDB from './migrateIndexedDB';
+// import migrateIndexedDB from './migrateIndexedDB';
 import setupNetworkConfig from './setupNetworkConfig';
 
 const resourceOrigin = getResourceUrl('origin');
@@ -36,7 +36,7 @@ export default function acceptConnection() {
 
             if (clientProfile) {
                 try {
-                    await migrateIndexedDB();
+                    // await migrateIndexedDB();
                     networkConfig = await setupNetworkConfig(clientProfile);
                     connection.initUi();
                 } catch (e) {
diff --git a/packages/extension/src/client/apis/ZkAsset.js b/packages/extension/src/client/apis/ZkAsset.js
@@ -255,6 +255,7 @@ export default class ZkAsset {
         returnProof,
         sender,
         publicOwner,
+        ...rest
     } = {}) => {
         if (!this.linkedTokenAddress) {
             throw new ApiError('zkAsset.private', {
@@ -288,6 +289,7 @@ export default class ZkAsset {
         }
 
         return {
+            ...rest,
             success,
             outputNotes,
             proof,
@@ -330,6 +332,7 @@ export default class ZkAsset {
         inputNoteHashes,
         returnProof,
         sender,
+        ...rest
     } = {}) => {
         if (!this.linkedTokenAddress) {
             throw new ApiError('zkAsset.private', {
@@ -367,6 +370,7 @@ export default class ZkAsset {
         }
 
         return {
+            ...rest,
             success,
             proof,
         };
@@ -431,6 +435,7 @@ export default class ZkAsset {
             success,
             outputNotes,
             proofData,
+            ...rest
         } = await ConnectionService.query(
             'constructProof',
             {
@@ -447,17 +452,10 @@ export default class ZkAsset {
             },
         );
 
-        let proof;
-        if (proofData) {
-            proof = proofData
-                ? await recoverJoinSplitProof(proofData)
-                : null;
-        }
-
         return {
+            ...rest,
             success,
             outputNotes,
-            proof,
         };
     };
 
diff --git a/packages/extension/src/config/database.js b/packages/extension/src/config/database.js
@@ -1,3 +1,3 @@
-export const version = 1;
+export const version = 2;
 export const sdkSettingDbName = 'aztec-sdk';
 export const networkDbPrefix = 'aztec_network';
diff --git a/packages/extension/src/config/provider.js b/packages/extension/src/config/provider.js
@@ -1,5 +1,6 @@
 export const infuraProjectId = '09c4eed231c840d5ace14ba5389a1a7c';
 
-export const infuraProviderUrlPattern = 'wss://{networkName}.infura.io/ws/v3/{projectId}';
+export const infuraHttpProviderUrlPattern = 'https://{networkName}.infura.io/v3/{projectId}';
+export const infuraWsProviderUrlPattern = 'wss://{networkName}.infura.io/ws/v3/{projectId}';
 
 export const defaultProviderUrl = 'ws://localhost:8545';
diff --git a/packages/extension/src/config/supportsPermitSignature.js b/packages/extension/src/config/supportsPermitSignature.js
@@ -1,3 +1,3 @@
 export default {
-    '0x6B175474E89094C44Da98b954EedeAC495271d0F': true,
+    // '0x6B175474E89094C44Da98b954EedeAC495271d0F': true,
 };
diff --git a/packages/extension/src/ui/pages/Send.jsx b/packages/extension/src/ui/pages/Send.jsx
@@ -21,6 +21,7 @@ const Send = ({
     numberOfOutputNotes,
     inputNoteHashes,
     userAccess,
+    returnProof,
 }) => {
     const fetchInitialData = async () => {
         const gsnConfig = await getGSNConfig();
@@ -31,7 +32,10 @@ const Send = ({
         const {
             address: currentAddress,
         } = currentAccount;
-        const steps = isGSNAvailable ? sendSteps.gsn : sendSteps.metamask;
+        let steps = isGSNAvailable ? sendSteps.gsn : sendSteps.metamask;
+        if (returnProof) {
+            steps = sendSteps.returnProof;
+        }
         const sender = proxyContract;
 
         const asset = await makeAsset(assetAddress);
@@ -77,13 +81,15 @@ Send.propTypes = {
     numberOfOutputNotes: PropTypes.number,
     inputNoteHashes: PropTypes.arrayOf(PropTypes.string),
     userAccess: PropTypes.arrayOf(PropTypes.string),
+    returnProof: PropTypes.bool,
 };
 
 Send.defaultProps = {
     numberOfInputNotes: emptyIntValue,
     numberOfOutputNotes: emptyIntValue,
     inputNoteHashes: [],
     userAccess: [],
+    returnProof: false,
 };
 
 export default Send;
diff --git a/packages/extension/src/ui/steps/createNoteFromBalance.js b/packages/extension/src/ui/steps/createNoteFromBalance.js
@@ -88,6 +88,10 @@ const stepSendViaGSN = {
 };
 
 export default {
+    returnProof: {
+        stepApprove,
+        stepSign,
+    },
     gsn: [
         stepApprove,
         stepSign,
diff --git a/packages/extension/src/ui/steps/send.js b/packages/extension/src/ui/steps/send.js
@@ -88,6 +88,10 @@ const stepSendViaGSN = {
 };
 
 export default {
+    returnProof: [
+        stepApprove,
+        stepSignNotes,
+    ],
     gsn: [
         stepApprove,
         stepSignNotes,
diff --git a/packages/extension/src/ui/steps/withdraw.js b/packages/extension/src/ui/steps/withdraw.js
@@ -93,6 +93,10 @@ const stepSendViaGSN = {
 };
 
 export default {
+    returnProof: [
+        stepApprove,
+        stepSignNotes,
+    ],
     gsn: [
         stepApprove,
         stepSignNotes,
diff --git a/packages/extension/src/utils/Web3Service.js b/packages/extension/src/utils/Web3Service.js
@@ -390,7 +390,7 @@ class Web3Service {
                                     method: gsnContract.methods[methodName],
                                     fromAddress: signingInfo.address,
                                     args,
-                                    gasPrice: gasPrice ? gasPrice * 2 : 18000000000, // set gas price 100% higher than last few blocks median to ensure we get in the block
+                                    gasPrice: gasPrice ? gasPrice * 1 : 18000000000, // set gas price 100% higher than last few blocks median to ensure we get in the block
                                     web3,
                                 });
                             },
diff --git a/packages/extension/src/utils/network/getProviderUrl.js b/packages/extension/src/utils/network/getProviderUrl.js
@@ -1,14 +1,15 @@
 import networks from '~/config/networks';
 import {
     infuraProjectId,
-    infuraProviderUrlPattern,
+    infuraHttpProviderUrlPattern,
+    infuraWsProviderUrlPattern,
     defaultProviderUrl,
 } from '~/config/provider';
 import {
     formatStrPattern,
 } from '~/utils/format';
 
-export default function getProviderUrl(networkId, projectId = infuraProjectId) {
+export default function getProviderUrl(networkId, ws = false, projectId = infuraProjectId) {
     const networkKey = Object.keys(networks)
         .find(name => networks[name].id === networkId);
     const network = networks[networkKey];
@@ -20,7 +21,7 @@ export default function getProviderUrl(networkId, projectId = infuraProjectId) {
         networkName,
     } = network;
 
-    return formatStrPattern(infuraProviderUrlPattern, {
+    return formatStrPattern(ws ? infuraWsProviderUrlPattern : infuraHttpProviderUrlPattern, {
         networkName: networkName.toLowerCase(),
         projectId,
     });

Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,13 @@ class Watcher {`
`242`	`242`
`243`	`243`	`return subscription;`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+ handleFetchError = (error) => {`
	`247`	`+ errorLog('Failed to sync CreateNote / UpdateMetadata / DestroyNote with web3.', error);`
	`248`	`+ if (process.env.NODE_ENV === 'development') {`
	`249`	`+ this.paused = true;`
	`250`	`+ }`
	`251`	`+ };`
`245`	`252`	`}`
`246`	`253`
`247`	`254`	`export default Watcher;`