From 6d1adddb28c7534205e891becd3afdd06b55537e Mon Sep 17 00:00:00 2001 From: Tomas Krnak Date: Thu, 17 Nov 2022 21:25:36 +0700 Subject: [PATCH] fixup! feat(core): add Zcash shielded transactions --- core/src/apps/zcash/get_address.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/apps/zcash/get_address.py b/core/src/apps/zcash/get_address.py index 9cbe3fb977..c550b15e9b 100644 --- a/core/src/apps/zcash/get_address.py +++ b/core/src/apps/zcash/get_address.py @@ -11,7 +11,7 @@ from apps.common import address_type from apps.common.coininfo import CoinInfo, by_name from apps.common.paths import HARDENED, address_n_to_str -from .orchard import keychain as z_keychain +from .orchard.keychain import OrchardKeychain from .unified import Typecode, encode_address if TYPE_CHECKING: @@ -31,7 +31,7 @@ async def get_address(ctx: Context, msg: ZcashGetAddress) -> ZcashAddress: if msg.z_address_n: receivers = {} - receivers[Typecode.ORCHARD] = await get_raw_orchard_address(ctx, msg) + receivers[Typecode.ORCHARD] = await get_raw_orchard_address(ctx, coin, msg) if msg.t_address_n: if msg.t_address_n[2] != msg.z_address_n[2]: @@ -70,10 +70,10 @@ async def get_raw_transparent_address( return sha256_ripemd160(node.public_key()).digest() -@z_keychain.with_keychain async def get_raw_orchard_address( - ctx: Context, msg: ZcashGetAddress, keychain: z_keychain.OrchardKeychain + ctx: Context, coin: CoinInfo, msg: ZcashGetAddress ) -> bytes: """Returns raw Zcash Orchard address.""" + keychain = await OrchardKeychain.for_coin(ctx, coin) fvk = keychain.derive(msg.z_address_n).full_viewing_key() return fvk.address(msg.diversifier_index).to_bytes()