fix: passing empty vks

anoma · Dec 27, 2024 · f9a59b1 · f9a59b1
1 parent d5701c5
commit f9a59b1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 19 deletions.
diff --git a/apps/namadillo/src/App/WorkerTest.tsx b/apps/namadillo/src/App/WorkerTest.tsx
@@ -143,10 +143,6 @@ export function WorkerTest(): JSX.Element {
       ],
     });
 
-    const vks = accounts
-      ?.filter((acc) => acc.type === "shielded-keys")
-      .map((a) => ({ key: a.viewingKey!, birthday: 0 }));
-
     const disposableSigner = (await refetch()).data;
 
     const msg: Unshield = {
@@ -163,7 +159,6 @@ export function WorkerTest(): JSX.Element {
         },
         unshieldingProps: [shieldingMsgValue],
         chain: chain!,
-        vks: vks!,
       },
     };
 
@@ -208,10 +203,6 @@ export function WorkerTest(): JSX.Element {
       ],
     });
 
-    const vks = accounts
-      ?.filter((acc) => acc.type === "shielded-keys")
-      .map((a) => ({ key: a.viewingKey!, birthday: 0 }));
-
     const disposableSigner = (await refetch()).data;
 
     const msg: ShieldedTransfer = {
@@ -228,7 +219,6 @@ export function WorkerTest(): JSX.Element {
         },
         props: [shieldingMsgValue],
         chain: chain!,
-        vks: vks!,
       },
     };
 

diff --git a/apps/namadillo/src/atoms/shield/services.ts b/apps/namadillo/src/atoms/shield/services.ts
@@ -141,7 +141,6 @@ export const submitUnshieldTx = async (
       gasConfig,
       unshieldingProps: [unshieldingMsgValue],
       chain,
-      vks: [],
     },
   };
 
@@ -203,7 +202,6 @@ export const submitShieldedTx = async (
       gasConfig,
       props: [shieldedTransferMsgValue],
       chain,
-      vks: [],
     },
   };
 

diff --git a/apps/namadillo/src/workers/MaspTxMessages.ts b/apps/namadillo/src/workers/MaspTxMessages.ts
@@ -1,6 +1,5 @@
 import {
   Account,
-  DatedViewingKey,
   ShieldedTransferMsgValue,
   ShieldingTransferMsgValue,
   TxResponseMsgValue,
@@ -37,7 +36,6 @@ type UnshieldPayload = {
   gasConfig: GasConfig;
   unshieldingProps: UnshieldingTransferMsgValue[];
   chain: ChainSettings;
-  vks: DatedViewingKey[];
 };
 export type Unshield = WebWorkerMessage<"unshield", UnshieldPayload>;
 export type UnshieldDone = WebWorkerMessage<
@@ -50,7 +48,6 @@ type ShieldedTransferPayload = {
   gasConfig: GasConfig;
   props: ShieldedTransferMsgValue[];
   chain: ChainSettings;
-  vks: DatedViewingKey[];
 };
 export type ShieldedTransfer = WebWorkerMessage<
   "shielded-transfer",

diff --git a/apps/namadillo/src/workers/MaspTxWorker.ts b/apps/namadillo/src/workers/MaspTxWorker.ts
@@ -103,9 +103,8 @@ async function unshield(
   sdk: Sdk,
   payload: Unshield["payload"]
 ): Promise<EncodedTxData<UnshieldingTransferMsgValue>> {
-  const { account, gasConfig, chain, unshieldingProps, vks } = payload;
+  const { account, gasConfig, chain, unshieldingProps } = payload;
 
-  await sdk.rpc.shieldedSync(vks);
   await sdk.masp.loadMaspParams("");
 
   const encodedTxData = await buildTx<UnshieldingTransferMsgValue>(
@@ -125,9 +124,8 @@ async function shieldedTransfer(
   sdk: Sdk,
   payload: ShieldedTransfer["payload"]
 ): Promise<EncodedTxData<ShieldedTransferMsgValue>> {
-  const { account, gasConfig, chain, props, vks } = payload;
+  const { account, gasConfig, chain, props } = payload;
 
-  await sdk.rpc.shieldedSync(vks);
   await sdk.masp.loadMaspParams("");
 
   const encodedTxData = await buildTx<ShieldedTransferMsgValue>(

diff --git a/packages/shared/lib/src/sdk/mod.rs b/packages/shared/lib/src/sdk/mod.rs
@@ -519,6 +519,7 @@ impl Sdk {
         let bparams =
             generate_masp_build_params(MAX_HW_SPEND, MAX_HW_CONVERT, MAX_HW_OUTPUT, &args.tx)
                 .await?;
+        let _ = &self.namada.shielded_mut().await.load().await?;
 
         let (tx, signing_data, _) = match bparams {
             BuildParams::RngBuildParams(mut bparams) => {