Skip to content

Commit 8166d46

Browse files
committed
bump trezor firmware dep
1 parent 433d2ef commit 8166d46

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wallet/src/signer/trezor_signer/mod.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,19 @@ use trezor_client::{
5959
client::mintlayer::MintlayerSignature,
6060
find_devices,
6161
protos::{
62-
features::Capability, MintlayerAccountCommandTxInput,
63-
MintlayerAccountSpendingDelegationBalance, MintlayerAccountTxInput, MintlayerAddressPath,
64-
MintlayerAddressType, MintlayerBurnTxOutput, MintlayerChainType,
65-
MintlayerChangeTokenAuthority, MintlayerChangeTokenMetadataUri, MintlayerConcludeOrder,
66-
MintlayerCreateDelegationIdTxOutput, MintlayerCreateOrderTxOutput,
62+
features::Capability,
63+
mintlayer_tx_ack::{MintlayerTxInput, MintlayerTxOutput},
64+
MintlayerAccountCommandTxInput, MintlayerAccountSpendingDelegationBalance,
65+
MintlayerAccountTxInput, MintlayerAddressPath, MintlayerAddressType, MintlayerBurnTxOutput,
66+
MintlayerChainType, MintlayerChangeTokenAuthority, MintlayerChangeTokenMetadataUri,
67+
MintlayerConcludeOrder, MintlayerCreateDelegationIdTxOutput, MintlayerCreateOrderTxOutput,
6768
MintlayerCreateStakePoolTxOutput, MintlayerDataDepositTxOutput,
6869
MintlayerDelegateStakingTxOutput, MintlayerFillOrder, MintlayerFreezeToken,
6970
MintlayerHtlcTxOutput, MintlayerIssueFungibleTokenTxOutput, MintlayerIssueNftTxOutput,
7071
MintlayerLockThenTransferTxOutput, MintlayerLockTokenSupply, MintlayerMintTokens,
7172
MintlayerOutputValue, MintlayerProduceBlockFromStakeTxOutput, MintlayerTokenOutputValue,
72-
MintlayerTokenTotalSupply, MintlayerTokenTotalSupplyType, MintlayerTxInput,
73-
MintlayerTxOutput, MintlayerUnfreezeToken, MintlayerUnmintTokens, MintlayerUtxoType,
73+
MintlayerTokenTotalSupply, MintlayerTokenTotalSupplyType, MintlayerUnfreezeToken,
74+
MintlayerUnmintTokens, MintlayerUtxoType,
7475
},
7576
Model,
7677
};
@@ -539,7 +540,7 @@ fn to_trezor_input_msgs(
539540
.zip(ptx.destinations())
540541
.map(|((inp, utxo), dest)| match (inp, utxo, dest) {
541542
(TxInput::Utxo(outpoint), Some(_), Some(dest)) => {
542-
to_trezor_utxo_input(outpoint, chain_config, dest, key_chain)
543+
to_trezor_utxo_input(outpoint, dest, key_chain)
543544
}
544545
(TxInput::Account(outpoint), _, Some(dest)) => {
545546
to_trezor_account_input(chain_config, dest, key_chain, outpoint)
@@ -588,7 +589,7 @@ fn to_trezor_account_command_input(
588589
AccountCommand::FreezeToken(token_id, unfreezable) => {
589590
let mut req = MintlayerFreezeToken::new();
590591
req.set_token_id(Address::new(chain_config, *token_id)?.into_string());
591-
req.set_is_token_unfreezable(unfreezable.as_bool());
592+
req.set_is_token_unfreezeable(unfreezable.as_bool());
592593

593594
inp_req.freeze_token = Some(req).into();
594595
}
@@ -736,7 +737,6 @@ fn to_trezor_account_input(
736737

737738
fn to_trezor_utxo_input(
738739
outpoint: &common::chain::UtxoOutPoint,
739-
chain_config: &ChainConfig,
740740
dest: &Destination,
741741
key_chain: &impl AccountKeyChains,
742742
) -> SignerResult<MintlayerTxInput> {
@@ -754,7 +754,6 @@ fn to_trezor_utxo_input(
754754
inp_req.set_prev_hash(id.to_vec());
755755
inp_req.set_prev_index(outpoint.output_index());
756756

757-
inp_req.set_address(Address::new(chain_config, dest.clone())?.into_string());
758757
inp_req.addresses = destination_to_address_paths(key_chain, dest);
759758

760759
let mut inp = MintlayerTxInput::new();

wallet/wallet-rpc-lib/src/rpc/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ use wallet_types::{
8484
partially_signed_transaction::{
8585
PartiallySignedTransaction, TokenAdditionalInfo, TxAdditionalInfo,
8686
},
87+
scan_blockchain::ScanBlockchain,
8788
signature_status::SignatureStatus,
8889
wallet_tx::TxData,
8990
with_locked::WithLocked,

wallet/wallet-rpc-lib/src/service/worker.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use logging::log;
2323
use utils_networking::broadcaster::Broadcaster;
2424
use wallet_controller::types::{CreatedWallet, WalletCreationOptions, WalletTypeArgs};
2525
use wallet_controller::{ControllerError, NodeInterface};
26+
use wallet_types::scan_blockchain::ScanBlockchain;
2627
use wallet_types::wallet_type::WalletType;
2728

2829
use crate::types::RpcError;

0 commit comments

Comments
 (0)