Skip to content

Commit ad8da27

Browse files
committed
Removed checking card number for signing to avoid problems with ssigning by not primary card
1 parent 2483ee1 commit ad8da27

9 files changed

Lines changed: 3 additions & 13 deletions

feature-tangem/src/main/java/cash/p/terminal/tangem/domain/usecase/SignHashesTransactionUseCase.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import com.tangem.crypto.hdWallet.DerivationPath
77
class SignHashesTransactionUseCase(private val tangemSdkManager: TangemSdkManager) {
88

99
suspend operator fun invoke(
10-
cardId: String?,
1110
hashes: Array<ByteArray>,
1211
walletPublicKey: ByteArray,
1312
derivationPath: DerivationPath?,
1413
message: Message? = null
1514
) = tangemSdkManager.sign(
16-
cardId = cardId,
15+
cardId = null,
1716
hashes = hashes,
1817
walletPublicKey = walletPublicKey,
1918
derivationPath = derivationPath,

feature-tangem/src/main/java/cash/p/terminal/tangem/domain/usecase/SignOneHashTransactionUseCase.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import com.tangem.crypto.hdWallet.DerivationPath
77
class SignOneHashTransactionUseCase(private val tangemSdkManager: TangemSdkManager) {
88

99
suspend operator fun invoke(
10-
cardId: String?,
1110
hash: ByteArray,
1211
walletPublicKey: ByteArray,
1312
derivationPath: DerivationPath?,
1413
message: Message? = null
1514
) = tangemSdkManager.sign(
16-
cardId = cardId,
15+
cardId = null,
1716
hash = hash,
1817
walletPublicKey = walletPublicKey,
1918
derivationPath = derivationPath,

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/HardwareWalletBinanceChainSigner.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class HardwareWalletBinanceChainSigner(
3131
return runBlocking {
3232
val signBytesResponse =
3333
signOneHashTransactionUseCase(
34-
cardId = cardId,
3534
hash = message,
3635
walletPublicKey = hardwarePublicKey.publicKey,
3736
derivationPath = DerivationPath(hardwarePublicKey.derivationPath)

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/HardwareWalletEcdaSigner.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ class HardwareWalletEcdaSigner(
8080
"${hardwarePublicKey.derivationPath}/$changeSegment/$addressIndexSegment"
8181
Log.d("HardwareWalletSigner", "sigScriptEcdsaData $fullDerivationPathString")
8282
val signResponse: CompletionResult<SignResponse> = signHashesTransactionUseCase(
83-
cardId = cardId,
8483
hashes = arrayOf(hashToSign),
8584
walletPublicKey = hardwarePublicKey.publicKey,
8685
derivationPath = DerivationPath(fullDerivationPathString)
@@ -178,7 +177,6 @@ class HardwareWalletEcdaSigner(
178177
val fullDerivationPathForAddress = DerivationPath(fullDerivationPathString)
179178

180179
val signResponse: CompletionResult<SignResponse> = signHashesTransactionUseCase(
181-
cardId = cardId,
182180
hashes = dataHashes.toTypedArray(),
183181
walletPublicKey = hardwarePublicKey.publicKey,
184182
derivationPath = fullDerivationPathForAddress

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/HardwareWalletEvmSigner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class HardwareWalletEvmSigner(
116116
isLegacy: Boolean
117117
): Signature {
118118
val signBytesResponse =
119-
signOneHashTransactionUseCase(cardId, hash, walletPublicKey, DerivationPath(publicKey.derivationPath))
119+
signOneHashTransactionUseCase(hash, walletPublicKey, DerivationPath(publicKey.derivationPath))
120120
when (signBytesResponse) {
121121
is CompletionResult.Success -> {
122122
val byteSignature = signBytesResponse.data.signature

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/HardwareWalletSchnorrSigner.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class HardwareWalletSchnorrSigner(
8585
val walletPublicKey =
8686
hardwarePublicKey.publicKey.copyOfRange(1, hardwarePublicKey.publicKey.size)
8787
val signResponse: CompletionResult<SignResponse> = signHashesTransactionUseCase(
88-
cardId = cardId,
8988
hashes = dataToSign.toTypedArray(),
9089
walletPublicKey = walletPublicKey,
9190
derivationPath = DerivationPath(fullDerivationPathString)
@@ -127,7 +126,6 @@ class HardwareWalletSchnorrSigner(
127126
val walletPublicKey =
128127
hardwarePublicKey.publicKey.copyOfRange(1, hardwarePublicKey.publicKey.size)
129128
val signResponse: CompletionResult<SignResponse> = signHashesTransactionUseCase(
130-
cardId = cardId,
131129
hashes = arrayOf(signatureHash),
132130
walletPublicKey = walletPublicKey,
133131
derivationPath = DerivationPath(fullDerivationPathString)

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/HardwareWalletSolanaAccountSigner.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class HardwareWalletSolanaAccountSigner(
2222
return runBlocking {
2323
val signBytesResponse =
2424
signOneHashTransactionUseCase(
25-
cardId = cardId,
2625
hash = serializedMessage,
2726
walletPublicKey = hardwarePublicKey.publicKey,
2827
derivationPath = DerivationPath(hardwarePublicKey.derivationPath)

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/HardwareWalletTronSigner.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class HardwareWalletTronSigner(
3636
return runBlocking {
3737
val signBytesResponse =
3838
signOneHashTransactionUseCase(
39-
cardId = cardId,
4039
hash = rawTransactionHash,
4140
walletPublicKey = hardwarePublicKey.publicKey,
4241
derivationPath = DerivationPath(hardwarePublicKey.derivationPath)

feature-tangem/src/main/java/cash/p/terminal/tangem/signer/TonPrivateKeyEd25519.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class TonPrivateKeyEd25519(
3838
return runBlocking {
3939
val signBytesResponse =
4040
signOneHashTransactionUseCase(
41-
cardId = cardId,
4241
hash = message,
4342
walletPublicKey = hardwarePublicKey.publicKey,
4443
derivationPath = DerivationPath(hardwarePublicKey.derivationPath)

0 commit comments

Comments
 (0)