add Account domain and implement redux-saga

package.json

@@ -31,7 +31,7 @@
     "decimal.js": "^10.2.1",
     "formik": "^2.2.6",
     "google-protobuf": "^3.15.8",
-    "ldk": "^0.4.0",
+    "ldk": "0.4.3",
     "lodash.debounce": "^4.0.8",
     "lottie-web": "^5.7.8",
     "marina-provider": "^1.4.5",
@@ -47,7 +47,7 @@
     "readable-stream": "^3.6.0",
     "redux": "^4.1.0",
     "redux-persist": "^6.0.0",
-    "redux-thunk": "^2.3.0",
+    "redux-saga": "^1.1.3",
     "stream-browserify": "^3.0.0",
     "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.1.2",
     "taxi-protobuf": "vulpemventures/taxi-protobuf",

public/manifest.json

@@ -4,10 +4,10 @@
   "manifest_version": 2,
   "description": "Liquid Wallet Web Extension",
   "permissions": [
-    "alarms",
     "storage",
     "unlimitedStorage",
     "idle",
+    "alarms",
     "<all_urls>"
   ],
   "background": {

src/application/constants/cypress.ts

@@ -1,18 +1,26 @@
+import { initialRestorerOpts, MnemonicAccountData } from '../../domain/account';
+import { PasswordHash } from '../../domain/password-hash';
+
+export const testPasswordHash: PasswordHash =
+  '8314b7cd43641c00d3389128fe0d8ff2c286d5bb42313fe88da1d6c88a60f48e';
+
 /**
  * test wallet data using to skip the onboarding step for Cypress.
  * data:
  * 	| mnemonic = "gas muscle wonder talk sand length swap immense critic opera tree fatigue"
  * 	| pwd = marinatest
  */
-export const testWalletData = {
-  restorerOpts: {},
+export const testWalletData: MnemonicAccountData = {
+  restorerOpts: {
+    liquid: initialRestorerOpts,
+    testnet: initialRestorerOpts,
+    regtest: initialRestorerOpts,
+  },
   encryptedMnemonic:
     'f343ad95c7be4b07b213ea489d6135b3fb7d659dfb4c9dc2ee9c9e7202100043b5fba308dd2f5d23cd3061452b644653b7c33d79704261feaefd220e9ef9a39784d593bb887f484dccd85b1eb7d53aba',
   masterXPub:
     'vpub5SLqN2bLY4WeYFQ5AFRZPCrhemcgnMPFCcM3L4aepayNa38B7xfjtfan5mNJevzBuUWA98y1CWab2L8dpefgywg3D7dvuNtY1X9UjUKgHvC',
   masterBlindingKey: 'd4422429e8f06ba093524b31b0ef6d69e2d26e0dd87fade4ab5c875fba2e85d1',
-  passwordHash: '8314b7cd43641c00d3389128fe0d8ff2c286d5bb42313fe88da1d6c88a60f48e',
-  confidentialAddresses: [],
 };
 
 export const testAppURL = 'https://vulpemventures.github.io/marina-api-test-app/';

src/application/redux/actions/action-types.ts

@@ -1,17 +1,18 @@
 // Wallet
 export const WALLET_SET_DATA = 'WALLET_SET_DATA';
+export const SET_RESTORER_OPTS = 'SET_RESTORER_OPTS';
 export const ADD_UTXO = 'ADD_UTXO';
 export const DELETE_UTXO = 'DELETE_UTXO';
 export const FLUSH_UTXOS = 'FLUSH_UTXOS';
-export const UPDATE_UTXOS = 'UPDATE_UTXOS';
 export const SET_DEEP_RESTORER_GAP_LIMIT = 'SET_DEEP_RESTORER_GAP_LIMIT';
 export const SET_DEEP_RESTORER_IS_LOADING = 'SET_DEEP_RESTORER_IS_LOADING';
 export const SET_DEEP_RESTORER_ERROR = 'SET_DEEP_RESTORER_ERROR';
-export const NEW_ADDRESS_SUCCESS = 'NEW_ADDRESS_SUCCESS';
-export const NEW_CHANGE_ADDRESS_SUCCESS = 'NEW_CHANGE_ADDRESS_SUCCESS';
+export const INCREMENT_EXTERNAL_ADDRESS_INDEX = 'INCREMENT_EXTERNAL_ADDRESS_INDEX';
+export const INCREMENT_INTERNAL_ADDRESS_INDEX = 'INCREMENT_INTERNAL_ADDRESS_INDEX';
 export const SET_VERIFIED = 'SET_VERIFIED';
 export const RESET_WALLET = 'RESET_WALLET';
-export const SET_UPDATER_LOADER = 'SET_UPDATER_LOADER';
+export const POP_UPDATER_LOADER = 'POP_UPDATER_LOADER';
+export const PUSH_UPDATER_LOADER = 'PUSH_UPDATER_LOADER';
 
 // App
 export const AUTHENTICATION_SUCCESS = 'AUTHENTICATION_SUCCESS';
@@ -26,13 +27,13 @@ export const RESET_APP = 'RESET_APP';
 export const ONBOARDING_SET_MNEMONIC_AND_PASSWORD = 'ONBOARDING_SET_MNEMONIC_AND_PASSWORD';
 export const ONBOARDING_FLUSH = 'ONBOARDING_FLUSH';
 export const ONBOARDING_SET_IS_FROM_POPUP_FLOW = 'ONBOARDING_SET_IS_FROM_POPUP_FLOW';
+export const ONBOARDING_SET_VERIFIED = 'ONBOARDING_SET_VERIFIED';
 
 // Transactions history
-export const UPDATE_TXS = 'UPDATE_TXS';
 export const ADD_TX = 'ADD_TX';
-export const RESET_TXS = 'RESET_TXS';
 
 // Pending transaction
+export const PENDING_TX_SET_STEP = 'PENDING_TX_SET_STEP';
 export const PENDING_TX_SET_ASSET = 'PENDING_TX_SET_ASSET';
 export const PENDING_TX_SET_ADDRESSES_AND_AMOUNT = 'PENDING_TX_SET_ADDRESSES_AND_AMOUNT';
 export const PENDING_TX_SET_FEE_CHANGE_ADDRESS = 'PENDING_TX_SET_FEE_CHANGE_ADDRESS';
@@ -52,18 +53,19 @@ export const SET_MSG = 'SET_MSG';
 export const FLUSH_MSG = 'FLUSH_MSG';
 export const SELECT_HOSTNAME = 'SELECT_HOSTNAME';
 export const FLUSH_SELECTED_HOSTNAME = 'FLUSH_SELECTED_HOSTNAME';
+export const SET_APPROVE_REQUEST_PARAM = 'SET_APPROVE_REQUEST_PARAM';
 export const RESET_CONNECT = 'RESET_CONNECT';
 
 // Taxi
 export const SET_TAXI_ASSETS = 'SET_TAXI_ASSETS';
 export const UPDATE_TAXI_ASSETS = 'UPDATE_TAXI_ASSETS';
 export const RESET_TAXI = 'RESET_TAXI';
 
-// Alarms
-export const START_PERIODIC_UPDATE = 'START_PERIODIC_UPDATE';
-
 // Restoration
 export const START_DEEP_RESTORATION = 'START_DEEP_RESTORATION';
 
 // Reset
 export const RESET = 'RESET';
+
+// Updater taskes
+export const UPDATE_TASK = 'UPDATE_TASK';

src/application/redux/actions/app.ts

@@ -4,7 +4,6 @@ import {
   ONBOARDING_COMPLETETED,
   LOGOUT_SUCCESS,
   CHANGE_NETWORK_SUCCESS,
-  START_PERIODIC_UPDATE,
   SET_EXPLORER,
   RESET,
 } from './action-types';
@@ -13,6 +12,7 @@ import { Password } from '../../../domain/password';
 import { match, PasswordHash } from '../../../domain/password-hash';
 import { ExplorerURLs } from '../../../domain/app';
 import { NetworkString } from 'ldk';
+import { INVALID_PASSWORD_ERROR } from '../../utils/constants';
 
 export const setExplorer = (explorer: ExplorerURLs, network: NetworkString): AnyAction => ({
   type: SET_EXPLORER,
@@ -26,7 +26,10 @@ export const onboardingCompleted = (): AnyAction => ({
 export function logIn(password: Password, passwordHash: PasswordHash): AnyAction {
   try {
     if (!match(password, passwordHash)) {
-      return { type: AUTHENTICATION_FAILURE, payload: { error: new Error('Invalid password') } };
+      return {
+        type: AUTHENTICATION_FAILURE,
+        payload: { error: new Error(INVALID_PASSWORD_ERROR) },
+      };
     }
 
     return { type: AUTHENTICATION_SUCCESS };
@@ -43,10 +46,6 @@ export function changeNetwork(network: NetworkString): AnyAction {
   return { type: CHANGE_NETWORK_SUCCESS, payload: { network } };
 }
 
-export function startPeriodicUpdate(): AnyAction {
-  return { type: START_PERIODIC_UPDATE };
-}
-
 export function reset(): AnyAction {
   return { type: RESET };
 }

src/application/redux/actions/onboarding.ts

@@ -2,13 +2,18 @@ import {
   ONBOARDING_FLUSH,
   ONBOARDING_SET_MNEMONIC_AND_PASSWORD,
   ONBOARDING_SET_IS_FROM_POPUP_FLOW,
+  ONBOARDING_SET_VERIFIED,
 } from './action-types';
 import { AnyAction } from 'redux';
 
-export function setPasswordAndOnboardingMnemonic(password: string, mnemonic: string): AnyAction {
+export function setPasswordAndOnboardingMnemonic(
+  password: string,
+  mnemonic: string,
+  needSecurityAccount: boolean
+): AnyAction {
   return {
     type: ONBOARDING_SET_MNEMONIC_AND_PASSWORD,
-    payload: { mnemonic, password },
+    payload: { mnemonic, password, needSecurityAccount },
   };
 }
 
@@ -22,3 +27,14 @@ export function setBackup(mnemonic: string): AnyAction {
     payload: { mnemonic },
   };
 }
+
+// Onboarding Verified is a temporary state for verification of the secret mnemonic
+// It aims to flag the new wallet as verified if
+// (1) the user has already backed up the mnemonic via onboarding/wallet-confirm
+// (2) the user is restoring a wallet via onboarding/wallet-restore
+// then `wallet.isVerified` is set to `onboarding.verified` during onboarding /end-of-flow confirm step
+export function setOnboardingVerified(): AnyAction {
+  return {
+    type: ONBOARDING_SET_VERIFIED,
+  };
+}

src/application/redux/actions/taxi.ts

@@ -1,10 +1,11 @@
+import { NetworkString } from 'ldk';
 import { AnyAction } from 'redux';
 import { SET_TAXI_ASSETS, UPDATE_TAXI_ASSETS } from './action-types';
 
-export function setTaxiAssets(newAssets: string[]): AnyAction {
+export function setTaxiAssets(network: NetworkString, newAssets: string[]): AnyAction {
   return {
     type: SET_TAXI_ASSETS,
-    payload: newAssets,
+    payload: { network, assets: newAssets },
   };
 }
 

src/application/redux/actions/transaction.ts

@@ -4,27 +4,40 @@ import {
   PENDING_TX_SET_ADDRESSES_AND_AMOUNT,
   PENDING_TX_SET_FEE_CHANGE_ADDRESS,
   PENDING_TX_SET_FEE_AMOUNT_AND_ASSET,
-  UPDATE_TXS,
   PENDING_TX_SET_PSET,
+  PENDING_TX_SET_STEP,
   ADD_TX,
 } from './action-types';
 import { AnyAction } from 'redux';
 import { Address } from '../../../domain/address';
 import { TxDisplayInterface } from '../../../domain/transaction';
-import { NetworkString } from 'ldk';
+import { NetworkString, UnblindedOutput, TxInterface } from 'ldk';
+import { AccountID } from '../../../domain/account';
+import { ActionWithPayload } from '../../../domain/common';
+import { PendingTxStep } from '../reducers/transaction-reducer';
+
+export type AddTxAction = ActionWithPayload<{
+  tx: TxInterface;
+  network: NetworkString;
+  accountID: AccountID;
+}>;
 
 export function setAsset(asset: string): AnyAction {
   return { type: PENDING_TX_SET_ASSET, payload: { asset } };
 }
 
+export function setPendingTxStep(step: PendingTxStep): AnyAction {
+  return { type: PENDING_TX_SET_STEP, payload: { step } };
+}
+
 export function setAddressesAndAmount(
-  receipientAddress: Address,
-  changeAddress: Address,
-  amountInSatoshi: number
+  amountInSatoshi: number,
+  changeAddresses?: Address[],
+  recipientAddress?: Address
 ): AnyAction {
   return {
     type: PENDING_TX_SET_ADDRESSES_AND_AMOUNT,
-    payload: { receipientAddress, changeAddress, amountInSatoshi },
+    payload: { recipientAddress, changeAddresses, amountInSatoshi },
   };
 }
 
@@ -40,22 +53,20 @@ export function flushPendingTx(): AnyAction {
   return { type: PENDING_TX_FLUSH };
 }
 
-export function updateTxs(): AnyAction {
-  return {
-    type: UPDATE_TXS,
-  };
-}
-
-export function setPset(pset: string): AnyAction {
+export function setPset(pset: string, utxos: UnblindedOutput[]): AnyAction {
   return {
     type: PENDING_TX_SET_PSET,
-    payload: { pset },
+    payload: { pset, utxos },
   };
 }
 
-export function addTx(tx: TxDisplayInterface, network: NetworkString): AnyAction {
+export function addTx(
+  accountID: AccountID,
+  tx: TxDisplayInterface,
+  network: NetworkString
+): AnyAction {
   return {
     type: ADD_TX,
-    payload: { tx, network },
+    payload: { tx, network, accountID },
   };
 }

src/application/redux/actions/updater.ts

@@ -0,0 +1,14 @@
+import { NetworkString } from 'ldk';
+import { AccountID } from '../../../domain/account';
+import { ActionWithPayload } from '../../../domain/common';
+import { UPDATE_TASK } from './action-types';
+
+export type UpdateTaskAction = ActionWithPayload<{ accountID: AccountID; network: NetworkString }>;
+
+export const updateTaskAction = (
+  accountID: AccountID,
+  network: NetworkString
+): UpdateTaskAction => ({
+  type: UPDATE_TASK,
+  payload: { accountID, network },
+});

src/application/redux/actions/utxos.ts

@@ -1,19 +1,32 @@
-import { UnblindedOutput } from 'ldk';
+import { NetworkString, UnblindedOutput } from 'ldk';
 import { AnyAction } from 'redux';
-import { ADD_UTXO, DELETE_UTXO, FLUSH_UTXOS, UPDATE_UTXOS } from './action-types';
+import { AccountID } from '../../../domain/account';
+import { ActionWithPayload } from '../../../domain/common';
+import { ADD_UTXO, DELETE_UTXO, FLUSH_UTXOS } from './action-types';
 
-export function updateUtxos(): AnyAction {
-  return { type: UPDATE_UTXOS };
-}
+export type AddUtxoAction = ActionWithPayload<{
+  accountID: AccountID;
+  utxo: UnblindedOutput;
+  network: NetworkString;
+}>;
 
-export function addUtxo(utxo: UnblindedOutput): AnyAction {
-  return { type: ADD_UTXO, payload: { utxo } };
+export function addUtxo(
+  accountID: AccountID,
+  utxo: UnblindedOutput,
+  network: NetworkString
+): AddUtxoAction {
+  return { type: ADD_UTXO, payload: { accountID, utxo, network } };
 }
 
-export function deleteUtxo(txid: string, vout: number): AnyAction {
-  return { type: DELETE_UTXO, payload: { txid, vout } };
+export function deleteUtxo(
+  accountID: AccountID,
+  txid: string,
+  vout: number,
+  network: NetworkString
+): AnyAction {
+  return { type: DELETE_UTXO, payload: { txid, vout, accountID, network } };
 }
 
-export function flushUtxos(): AnyAction {
-  return { type: FLUSH_UTXOS };
+export function flushUtxos(accountID: AccountID, network: NetworkString): AnyAction {
+  return { type: FLUSH_UTXOS, payload: { accountID, network } };
 }