Merge pull request #21 from nightly-labs/cleanup

cleanup
nightly-labs · Nov 28, 2024 · 0b381a1 · 0b381a1
2 parents 2de8d7f + 5fb869d
commit 0b381a1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/nightly-labs/aptos-snap"
   },
   "source": {
-    "shasum": "2vmlVMaaQQEP6iTlvUw7JAQobmuO/1QmLezdak5ajfU=",
+    "shasum": "uq662wuJJ9H2BT977RirjHRL/ioOK1V5HN03KqXOIgE=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snap/src/connection.ts b/packages/snap/src/connection.ts
diff --git a/packages/snap/src/index.tsx b/packages/snap/src/index.tsx
@@ -3,7 +3,7 @@ import {
   NetworkInfo,
 } from '@aptos-labs/wallet-standard';
 import type { OnRpcRequestHandler } from '@metamask/snaps-sdk';
-import { Address, Bold, Box, Text } from '@metamask/snaps-sdk/jsx';
+import { Bold, Box, Text } from '@metamask/snaps-sdk/jsx';
 import { getAccount } from './account';
 import { decodeAptosTransaction } from './aptos';
 
@@ -24,8 +24,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
 }) => {
   // Get the state
   const state = await getState();
-  console.log({ state });
-  console.log({ request });
   switch (request.method) {
     case 'connect': {
       const account = await getAccount();
@@ -95,7 +93,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
     }
     case 'signAndSubmitTransaction': {
       const account = await getAccount();
-
       const result = await snap.request({
         method: 'snap_dialog',
         params: {
@@ -113,13 +110,13 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
           ),
         },
       });
-      const signAndSubmitTransactionInput = decodeAptosTransaction(
-        (request.params as any).payload,
-      );
-      const signature = account.signTransactionWithAuthenticator(
-        signAndSubmitTransactionInput,
-      );
       if (result === true) {
+        const signAndSubmitTransactionInput = decodeAptosTransaction(
+          (request.params as any).payload,
+        );
+        const signature = account.signTransactionWithAuthenticator(
+          signAndSubmitTransactionInput,
+        );
         return signature.bcsToHex().toString();
       } else {
         throw new Error('User rejected the request.');
@@ -148,8 +145,8 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
           ),
         },
       });
-      const signature = account.sign(signMessageParams.message);
       if (result === true) {
+        const signature = account.sign(signMessageParams.message);
         return signature.bcsToHex().toString();
       } else {
         throw new Error('User rejected the request.');

diff --git a/packages/snap/src/utils.ts b/packages/snap/src/utils.ts
@@ -9,11 +9,11 @@ export async function getState(): Promise<SnapState> {
       encrypted: false,
     },
   });
-  console.log({ snapState });
   // Check if the state is null
   if (snapState === null) {
     // Update the state with default values
-    const result = await snap.request({
+    // Ignore the error if the state is not updated
+    await snap.request({
       method: 'snap_manageState',
       params: {
         operation: ManageStateOperation.UpdateState,
@@ -22,15 +22,14 @@ export async function getState(): Promise<SnapState> {
         newState: DEFAULT_SNAP_STATE,
       },
     });
-    console.log({ result });
     return DEFAULT_SNAP_STATE;
   }
   // @ts-ignore
   return snapState as SnapState;
 }
 
 export async function updateState(newState: SnapState) {
-  const result = await snap.request({
+  return await snap.request({
     method: 'snap_manageState',
     params: {
       operation: ManageStateOperation.UpdateState,
@@ -39,7 +38,6 @@ export async function updateState(newState: SnapState) {
       newState: newState,
     },
   });
-  console.log({ result });
 }
 
 export const isAptosSignAndSubmitTransactionInput = (