GaloyMoney · UncleSamtoshi · Nov 14, 2023 · Nov 14, 2023
diff --git a/core/api/dev/apollo-federation/supergraph.graphql b/core/api/dev/apollo-federation/supergraph.graphql
@@ -46,7 +46,7 @@ interface Account
   level: AccountLevel!
   limits: AccountLimits!
   notificationSettings: NotificationSettings!
-  pendingTransactions(walletIds: [WalletId]): [Transaction!]!
+  pendingIncomingTransactions(walletIds: [WalletId]): [Transaction!]!
   realtimePrice: RealtimePrice!
   transactions(
     """Returns the items in the list that come after the specified cursor."""
@@ -251,8 +251,8 @@ type BTCWallet implements Wallet
 
   """An unconfirmed incoming onchain balance."""
   pendingIncomingBalance: SignedAmount!
-  pendingTransactions: [Transaction!]!
-  pendingTransactionsByAddress(
+  pendingIncomingTransactions: [Transaction!]!
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!
@@ -395,7 +395,7 @@ type ConsumerAccount implements Account
   level: AccountLevel!
   limits: AccountLimits!
   notificationSettings: NotificationSettings!
-  pendingTransactions(walletIds: [WalletId]): [Transaction!]!
+  pendingIncomingTransactions(walletIds: [WalletId]): [Transaction!]!
 
   """List the quiz questions of the consumer account"""
   quiz: [Quiz!]!
@@ -1749,8 +1749,8 @@ type UsdWallet implements Wallet
 
   """An unconfirmed incoming onchain balance."""
   pendingIncomingBalance: SignedAmount!
-  pendingTransactions: [Transaction!]!
-  pendingTransactionsByAddress(
+  pendingIncomingTransactions: [Transaction!]!
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!
@@ -2077,20 +2077,20 @@ interface Wallet
   pendingIncomingBalance: SignedAmount!
 
   """
-  Pending OnChain transactions. When transactions
+  Pending incoming OnChain transactions. When transactions
   are confirmed they will receive a new id and be found in the transactions
   list. Transactions are ordered anti-chronologically,
   ie: the newest transaction will be first
   """
-  pendingTransactions: [Transaction!]!
+  pendingIncomingTransactions: [Transaction!]!
 
   """
-  Pending OnChain transactions. When transactions
+  Pending incoming OnChain transactions. When transactions
   are confirmed they will receive a new id and be found in the transactions
   list. Transactions are ordered anti-chronologically,
   ie: the newest transaction will be first
   """
-  pendingTransactionsByAddress(
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!

diff --git a/...nding-onchain-transactions-for-account.ts → ...ming-on-chain-transactions-for-account.ts b/...nding-onchain-transactions-for-account.ts → ...ming-on-chain-transactions-for-account.ts
@@ -1,10 +1,10 @@
-import { getPendingOnChainTransactionsForWallets } from "../wallets/get-pending-onchain-transactions-for-wallets"
+import { getPendingIncomingOnChainTransactionsForWallets } from "../wallets/get-pending-incoming-on-chain-transactions-for-wallets"
 
 import { RepositoryError } from "@/domain/errors"
 import { checkedToWalletId } from "@/domain/wallets"
 import { WalletsRepository } from "@/services/mongoose"
 
-export const getPendingOnChainTransactionsForAccountByWalletIds = async ({
+export const getPendingIncomingOnChainTransactionsForAccountByWalletIds = async ({
   account,
   walletIds,
 }: {
@@ -17,7 +17,7 @@ export const getPendingOnChainTransactionsForAccountByWalletIds = async ({
   if (accountWallets instanceof RepositoryError) return accountWallets
 
   if (!walletIds) {
-    return getPendingOnChainTransactionsForWallets({ wallets: accountWallets })
+    return getPendingIncomingOnChainTransactionsForWallets({ wallets: accountWallets })
   }
 
   const checkedWalletIds: WalletId[] = []
@@ -32,5 +32,5 @@ export const getPendingOnChainTransactionsForAccountByWalletIds = async ({
     checkedWalletIds.includes(wallet.id),
   )
 
-  return getPendingOnChainTransactionsForWallets({ wallets: selectedWallets })
+  return getPendingIncomingOnChainTransactionsForWallets({ wallets: selectedWallets })
 }
diff --git a/core/api/src/app/accounts/index.ts b/core/api/src/app/accounts/index.ts
@@ -25,7 +25,7 @@ export * from "./disable-notification-category"
 export * from "./enable-notification-category"
 export * from "./enable-notification-channel"
 export * from "./disable-notification-channel"
-export * from "./get-pending-onchain-transactions-for-account"
+export * from "./get-pending-incoming-on-chain-transactions-for-account"
 export * from "./get-invoices-for-account"
 
 const accounts = AccountsRepository()

diff --git a/...get-pending-onchain-balance-for-wallet.ts → ...g-incoming-on-chain-balance-for-wallet.ts b/...get-pending-onchain-balance-for-wallet.ts → ...g-incoming-on-chain-balance-for-wallet.ts
@@ -7,7 +7,9 @@ import { WalletOnChainPendingReceiveRepository } from "@/services/mongoose"
 import { IncomingOnChainTxHandler } from "@/domain/bitcoin/onchain/incoming-tx-handler"
 import { WalletCurrency, ZERO_CENTS, ZERO_SATS } from "@/domain/shared"
 
-export const getPendingOnChainBalanceForWallets = async <S extends WalletCurrency>(
+export const getPendingIncomingOnChainBalanceForWallets = async <
+  S extends WalletCurrency,
+>(
   wallets: Wallet[],
 ): Promise<{ [key: WalletId]: PaymentAmount<S> } | ApplicationError> => {
   const pendingIncoming = await WalletOnChainPendingReceiveRepository().listByWalletIds({

diff --git a/.../get-pending-transactions-by-addresses.ts → ...ing-on-chain-transactions-by-addresses.ts b/.../get-pending-transactions-by-addresses.ts → ...ing-on-chain-transactions-by-addresses.ts
@@ -2,7 +2,7 @@ import { CouldNotFindError } from "@/domain/errors"
 
 import { WalletOnChainPendingReceiveRepository } from "@/services/mongoose"
 
-export const getPendingTransactionsForWalletsByAddresses = async ({
+export const getPendingIncomingOnChainTransactionsForWalletsByAddresses = async ({
   wallets,
   addresses,
 }: {

diff --git a/...nding-onchain-transactions-for-wallets.ts → ...ming-on-chain-transactions-for-wallets.ts b/...nding-onchain-transactions-for-wallets.ts → ...ming-on-chain-transactions-for-wallets.ts
@@ -2,7 +2,7 @@ import { CouldNotFindError } from "@/domain/errors"
 
 import { WalletOnChainPendingReceiveRepository } from "@/services/mongoose"
 
-export const getPendingOnChainTransactionsForWallets = async ({
+export const getPendingIncomingOnChainTransactionsForWallets = async ({
   wallets,
 }: {
   wallets: Wallet[]

diff --git a/core/api/src/app/wallets/index.ts b/core/api/src/app/wallets/index.ts
@@ -6,7 +6,7 @@ export * from "./create-on-chain-address"
 export * from "./get-balance-for-wallet"
 export * from "./get-last-on-chain-address"
 export * from "./get-on-chain-fee"
-export * from "./get-pending-onchain-balance-for-wallet"
+export * from "./get-pending-incoming-on-chain-balance-for-wallet"
 export * from "./get-transaction-by-id"
 export * from "./get-transactions-by-addresses"
 export * from "./get-transactions-by-hash"
@@ -17,8 +17,8 @@ export * from "./update-legacy-on-chain-receipt"
 export * from "./update-pending-invoices"
 export * from "./validate"
 export * from "./get-invoice-for-wallet-by-hash"
-export * from "./get-pending-onchain-transactions-for-wallets"
-export * from "./get-pending-transactions-by-addresses"
+export * from "./get-pending-incoming-on-chain-transactions-for-wallets"
+export * from "./get-pending-incoming-on-chain-transactions-by-addresses"
 export * from "./get-invoices-for-wallets"
 
 import { WalletsRepository } from "@/services/mongoose"

diff --git a/core/api/src/graphql/admin/schema.graphql b/core/api/src/graphql/admin/schema.graphql
@@ -100,8 +100,8 @@ type BTCWallet implements Wallet {
 
   """An unconfirmed incoming onchain balance."""
   pendingIncomingBalance: SignedAmount!
-  pendingTransactions: [Transaction!]!
-  pendingTransactionsByAddress(
+  pendingIncomingTransactions: [Transaction!]!
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!
@@ -479,8 +479,8 @@ type UsdWallet implements Wallet {
 
   """An unconfirmed incoming onchain balance."""
   pendingIncomingBalance: SignedAmount!
-  pendingTransactions: [Transaction!]!
-  pendingTransactionsByAddress(
+  pendingIncomingTransactions: [Transaction!]!
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!
@@ -555,20 +555,20 @@ interface Wallet {
   pendingIncomingBalance: SignedAmount!
 
   """
-  Pending OnChain transactions. When transactions
+  Pending incoming OnChain transactions. When transactions
   are confirmed they will receive a new id and be found in the transactions
   list. Transactions are ordered anti-chronologically,
   ie: the newest transaction will be first
   """
-  pendingTransactions: [Transaction!]!
+  pendingIncomingTransactions: [Transaction!]!
 
   """
-  Pending OnChain transactions. When transactions
+  Pending incoming OnChain transactions. When transactions
   are confirmed they will receive a new id and be found in the transactions
   list. Transactions are ordered anti-chronologically,
   ie: the newest transaction will be first
   """
-  pendingTransactionsByAddress(
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!

diff --git a/core/api/src/graphql/public/schema.graphql b/core/api/src/graphql/public/schema.graphql
@@ -21,7 +21,7 @@ interface Account {
   level: AccountLevel!
   limits: AccountLimits!
   notificationSettings: NotificationSettings!
-  pendingTransactions(walletIds: [WalletId]): [Transaction!]!
+  pendingIncomingTransactions(walletIds: [WalletId]): [Transaction!]!
   realtimePrice: RealtimePrice!
   transactions(
     """Returns the items in the list that come after the specified cursor."""
@@ -156,8 +156,8 @@ type BTCWallet implements Wallet {
 
   """An unconfirmed incoming onchain balance."""
   pendingIncomingBalance: SignedAmount!
-  pendingTransactions: [Transaction!]!
-  pendingTransactionsByAddress(
+  pendingIncomingTransactions: [Transaction!]!
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!
@@ -278,7 +278,7 @@ type ConsumerAccount implements Account {
   level: AccountLevel!
   limits: AccountLimits!
   notificationSettings: NotificationSettings!
-  pendingTransactions(walletIds: [WalletId]): [Transaction!]!
+  pendingIncomingTransactions(walletIds: [WalletId]): [Transaction!]!
 
   """List the quiz questions of the consumer account"""
   quiz: [Quiz!]!
@@ -1358,8 +1358,8 @@ type UsdWallet implements Wallet {
 
   """An unconfirmed incoming onchain balance."""
   pendingIncomingBalance: SignedAmount!
-  pendingTransactions: [Transaction!]!
-  pendingTransactionsByAddress(
+  pendingIncomingTransactions: [Transaction!]!
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!
@@ -1619,20 +1619,20 @@ interface Wallet {
   pendingIncomingBalance: SignedAmount!
 
   """
-  Pending OnChain transactions. When transactions
+  Pending incoming OnChain transactions. When transactions
   are confirmed they will receive a new id and be found in the transactions
   list. Transactions are ordered anti-chronologically,
   ie: the newest transaction will be first
   """
-  pendingTransactions: [Transaction!]!
+  pendingIncomingTransactions: [Transaction!]!
 
   """
-  Pending OnChain transactions. When transactions
+  Pending incoming OnChain transactions. When transactions
   are confirmed they will receive a new id and be found in the transactions
   list. Transactions are ordered anti-chronologically,
   ie: the newest transaction will be first
   """
-  pendingTransactionsByAddress(
+  pendingIncomingTransactionsByAddress(
     """Returns the items that include this address."""
     address: OnChainAddress!
   ): [Transaction!]!

diff --git a/core/api/src/graphql/public/types/abstract/account.ts b/core/api/src/graphql/public/types/abstract/account.ts
@@ -62,7 +62,7 @@ const IAccount = GT.Interface({
         },
       },
     },
-    pendingTransactions: {
+    pendingIncomingTransactions: {
       type: GT.NonNullList(Transaction),
       args: {
         walletIds: {

diff --git a/core/api/src/graphql/public/types/object/business-account.ts b/core/api/src/graphql/public/types/object/business-account.ts
@@ -161,7 +161,7 @@ const BusinessAccount = GT.Object({
         )
       },
     },
-    pendingTransactions: {
+    pendingIncomingTransactions: {
       type: GT.NonNullList(Transaction),
       args: {
         walletIds: {
@@ -171,7 +171,7 @@ const BusinessAccount = GT.Object({
       resolve: async (source, args) => {
         const { walletIds } = args
         const transactions =
-          await Accounts.getPendingOnChainTransactionsForAccountByWalletIds({
+          await Accounts.getPendingIncomingOnChainTransactionsForAccountByWalletIds({
             account: source,
             walletIds,
           })

diff --git a/core/api/src/graphql/public/types/object/consumer-account.ts b/core/api/src/graphql/public/types/object/consumer-account.ts
@@ -209,7 +209,7 @@ const ConsumerAccount = GT.Object<Account, GraphQLPublicContextAuth>({
         )
       },
     },
-    pendingTransactions: {
+    pendingIncomingTransactions: {
       type: GT.NonNullList(Transaction),
       args: {
         walletIds: {
@@ -220,7 +220,7 @@ const ConsumerAccount = GT.Object<Account, GraphQLPublicContextAuth>({
         const { walletIds } = args
 
         const transactions =
-          await Accounts.getPendingOnChainTransactionsForAccountByWalletIds({
+          await Accounts.getPendingIncomingOnChainTransactionsForAccountByWalletIds({
             account: source,
             walletIds,
           })

diff --git a/core/api/src/graphql/shared/types/abstract/wallet.ts b/core/api/src/graphql/shared/types/abstract/wallet.ts
@@ -48,8 +48,8 @@ const IWallet = GT.Interface({
         },
       },
     },
-    pendingTransactionsByAddress: {
-      description: dedent`Pending OnChain transactions. When transactions
+    pendingIncomingTransactionsByAddress: {
+      description: dedent`Pending incoming OnChain transactions. When transactions
       are confirmed they will receive a new id and be found in the transactions
       list. Transactions are ordered anti-chronologically,
       ie: the newest transaction will be first`,
@@ -61,8 +61,8 @@ const IWallet = GT.Interface({
         },
       },
     },
-    pendingTransactions: {
-      description: dedent`Pending OnChain transactions. When transactions
+    pendingIncomingTransactions: {
+      description: dedent`Pending incoming OnChain transactions. When transactions
       are confirmed they will receive a new id and be found in the transactions
       list. Transactions are ordered anti-chronologically,
       ie: the newest transaction will be first`,

diff --git a/core/api/src/graphql/shared/types/object/btc-wallet.ts b/core/api/src/graphql/shared/types/object/btc-wallet.ts
@@ -57,7 +57,9 @@ const BtcWallet = GT.Object<Wallet>({
       type: GT.NonNull(SignedAmount),
       description: "An unconfirmed incoming onchain balance.",
       resolve: async (source) => {
-        const balanceSats = await Wallets.getPendingOnChainBalanceForWallets([source])
+        const balanceSats = await Wallets.getPendingIncomingOnChainBalanceForWallets([
+          source,
+        ])
         if (balanceSats instanceof Error) {
           throw mapError(balanceSats)
         }
@@ -92,19 +94,20 @@ const BtcWallet = GT.Object<Wallet>({
       },
       description: "A list of BTC transactions associated with this wallet.",
     },
-    pendingTransactions: {
+    pendingIncomingTransactions: {
       type: GT.NonNullList(Transaction),
       resolve: async (source) => {
-        const transactions = await Wallets.getPendingOnChainTransactionsForWallets({
-          wallets: [source],
-        })
+        const transactions =
+          await Wallets.getPendingIncomingOnChainTransactionsForWallets({
+            wallets: [source],
+          })
         if (transactions instanceof Error) {
           throw mapError(transactions)
         }
         return transactions
       },
     },
-    pendingTransactionsByAddress: {
+    pendingIncomingTransactionsByAddress: {
       type: GT.NonNullList(Transaction),
       args: {
         address: {
@@ -116,10 +119,11 @@ const BtcWallet = GT.Object<Wallet>({
         const { address } = args
         if (address instanceof Error) throw address
 
-        const transactions = await Wallets.getPendingTransactionsForWalletsByAddresses({
-          wallets: [source],
-          addresses: [address],
-        })
+        const transactions =
+          await Wallets.getPendingIncomingOnChainTransactionsForWalletsByAddresses({
+            wallets: [source],
+            addresses: [address],
+          })
         if (transactions instanceof Error) {
           throw mapError(transactions)
         }