Feature/btc #6057

SeniorZhai · 2026-01-05T06:57:06Z

No description provided.

# Conflicts: # app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt

# Conflicts: # app/src/sharedTest/java/one.mixin.android.mock/AccountMock.kt

Copilot

Pull request overview

This PR adds Bitcoin (BTC) support to the wallet feature, enabling users to manage Bitcoin in their classic wallets.

Key Changes

Added Bitcoin SegWit address generation and transaction signing support
Introduced UTXO management with a new outputs database table
Created UI for prompting users to add Bitcoin addresses to existing classic wallets

Reviewed changes

Copilot reviewed 47 out of 47 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
app/src/main/res/values/strings.xml	Added English strings for Bitcoin wallet introduction feature
app/src/main/res/values-zh-rTW/strings.xml	Added Traditional Chinese translations for Bitcoin feature
app/src/main/res/values-zh-rCN/strings.xml	Added Simplified Chinese translations for Bitcoin feature
app/src/main/res/layout/fragment_classic_wallet_missing_btc_address_intro.xml	New layout for Bitcoin address introduction screen
app/src/main/res/layout/fragment_classic_wallet_missing_btc_address_bottom_sheet.xml	New bottom sheet layout for Bitcoin address setup
app/src/main/res/drawable/*.xml	Added vector drawables for Bitcoin wallet features (with naming issues)
app/src/main/java/one/mixin/android/ui/wallet/ClassicWalletMissingBtcAddressFragment.kt	New fragment handling Bitcoin address addition to classic wallets
app/src/main/java/one/mixin/android/ui/home/MainActivity.kt	Integrated Bitcoin address check before wallet navigation
app/src/main/java/one/mixin/android/web3/js/Web3Signer.kt	Added Bitcoin transaction signing logic
app/src/main/java/one/mixin/android/tip/TipSign.kt	Added Bitcoin key derivation using BIP84 (SegWit)
app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt	Added Bitcoin address generation methods for SegWit and Taproot
app/src/main/java/one/mixin/android/db/WalletDatabase.kt	Added database migration to version 7 with outputs table
app/src/main/java/one/mixin/android/db/web3/WalletOutputDao.kt	New DAO for managing Bitcoin UTXOs
app/src/main/java/one/mixin/android/api/response/web3/WalletOutput.kt	New data model for Bitcoin outputs (UTXOs)
app/src/main/java/one/mixin/android/job/RefreshWeb3BitCoinJob.kt	New job for refreshing Bitcoin UTXO data
app/build.gradle	Updated BouncyCastle dependency version management

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-05T07:07:39Z

app/src/main/java/one/mixin/android/tip/wc/internal/TipGas.kt


 fun buildTipGas(assetId: String, response: EstimateFeeResponse): TipGas {
-    return TipGas(assetId, response.gasLimit!!.toBigInteger(), response.maxFeePerGas!!.toBigInteger(), response.maxPriorityFeePerGas!!.toBigInteger())
+    return TipGas(assetId, response.gasLimit!!.toBigInteger(), response.maxFeePerGas!!.toBigInteger(), response.maxPriorityFeePerGas!!.toBigInteger(), )


Trailing comma after parameter should be removed or all parameters should consistently have trailing commas according to Kotlin style guidelines.

Suggested change

return TipGas(assetId, response.gasLimit!!.toBigInteger(), response.maxFeePerGas!!.toBigInteger(), response.maxPriorityFeePerGas!!.toBigInteger(), )

return TipGas(assetId, response.gasLimit!!.toBigInteger(), response.maxFeePerGas!!.toBigInteger(), response.maxPriorityFeePerGas!!.toBigInteger())

Copilot · 2026-01-05T07:07:40Z

app/src/main/res/drawable/ic_wallet_saemless.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"


The drawable filename contains a typo. "saemless" should be "seamless".

Copilot · 2026-01-05T07:07:40Z

app/src/main/res/layout/fragment_wallet_missing_btc_address_intro.xml

+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wallet_saemless" />


The drawable reference contains a typo. "ic_wallet_saemless" should be "ic_wallet_seamless".

Copilot · 2026-01-05T07:07:40Z

app/src/main/res/drawable/ic_wallet_compatibillity.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"


The drawable filename contains a typo. "compatibillity" should be "compatibility".

Copilot · 2026-01-05T07:07:40Z

app/src/main/res/layout/fragment_wallet_missing_btc_address_intro.xml

+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wallet_compatibillity" />


The drawable reference contains a typo. "ic_wallet_compatibillity" should be "ic_wallet_compatibility".

Copilot · 2026-01-05T07:07:41Z

app/src/main/java/one/mixin/android/db/web3/vo/Web3TokenItem.kt

+            val rawTxHex: String = tx.serialize().toHex()
+            return JsSignMessage(0, JsSignMessage.TYPE_BTC_TRANSACTION, data = rawTxHex, fee = gas)
+
+        }else{


Missing space after "if" keyword. The code should follow Kotlin style guidelines with proper spacing.

Suggested change

}else{

} else {

Copilot · 2026-01-05T07:07:41Z

app/src/main/java/one/mixin/android/ui/wallet/InputFragment.kt

+                    web3Token != null && (chainToken == null || gas == null || (chainToken?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO) < gas ||
+                            (web3Token?.assetId == chainToken?.assetId && (gas ?: BigDecimal.ZERO).add(BigDecimal(v)) > (web3Token?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO)))


The conditional logic appears to have incorrect balance comparison. The chain token balance check should have proper parentheses grouping to ensure the comparison operators work correctly.

Copilot · 2026-01-05T07:07:41Z

app/src/main/java/one/mixin/android/ui/wallet/InputFragment.kt

        }
-
-        v = BigDecimal(v).multiply(percentageOfBalance).max(BigDecimal.ZERO).stripTrailingZeros().toPlainString()
+        v = BigDecimal(v).multiply(percentageOfBalance).max(BigDecimal.ZERO).setScale(8, RoundingMode.DOWN).toPlainString()


Missing space before opening brace after "else". The code should follow Kotlin style guidelines with proper spacing.

SeniorZhai added 23 commits December 24, 2025 18:52

Generate Bitcoin address

d6ada0b

Unlock btc address

e9b6cd1

Merge remote-tracking branch 'origin/master' into feature/btc

f73cb6a

# Conflicts: # app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt

Update wallet

96df403

Merge remote-tracking branch 'origin/master' into feature/btc

897efc5

Merge remote-tracking branch 'origin/master' into feature/btc

cc14771

Merge remote-tracking branch 'origin/fix/test' into fix/room-sql-parser

9f6197e

# Conflicts: # app/src/sharedTest/java/one.mixin.android.mock/AccountMock.kt

Fetch utxo

4242fa4

Merge remote-tracking branch 'origin/master' into feature/btc

122e51d

Update btc fee

1644db3

Merge commit '037dd4065f64d33ac8907b2c6fa3ee141415a615' into feature/btc

8009ade

Update local output

8b5b9bf

Remove unused code

fa97196

Code clean

fd11231

Refresh utxo

1170698

Update btc transaction

7bdbe8a

Merge branch 'master' into feature/btc

3d2fa2b

Merge commit '2d6d3e50ddae670906304200c54afb8a7f4a77d5' into feature/btc

7e2f70d

Update btc sign

8a652e7

Merge remote-tracking branch 'origin/master' into feature/btc

2b59e4d

Update btc sign

2c38b07

Update sign

78a4d78

Refresh gas

ed65570

SeniorZhai requested a review from Copilot January 5, 2026 06:57

Copilot started reviewing on behalf of SeniorZhai January 5, 2026 06:57 View session

Copilot AI reviewed Jan 5, 2026

View reviewed changes

SeniorZhai added 4 commits January 5, 2026 15:22

Merge commit '20169aa21e0bf49d55ea87b7ed537b188f710377' into feature/btc

bec89e2

Update database schema

6ea449e

Update cancel and speed up

43e358a

Update create wallet

ca2a936

Update upgrade wallet

8274537

SeniorZhai force-pushed the feature/btc branch from 9529b53 to 8274537 Compare January 6, 2026 07:36

SeniorZhai added 3 commits January 6, 2026 16:36

Update database schema

fbecc17

Update api

cf45dcd

Update handle pending transaction

b80741f

SeniorZhai force-pushed the feature/btc branch from 4b48de6 to b80741f Compare January 7, 2026 01:20

SeniorZhai added 2 commits January 7, 2026 09:48

Update upgrade logic and resign logic

51964b1

Update btc swap

5de585f

SeniorZhai force-pushed the feature/btc branch from 6217887 to 5de585f Compare January 7, 2026 06:20

SeniorZhai added 7 commits January 7, 2026 14:32

Update fee api

37aa210

Update local amount

fc42e8a

Merge remote-tracking branch 'origin/master' into feature/btc

35b1b1f

Save change output

f03d981

Remove utxo

1d1ab4b

Update cancel transaction

22bbe67

Update

f97087a

SeniorZhai force-pushed the feature/btc branch from 197ad8f to 6ca9e09 Compare January 8, 2026 05:35

Pending notfound

1be6499

SeniorZhai force-pushed the feature/btc branch from 6ca9e09 to 1be6499 Compare January 8, 2026 09:52

SeniorZhai added 9 commits January 8, 2026 18:07

Code clean

6381831

Debug utxo

cb90ba8

Update sync logic

f5837d4

Import btc

c139d12

MInimum change

7716501

Dust change

df83e71

Min btc amount

3e56751

Update

1c7a20c

Update handle pending

61f9581

SeniorZhai force-pushed the feature/btc branch from 30d1cdf to 61f9581 Compare January 9, 2026 09:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Feature/btc #6057

Feature/btc #6057

Uh oh!

SeniorZhai commented Jan 5, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Copilot AI Jan 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	return TipGas(assetId, response.gasLimit!!.toBigInteger(), response.maxFeePerGas!!.toBigInteger(), response.maxPriorityFeePerGas!!.toBigInteger(), )
	return TipGas(assetId, response.gasLimit!!.toBigInteger(), response.maxFeePerGas!!.toBigInteger(), response.maxPriorityFeePerGas!!.toBigInteger())

		@@ -0,0 +1,15 @@
		<vector xmlns:android="http://schemas.android.com/apk/res/android"

		@@ -0,0 +1,24 @@
		<vector xmlns:android="http://schemas.android.com/apk/res/android"

		web3Token != null && (chainToken == null \|\| gas == null \|\| (chainToken?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO) < gas \|\|
		(web3Token?.assetId == chainToken?.assetId && (gas ?: BigDecimal.ZERO).add(BigDecimal(v)) > (web3Token?.balance?.toBigDecimalOrNull() ?: BigDecimal.ZERO)))

Feature/btc #6057

Are you sure you want to change the base?

Feature/btc #6057

Uh oh!

Conversation

SeniorZhai commented Jan 5, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants