) => {
const {
hasNewVaultGenerationFailed = false,
@@ -173,9 +118,6 @@ const vaultSlice = createSlice({
},
},
extraReducers: (builder) => {
- builder.addCase(ADD_SIGINING_DEVICE, (state) => {
- state.isGeneratingNewVault = true;
- });
builder.addCase(ADD_NEW_VAULT, (state) => {
state.isGeneratingNewVault = false;
});
@@ -183,16 +125,12 @@ const vaultSlice = createSlice({
});
export const {
- addSigningDevice,
vaultCreated,
initiateVaultMigration,
vaultMigrationCompleted,
- removeSigningDevice,
setIntroModal,
setSdIntroModal,
setWhirlpoolIntro,
- updateSigningDevice,
- clearSigningDevice,
resetVaultMigration,
setTempShellId,
setBackupBSMSForIKS,
diff --git a/src/store/sagaActions/bhr.ts b/src/store/sagaActions/bhr.ts
index 980dc99b4..624ad2eb7 100644
--- a/src/store/sagaActions/bhr.ts
+++ b/src/store/sagaActions/bhr.ts
@@ -1,5 +1,5 @@
import { BackupHistory } from 'src/models/enums/BHR';
-import { Vault, VaultSigner } from 'src/core/wallets/interfaces/vault';
+import { Signer, Vault } from 'src/core/wallets/interfaces/vault';
export const UPDATE_APP_IMAGE = 'UPDATE_APP_IMAGE';
export const GET_APP_IMAGE = 'GET_APP_IMAGE';
@@ -61,7 +61,7 @@ export const recoverBackup = (password: string, encData: string) => ({
// HealthChecks
-export const healthCheckSigner = (signers: VaultSigner[]) => ({
+export const healthCheckSigner = (signers: Signer[]) => ({
type: UPADTE_HEALTH_CHECK_SIGNER,
payload: {
signers,
diff --git a/src/store/sagaActions/send_and_receive.ts b/src/store/sagaActions/send_and_receive.ts
index 7dd9acab0..568af8920 100644
--- a/src/store/sagaActions/send_and_receive.ts
+++ b/src/store/sagaActions/send_and_receive.ts
@@ -1,4 +1,4 @@
-import { TransactionPrerequisiteElements, UTXO } from 'src/core/wallets/interfaces';
+import { UTXO } from 'src/core/wallets/interfaces';
import { Action } from 'redux';
import { Recipient } from 'src/models/interfaces/Recipient';
@@ -32,7 +32,6 @@ export const CALCULATE_SEND_MAX_FEE = 'CALCULATE_SEND_MAX_FEE';
export const CLEAR_SEND_MAX_FEE = 'CLEAR_SEND_MAX_FEE';
export const SEND_MAX_FEE_CALCULATED = 'SEND_MAX_FEE_CALCULATED';
export const CALCULATE_CUSTOM_FEE = 'CALCULATE_CUSTOM_FEE';
-export const CUSTOM_FEE_CALCULATED = 'CUSTOM_FEE_CALCULATED';
export const CUSTOM_SEND_MAX_CALCULATED = 'CUSTOM_SEND_MAX_CALCULATED';
export const SEND_TX_NOTIFICATION = 'SEND_TX_NOTIFICATION';
@@ -274,6 +273,7 @@ export interface CalculateCustomFeeAction extends Action {
}[];
feePerByte: string;
customEstimatedBlocks: string;
+ selectedUTXOs?: UTXO[];
};
}
@@ -285,29 +285,11 @@ export const calculateCustomFee = (payload: {
}[];
feePerByte: string;
customEstimatedBlocks: string;
+ selectedUTXOs?: UTXO[];
}): CalculateCustomFeeAction => ({
type: CALCULATE_CUSTOM_FEE,
payload,
});
-
-export interface CustomFeeCalculatedAction extends Action {
- type: typeof CUSTOM_FEE_CALCULATED;
- payload: {
- successful: boolean;
- carryOver?: { customTxPrerequisites: TransactionPrerequisiteElements };
- err?: string | null;
- };
-}
-
-export const customFeeCalculated = (payload: {
- successful: boolean;
- carryOver?: { customTxPrerequisites: TransactionPrerequisiteElements };
- err?: string | null;
-}): CustomFeeCalculatedAction => ({
- type: CUSTOM_FEE_CALCULATED,
- payload,
-});
-
export interface CustomSendMaxCalculatedAction extends Action {
type: typeof CUSTOM_SEND_MAX_CALCULATED;
payload: {
diff --git a/src/store/sagaActions/vaults.ts b/src/store/sagaActions/vaults.ts
index 107289efd..55e266e7b 100644
--- a/src/store/sagaActions/vaults.ts
+++ b/src/store/sagaActions/vaults.ts
@@ -1,4 +1,4 @@
-import { Vault, VaultSigner } from 'src/core/wallets/interfaces/vault';
+import { Signer, Vault } from 'src/core/wallets/interfaces/vault';
import { NewVaultInfo } from '../sagas/wallets';
// types and action creators: dispatched by components and sagas
@@ -6,7 +6,6 @@ export const ADD_NEW_VAULT = 'ADD_NEW_VAULT';
export const ADD_SIGINING_DEVICE = 'ADD_SIGINING_DEVICE';
export const MIGRATE_VAULT = 'MIGRATE_VAULT';
export const FINALISE_VAULT_MIGRATION = 'FINALISE_VAULT_MIGRATION';
-export const FINALIZE_IK_SETUP = 'FINALIZE_IK_SETUP';
export const addNewVault = (payload: {
newVaultInfo: NewVaultInfo;
@@ -19,9 +18,9 @@ export const addNewVault = (payload: {
payload,
});
-export const addSigningDevice = (payload: VaultSigner) => ({
+export const addSigningDevice = (signers: Signer[]) => ({
type: ADD_SIGINING_DEVICE,
- payload,
+ payload: { signers },
});
export const migrateVault = (newVaultInfo: NewVaultInfo, vaultShellId: string) => ({
@@ -33,8 +32,3 @@ export const finaliseVaultMigration = (payload: string) => ({
type: FINALISE_VAULT_MIGRATION,
payload: { vaultId: payload },
});
-
-export const finaliseIKSetup = (vault: Vault) => ({
- type: FINALIZE_IK_SETUP,
- payload: { vault },
-});
diff --git a/src/store/sagaActions/wallets.ts b/src/store/sagaActions/wallets.ts
index fa6356b47..00107fd87 100644
--- a/src/store/sagaActions/wallets.ts
+++ b/src/store/sagaActions/wallets.ts
@@ -1,4 +1,4 @@
-import { Vault, VaultSigner } from 'src/core/wallets/interfaces/vault';
+import { Signer, Vault, VaultSigner } from 'src/core/wallets/interfaces/vault';
import { VisibilityType } from 'src/core/wallets/enums';
import { Wallet } from 'src/core/wallets/interfaces/wallet';
import { SignerException, SignerRestriction } from 'src/services/interfaces';
@@ -30,7 +30,9 @@ export const RESET_TWO_FA_LOADER = 'RESET_TWO_FA_LOADER';
export const TEST_SATS_RECIEVE = 'TEST_SATS_RECIEVE';
export const UAI_VAULT_TO_WALLET = 'UAI_VAULT_TO_WALLET';
export const UPDATE_WALLET_DETAILS = 'UPDATE_WALLET_DETAILS';
+export const UPDATE_VAULT_DETAILS = 'UPDATE_VAULT_DETAILS';
export const UPDATE_SIGNER_DETAILS = 'UPDATE_SIGNER_DETAILS';
+export const UPDATE_KEY_DETAILS = 'UPDATE_KEY_DETAILS';
export const ADD_WHIRLPOOL_WALLETS = 'ADD_WHIRLPOOL_WALLETS';
export const ADD_WHIRLPOOL_WALLETS_LOCAL = 'ADD_WHIRLPOOL_WALLETS_LOCAL';
export const UPDATE_WALLET_PATH_PURPOSE_DETAILS = 'UPDATE_WALLET_PATH_PURPOSE_DETAILS';
@@ -112,7 +114,8 @@ export const incrementAddressIndex = (
});
export const updateSignerPolicy = (
- signer: VaultSigner,
+ signer: Signer,
+ signingKey: VaultSigner,
updates: {
restrictions?: SignerRestriction;
exceptions?: SignerException;
@@ -122,6 +125,7 @@ export const updateSignerPolicy = (
type: UPDATE_SIGNER_POLICY,
payload: {
signer,
+ signingKey,
updates,
verificationToken,
},
@@ -300,6 +304,20 @@ export const updateWalletDetails = (
details,
},
});
+
+export const updateVaultDetails = (
+ vault: Vault,
+ details: {
+ name: string;
+ description: string;
+ }
+) => ({
+ type: UPDATE_VAULT_DETAILS,
+ payload: {
+ vault,
+ details,
+ },
+});
export const updateWalletPathAndPurposeDetails = (
wallet: Wallet,
details: {
@@ -314,7 +332,7 @@ export const updateWalletPathAndPurposeDetails = (
},
});
-export const updateSignerDetails = (signer: VaultSigner, key: string, value: any) => ({
+export const updateSignerDetails = (signer: Signer, key: string, value: any) => ({
type: UPDATE_SIGNER_DETAILS,
payload: {
signer,
@@ -322,3 +340,12 @@ export const updateSignerDetails = (signer: VaultSigner, key: string, value: any
value,
},
});
+
+export const updateKeyDetails = (signer: VaultSigner, key: string, value: any) => ({
+ type: UPDATE_KEY_DETAILS,
+ payload: {
+ signer,
+ key,
+ value,
+ },
+});
diff --git a/src/store/sagas/bhr.ts b/src/store/sagas/bhr.ts
index 8709dc45d..f910a44ff 100644
--- a/src/store/sagas/bhr.ts
+++ b/src/store/sagas/bhr.ts
@@ -15,7 +15,7 @@ import DeviceInfo from 'react-native-device-info';
import { KeeperApp } from 'src/models/interfaces/KeeperApp';
import { RealmSchema } from 'src/storage/realm/enum';
import Relay from 'src/services/operations/Relay';
-import { Vault, VaultSigner } from 'src/core/wallets/interfaces/vault';
+import { Signer, Vault, VaultSigner } from 'src/core/wallets/interfaces/vault';
import { captureError } from 'src/services/sentry';
import crypto from 'crypto';
import dbManager from 'src/storage/realm/dbManager';
@@ -60,27 +60,49 @@ import { generateSignerFromMetaData } from 'src/hardware';
import { SignerStorage, SignerType, VaultType, XpubTypes } from 'src/core/wallets/enums';
import { getCosignerDetails } from 'src/core/wallets/factories/WalletFactory';
import { NewVaultInfo, addNewVaultWorker } from './wallets';
+import { getJSONFromRealmObject } from 'src/storage/realm/utils';
+import { KEY_MANAGEMENT_VERSION } from './upgrade';
-export function* updateAppImageWorker({ payload }) {
- const { wallets } = payload;
+export function* updateAppImageWorker({
+ payload,
+}: {
+ payload: {
+ wallets?: Wallet[];
+ signers?: Signer[];
+ };
+}) {
+ const { wallets, signers } = payload;
const { primarySeed, id, publicId, subscription, networkType, version }: KeeperApp = yield call(
dbManager.getObjectByIndex,
RealmSchema.KeeperApp
);
const walletObject = {};
+ const signersObjects = {};
const encryptionKey = generateEncryptionKey(primarySeed);
if (wallets) {
for (const wallet of wallets) {
const encrytedWallet = encrypt(encryptionKey, JSON.stringify(wallet));
walletObject[wallet.id] = encrytedWallet;
}
+ } else if (signers) {
+ for (const signer of signers) {
+ const encrytedWallet = encrypt(encryptionKey, JSON.stringify(signer));
+ signersObjects[signer.masterFingerprint] = encrytedWallet;
+ }
} else {
+ //update all wallets and signers
const wallets: Wallet[] = yield call(dbManager.getCollection, RealmSchema.Wallet);
for (const index in wallets) {
const wallet = wallets[index];
const encrytedWallet = encrypt(encryptionKey, JSON.stringify(wallet));
walletObject[wallet.id] = encrytedWallet;
}
+ const signers: Signer[] = yield call(dbManager.getCollection, RealmSchema.Signer);
+ for (const index in signers) {
+ const signer = signers[index];
+ const encrytedSigner = encrypt(encryptionKey, JSON.stringify(signer));
+ signersObjects[signer.masterFingerprint] = encrytedSigner;
+ }
}
const nodes: NodeDetail[] = yield call(dbManager.getCollection, RealmSchema.NodeConnect);
@@ -93,11 +115,14 @@ export function* updateAppImageWorker({ payload }) {
nodesToUpdate.push(encrytedNode);
}
}
+
+ // API call to Relay to do modular updates
try {
const response = yield call(Relay.updateAppImage, {
appId: id,
publicId,
walletObject,
+ signersObjects,
networkType,
subscription: JSON.stringify(subscription),
version,
@@ -129,11 +154,12 @@ export function* updateVaultImageWorker({
const vaultEncrypted = encrypt(encryptionKey, JSON.stringify(vault));
if (isUpdate) {
- Relay.updateVaultImage({
+ const response = Relay.updateVaultImage({
isUpdate,
vaultId: vault.id,
vault: vaultEncrypted,
});
+ return response;
}
const signersData: Array<{
@@ -142,27 +168,14 @@ export function* updateVaultImageWorker({
}> = [];
const signerIdXpubMap = {};
for (const signer of vault.signers) {
- signerIdXpubMap[signer.signerId] = signer.xpub;
+ signerIdXpubMap[signer.xfp] = signer.xpub;
signersData.push({
- signerId: signer.signerId,
+ signerId: signer.xfp,
xfpHash: hash256(signer.masterFingerprint),
});
}
- // updating signerIdXpubMap if the signer was created through automated mock flow
- // const signerIdsToFilter = [];
- // for (const signer of vault.signers) {
- // if (signer.amfData && signer.amfData.xpub) {
- // signerIdXpubMap[signer.amfData.signerId] = signer.amfData.xpub;
- // signersData.push({
- // signerId: signer.amfData.signerId,
- // xfpHash: hash256(signer.xpubInfo.xfp),
- // });
- // signerIdsToFilter.push(signer.signerId);
- // }
- // }
- // signersData = signersData.filter((signer) => !signerIdsToFilter.includes(signer.signerId));
-
- // TO-DO to be removed
+
+ // TODO to be removed
const subscriptionStrings = JSON.stringify(subscription);
try {
@@ -245,7 +258,7 @@ function* getAppImageWorker({ payload }) {
const primarySeed = bip39.mnemonicToSeedSync(primaryMnemonic);
const appID = crypto.createHash('sha256').update(primarySeed).digest('hex');
const encryptionKey = generateEncryptionKey(primarySeed.toString('hex'));
- const { appImage, vaultImage, subscription, UTXOinfos, labels } = yield call(
+ const { appImage, subscription, UTXOinfos, vaultImage, labels, allVaultImages } = yield call(
Relay.getAppImage,
appID
);
@@ -273,9 +286,10 @@ function* getAppImageWorker({ payload }) {
appID,
subscription,
appImage,
- vaultImage,
+ allVaultImages,
UTXOinfos,
- labels
+ labels,
+ previousVersion
);
} else {
const plebSubscription = {
@@ -293,9 +307,10 @@ function* getAppImageWorker({ payload }) {
appID,
plebSubscription,
appImage,
- vaultImage,
+ allVaultImages,
UTXOinfos,
- labels
+ labels,
+ previousVersion
);
}
}
@@ -315,9 +330,10 @@ function* recoverApp(
appID,
subscription,
appImage,
- vaultImage,
+ allVaultImages,
UTXOinfos,
- labels
+ labels,
+ previousVersion
) {
const entropy = yield call(
BIP85.bip39MnemonicToEntropy,
@@ -365,10 +381,10 @@ function* recoverApp(
if (parsedText) {
const signers: VaultSigner[] = [];
parsedText.signersDetails.forEach((config) => {
- const signer = generateSignerFromMetaData({
+ const { signer } = generateSignerFromMetaData({
xpub: config.xpub,
derivationPath: config.path,
- xfp: config.masterFingerprint,
+ masterFingerprint: config.masterFingerprint,
signerType: SignerType.KEEPER,
storageType: SignerStorage.WARM,
isMultisig: config.isMultisig,
@@ -376,7 +392,7 @@ function* recoverApp(
signers.push(signer);
});
- const { xpubDetails } = getCosignerDetails(decrytpedWallet, app.id);
+ const { xpubDetails } = getCosignerDetails(decrytpedWallet);
const isValidDescriptor = signers.find(
(signer) => signer.xpub === xpubDetails[XpubTypes.P2WSH].xpub
);
@@ -403,11 +419,77 @@ function* recoverApp(
}
}
+ //Signers recreatin
+ if (appImage.signers) {
+ for (const [key, value] of Object.entries(appImage.signers)) {
+ const decrytpedSigner: Signer = JSON.parse(decrypt(encryptionKey, value));
+ yield call(dbManager.createObject, RealmSchema.Signer, decrytpedSigner);
+ }
+ }
+
// Vault recreation
- if (vaultImage) {
- const vault = JSON.parse(decrypt(encryptionKey, vaultImage.vault));
+ if (allVaultImages.length > 0) {
+ for (const vaultImage of allVaultImages) {
+ const vault = JSON.parse(decrypt(encryptionKey, vaultImage.vault));
+
+ if (semver.lt(previousVersion, KEY_MANAGEMENT_VERSION)) {
+ if (vault?.signers?.length) {
+ vault.signers.forEach((signer, index) => {
+ signer.xfp = signer.signerId;
+ signer.registeredVaults = [
+ {
+ vaultId: vault.id,
+ registered: signer.registered,
+ registrationInfo: signer.deviceInfo ? JSON.stringify(signer.deviceInfo) : '',
+ },
+ ];
+ });
+ }
- yield call(dbManager.createObject, RealmSchema.Vault, vault);
+ if (vault.signers.length) {
+ for (const signer of vault.signers) {
+ const signerXpubs = {};
+ Object.keys(signer.xpubDetails).forEach((type) => {
+ if (signer.xpubDetails[type].xpub) {
+ if (signerXpubs[type]) {
+ signerXpubs[type].push({
+ xpub: signer.xpubDetails[type].xpub,
+ xpriv: signer.xpubDetails[type].xpriv,
+ derivationPath: signer.xpubDetails[type].derivationPath,
+ });
+ } else {
+ signerXpubs[type] = [
+ {
+ xpub: signer.xpubDetails[type].xpub,
+ xpriv: signer.xpubDetails[type].xpriv,
+ derivationPath: signer.xpubDetails[type].derivationPath,
+ },
+ ];
+ }
+ }
+ });
+ const signerObject = {
+ masterFingerprint: signer.masterFingerprint,
+ type: signer.type,
+ signerName: signer.signerName,
+ signerDescription: signer.signerDescription,
+ lastHealthCheck: signer.lastHealthCheck,
+ addedOn: signer.addedOn,
+ isMock: signer.isMock,
+ storageType: signer.storageType,
+ signerPolicy: signer.signerPolicy,
+ inheritanceKeyInfo: signer.inheritanceKeyInfo,
+ hidden: false,
+ signerXpubs,
+ };
+ yield call(dbManager.createObject, RealmSchema.Signer, signerObject);
+ }
+ }
+
+ yield call(dbManager.createObject, RealmSchema.Vault, vault);
+ }
+ yield call(dbManager.createObject, RealmSchema.Vault, vault);
+ }
}
// UTXOinfo restore
diff --git a/src/store/sagas/index.ts b/src/store/sagas/index.ts
index 0e3805637..e659622a8 100644
--- a/src/store/sagas/index.ts
+++ b/src/store/sagas/index.ts
@@ -14,11 +14,12 @@ import {
updateWalletDetailWatcher,
updateWalletSettingsWatcher,
updateSignerDetails,
+ updateKeyDetails,
updateWalletsPropertyWatcher,
addWhirlpoolWalletsWatcher,
addWhirlpoolWalletsLocalWatcher,
updateWalletPathAndPuposeDetailWatcher,
- finaliseIKSetupWatcher,
+ updateVaultDetailsWatcher,
} from './wallets';
import {
addUaiStackWatcher,
@@ -98,8 +99,9 @@ const rootSaga = function* () {
addSigningDeviceWatcher,
migrateVaultWatcher,
finaliseVaultMigrationWatcher,
- finaliseIKSetupWatcher,
+ updateVaultDetailsWatcher,
updateSignerDetails,
+ updateKeyDetails,
// send and receive
fetchExchangeRatesWatcher,
diff --git a/src/store/sagas/login.ts b/src/store/sagas/login.ts
index 2611db0d9..063dc45fa 100644
--- a/src/store/sagas/login.ts
+++ b/src/store/sagas/login.ts
@@ -174,7 +174,6 @@ function* credentialsAuthWorker({ payload }) {
uaiChecks([
uaiType.SIGNING_DEVICES_HEALTH_CHECK,
uaiType.SECURE_VAULT,
- uaiType.VAULT_MIGRATION,
uaiType.DEFAULT,
uaiType.VAULT_TRANSFER,
])
diff --git a/src/store/sagas/restoreUpgrade.ts b/src/store/sagas/restoreUpgrade.ts
index efb218dc1..0946d8d1b 100644
--- a/src/store/sagas/restoreUpgrade.ts
+++ b/src/store/sagas/restoreUpgrade.ts
@@ -3,7 +3,6 @@ import semver from 'semver';
import { decrypt, encrypt } from 'src/services/operations/encryption';
import Relay from 'src/services/operations/Relay';
import { Vault } from 'src/core/wallets/interfaces/vault';
-import { ADDITION_OF_VAULTSHELL_VERSION } from './upgrade';
export function* applyRestoreSequence({
previousVersion,
@@ -19,8 +18,6 @@ export function* applyRestoreSequence({
encryptionKey: string;
}) {
console.log(`applying restore upgarde sequence - from: ${previousVersion} to ${newVersion}`);
- if (semver.lte(previousVersion, ADDITION_OF_VAULTSHELL_VERSION))
- yield call(additionOfVaultShellId, vaultImage, appImage, encryptionKey);
yield call(updateVersion, appImage, newVersion);
}
@@ -46,7 +43,7 @@ function* additionOfVaultShellId(vaultImage, appImage, encryptionKey) {
}
//while restoring, updating the version on the appImage
-//TO-DO
+//TODO
function* updateVersion(appImage, newVersion) {
try {
yield call(Relay.updateAppImage, {
diff --git a/src/store/sagas/send_and_receive.ts b/src/store/sagas/send_and_receive.ts
index 30e0c1ba7..f1fcabbd9 100644
--- a/src/store/sagas/send_and_receive.ts
+++ b/src/store/sagas/send_and_receive.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-plusplus */
-/* eslint-disable no-restricted-syntax */
import { AverageTxFeesByNetwork, SerializedPSBTEnvelop } from 'src/core/wallets/interfaces';
import { EntityKind, LabelRefType, TxPriority } from 'src/core/wallets/enums';
import { call, put, select } from 'redux-saga/effects';
@@ -12,12 +10,13 @@ import WalletUtilities from 'src/core/wallets/operations/utils';
import _ from 'lodash';
import idx from 'idx';
import { TransferType } from 'src/models/enums/TransferType';
-import {
+import ElectrumClient, {
+ ELECTRUM_CLIENT,
ELECTRUM_NOT_CONNECTED_ERR,
ELECTRUM_NOT_CONNECTED_ERR_TOR,
} from 'src/services/electrum/client';
-import { createWatcher } from '../utilities';
import dbManager from 'src/storage/realm/dbManager';
+import { createWatcher } from '../utilities';
import {
SendPhaseOneExecutedPayload,
sendPhaseOneExecuted,
@@ -27,6 +26,7 @@ import {
crossTransferExecuted,
crossTransferFailed,
sendPhaseTwoStarted,
+ customFeeCalculated,
} from '../reducers/send_and_receive';
import { setAverageTxFee, setExchangeRates } from '../reducers/network';
import {
@@ -44,11 +44,11 @@ import {
SendPhaseOneAction,
SendPhaseThreeAction,
SendPhaseTwoAction,
- customFeeCalculated,
feeIntelMissing,
} from '../sagaActions/send_and_receive';
import { addLabelsWorker } from './utxos';
import { setElectrumNotConnectedErr } from '../reducers/login';
+import { connectToNodeWorker } from './network';
export function* fetchFeeRatesWorker() {
try {
@@ -125,23 +125,40 @@ function* sendPhaseOneWorker({ payload }: SendPhaseOneAction) {
export const sendPhaseOneWatcher = createWatcher(sendPhaseOneWorker, SEND_PHASE_ONE);
function* sendPhaseTwoWorker({ payload }: SendPhaseTwoAction) {
+ if (!ELECTRUM_CLIENT.isClientConnected) {
+ ElectrumClient.resetCurrentPeerIndex();
+ yield call(connectToNodeWorker);
+ }
yield put(sendPhaseTwoStarted());
const sendPhaseOneResults: SendPhaseOneExecutedPayload = yield select(
(state) => state.sendAndReceive.sendPhaseOne
);
+ const customSendPhaseOneResults = yield select(
+ (state) => state.sendAndReceive.customPrioritySendPhaseOne
+ );
+
const { wallet, txnPriority, note, label, transferType } = payload;
const txPrerequisites = _.cloneDeep(idx(sendPhaseOneResults, (_) => _.outputs.txPrerequisites)); // cloning object(mutable) as reducer states are immutable
+ const customTxPrerequisites = _.cloneDeep(
+ idx(customSendPhaseOneResults, (_) => _.outputs.customTxPrerequisites)
+ );
+
const recipients = idx(sendPhaseOneResults, (_) => _.outputs.recipients);
- const network = WalletUtilities.getNetworkByType(wallet.networkType);
+ const signerMap = {};
+ if (wallet.entityKind === EntityKind.VAULT) {
+ dbManager
+ .getCollection(RealmSchema.Signer)
+ .forEach((signer) => (signerMap[signer.masterFingerprint as string] = signer));
+ }
try {
const { txid, serializedPSBTEnvelops, finalOutputs } = yield call(
WalletOperations.transferST2,
wallet,
txPrerequisites,
txnPriority,
- network,
- recipients
- // customTxPrerequisites
+ recipients,
+ customTxPrerequisites,
+ signerMap
);
switch (wallet.entityKind) {
@@ -170,8 +187,9 @@ function* sendPhaseTwoWorker({ payload }: SendPhaseTwoAction) {
break;
case EntityKind.VAULT:
- if (!serializedPSBTEnvelops.length)
+ if (!serializedPSBTEnvelops.length) {
throw new Error('Send failed: unable to generate serializedPSBTEnvelop');
+ }
yield put(
sendPhaseTwoExecuted({
successful: true,
@@ -181,7 +199,7 @@ function* sendPhaseTwoWorker({ payload }: SendPhaseTwoAction) {
break;
default:
- throw new Error('Invalid Entity: not a Vault/Wallet');
+ throw new Error('Invalid Entity: not a vault/Wallet');
}
if (wallet.entityKind === EntityKind.WALLET) {
const enabledTransferTypes = [TransferType.WALLET_TO_VAULT];
@@ -202,8 +220,9 @@ function* sendPhaseTwoWorker({ payload }: SendPhaseTwoAction) {
}
}
} catch (err) {
- if ([ELECTRUM_NOT_CONNECTED_ERR, ELECTRUM_NOT_CONNECTED_ERR_TOR].includes(err?.message))
+ if ([ELECTRUM_NOT_CONNECTED_ERR, ELECTRUM_NOT_CONNECTED_ERR_TOR].includes(err?.message)) {
yield put(setElectrumNotConnectedErr(err?.message));
+ }
yield put(
sendPhaseTwoExecuted({
@@ -220,10 +239,18 @@ function* sendPhaseThreeWorker({ payload }: SendPhaseThreeAction) {
const sendPhaseOneResults: SendPhaseOneExecutedPayload = yield select(
(state) => state.sendAndReceive.sendPhaseOne
);
+ const customSendPhaseOneResults = yield select(
+ (state) => state.sendAndReceive.customPrioritySendPhaseOne
+ );
const serializedPSBTEnvelops: SerializedPSBTEnvelop[] = yield select(
(state) => state.sendAndReceive.sendPhaseTwo.serializedPSBTEnvelops
);
+
const txPrerequisites = _.cloneDeep(idx(sendPhaseOneResults, (_) => _.outputs.txPrerequisites)); // cloning object(mutable) as reducer states are immutable
+ const customTxPrerequisites = _.cloneDeep(
+ idx(customSendPhaseOneResults, (_) => _.outputs.customTxPrerequisites)
+ );
+
const recipients = idx(sendPhaseOneResults, (_) => _.outputs.recipients);
const { wallet, txnPriority, note, label } = payload;
try {
@@ -238,10 +265,11 @@ function* sendPhaseThreeWorker({ payload }: SendPhaseThreeAction) {
txHex = serializedPSBTEnvelop.txHex; // txHex is given out by COLDCARD, KEYSTONE and TREZOR post signing
}
}
- if (availableSignatures < threshold)
+ if (availableSignatures < threshold) {
throw new Error(
`Insufficient signatures, required:${threshold} provided:${availableSignatures}`
);
+ }
const { txid, finalOutputs } = yield call(
WalletOperations.transferST3,
@@ -249,6 +277,7 @@ function* sendPhaseThreeWorker({ payload }: SendPhaseThreeAction) {
serializedPSBTEnvelops,
txPrerequisites,
txnPriority,
+ customTxPrerequisites,
txHex
);
if (!txid) throw new Error('Send failed: unable to generate txid using the signed PSBT');
@@ -286,8 +315,9 @@ function* sendPhaseThreeWorker({ payload }: SendPhaseThreeAction) {
});
}
} catch (err) {
- if ([ELECTRUM_NOT_CONNECTED_ERR, ELECTRUM_NOT_CONNECTED_ERR_TOR].includes(err?.message))
+ if ([ELECTRUM_NOT_CONNECTED_ERR, ELECTRUM_NOT_CONNECTED_ERR_TOR].includes(err?.message)) {
yield put(setElectrumNotConnectedErr(err?.message));
+ }
yield put(
sendPhaseThreeExecuted({
@@ -331,13 +361,11 @@ function* corssTransferWorker({ payload }: CrossTransferAction) {
);
if (txPrerequisites) {
- const network = WalletUtilities.getNetworkByType(sender.networkType);
const { txid } = yield call(
WalletOperations.transferST2,
sender,
txPrerequisites,
TxPriority.LOW,
- network,
recipients
);
@@ -385,12 +413,11 @@ export const calculateSendMaxFeeWatcher = createWatcher(
);
function* calculateCustomFee({ payload }: CalculateCustomFeeAction) {
- // feerate should be > minimum relay feerate(default: 1000 satoshis per kB or 1 sat/byte).
if (parseInt(payload.feePerByte, 10) < 1) {
yield put(
customFeeCalculated({
successful: false,
- carryOver: {
+ outputs: {
customTxPrerequisites: null,
},
err: 'Custom fee minimum: 1 sat/byte',
@@ -399,12 +426,14 @@ function* calculateCustomFee({ payload }: CalculateCustomFeeAction) {
return;
}
- const { wallet, recipients, feePerByte, customEstimatedBlocks } = payload;
- const sending: any = {};
- const txPrerequisites = idx(sending, (_) => _.sendST1.carryOver.txPrerequisites);
+ const { wallet, recipients, feePerByte, customEstimatedBlocks, selectedUTXOs } = payload;
+ const sendPhaseOneResults: SendPhaseOneExecutedPayload = yield select(
+ (state) => state.sendAndReceive.sendPhaseOne
+ );
+ const txPrerequisites = idx(sendPhaseOneResults, (_) => _.outputs.txPrerequisites);
let outputs;
- if (sending.feeIntelMissing) {
+ if (!txPrerequisites) {
// process recipients & generate outputs(normally handled by transfer ST1 saga)
const outputsArray = [];
for (const recipient of recipients) {
@@ -414,24 +443,24 @@ function* calculateCustomFee({ payload }: CalculateCustomFeeAction) {
});
}
outputs = outputsArray;
- } else {
- if (!txPrerequisites) throw new Error('ST1 carry-over missing');
- outputs = txPrerequisites[TxPriority.LOW].outputs.filter((output) => output.address);
- }
+ } else outputs = txPrerequisites[TxPriority.LOW].outputs.filter((output) => output.address);
const customTxPrerequisites = WalletOperations.prepareCustomTransactionPrerequisites(
wallet,
outputs,
- parseInt(feePerByte, 10)
+ parseInt(feePerByte, 10),
+ selectedUTXOs
);
- if (customTxPrerequisites.inputs) {
- customTxPrerequisites.estimatedBlocks = parseInt(customEstimatedBlocks, 10);
+ if (customTxPrerequisites[TxPriority.CUSTOM]?.inputs) {
+ customTxPrerequisites[TxPriority.CUSTOM].estimatedBlocks = parseInt(customEstimatedBlocks, 10);
+
yield put(
customFeeCalculated({
successful: true,
- carryOver: {
+ outputs: {
customTxPrerequisites,
+ recipients,
},
err: null,
})
@@ -444,7 +473,7 @@ function* calculateCustomFee({ payload }: CalculateCustomFeeAction) {
yield put(
customFeeCalculated({
successful: false,
- carryOver: {
+ outputs: {
customTxPrerequisites: null,
},
err: `Insufficient balance to pay: amount ${totalAmount} + fee(${customTxPrerequisites.fee}) at ${feePerByte} sats/byte`,
diff --git a/src/store/sagas/storage.ts b/src/store/sagas/storage.ts
index d29c22262..239ec3870 100644
--- a/src/store/sagas/storage.ts
+++ b/src/store/sagas/storage.ts
@@ -23,6 +23,8 @@ import { resetRealyWalletState } from '../reducers/bhr';
export const defaultTransferPolicyThreshold =
config.NETWORK_TYPE === NetworkType.MAINNET ? 1000000 : 5000;
+export const maxTransferPolicyThreshold = 1e11;
+
export function* setupKeeperAppWorker({ payload }) {
try {
const { appName, fcmToken }: { appName: string; fcmToken: string } = payload;
@@ -76,7 +78,7 @@ export function* setupKeeperAppWorker({ payload }) {
walletType: WalletType.DEFAULT,
walletDetails: {
name: 'Wallet 1',
- description: 'Single-sig bitcoin wallet',
+ description: '',
transferPolicy: {
id: uuidv4(),
threshold: defaultTransferPolicyThreshold,
@@ -138,7 +140,7 @@ function* setupKeeperVaultRecoveryAppWorker({ payload }) {
walletType: WalletType.DEFAULT,
walletDetails: {
name: 'Mobile Wallet',
- description: 'Single-sig bitcoin wallet',
+ description: '',
transferPolicy: {
id: uuidv4(),
threshold: defaultTransferPolicyThreshold,
diff --git a/src/store/sagas/uai.ts b/src/store/sagas/uai.ts
index d3ac1314f..08bd84d76 100644
--- a/src/store/sagas/uai.ts
+++ b/src/store/sagas/uai.ts
@@ -8,6 +8,8 @@ import { v4 as uuidv4 } from 'uuid';
import { Wallet } from 'src/core/wallets/interfaces/wallet';
import { KeeperApp } from 'src/models/interfaces/KeeperApp';
import { SUBSCRIPTION_SCHEME_MAP } from 'src/hooks/usePlan';
+import { isTestnet } from 'src/constants/Bitcoin';
+import { EntityKind, VaultType } from 'src/core/wallets/enums';
import { setRefreshUai } from '../reducers/uai';
import {
addToUaiStack,
@@ -19,8 +21,6 @@ import {
UAI_CHECKS,
} from '../sagaActions/uai';
import { createWatcher } from '../utilities';
-import { isTestnet } from 'src/constants/Bitcoin';
-import { EntityKind, VaultType } from 'src/core/wallets/enums';
const healthCheckRemider = (signer: VaultSigner) => {
const today = new Date();
@@ -119,7 +119,7 @@ function* uaiChecksWorker({ payload }) {
if (!secureVaultUai) {
yield put(
addToUaiStack({
- title: 'Add a signing device to activate your Vault',
+ title: 'Add a signer to activate your Vault',
isDisplay: false,
uaiType: uaiType.SECURE_VAULT,
prirority: 100,
@@ -152,7 +152,7 @@ function* uaiChecksWorker({ payload }) {
} else {
yield put(
addToUaiStack({
- title: `Transfer fund to Vault from ${wallet.presentationData.name}`,
+ title: `Transfer fund to vault from ${wallet.presentationData.name}`,
isDisplay: false,
uaiType: uaiType.VAULT_TRANSFER,
prirority: 80,
@@ -184,7 +184,7 @@ function* uaiChecksWorker({ payload }) {
if (!migrationUai) {
yield put(
addToUaiStack({
- title: 'To use the Vault, reconfigure signing device',
+ title: 'To use the vault, reconfigure signer',
isDisplay: false,
uaiType: uaiType.VAULT_MIGRATION,
prirority: 100,
@@ -204,7 +204,7 @@ function* uaiChecksWorker({ payload }) {
if (!defaultUai) {
yield put(
addToUaiStack({
- title: 'Make sure your signing devices are safe and accessible',
+ title: 'Make sure your signers are safe and accessible',
isDisplay: false,
uaiType: uaiType.DEFAULT,
prirority: 10,
diff --git a/src/store/sagas/upgrade.ts b/src/store/sagas/upgrade.ts
index 39d9ba0ad..15ec4f176 100644
--- a/src/store/sagas/upgrade.ts
+++ b/src/store/sagas/upgrade.ts
@@ -25,10 +25,12 @@ import SigningServer from 'src/services/operations/SigningServer';
import { generateCosignerMapUpdates } from 'src/core/wallets/factories/VaultFactory';
import InheritanceKeyServer from 'src/services/operations/InheritanceKey';
import { CosignersMapUpdate, IKSCosignersMapUpdate } from 'src/services/interfaces';
+import { updateAppImageWorker, updateVaultImageWorker } from './bhr';
export const LABELS_INTRODUCTION_VERSION = '1.0.4';
export const BIP329_INTRODUCTION_VERSION = '1.0.7';
export const ASSISTED_KEYS_MIGRATION_VERSION = '1.1.9';
+export const KEY_MANAGEMENT_VERSION = '1.1.9';
export function* applyUpgradeSequence({
previousVersion,
@@ -46,6 +48,10 @@ export function* applyUpgradeSequence({
yield put(migrateLabelsToBip329());
if (semver.lt(previousVersion, ASSISTED_KEYS_MIGRATION_VERSION)) yield call(migrateAssistedKeys);
+ if (semver.lt(previousVersion, KEY_MANAGEMENT_VERSION)) {
+ yield call(migrateStructureforSignersInAppImage);
+ yield call(migrateStructureforVaultInAppImage);
+ }
yield put(setAppVersion(newVersion));
yield put(updateVersionHistory(previousVersion, newVersion));
@@ -149,11 +155,18 @@ function* migrateAssistedKeys() {
const app: KeeperApp = yield call(dbManager.getObjectByIndex, RealmSchema.KeeperApp);
const { signers } = activeVault;
+ const signerMap = {};
+ dbManager
+ .getCollection(RealmSchema.Signer)
+ .forEach((signer) => (signerMap[signer.masterFingerprint as string] = signer));
for (let signer of signers) {
- if (signer.type === SignerType.POLICY_SERVER) {
+ const signerType = signerMap[signer.masterFingerprint].type;
+
+ if (signerType === SignerType.POLICY_SERVER) {
const cosignersMapUpdates: CosignersMapUpdate[] = yield call(
generateCosignerMapUpdates,
+ signerMap,
signers,
signer
);
@@ -165,9 +178,10 @@ function* migrateAssistedKeys() {
);
if (!migrationSuccessful) throw new Error('Failed to migrate assisted keys(SS)');
- } else if (signer.type === SignerType.INHERITANCEKEY) {
+ } else if (signerType === SignerType.INHERITANCEKEY) {
const cosignersMapUpdates: IKSCosignersMapUpdate[] = yield call(
generateCosignerMapUpdates,
+ signerMap,
signers,
signer
);
@@ -184,3 +198,28 @@ function* migrateAssistedKeys() {
console.log({ error });
}
}
+
+function* migrateStructureforSignersInAppImage() {
+ try {
+ const response = yield call(updateAppImageWorker, { payload: {} });
+ if (response.updated) {
+ console.log('Updated the Signers in app image');
+ } else {
+ console.log('Failed to update the update the app image with the updated the structure');
+ }
+ } catch (err) {}
+}
+
+function* migrateStructureforVaultInAppImage() {
+ try {
+ const vaults: Vault[] = yield call(dbManager.getCollection, RealmSchema.Vault);
+ const activeVault: Vault = vaults.filter((vault) => !vault.archived)[0] || null;
+
+ console.log('updating vault');
+ const vaultResponse = yield call(updateVaultImageWorker, {
+ payload: { isUpdate: true, vault: activeVault },
+ });
+ } catch (err) {
+ console.log('Something went wrong in updating the vault image', err);
+ }
+}
diff --git a/src/store/sagas/wallets.ts b/src/store/sagas/wallets.ts
index ae0363a0c..03f6eb4bf 100644
--- a/src/store/sagas/wallets.ts
+++ b/src/store/sagas/wallets.ts
@@ -9,14 +9,22 @@ import {
VaultType,
VisibilityType,
WalletType,
+ XpubTypes,
} from 'src/core/wallets/enums';
import {
InheritanceConfiguration,
+ InheritanceKeyInfo,
InheritancePolicy,
SignerException,
SignerRestriction,
} from 'src/services/interfaces';
-import { Vault, VaultScheme, VaultSigner } from 'src/core/wallets/interfaces/vault';
+import {
+ Signer,
+ Vault,
+ VaultPresentationData,
+ VaultScheme,
+ VaultSigner,
+} from 'src/core/wallets/interfaces/vault';
import {
TransferPolicy,
Wallet,
@@ -46,7 +54,10 @@ import config from 'src/core/config';
import { createWatcher } from 'src/store/utilities';
import dbManager from 'src/storage/realm/dbManager';
import { generateVault } from 'src/core/wallets/factories/VaultFactory';
-import { generateWallet, generateWalletSpecs } from 'src/core/wallets/factories/WalletFactory';
+import {
+ generateWallet,
+ generateWalletSpecsFromMnemonic,
+} from 'src/core/wallets/factories/WalletFactory';
import { getJSONFromRealmObject } from 'src/storage/realm/utils';
import { generateKey, hash256 } from 'src/services/operations/encryption';
import { uaiType } from 'src/models/interfaces/Uai';
@@ -59,12 +70,7 @@ import ElectrumClient, {
import InheritanceKeyServer from 'src/services/operations/InheritanceKey';
import { genrateOutputDescriptors } from 'src/core/utils';
import { RootState } from '../store';
-import {
- addSigningDevice,
- initiateVaultMigration,
- vaultCreated,
- vaultMigrationCompleted,
-} from '../reducers/vaults';
+import { initiateVaultMigration, vaultCreated, vaultMigrationCompleted } from '../reducers/vaults';
import {
ADD_NEW_WALLETS,
AUTO_SYNC_WALLETS,
@@ -83,22 +89,25 @@ import {
ADD_WHIRLPOOL_WALLETS_LOCAL,
UPDATE_WALLET_PATH_PURPOSE_DETAILS,
INCREMENT_ADDRESS_INDEX,
+ UPDATE_KEY_DETAILS,
+ UPDATE_VAULT_DETAILS,
} from '../sagaActions/wallets';
import {
ADD_NEW_VAULT,
ADD_SIGINING_DEVICE,
FINALISE_VAULT_MIGRATION,
- FINALIZE_IK_SETUP,
MIGRATE_VAULT,
- finaliseIKSetup,
} from '../sagaActions/vaults';
import { uaiChecks } from '../sagaActions/uai';
import { updateAppImageWorker, updateVaultImageWorker } from './bhr';
import {
+ relaySignersUpdateFail,
+ relaySignersUpdateSuccess,
relayVaultUpdateFail,
relayVaultUpdateSuccess,
relayWalletUpdateFail,
relayWalletUpdateSuccess,
+ setRelaySignersUpdateLoading,
setRelayVaultUpdateLoading,
setRelayWalletUpdateLoading,
} from '../reducers/bhr';
@@ -353,7 +362,7 @@ function* addNewWallet(
type: WalletType.DEFAULT,
instanceNum: defaultWalletInstacnes, // zero-indexed
walletName: walletName || 'Default Wallet',
- walletDescription: walletDescription || 'Bitcoin Wallet',
+ walletDescription: walletDescription || '',
derivationConfig,
primaryMnemonic,
networkType: config.NETWORK_TYPE,
@@ -366,7 +375,7 @@ function* addNewWallet(
type: WalletType.IMPORTED,
instanceNum: null, // bip-85 instance number is null for imported wallets
walletName: walletName || 'Imported Wallet',
- walletDescription: walletDescription || 'Bitcoin Wallet',
+ walletDescription: walletDescription || '',
importDetails,
networkType: config.NETWORK_TYPE,
transferPolicy,
@@ -379,7 +388,7 @@ function* addNewWallet(
type: WalletType.PRE_MIX,
instanceNum, // deposit account's index
walletName: 'Pre mix Wallet',
- walletDescription: 'Bitcoin Wallet',
+ walletDescription: '',
derivationConfig,
networkType: config.NETWORK_TYPE,
parentMnemonic,
@@ -391,7 +400,7 @@ function* addNewWallet(
type: WalletType.POST_MIX,
instanceNum, // deposit account's index
walletName: 'Post mix Wallet',
- walletDescription: 'Bitcoin Wallet',
+ walletDescription: '',
derivationConfig,
networkType: config.NETWORK_TYPE,
parentMnemonic,
@@ -403,7 +412,7 @@ function* addNewWallet(
type: WalletType.BAD_BANK,
instanceNum, // deposit account's index
walletName: 'Bad Bank Wallet',
- walletDescription: 'Bitcoin Wallet',
+ walletDescription: '',
derivationConfig,
networkType: config.NETWORK_TYPE,
parentMnemonic,
@@ -494,7 +503,11 @@ export function* addNewVaultWorker({
try {
const { newVaultInfo, isMigrated, oldVaultId, isRecreation = false } = payload;
let { vault } = payload;
+ const signerMap = {};
+ const signingDevices: Signer[] = yield call(dbManager.getCollection, RealmSchema.Signer);
+ signingDevices.forEach((signer) => (signerMap[signer.masterFingerprint as string] = signer));
+ let isNewVault = false;
// When the vault is passed directly during upgrade/downgrade process
if (!vault) {
const {
@@ -521,7 +534,20 @@ export function* addNewVaultWorker({
networkType,
vaultShellId,
collaborativeWalletId,
+ signerMap,
});
+ isNewVault = true;
+ }
+
+ if (isNewVault || isMigrated) {
+ // update IKS, if inheritance key has been added(new Vault) or needs an update(vault migration)
+ const [ikVaultKey] = vault.signers.filter(
+ (vaultKey) => signerMap[vaultKey.masterFingerprint]?.type === SignerType.INHERITANCEKEY
+ );
+ if (ikVaultKey) {
+ const ikSigner: Signer = signerMap[ikVaultKey.masterFingerprint];
+ yield call(finaliseIKSetupWorker, { payload: { ikSigner, ikVaultKey, vault } });
+ }
}
if (newVaultInfo && newVaultInfo.collaborativeWalletId && !isRecreation) {
@@ -559,7 +585,6 @@ export function* addNewVaultWorker({
yield put(vaultCreated({ hasNewVaultGenerationSucceeded: true }));
yield put(relayVaultUpdateSuccess());
- yield put(finaliseIKSetup(vault)); // update IKS, if inheritance key has been added
return true;
}
throw new Error('Relay updation failed');
@@ -578,8 +603,46 @@ export function* addNewVaultWorker({
export const addNewVaultWatcher = createWatcher(addNewVaultWorker, ADD_NEW_VAULT);
-function* addSigningDeviceWorker({ payload: signer }: { payload: VaultSigner }) {
- yield put(addSigningDevice([signer]));
+function* addSigningDeviceWorker({ payload: { signers } }: { payload: { signers: Signer[] } }) {
+ if (!!signers.length) {
+ const signerMap = {};
+ const existingSigners: Signer[] = yield call(dbManager.getCollection, RealmSchema.Signer);
+ existingSigners.forEach((signer) => (signerMap[signer.masterFingerprint as string] = signer));
+
+ // not letting user added multiple accounts for the same signer yet
+ for (const newSigner of signers) {
+ const existingSigner = signerMap[newSigner.masterFingerprint];
+ if (existingSigner) {
+ // TODO: we're not YET supporting multiple keys (accounts) for the same script type
+ if (
+ (newSigner.signerXpubs[XpubTypes.P2WPKH].length &&
+ existingSigner.signerXpubs[XpubTypes.P2WPKH].length) ||
+ (newSigner.signerXpubs[XpubTypes.P2WSH].length &&
+ existingSigner.signerXpubs[XpubTypes.P2WSH].length)
+ ) {
+ yield put(
+ relaySignersUpdateFail(
+ 'A different account has already been added. Please use the existing key for this signer.'
+ )
+ );
+ return false;
+ }
+ }
+ }
+ yield put(setRelaySignersUpdateLoading(true));
+ const response = yield call(updateAppImageWorker, { payload: { signers } });
+ if (response.updated) {
+ yield call(
+ dbManager.createObjectBulk,
+ RealmSchema.Signer,
+ signers,
+ Realm.UpdateMode.Modified
+ );
+ return true;
+ }
+ yield put(relaySignersUpdateFail(response.error));
+ return false;
+ }
}
export const addSigningDeviceWatcher = createWatcher(addSigningDeviceWorker, ADD_SIGINING_DEVICE);
@@ -603,6 +666,10 @@ function* migrateVaultWorker({
const networkType = config.NETWORK_TYPE;
+ const signerMap = {};
+ const signingDevices: Signer[] = yield call(dbManager.getCollection, RealmSchema.Signer);
+ signingDevices.forEach((signer) => (signerMap[signer.masterFingerprint as string] = signer));
+
const vault: Vault = yield call(generateVault, {
type: vaultType,
vaultName: vaultDetails.name,
@@ -611,7 +678,9 @@ function* migrateVaultWorker({
signers: vaultSigners,
networkType,
vaultShellId,
+ signerMap,
});
+
yield put(initiateVaultMigration({ isMigratingNewVault: true, intrimVault: vault }));
} catch (error) {
yield put(
@@ -643,7 +712,6 @@ function* finaliseVaultMigrationWorker({ payload }: { payload: { vaultId: string
error: null,
})
);
- yield put(uaiChecks([uaiType.VAULT_MIGRATION]));
}
} catch (error) {
yield put(
@@ -662,14 +730,15 @@ export const finaliseVaultMigrationWatcher = createWatcher(
FINALISE_VAULT_MIGRATION
);
-function* finaliseIKSetupWorker({ payload }: { payload: { vault: Vault } }) {
+function* finaliseIKSetupWorker({
+ payload,
+}: {
+ payload: { ikSigner: Signer; ikVaultKey: VaultSigner; vault: Vault };
+}) {
// finalise the IK setup
- const { vault } = payload;
- const [ikSigner] = vault.signers.filter((signer) => signer.type === SignerType.INHERITANCEKEY);
+ const { ikSigner, ikVaultKey, vault } = payload;
const backupBSMSForIKS = yield select((state: RootState) => state.vault.backupBSMSForIKS);
-
- if (!ikSigner) return;
- let updatedIkSigner: VaultSigner = null;
+ let updatedInheritanceKeyInfo: InheritanceKeyInfo = null;
if (ikSigner.inheritanceKeyInfo) {
// case: updating config for this new vault which already had IKS as one of its signers
@@ -679,32 +748,29 @@ function* finaliseIKSetupWorker({ payload }: { payload: { vault: Vault } }) {
const newIKSConfiguration: InheritanceConfiguration = {
m: vault.scheme.m,
n: vault.scheme.n,
- descriptors: vault.signers.map((signer) => signer.signerId),
+ descriptors: vault.signers.map((signer) => signer.xfp),
bsms: backupBSMSForIKS ? genrateOutputDescriptors(vault) : null,
};
const { updated } = yield call(
InheritanceKeyServer.updateInheritanceConfig,
- ikSigner.signerId,
+ ikVaultKey.xfp,
existingThresholdDescriptors,
newIKSConfiguration
);
if (updated) {
- updatedIkSigner = {
- ...ikSigner,
- inheritanceKeyInfo: {
- ...ikSigner.inheritanceKeyInfo,
- configuration: newIKSConfiguration,
- },
+ updatedInheritanceKeyInfo = {
+ ...ikSigner.inheritanceKeyInfo,
+ configuration: newIKSConfiguration,
};
- } else Alert.alert('Failed to update the inheritance key configuration');
+ } else throw new Error('Failed to update the inheritance key configuration');
} else {
// case: setting up a vault w/ IKS for the first time
const config: InheritanceConfiguration = {
m: vault.scheme.m,
n: vault.scheme.n,
- descriptors: vault.signers.map((signer) => signer.signerId),
+ descriptors: vault.signers.map((signer) => signer.xfp),
bsms: backupBSMSForIKS ? genrateOutputDescriptors(vault) : null,
};
@@ -715,37 +781,33 @@ function* finaliseIKSetupWorker({ payload }: { payload: { vault: Vault } }) {
const { setupSuccessful } = yield call(
InheritanceKeyServer.finalizeIKSetup,
- ikSigner.signerId,
+ ikVaultKey.xfp,
config,
policy
);
if (setupSuccessful) {
- updatedIkSigner = {
- ...ikSigner,
- inheritanceKeyInfo: {
- configuration: config,
- policy,
- },
+ updatedInheritanceKeyInfo = {
+ configuration: config,
+ policy,
};
- } else Alert.alert('Failed to finalise the inheritance key setup');
+ } else throw new Error('Failed to finalise the inheritance key setup');
}
- if (updatedIkSigner) {
+ if (updatedInheritanceKeyInfo) {
// send updates to realm
- const updatedSigners = vault.signers.map((signer) => {
- if (signer.type === SignerType.INHERITANCEKEY) return updatedIkSigner;
- return signer;
- });
-
- yield call(dbManager.updateObjectById, RealmSchema.Vault, vault.id, {
- signers: updatedSigners,
- });
+ yield call(
+ dbManager.updateObjectByPrimaryId,
+ RealmSchema.Signer,
+ 'masterFingerprint',
+ ikSigner.masterFingerprint,
+ {
+ inheritanceKeyInfo: updatedInheritanceKeyInfo,
+ }
+ );
}
}
-export const finaliseIKSetupWatcher = createWatcher(finaliseIKSetupWorker, FINALIZE_IK_SETUP);
-
function* syncWalletsWorker({
payload,
}: {
@@ -783,6 +845,7 @@ function* refreshWalletsWorker({
const { wallets, options } = payload;
try {
if (!ELECTRUM_CLIENT.isClientConnected) {
+ ElectrumClient.resetCurrentPeerIndex();
yield call(connectToNodeWorker);
}
@@ -963,17 +1026,19 @@ export const updateWalletSettingsWatcher = createWatcher(
export function* updateSignerPolicyWorker({
payload,
}: {
- payload: { signer; updates; verificationToken };
+ payload: { signer; signingKey; updates; verificationToken };
}) {
const vaults: Vault[] = yield call(dbManager.getCollection, RealmSchema.Vault);
const activeVault: Vault = vaults.filter((vault) => !vault.archived)[0] || null;
const {
signer,
+ signingKey,
updates,
verificationToken,
}: {
- signer: VaultSigner;
+ signer: Signer;
+ signingKey: VaultSigner;
updates: {
restrictions?: SignerRestriction;
exceptions?: SignerException;
@@ -982,7 +1047,7 @@ export function* updateSignerPolicyWorker({
} = payload;
const { updated } = yield call(
SigningServer.updatePolicy,
- signer.signerId,
+ signingKey.xfp,
verificationToken,
updates
);
@@ -993,18 +1058,25 @@ export function* updateSignerPolicyWorker({
const { signers } = activeVault;
for (const current of signers) {
- if (current.signerId === signer.signerId) {
- current.signerPolicy = {
- ...current.signerPolicy,
+ if (current.xfp === signingKey.xfp) {
+ const updatedSignerPolicy = {
+ ...signer.signerPolicy,
restrictions: updates.restrictions,
exceptions: updates.exceptions,
};
+
+ yield call(
+ dbManager.updateObjectByPrimaryId,
+ RealmSchema.Signer,
+ 'masterFingerprint',
+ signer.masterFingerprint,
+ {
+ signerPolicy: updatedSignerPolicy,
+ }
+ );
break;
}
}
- yield call(dbManager.updateObjectById, RealmSchema.Vault, activeVault.id, {
- signers,
- });
}
export const updateSignerPolicyWatcher = createWatcher(
@@ -1048,7 +1120,7 @@ function* updateWalletDetailsWorker({ payload }) {
shell: wallet.presentationData.shell,
};
yield put(setRelayWalletUpdateLoading(true));
- // API-TO-DO: based on response call the DB
+ // API-TODO: based on response call the DB
wallet.presentationData = presentationData;
const response = yield call(updateAppImageWorker, { payload: { walletId: wallet.id } });
if (response.updated) {
@@ -1069,6 +1141,51 @@ export const updateWalletDetailWatcher = createWatcher(
UPDATE_WALLET_DETAILS
);
+function* updateVaultDetailsWorker({ payload }) {
+ const {
+ vault,
+ details,
+ }: {
+ vault: Vault;
+ details: {
+ name: string;
+ description: string;
+ };
+ } = payload;
+ try {
+ const presentationData: VaultPresentationData = {
+ name: details.name,
+ description: details.description,
+ visibility: vault.presentationData.visibility,
+ shell: vault.presentationData.shell,
+ };
+ yield put(setRelayVaultUpdateLoading(true));
+ // API-TODO: based on response call the DB
+ vault.presentationData = presentationData;
+
+ console.log(vault.presentationData);
+ const response = yield call(updateVaultImageWorker, {
+ payload: { vault: vault },
+ });
+ if (response.updated) {
+ yield put(relayVaultUpdateSuccess());
+ yield call(dbManager.updateObjectById, RealmSchema.Vault, vault.id, {
+ presentationData,
+ });
+ } else {
+ yield put(relayVaultUpdateFail(response.error));
+ }
+ } catch (err) {
+ console.log('err', err);
+ yield put(relayVaultUpdateFail('Something went wrong!'));
+ }
+}
+
+export const updateVaultDetailsWatcher = createWatcher(
+ updateVaultDetailsWorker,
+ UPDATE_VAULT_DETAILS
+);
+
function* updateWalletPathAndPuposeDetailsWorker({ payload }) {
const {
wallet,
@@ -1085,14 +1202,14 @@ function* updateWalletPathAndPuposeDetailsWorker({ payload }) {
...wallet.derivationDetails,
xDerivationPath: details.path,
};
- const specs = generateWalletSpecs(
+ const specs = generateWalletSpecsFromMnemonic(
derivationDetails.mnemonic,
WalletUtilities.getNetworkByType(wallet.networkType),
derivationDetails.xDerivationPath
); // recreate the specs
yield put(setRelayWalletUpdateLoading(true));
- // API-TO-DO: based on response call the DB
+ // API-TODO: based on response call the DB
wallet.derivationDetails = derivationDetails;
wallet.specs = specs;
@@ -1116,6 +1233,42 @@ export const updateWalletPathAndPuposeDetailWatcher = createWatcher(
);
function* updateSignerDetailsWorker({ payload }) {
+ const {
+ signer,
+ key,
+ value,
+ }: {
+ signer: Signer;
+ key: string;
+ value: any;
+ } = payload;
+
+ yield put(setRelaySignersUpdateLoading(true));
+ try {
+ const response = yield call(updateAppImageWorker, { payload: { signers: [signer] } });
+ if (response.updated) {
+ yield call(
+ dbManager.updateObjectByPrimaryId,
+ RealmSchema.Signer,
+ 'masterFingerprint',
+ signer.masterFingerprint,
+ {
+ [key]: value,
+ }
+ );
+ yield put(relaySignersUpdateSuccess());
+ } else {
+ yield put(relaySignersUpdateFail(response.error));
+ }
+ } catch (err) {
+ console.error(err);
+ yield put(relaySignersUpdateFail('Something went wrong'));
+ }
+}
+
+export const updateSignerDetails = createWatcher(updateSignerDetailsWorker, UPDATE_SIGNER_DETAILS);
+
+function* updateKeyDetailsWorker({ payload }) {
const {
signer,
key,
@@ -1125,25 +1278,34 @@ function* updateSignerDetailsWorker({ payload }) {
key: string;
value: any;
} = payload;
- // TO_DO_VAULT_API
- const activeVault: Vault = dbManager
- .getCollection(RealmSchema.Vault)
- .filter((vault: Vault) => !vault.archived)[0];
-
- const updatedSigners = activeVault.signers.map((item) => {
- if (item.signerId === signer.signerId) {
- item[key] = value;
- return item;
+
+ const vaultSigner = dbManager.getObjectByPrimaryId(RealmSchema.VaultSigner, 'xpub', signer.xpub);
+ const vaultSignerJSON: VaultSigner = vaultSigner.toJSON();
+ if (key === 'registered') {
+ let updatedFlag = false;
+ const updatedRegsteredVaults = vaultSignerJSON.registeredVaults.map((info) => {
+ if (info.vaultId === value.vaultId) {
+ updatedFlag = true;
+ return { ...info, ...value };
+ } else {
+ return info;
+ }
+ });
+ if (!updatedFlag) {
+ updatedRegsteredVaults.push(value);
}
- return item;
- });
+ yield call(dbManager.updateObjectByPrimaryId, RealmSchema.VaultSigner, 'xpub', signer.xpub, {
+ registeredVaults: updatedRegsteredVaults,
+ });
+ return;
+ }
- yield call(dbManager.updateObjectById, RealmSchema.Vault, activeVault.id, {
- signers: updatedSigners,
+ yield call(dbManager.updateObjectByPrimaryId, RealmSchema.VaultSigner, 'xpub', signer.xpub, {
+ [key]: value,
});
}
-export const updateSignerDetails = createWatcher(updateSignerDetailsWorker, UPDATE_SIGNER_DETAILS);
+export const updateKeyDetails = createWatcher(updateKeyDetailsWorker, UPDATE_KEY_DETAILS);
function* updateWalletsPropertyWorker({
payload,
diff --git a/src/theme/Colors.ts b/src/theme/Colors.ts
index 78ba54e72..c092d876d 100644
--- a/src/theme/Colors.ts
+++ b/src/theme/Colors.ts
@@ -43,6 +43,34 @@ const Colors = {
ForestGreen: 'rgba(0,131,105,1)',
PearlGrey: 'rgba(250,252,252,1)',
pantoneGreen: 'rgba(45,103,89,1)',
+ pantoneGreenLight: 'rgba(45,103,89,0.08)',
+ Champagne: 'rgba(247,242,236,1)',
+ Warmbeige: 'rgba(247, 242, 236, 1)',
+ RussetBrown: 'rgba(145, 120, 93, 1)',
+ RussetBrownLight: 'rgba(210, 194, 179, 1)',
+ MintWhisper: 'rgba(45, 103, 89, 0.08)',
+ GreenishGrey: 'rgba(62, 82, 77, 1)',
+ brownColor: 'rgba(145, 120, 92, 1)',
+ learMoreTextcolor: 'rgba(242, 237, 230, 1)',
+ Linen: 'rgba(240, 235, 230, 1)',
+ LightBrown: 'rgba(145, 120, 93, 0.08)',
+ SlateGreen: 'rgba(165, 180, 174, 1)',
+ OffWhite: 'rgba(230,230,223,1)',
+ SageGreen: 'rgba(141,157,150,1)',
+ SlateGrey: 'rgba(36,49,46,1)',
+ LightKhaki: 'rgba(217,209,169,1)',
+ Eggshell: 'rgba(238,227,216,1)',
+ Teal: 'rgba(46,103,89,1)',
+ SmokeGreen: 'rgba(154,164,159,1)',
+ DeepOlive: 'rgba(35, 82, 71, 1)',
+ PaleKhaki: 'rgba(95,106,103,1)',
+ PaleTurquoise: 'rgba(184,214,207,1)',
+ darkGreen: 'rgb(46, 103, 89)',
+ PearlWhite: 'rgba(252, 252, 252, 1)',
+ deepTeal: 'rgba(28,73,64,1)',
+ PaleIvory: 'rgba(238,232,225,1)',
+ DarkSage: 'rgba(111,124,119,1)',
+ Smoke: 'rgba(162,162,162,1)',
// Dark
LightYellowDark: 'rgba(50,60,58,1)',
GraniteGrayDark: 'rgba(136,136,136,1)',
diff --git a/src/utils/GenerateLetterToAtternyPDF.ts b/src/utils/GenerateLetterToAtternyPDF.ts
index 1f670c59a..be097a191 100644
--- a/src/utils/GenerateLetterToAtternyPDF.ts
+++ b/src/utils/GenerateLetterToAtternyPDF.ts
@@ -25,13 +25,15 @@ const GenerateLetterToAtternyPDF = async (fingerPrints) => {
Letter to the Attorney
- This document is one of three Inheritance Planning documents provided by Keeper. The other 2 being Key Security Tips and Restoring Inheritance Vault. This document is auto-produced by the Bitcoin Keeper app. The data shared in this document is sensitive. Please be cautious about revealing part or all of its contents to anyone. To learn more, please visit bitcoinkeeper.app
+ This document is one of three Inheritance Planning documents provided by Keeper. The other 2 being Key Security Tips and Restoring Inheritance vault. This document is auto-produced by the Bitcoin Keeper app. The data shared in this document is sensitive. Please be cautious about revealing part or all of its contents to anyone. To learn more, please visit bitcoinkeeper.app
Subject: Bitcoin Bequest Information for Inclusion in My Will
Dear _________________ ,
I hope this letter finds you well. I am writing to provide you with the necessary information to include my bitcoin holdings in my estate plan. As a significant proportion of my wealth is held in bitcoin, it is crucial to address the legal transfer of these assets appropriately.
Below, I have outlined the specific details regarding my current bitcoin holdings:
1. Bitcoin Key Information:
- ${fingerPrints.map((keys, index) => `
Key ${index + 1} Fingerprint: ${keys}
`).join("")}
+ ${fingerPrints
+ .map((keys, index) => `
Key ${index + 1} Fingerprint: ${keys}
`)
+ .join('')}
These fingerprints act as unique identifiers for the respective keys without revealing sensitive details. Following the BIP32 (Bitcoin Improvement Proposal 32) standard, each fingerprint helps identify the associated extended public key (xPub). The xPub serves as a distinct identifier that can be utilized by a digital asset expert or software, adhering to standard BIP32 derivation paths, to locate and validate the keys during the transfer process.
Please note that the funds associated with these keys may be held in any combination of single-key or multi-signature (multisig) wallets. Regardless of the specific configuration, I intend that any wealth controlled by these keys be legally transferred to the designated heir or intended beneficiary.
My explicit intention is to transfer the legal title to my bitcoin holdings to the designated heir or intended beneficiary. However, it is important to note that access to the actual keys and the bitcoin will be provided separately to the intended beneficiary. This letter solely addresses the transfer of legal title and the inclusion of my bitcoin assets in my estate plan.
@@ -39,13 +41,13 @@ const GenerateLetterToAtternyPDF = async (fingerPrints) => {
Thank you for your professional assistance in preparing my estate plan and ensuring the proper transfer of the legal title to my bitcoin assets according to my wishes.
Sincerely,
------------------------------------------------------------------------------------
- This document is one of three Inheritance Planning documents provided by Keeper. The other 2 being Key Security Tips and Restoring Inheritance Vault. This document is auto-produced by the Bitcoin Keeper app. The data shared in this document is sensitive. Please be cautious about revealing part or all of its contents to anyone. To learn more, please visit bitcoinkeeper.app
+ This document is one of three Inheritance Planning documents provided by Keeper. The other 2 being Key Security Tips and Restoring Inheritance vault. This document is auto-produced by the Bitcoin Keeper app. The data shared in this document is sensitive. Please be cautious about revealing part or all of its contents to anyone. To learn more, please visit bitcoinkeeper.app