edge-core-js 0.19.18 → 0.19.21

package/lib/core/account/account-api.js

@@ -35,6 +35,7 @@ import {
   splitWalletInfo
 } from '../login/keys.js'
 import { applyKit } from '../login/login.js'
+import { deleteLogin } from '../login/login-delete.js'
 import {
   cancelOtpReset,
   disableOtp,
@@ -291,6 +292,10 @@ export function makeAccountApi(ai, accountId) {
     },
 
     // Login management:
+    async deleteRemoteAccount() {
+      const { loginTree } = accountState()
+      await deleteLogin(ai, loginTree)
+    },
     async logout() {
       ai.props.dispatch({ type: 'LOGOUT', payload: { accountId } })
     },

package/lib/core/actions.js

@@ -364,6 +364,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 

package/lib/core/currency/wallet/currency-wallet-api.js

@@ -633,6 +633,7 @@ export function combineTxWithFile(
 
   // Copy the tx properties to the output:
   const out = {
+    confirmations: tx.confirmations,
     blockHeight: tx.blockHeight,
     date: tx.date,
     ourReceiveAddresses: tx.ourReceiveAddresses,

package/lib/core/currency/wallet/currency-wallet-callbacks.js

@@ -129,11 +129,56 @@ export function makeCurrencyWalletCallbacks(
       })
     },
 
+    // DEPRECATE: After all currency plugins implement new Confirmations API
     onBlockHeightChanged(height) {
       pushUpdate({
         id: walletId,
         action: 'onBlockHeightChanged',
         updateFunc: () => {
+          // Update transaction confirmation status
+          const { txs: reduxTxs } = input.props.walletState
+          const txsHack = Object.values(reduxTxs)
+          const reduxTxsArray = txsHack
+          for (const reduxTx of reduxTxsArray) {
+            if (
+              reduxTx.confirmations !== 'confirmed' &&
+              reduxTx.confirmations !== 'dropped'
+            ) {
+              const {
+                requiredConfirmations
+              } = input.props.walletState.currencyInfo
+              const { height } = input.props.walletState
+
+              reduxTx.confirmations = validateConfirmations(
+                reduxTx,
+                height,
+                requiredConfirmations
+              )
+
+              // Recreate the EdgeTransaction object
+              const txidHash = hashStorageWalletFilename(
+                input.props.state,
+                walletId,
+                reduxTx.txid
+              )
+              const { files } = input.props.walletState
+              const changedTx = combineTxWithFile(
+                input,
+                reduxTx,
+                files[txidHash],
+                reduxTx.currencyCode
+              )
+
+              // Dispatch event to update the redux transaction object
+              input.props.dispatch({
+                type: 'CHANGE_MERGE_TX',
+                payload: { tx: reduxTx }
+              })
+              // Dispatch event to update the EdgeTransaction object
+              throtteldOnTxChanged([changedTx])
+            }
+          }
+
           input.props.dispatch({
             type: 'CURRENCY_ENGINE_CHANGED_HEIGHT',
             payload: { height, walletId }
@@ -189,6 +234,21 @@ export function makeCurrencyWalletCallbacks(
       for (const tx of txs) {
         const { txid } = tx
 
+        // DEPRECATE: After all currency plugins implement new Confirmations API
+        if (
+          tx.confirmations !== 'confirmed' &&
+          tx.confirmations !== 'dropped'
+        ) {
+          const { requiredConfirmations } = input.props.walletState.currencyInfo
+          const { height } = input.props.walletState
+
+          tx.confirmations = validateConfirmations(
+            tx,
+            height,
+            requiredConfirmations
+          )
+        }
+
         // Verify that something has changed:
         const reduxTx = mergeTx(tx, defaultCurrency, reduxTxs[txid])
         if (compare(reduxTx, reduxTxs[txid])) continue
@@ -257,3 +317,27 @@ export function watchCurrencyWallet(input) {
   }
   checkChangesLoop(input.props)
 }
+
+const validateConfirmations = (
+  tx,
+  blockHeight,
+  requiredConfirmations = 1 // Default confirmation rule is 1 block
+) => {
+  // If tx block height is 0, this means it's not yet mined in a block,
+  // so block confirmations is 0.
+  const blockConfirmations =
+    tx.blockHeight === 0 ? 0 : 1 + blockHeight - tx.blockHeight
+  /*
+  A negative number of block confirmations means the wallet's block 
+  height has not caught up with the transaction's block height, or the
+  transaction is mined in a block which is apart of an chain fork.
+  Either way, the transaction is considered unconfirmed.
+  */
+  const confirmations =
+    blockConfirmations >= requiredConfirmations
+      ? 'confirmed'
+      : blockConfirmations <= 0
+      ? 'unconfirmed'
+      : blockConfirmations
+  return confirmations
+}

package/lib/core/currency/wallet/currency-wallet-reducer.js

@@ -1,4 +1,4 @@
-// 
+ function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// 
 
 import {
 
@@ -89,6 +89,8 @@ import { currencyCodesToTokenIds } from './enabled-tokens.js'
 
 
 
+
+
 
 
 
@@ -320,6 +322,12 @@ const currencyWalletInner
     next
   ) {
     switch (action.type) {
+      case 'CHANGE_MERGE_TX': {
+        const { tx } = action.payload
+        const out = { ...state }
+        out[tx.txid] = tx
+        return out
+      }
       case 'CURRENCY_ENGINE_CHANGED_TXS': {
         const { txs } = action.payload
         const defaultCurrency = next.self.currencyInfo.currencyCode
@@ -393,6 +401,8 @@ export const currencyWalletReducer
 )
 
 const defaultTx = {
+  confirmations: 'unconfirmed',
+  currencyCode: '',
   blockHeight: 0,
   date: 0,
   ourReceiveAddresses: [],
@@ -411,7 +421,11 @@ export function mergeTx(
   defaultCurrency,
   oldTx = defaultTx
 ) {
+  const currencyCode =
+    tx.currencyCode != null ? tx.currencyCode : defaultCurrency
   const out = {
+    confirmations: _nullishCoalesce(tx.confirmations, () => ( 'unconfirmed')),
+    currencyCode,
     blockHeight: tx.blockHeight,
     date: tx.date,
     ourReceiveAddresses: tx.ourReceiveAddresses,
@@ -423,8 +437,6 @@ export function mergeTx(
     networkFee: { ...oldTx.networkFee }
   }
 
-  const currencyCode =
-    tx.currencyCode != null ? tx.currencyCode : defaultCurrency
   out.nativeAmount[currencyCode] = tx.nativeAmount
   out.networkFee[currencyCode] =
     tx.networkFee != null ? tx.networkFee.toString() : '0'

package/lib/core/login/login-delete.js

@@ -0,0 +1,23 @@
+
+
+
+import { makeAuthJson } from './login.js'
+import { loginFetch } from './login-fetch.js'
+import { getStashById } from './login-selectors.js'
+
+
+/**
+ * Deletes a login from the server.
+ */
+export async function deleteLogin(
+  ai,
+  login
+) {
+  const { stashTree } = getStashById(ai, login.loginId)
+  await loginFetch(
+    ai,
+    'POST',
+    '/v2/login/delete',
+    makeAuthJson(stashTree, login)
+  )
+}

package/lib/node/index.js

@@ -5461,6 +5461,16 @@ function makeExchangeCache(ai) {
   return out;
 }
 
+/**
+ * Deletes a login from the server.
+ */
+async function deleteLogin(ai, login) {
+  const {
+    stashTree
+  } = getStashById(ai, login.loginId);
+  await loginFetch(ai, 'POST', '/v2/login/delete', makeAuthJson(stashTree, login));
+}
+
 const wasChangePasswordPayload = cleaners.uncleaner(asChangePasswordPayload);
 const passwordAuthSnrp = userIdSnrp;
 
@@ -7672,6 +7682,13 @@ function makeAccountApi(ai, accountId) {
     },
 
     // Login management:
+    async deleteRemoteAccount() {
+      const {
+        loginTree
+      } = accountState();
+      await deleteLogin(ai, loginTree);
+    },
+
     async logout() {
       ai.props.dispatch({
         type: 'LOGOUT',
@@ -9649,6 +9666,17 @@ const currencyWalletInner = reduxKeto.buildReducer({
 
   txs(state = {}, action, next) {
     switch (action.type) {
+      case 'CHANGE_MERGE_TX':
+        {
+          const {
+            tx
+          } = action.payload;
+          const out = { ...state
+          };
+          out[tx.txid] = tx;
+          return out;
+        }
+
       case 'CURRENCY_ENGINE_CHANGED_TXS':
         {
           const {
@@ -9714,6 +9742,8 @@ const currencyWalletReducer = reduxKeto.filterReducer(currencyWalletInner, (acti
   };
 });
 const defaultTx = {
+  confirmations: 'unconfirmed',
+  currencyCode: '',
   blockHeight: 0,
   date: 0,
   ourReceiveAddresses: [],
@@ -9728,7 +9758,10 @@ const defaultTx = {
  */
 
 function mergeTx(tx, defaultCurrency, oldTx = defaultTx) {
+  const currencyCode = tx.currencyCode != null ? tx.currencyCode : defaultCurrency;
   const out = {
+    confirmations: tx.confirmations ?? 'unconfirmed',
+    currencyCode,
     blockHeight: tx.blockHeight,
     date: tx.date,
     ourReceiveAddresses: tx.ourReceiveAddresses,
@@ -9740,7 +9773,6 @@ function mergeTx(tx, defaultCurrency, oldTx = defaultTx) {
     networkFee: { ...oldTx.networkFee
     }
   };
-  const currencyCode = tx.currencyCode != null ? tx.currencyCode : defaultCurrency;
   out.nativeAmount[currencyCode] = tx.nativeAmount;
   out.networkFee[currencyCode] = tx.networkFee != null ? tx.networkFee.toString() : '0';
 
@@ -9849,11 +9881,46 @@ function makeCurrencyWalletCallbacks(input) {
       });
     },
 
+    // DEPRECATE: After all currency plugins implement new Confirmations API
     onBlockHeightChanged(height) {
       pushUpdate({
         id: walletId,
         action: 'onBlockHeightChanged',
         updateFunc: () => {
+          // Update transaction confirmation status
+          const {
+            txs: reduxTxs
+          } = input.props.walletState;
+          const txsHack = Object.values(reduxTxs);
+          const reduxTxsArray = txsHack;
+
+          for (const reduxTx of reduxTxsArray) {
+            if (reduxTx.confirmations !== 'confirmed' && reduxTx.confirmations !== 'dropped') {
+              const {
+                requiredConfirmations
+              } = input.props.walletState.currencyInfo;
+              const {
+                height
+              } = input.props.walletState;
+              reduxTx.confirmations = validateConfirmations(reduxTx, height, requiredConfirmations); // Recreate the EdgeTransaction object
+
+              const txidHash = hashStorageWalletFilename(input.props.state, walletId, reduxTx.txid);
+              const {
+                files
+              } = input.props.walletState;
+              const changedTx = combineTxWithFile(input, reduxTx, files[txidHash], reduxTx.currencyCode); // Dispatch event to update the redux transaction object
+
+              input.props.dispatch({
+                type: 'CHANGE_MERGE_TX',
+                payload: {
+                  tx: reduxTx
+                }
+              }); // Dispatch event to update the EdgeTransaction object
+
+              throtteldOnTxChanged([changedTx]);
+            }
+          }
+
           input.props.dispatch({
             type: 'CURRENCY_ENGINE_CHANGED_HEIGHT',
             payload: {
@@ -9909,7 +9976,18 @@ function makeCurrencyWalletCallbacks(input) {
       for (const tx of txs) {
         const {
           txid
-        } = tx; // Verify that something has changed:
+        } = tx; // DEPRECATE: After all currency plugins implement new Confirmations API
+
+        if (tx.confirmations !== 'confirmed' && tx.confirmations !== 'dropped') {
+          const {
+            requiredConfirmations
+          } = input.props.walletState.currencyInfo;
+          const {
+            height
+          } = input.props.walletState;
+          tx.confirmations = validateConfirmations(tx, height, requiredConfirmations);
+        } // Verify that something has changed:
+
 
         const reduxTx = mergeTx(tx, defaultCurrency, reduxTxs[txid]);
         if (compare(reduxTx, reduxTxs[txid])) continue; // Ensure the transaction has metadata:
@@ -9982,6 +10060,22 @@ function watchCurrencyWallet(input) {
   checkChangesLoop(input.props);
 }
 
+const validateConfirmations = (tx, blockHeight, requiredConfirmations = 1 // Default confirmation rule is 1 block
+) => {
+  // If tx block height is 0, this means it's not yet mined in a block,
+  // so block confirmations is 0.
+  const blockConfirmations = tx.blockHeight === 0 ? 0 : 1 + blockHeight - tx.blockHeight;
+  /*
+  A negative number of block confirmations means the wallet's block 
+  height has not caught up with the transaction's block height, or the
+  transaction is mined in a block which is apart of an chain fork.
+  Either way, the transaction is considered unconfirmed.
+  */
+
+  const confirmations = blockConfirmations >= requiredConfirmations ? 'confirmed' : blockConfirmations <= 0 ? 'unconfirmed' : blockConfirmations;
+  return confirmations;
+};
+
 function dateFilter(tx, opts) {
   const {
     startDate = -Infinity,
@@ -10623,6 +10717,7 @@ function combineTxWithFile(input, tx, file, currencyCode) {
   } = flowHack; // Copy the tx properties to the output:
 
   const out = {
+    confirmations: tx.confirmations,
     blockHeight: tx.blockHeight,
     date: tx.date,
     ourReceiveAddresses: tx.ourReceiveAddresses,

package/lib/types/types.js

@@ -1408,6 +1408,10 @@ export * from './error.js'
 
 
 
+
+
+
+
 
 
 

package/lib/types/types.ts

@@ -301,7 +301,7 @@ export interface EdgeCurrencyInfo {
   canReplaceByFee?: boolean // Defaults to false
   customFeeTemplate?: EdgeObjectTemplate // Indicates custom fee support
   customTokenTemplate?: EdgeObjectTemplate // Indicates custom token support
-  requiredConfirmations?: number
+  requiredConfirmations?: number // Block confirmations required for a tx
   memoMaxLength?: number // Max number of text characters, if supported
   memoMaxValue?: string // Max numerical value, if supported
   memoType?: 'text' | 'number' | 'other' // undefined means no memo support
@@ -367,6 +367,7 @@ export interface EdgeTransaction {
   parentNetworkFee?: string
 
   // Confirmation status:
+  confirmations?: 'confirmed' | 'unconfirmed' | 'dropped' | number
   blockHeight: number
   date: number
 
@@ -551,11 +552,13 @@ export interface EdgeCurrencyEngineCallbacks {
     currencyCode: string,
     nativeBalance: string
   ) => void
-  readonly onBlockHeightChanged: (blockHeight: number) => void
   readonly onStakingStatusChanged: (status: EdgeStakingStatus) => void
   readonly onTransactionsChanged: (transactions: EdgeTransaction[]) => void
   readonly onTxidsChanged: (txids: EdgeTxidMap) => void
   readonly onWcNewContractCall: (payload: JsonObject) => void
+
+  // Deprecated
+  readonly onBlockHeightChanged: (blockHeight: number) => void
 }
 
 export interface EdgeCurrencyEngineOptions {
@@ -1156,6 +1159,7 @@ export interface EdgeAccount {
   readonly fetchLobby: (lobbyId: string) => Promise<EdgeLobby>
 
   // Login management:
+  readonly deleteRemoteAccount: () => Promise<void>
   readonly logout: () => Promise<void>
 
   // Master wallet list:

package/lib/types.d.ts

@@ -238,6 +238,7 @@ export interface EdgeTransaction {
     nativeAmount: string;
     networkFee: string;
     parentNetworkFee?: string;
+    confirmations?: 'confirmed' | 'unconfirmed' | 'dropped' | number;
     blockHeight: number;
     date: number;
     txid: string;
@@ -371,11 +372,11 @@ export interface EdgeCurrencyEngineCallbacks {
     readonly onAddressChanged: () => void;
     readonly onAddressesChecked: (progressRatio: number) => void;
     readonly onBalanceChanged: (currencyCode: string, nativeBalance: string) => void;
-    readonly onBlockHeightChanged: (blockHeight: number) => void;
     readonly onStakingStatusChanged: (status: EdgeStakingStatus) => void;
     readonly onTransactionsChanged: (transactions: EdgeTransaction[]) => void;
     readonly onTxidsChanged: (txids: EdgeTxidMap) => void;
     readonly onWcNewContractCall: (payload: JsonObject) => void;
+    readonly onBlockHeightChanged: (blockHeight: number) => void;
 }
 export interface EdgeCurrencyEngineOptions {
     callbacks: EdgeCurrencyEngineCallbacks;
@@ -725,6 +726,7 @@ export interface EdgeAccount {
     readonly approveVoucher: (voucherId: string) => Promise<void>;
     readonly rejectVoucher: (voucherId: string) => Promise<void>;
     readonly fetchLobby: (lobbyId: string) => Promise<EdgeLobby>;
+    readonly deleteRemoteAccount: () => Promise<void>;
     readonly logout: () => Promise<void>;
     readonly allKeys: EdgeWalletInfoFull[];
     readonly changeWalletStates: (walletStates: EdgeWalletStates) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-core-js",
-  "version": "0.19.18",
+  "version": "0.19.21",
   "description": "Edge account & wallet management library",
   "keywords": [
     "bitcoin",

package/src/types/types.js

@@ -304,7 +304,7 @@ export type EdgeCurrencyInfo = {
   canReplaceByFee?: boolean, // Defaults to false
   customFeeTemplate?: EdgeObjectTemplate, // Indicates custom fee support
   customTokenTemplate?: EdgeObjectTemplate, // Indicates custom token support
-  requiredConfirmations?: number,
+  requiredConfirmations?: number, // Block confirmations required for a tx
   memoMaxLength?: number, // Max number of text characters, if supported
   memoMaxValue?: string, // Max numerical value, if supported
   memoType?: 'text' | 'number' | 'other', // undefined means no memo support
@@ -370,6 +370,7 @@ export type EdgeTransaction = {
   parentNetworkFee?: string,
 
   // Confirmation status:
+  confirmations?: 'confirmed' | 'unconfirmed' | 'dropped' | number,
   blockHeight: number,
   date: number,
 
@@ -549,11 +550,13 @@ export type EdgeCurrencyEngineCallbacks = {
   +onAddressChanged: () => void,
   +onAddressesChecked: (progressRatio: number) => void,
   +onBalanceChanged: (currencyCode: string, nativeBalance: string) => void,
-  +onBlockHeightChanged: (blockHeight: number) => void,
   +onStakingStatusChanged: (status: EdgeStakingStatus) => void,
   +onTransactionsChanged: (transactions: EdgeTransaction[]) => void,
   +onTxidsChanged: (txids: EdgeTxidMap) => void,
-  +onWcNewContractCall: (payload: JsonObject) => void
+  +onWcNewContractCall: (payload: JsonObject) => void,
+
+  // Deprecated
+  +onBlockHeightChanged: (blockHeight: number) => void
 }
 
 export type EdgeCurrencyEngineOptions = {
@@ -1124,6 +1127,7 @@ export type EdgeAccount = {
   +fetchLobby: (lobbyId: string) => Promise<EdgeLobby>,
 
   // Login management:
+  +deleteRemoteAccount: () => Promise<void>,
   +logout: () => Promise<void>,
 
   // Master wallet list: