Simply accept an Address

penumbra-zone · Mar 23, 2024 · f26d1e3 · f26d1e3
1 parent 77a1643
commit f26d1e3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/packages/perspective/plan/get-address-view.ts b/packages/perspective/plan/get-address-view.ts
@@ -3,10 +3,9 @@ import {
   AddressView,
 } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
 import { getAddressIndexByAddress } from '@penumbra-zone/wasm/src/address';
-import { bech32Address } from '@penumbra-zone/bech32/src/address';
 
 export const getAddressView = (address: Address, fullViewingKey: string): AddressView => {
-  const index = getAddressIndexByAddress(fullViewingKey, bech32Address(address));
+  const index = getAddressIndexByAddress(fullViewingKey, address);
 
   if (index) {
     return new AddressView({

diff --git a/packages/router/src/grpc/custody/authorize/index.ts b/packages/router/src/grpc/custody/authorize/index.ts
@@ -9,7 +9,6 @@ import { Box } from '@penumbra-zone/types/src/box';
 import { UserChoice } from '@penumbra-zone/types/src/user-choice';
 import { assertValidSwaps } from './assert-valid-swaps';
 import { getAddressIndexByAddress } from '@penumbra-zone/wasm/src/address';
-import { bech32Address } from '@penumbra-zone/bech32/src/address';
 
 export const authorize: Impl['authorize'] = async (req, ctx) => {
   if (!req.plan) throw new ConnectError('No plan included in request', Code.InvalidArgument);
@@ -21,7 +20,7 @@ export const authorize: Impl['authorize'] = async (req, ctx) => {
 
   const { fullViewingKey } = (await services.getWalletServices()).viewServer;
   assertValidSwaps(req.plan, address =>
-    address ? Boolean(getAddressIndexByAddress(fullViewingKey, bech32Address(address))) : false,
+    address ? Boolean(getAddressIndexByAddress(fullViewingKey, address)) : false,
   );
 
   if (!approveReq) throw new ConnectError('Approver not found', Code.Unavailable);

diff --git a/packages/router/src/grpc/view-protocol-server/index-by-address.ts b/packages/router/src/grpc/view-protocol-server/index-by-address.ts
@@ -4,7 +4,6 @@ import { servicesCtx } from '../../ctx/prax';
 import { getAddressIndexByAddress } from '@penumbra-zone/wasm/src/address';
 
 import { Code, ConnectError } from '@connectrpc/connect';
-import { bech32Address } from '@penumbra-zone/bech32/src/address';
 
 export const indexByAddress: Impl['indexByAddress'] = async (req, ctx) => {
   if (!req.address) throw new ConnectError('no address given in request', Code.InvalidArgument);
@@ -13,9 +12,7 @@ export const indexByAddress: Impl['indexByAddress'] = async (req, ctx) => {
     viewServer: { fullViewingKey },
   } = await services.getWalletServices();
 
-  const address = bech32Address(req.address);
-
-  const addressIndex = getAddressIndexByAddress(fullViewingKey, address);
+  const addressIndex = getAddressIndexByAddress(fullViewingKey, req.address);
 
   if (!addressIndex) return {};
 

diff --git a/packages/wasm/src/address.test.ts b/packages/wasm/src/address.test.ts
@@ -1,7 +1,8 @@
 import { describe, expect, it } from 'vitest';
 import { generateSpendKey, getAddressByIndex, getFullViewingKey } from './keys';
 import { getAddressIndexByAddress } from './address';
-import { bech32Address } from '@penumbra-zone/bech32/src/address';
+import { bech32ToAddress } from '@penumbra-zone/bech32/src/address';
+import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
 
 describe('address', () => {
   const seedPhrase =
@@ -13,14 +14,17 @@ describe('address', () => {
       const fullViewingKey = getFullViewingKey(spendKey);
       const address = getAddressByIndex(fullViewingKey, 1);
 
-      expect(getAddressIndexByAddress(fullViewingKey, bech32Address(address))!.account).toBe(1);
+      expect(getAddressIndexByAddress(fullViewingKey, address)!.account).toBe(1);
     });
 
     it('returns undefined with uncontrolled addr', () => {
       const spendKey = generateSpendKey(seedPhrase);
       const fullViewingKey = getFullViewingKey(spendKey);
-      const address =
-        'penumbra1ftmn2a3hf8pxe0e48es8u9rqhny4xggq9wn2caxcjnfwfhwr5s0t3y6nzs9gx3ty5czd0sd9ssfgjt2pcxrq93yvgk2gu3ynmayuwgddkxthce8l445v8x6v07y2sjd8djcr6v';
+      const address = new Address({
+        inner: bech32ToAddress(
+          'penumbra1ftmn2a3hf8pxe0e48es8u9rqhny4xggq9wn2caxcjnfwfhwr5s0t3y6nzs9gx3ty5czd0sd9ssfgjt2pcxrq93yvgk2gu3ynmayuwgddkxthce8l445v8x6v07y2sjd8djcr6v',
+        ),
+      });
 
       expect(getAddressIndexByAddress(fullViewingKey, address)).toBeUndefined();
     });

diff --git a/packages/wasm/src/address.ts b/packages/wasm/src/address.ts
@@ -1,14 +1,18 @@
 import { get_short_address_by_index, is_controlled_address } from '../wasm';
-import { AddressIndex } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
+import {
+  Address,
+  AddressIndex,
+} from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
 import { JsonValue } from '@bufbuild/protobuf';
+import { bech32Address } from '@penumbra-zone/bech32/src/address';
 
 export const getShortAddressByIndex = (fullViewingKey: string, index: number) =>
   get_short_address_by_index(fullViewingKey, index) as string;
 
 export const getAddressIndexByAddress = (
   fullViewingKey: string,
-  bech32Address: string,
+  address: Address,
 ): AddressIndex | undefined => {
-  const res = is_controlled_address(fullViewingKey, bech32Address) as JsonValue;
+  const res = is_controlled_address(fullViewingKey, bech32Address(address)) as JsonValue;
   return res ? AddressIndex.fromJson(res) : undefined;
 };