fix fmt/clippy

cartridge-gg · Jun 18, 2024 · 6eb96ef · 6eb96ef
1 parent 7ed477e
commit 6eb96ef
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 31 deletions.
diff --git a/packages/account-wasm/pkg/account_wasm_bg.js b/packages/account-wasm/pkg/account_wasm_bg.js
@@ -416,16 +416,6 @@ export function __wbindgen_string_get(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr1;
 };
 
-export function __wbindgen_cb_drop(arg0) {
-    const obj = takeObject(arg0).original;
-    if (obj.cnt-- == 1) {
-        obj.a = 0;
-        return true;
-    }
-    const ret = false;
-    return ret;
-};
-
 export function __wbindgen_bigint_from_u64(arg0) {
     const ret = BigInt.asUintN(64, arg0);
     return addHeapObject(ret);
@@ -447,6 +437,16 @@ export function __wbindgen_in(arg0, arg1) {
     return ret;
 };
 
+export function __wbindgen_cb_drop(arg0) {
+    const obj = takeObject(arg0).original;
+    if (obj.cnt-- == 1) {
+        obj.a = 0;
+        return true;
+    }
+    const ret = false;
+    return ret;
+};
+
 export function __wbindgen_object_clone_ref(arg0) {
     const ret = getObject(arg0);
     return addHeapObject(ret);
@@ -918,8 +918,8 @@ export function __wbindgen_memory() {
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper1461(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 464, __wbg_adapter_40);
+export function __wbindgen_closure_wrapper1464(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 465, __wbg_adapter_40);
     return addHeapObject(ret);
 };
 
diff --git a/packages/account-wasm/pkg/account_wasm_bg.wasm b/packages/account-wasm/pkg/account_wasm_bg.wasm
diff --git a/packages/account-wasm/src/lib.rs b/packages/account-wasm/src/lib.rs
@@ -174,14 +174,14 @@ impl CartridgeAccount {
             nonce: SigningKey::from_random().secret_scalar(),
         };
 
-        // let signed = if let Some(session_details) = from_value(session_details)? {
-        //     self.session_account(session_details)
-        //         .await?
-        //         .sign_outside_execution(outside.clone())
-        //         .await?
-        // } else {
-        let signed = self.account.sign_outside_execution(outside.clone()).await?;
-        //};
+        let signed = if let Some(session_details) = from_value(session_details)? {
+            self.session_account(session_details)
+                .await?
+                .sign_outside_execution(outside.clone())
+                .await?
+        } else {
+            self.account.sign_outside_execution(outside.clone()).await?
+        };
 
         let response = PaymasterRequest::send(
             self.rpc_url.clone(),

diff --git a/packages/account-wasm/src/paymaster.rs b/packages/account-wasm/src/paymaster.rs
@@ -1,4 +1,4 @@
-use reqwest::{Client, Response};
+use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use serde_wasm_bindgen::to_value;
 use starknet::core::types::FieldElement;
@@ -51,7 +51,7 @@ impl PaymasterRequest {
                 signature,
             },
         };
-        
+
         let body = stringify(&to_value(&request)?)
             .map_err(|_| JsError::new("Error stringifying payload"))?;
 

diff --git a/packages/account-wasm/src/types/call.rs b/packages/account-wasm/src/types/call.rs
@@ -1,8 +1,5 @@
 use serde::{Deserialize, Serialize};
-use starknet::{
-    accounts::Call,
-    core::types::FieldElement,
-};
+use starknet::{accounts::Call, core::types::FieldElement};
 use std::str::FromStr;
 use wasm_bindgen::prelude::*;
 

diff --git a/packages/account-wasm/src/types/outside_execution.rs b/packages/account-wasm/src/types/outside_execution.rs
@@ -35,7 +35,7 @@ impl TryFrom<JsOutsideExecution> for OutsideExecution {
             calls: value
                 .calls
                 .into_iter()
-                .map(|c| Call::try_from(c))
+                .map(Call::try_from)
                 .collect::<Result<Vec<Call>, _>>()?,
         })
     }

diff --git a/packages/keychain/src/utils/account.ts b/packages/keychain/src/utils/account.ts
@@ -12,7 +12,6 @@ import {
   BigNumberish,
   TransactionFinalityStatus,
   InvocationsDetails,
-  num,
   TransactionExecutionStatus,
   shortString,
   transaction,
@@ -30,7 +29,7 @@ import { CartridgeAccount } from "@cartridge/account-wasm";
 import { Session } from "@cartridge/controller";
 import { VERSION } from "./controller";
 
-const EST_FEE_MULTIPLIER = 10n;
+const EST_FEE_MULTIPLIER = 2n;
 
 export enum Status {
   COUNTERFACTUAL = "COUNTERFACTUAL",
@@ -170,8 +169,7 @@ class Account extends BaseAccount {
 
     transactionsDetail.nonce =
       transactionsDetail.nonce ?? (await this.getNonce("pending"));
-    //transactionsDetail.maxFee = num.toHex(transactionsDetail.maxFee);
-    transactionsDetail.maxFee = "0x2386F26FC10000";
+    transactionsDetail.maxFee = num.toHex(transactionsDetail.maxFee);
 
     const res = await this.cartridge.execute(
       transaction.transformCallsToMulticallArrays_cairo1(calls),