feat: add psbt functionality #641

edgarkhanzadian · 2024-11-20T15:22:05Z

Add PsbtSigner component.
Hook up PsbtSigner to send flow
Create a basic psbt with 1 input utxo for psbt testing
Market data should be returned in cents, not dollars
Fix flaky balances using unique react query keys for btc balance
Update api to the leather-hosted api
Fix encryption compliance in Info.plist so appstore doesn't require manual submission for every build

Note: I'll leave the commits unsquashed for now until right before the merge, just in case i need to revert some of the changes.

kyranjamie

Thanks @edgarkhanzadian, just dropping some comments in here. Main thoughts is that I think it isn't necessary to pass around addresses the way being done here.

apps/mobile/src/features/send/send-sheets/sign-psbt.tsx

apps/mobile/src/store/keychains/bitcoin/bitcoin-keychains.read.ts

packages/bitcoin/src/psbt/psbt-details.ts

packages/bitcoin/src/psbt/psbt-inputs.ts

packages/bitcoin/src/psbt/psbt-inscriptions.ts

codecov · 2024-11-26T15:01:14Z

Codecov Report

Attention: Patch coverage is 0.57143% with 174 lines in your changes missing coverage. Please review.

Project coverage is 28.71%. Comparing base (1a71396) to head (da5ade0).
Report is 1 commits behind head on dev.

Files with missing lines	Patch %	Lines
packages/bitcoin/src/psbt/psbt-details.ts	0.00%	43 Missing ⚠️
packages/bitcoin/src/psbt/psbt-totals.ts	0.00%	41 Missing ⚠️
packages/bitcoin/src/psbt/psbt-inputs.ts	0.00%	33 Missing ⚠️
packages/bitcoin/src/psbt/psbt-outputs.ts	0.00%	24 Missing ⚠️
packages/bitcoin/src/psbt/utils.ts	0.00%	17 Missing ⚠️
packages/bitcoin/src/index.ts	0.00%	6 Missing ⚠️
packages/bitcoin/src/bitcoin.utils.ts	16.66%	5 Missing ⚠️
...es/services/src/market-data/market-data.service.ts	0.00%	4 Missing ⚠️
...s/query/src/bitcoin/balance/btc-blockbook-utxos.ts	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##              dev     #641      +/-   ##
==========================================
- Coverage   29.41%   28.71%   -0.71%     
==========================================
  Files         175      180       +5     
  Lines        6836     7008     +172     
  Branches      457      462       +5     
==========================================
+ Hits         2011     2012       +1     
- Misses       4825     4996     +171

Files with missing lines	Coverage Δ
...s/query/src/bitcoin/balance/btc-blockbook-utxos.ts	`0.00% <0.00%> (ø)`
...es/services/src/market-data/market-data.service.ts	`0.00% <0.00%> (ø)`
packages/bitcoin/src/bitcoin.utils.ts	`41.55% <16.66%> (-0.67%)`	⬇️
packages/bitcoin/src/index.ts	`0.00% <0.00%> (ø)`
packages/bitcoin/src/psbt/utils.ts	`0.00% <0.00%> (ø)`
packages/bitcoin/src/psbt/psbt-outputs.ts	`0.00% <0.00%> (ø)`
packages/bitcoin/src/psbt/psbt-inputs.ts	`0.00% <0.00%> (ø)`
packages/bitcoin/src/psbt/psbt-totals.ts	`0.00% <0.00%> (ø)`
packages/bitcoin/src/psbt/psbt-details.ts	`0.00% <0.00%> (ø)`

Components	Coverage Δ
bitcoin	`62.23% <0.58%> (-9.02%)`	⬇️
query	`12.65% <0.00%> (ø)`
utils	`49.19% <ø> (ø)`
crypto	`68.21% <ø> (ø)`
stacks	`72.38% <ø> (ø)`

kyranjamie

Great work @edgarkhanzadian this is coming together 👌🏼

apps/mobile/src/features/approver/components/inputs-outputs-card.tsx

apps/mobile/src/features/approver/components/utxo-row.tsx

apps/mobile/src/queries/balance/bitcoin-balance.query.ts

edgarkhanzadian · 2024-11-29T12:25:47Z

apps/mobile/ios/leatherwalletmobile/Info.plist

+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false />


Fixing the appstore connect deployment, s.t. appstore connect does not ask for manual approval every time we upload a build to testflight

edgarkhanzadian · 2024-11-29T12:56:18Z

packages/query/src/bitcoin/balance/btc-blockbook-utxos.ts

@@ -28,7 +28,7 @@ const accountUtxoResponseSchema = z.array(utxoSchema);
 export type Utxo = z.infer<typeof utxoSchema>;

 export function createUtxoAccountCacheKey(network: string, descriptor: string) {
-  return ['btc-utxos', network, descriptor.substring(0, 10)];
+  return ['btc-utxos', network, descriptor.substring(0, 35)];


10 characters were not enough to make a unique xpub key for multiple accounts, extending it to 35 fixed it

yep I saw a similar bug elsewhere

edgarkhanzadian · 2024-11-29T12:56:38Z

packages/services/src/market-data/market-data.service.ts

@@ -78,9 +79,13 @@ export function createMarketDataService(
      .map(r => r.value)
      .filter(isDefined);
    if (prices.length === 0) throw new Error('Unable to fetch price data: ' + currency);
+
+    const meanPrice = calculateMeanAverage(prices);
+    const meanPriceFractional = convertAmountToFractionalUnit(meanPrice, currencyDecimalsMap.USD);


Services should return cents, not dollars

apps/mobile/src/features/approver/components/utxo-row.tsx

apps/mobile/src/features/approver/psbt/psbt-signer.tsx

kyranjamie · 2024-11-29T14:04:10Z

apps/mobile/src/store/accounts/accounts.read.ts

+}
+
+function selectByAccountIds(accountIds: string[]) {
+  return createSelector(selectors.selectEntities, entities => {


selectors.selectAll does the mapping you do here

selectAll returns an array of accounts which i'd need to filter up using accountIds array. In this case, entities is a map from which i can select only the accounts that i need, without going through all accounts accountIds.length times. Thought to include a small optimization for big wallets

apps/mobile/src/components/spinner-icon.tsx

tigranpetrossian · 2024-11-29T14:41:48Z

apps/mobile/src/features/approver/components/inputs-outputs-card.tsx

+    const btcBalance = createMoney(Number(inputOutput.value), 'BTC');
+    const usdBalance = btcMarketData
+      ? baseCurrencyAmountInQuote(btcBalance, btcMarketData)
+      : createMoney(0, 'USD');


I've seen this used in few other places, and it can potentially cause flicker from 0 to actual balance, unless the relevant query happens to be in cache and fresh. Is there anything we're missing design-wise to avoid this?
Couple things I can think of:

Loading state (if applicable)

Making shared data like market queries globally available upon app startup

Agree, we need to think of that but we might need to handle it as a part of a separate PR

apps/mobile/src/features/send/send-form/hooks/use-send-form-btc.tsx

fbwoolf · 2024-11-29T20:32:28Z

apps/mobile/src/features/approver/components/fee-card.tsx


-export function FeeCard({ feeType }: { feeType: FeeTypes }) {
+export function FeeCard({ feeType, amount }: { feeType: FeeTypes; amount: Money }) {


Maybe use a props interface?

fbwoolf · 2024-11-29T20:34:17Z

apps/mobile/src/features/approver/components/outcomes-card.tsx


-export function OutcomesCard() {


What does OutcomesCard refer to? Not sure I understand what this is exactly?

fbwoolf · 2024-11-29T20:39:46Z

apps/mobile/src/features/send/send-form/hooks/use-send-form-btc.tsx

-      // eslint-disable-next-line no-console, lingui/no-unlocalized-strings
-      console.log('Send form data:', values);
+    async onInitSendTransfer(values: SendFormBtcSchema) {
+      if (!sortedUtxos[0]) throw new Error('no utxo');


Was this all just for testing? Please don't merge over my work in latest btc send form PR to gen the unsigned psbt.

Yeap! i created a very basic psbt here just for testing purposes until your changes get merged.

Great work @edgarkhanzadian, can you rebase on my latest merge before I approve? My changes in onInitSendTransfer in use-send-form.tsx should generate the unsigned psbt to pass to your work.

Sounds awesome! Will update the PR

fbwoolf · 2024-11-29T20:46:25Z

Great work @edgarkhanzadian, can you rebase on my latest merge before I approve? My changes in onInitSendTransfer in use-send-form.tsx should generate the unsigned psbt to pass to your work.

feat: add psbt functionality

f01ba24

kyranjamie reviewed Nov 20, 2024

View reviewed changes

edgarkhanzadian added 4 commits November 21, 2024 15:54

Merge branch 'dev' into feat/sign-psbt

6422dfd

feat: get psbt details in

aa11e54

Merge branch 'dev' into feat/sign-psbt

55e1ff1

feat: send psbt hex from send from to sign psbt

bc6ee11

kyranjamie reviewed Nov 26, 2024

View reviewed changes

edgarkhanzadian added 15 commits November 28, 2024 16:37

fix: update ui buttons

ec98b16

fix: update bitcoin api url

9f321be

Merge branch 'dev' into feat/sign-psbt

80d04ef

fix: flaky btc balance and btc fiat prices

ed3ea04

fix: tsc

b9b31df

fix: podfile lock

502403c

refactor: move base psbt component to approver folder

18c2630

fix: separate onSuccess

80b647b

fix: lint

03df715

fix: syncpack

ecac28f

fix: address comments

fe20c39

refactor: use PsbtSigner component

732da6f

fix: move functionality to onSubmitTransaction

0a955ce

fix: set dummy requester origin for now

dd8e36b

fix: btc total + use highest utxo for psbt

0d27772

edgarkhanzadian commented Nov 29, 2024

View reviewed changes

edgarkhanzadian marked this pull request as ready for review November 29, 2024 13:00

edgarkhanzadian requested review from kyranjamie, pete-watters, tigranpetrossian, camerow and alexp3y November 29, 2024 13:00

edgarkhanzadian requested review from fbwoolf and alter-eggo November 29, 2024 13:00

kyranjamie reviewed Nov 29, 2024

View reviewed changes

apps/mobile/src/features/approver/components/utxo-row.tsx Outdated Show resolved Hide resolved

kyranjamie reviewed Nov 29, 2024

View reviewed changes

apps/mobile/src/features/approver/psbt/psbt-signer.tsx Outdated Show resolved Hide resolved

kyranjamie reviewed Nov 29, 2024

View reviewed changes

tigranpetrossian approved these changes Nov 29, 2024

View reviewed changes

edgarkhanzadian added 3 commits November 29, 2024 19:32

refactor: collocate psbt-signer component

43e334c

refactor: use truncateMiddle

e066c0a

refactor: namings

da5ade0

fbwoolf reviewed Nov 29, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add psbt functionality #641

feat: add psbt functionality #641

edgarkhanzadian commented Nov 20, 2024 •

edited

Loading

kyranjamie left a comment

codecov bot commented Nov 26, 2024 •

edited

Loading

kyranjamie left a comment

edgarkhanzadian Nov 29, 2024

edgarkhanzadian Nov 29, 2024

kyranjamie Nov 29, 2024

edgarkhanzadian Nov 29, 2024

kyranjamie Nov 29, 2024

edgarkhanzadian Nov 29, 2024

tigranpetrossian Nov 29, 2024

edgarkhanzadian Nov 29, 2024

fbwoolf Nov 29, 2024

fbwoolf Nov 29, 2024

fbwoolf Nov 29, 2024

edgarkhanzadian Nov 29, 2024

fbwoolf commented Nov 29, 2024


		export function FeeCard({ feeType }: { feeType: FeeTypes }) {
		export function FeeCard({ feeType, amount }: { feeType: FeeTypes; amount: Money }) {

feat: add psbt functionality #641

Are you sure you want to change the base?

feat: add psbt functionality #641

Conversation

edgarkhanzadian commented Nov 20, 2024 • edited Loading

kyranjamie left a comment

Choose a reason for hiding this comment

codecov bot commented Nov 26, 2024 • edited Loading

Codecov Report

kyranjamie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fbwoolf commented Nov 29, 2024

edgarkhanzadian commented Nov 20, 2024 •

edited

Loading

codecov bot commented Nov 26, 2024 •

edited

Loading