Skip to content

Commit dd3f1e8

Browse files
committed
fix confirm total after rebase
1 parent 653acc9 commit dd3f1e8

File tree

7 files changed

+30
-25
lines changed

7 files changed

+30
-25
lines changed

core/embed/rust/Cargo.lock

Lines changed: 25 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/apps/mintlayer/sign_tx/helpers.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,18 @@ def __init__(
6464
fee: int,
6565
fee_rate: float,
6666
coin: CoinInfo,
67-
address_n: Bip32Path | None,
6867
):
6968
self.spending = spending
7069
self.fee = fee
7170
self.fee_rate = fee_rate
7271
self.coin = coin
73-
self.address_n = address_n
7472

7573
def confirm_dialog(self) -> Awaitable[Any]:
7674
return layout.confirm_total(
7775
self.spending,
7876
self.fee,
7977
self.fee_rate,
8078
self.coin,
81-
self.address_n,
8279
)
8380

8481

@@ -114,8 +111,8 @@ def confirm_output(output: MintlayerTxOutput, coin: CoinInfo, output_index: int,
114111
return (yield UiConfirmOutput(output, coin, output_index, chunkify))
115112

116113

117-
def confirm_total(spending: int, fee: int, fee_rate: float, coin: CoinInfo, address_n: Bip32Path | None) -> Awaitable[None]: # type: ignore [awaitable-is-generator]
118-
return (yield UiConfirmTotal(spending, fee, fee_rate, coin, address_n))
114+
def confirm_total(spending: int, fee: int, fee_rate: float, coin: CoinInfo) -> Awaitable[None]: # type: ignore [awaitable-is-generator]
115+
return (yield UiConfirmTotal(spending, fee, fee_rate, coin))
119116

120117

121118
def confirm_change_count_over_threshold(change_count: int) -> Awaitable[Any]: # type: ignore [awaitable-is-generator]

core/src/apps/mintlayer/sign_tx/layout.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,12 @@ async def confirm_total(
204204
fee: int,
205205
fee_rate: float,
206206
coin: CoinInfo,
207-
address_n: Bip32Path | None,
208207
) -> None:
209208

210209
await layouts.confirm_total(
211210
format_coin_amount(spending.to_bytes(16, "big"), None),
212211
format_coin_amount(fee.to_bytes(16, "big"), None),
213212
fee_rate_amount=format_fee_rate(fee_rate, coin) if fee_rate >= 0 else None,
214-
account_label=account_label(coin, address_n),
215213
)
216214

217215

core/src/apps/mintlayer/sign_tx/signer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ async def signer(self) -> None:
9797
fee,
9898
fee_rate,
9999
coin,
100-
None,
101100
)
102101

103102
# Make sure proper progress is shown, in case dialog was not required

vendor/secp256k1-zkp

Submodule secp256k1-zkp updated 113 files

0 commit comments

Comments
 (0)