Revert "Revert "Fix est fee (#314)" (#315)"

This reverts commit 2830319.
cartridge-gg · May 29, 2024 · 550318e · 550318e
1 parent fa21f52
commit 550318e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/examples/starknet-react-next/src/components/StarknetProvider.tsx b/examples/starknet-react-next/src/components/StarknetProvider.tsx
@@ -25,7 +25,7 @@ export function StarknetProvider({ children }: PropsWithChildren) {
   );
 }
 
-const url = "https://keychain-git-preview-test.preview.cartridge.gg";
+const url = "https://keychain-git-preview-test.preview.cartridge.gg/";
 
 const connectors = [
   new CartridgeConnector(

diff --git a/packages/keychain/src/components/Execute/index.tsx b/packages/keychain/src/components/Execute/index.tsx
@@ -58,9 +58,6 @@ export function Execute({
   const [ethApproved, setEthApproved] = useState<bigint>();
   const [lowEthInfo, setLowEthInfo] = useState<LowEthInfo>();
   const [bridging, setBridging] = useState<boolean>(false);
-  // temporary boosting max fees
-  // @ts-expect-error there's no setter field for now
-  const [multiplier, setMultiplier] = useState(2n);
 
   const account = controller.account(chainId);
   const calls = useMemo(() => {
@@ -103,8 +100,8 @@ export function Execute({
 
     if (account.status === Status.DEPLOYED && transactionsDetail.maxFee) {
       setFees({
-        base: BigInt(transactionsDetail.maxFee) * multiplier,
-        max: BigInt(transactionsDetail.maxFee) * multiplier,
+        base: BigInt(transactionsDetail.maxFee),
+        max: BigInt(transactionsDetail.maxFee),
       });
       return;
     }
@@ -126,7 +123,7 @@ export function Execute({
     account
       .estimateInvokeFee(calls, transactionsDetail)
       .then((fees) => {
-        setFees({ base: fees.overall_fee * multiplier, max: fees.suggestedMaxFee * multiplier });
+        setFees({ base: fees.overall_fee, max: fees.suggestedMaxFee });
       })
       .catch((e) => {
         console.error(e);
@@ -141,7 +138,6 @@ export function Execute({
     calls,
     chainId,
     transactionsDetail,
-    multiplier
   ]);
 
   useEffect(() => {

diff --git a/packages/keychain/src/pages/index.tsx b/packages/keychain/src/pages/index.tsx
@@ -192,8 +192,6 @@ const Index: NextPage = () => {
                       nonce: transactionsDetail.nonce,
                     })
                   ).suggestedMaxFee;
-
-                  console.log("execute", { estFee: transactionsDetail.maxFee });
                 }
 
                 if (

diff --git a/packages/keychain/src/utils/account.ts b/packages/keychain/src/utils/account.ts
@@ -28,6 +28,8 @@ import Storage from "./storage";
 import { CartridgeAccount } from "@cartridge/account-wasm";
 import { Session } from "@cartridge/controller";
 
+const EST_FEE_MULTIPLIER = 10n;
+
 export enum Status {
   COUNTERFACTUAL = "COUNTERFACTUAL",
   DEPLOYING = "DEPLOYING",
@@ -178,8 +180,6 @@ class Account extends BaseAccount {
       transactionsDetail.nonce ?? (await this.getNonce("pending"));
     transactionsDetail.maxFee = num.toHex(transactionsDetail.maxFee);
 
-    console.log("account", { estFee: transactionsDetail.maxFee });
-
     const res = await this.cartridge
       .execute(calls as Array<Call>, transactionsDetail, session)
       .catch((e) => {
@@ -217,7 +217,12 @@ class Account extends BaseAccount {
 
     details.nonce = details.nonce ?? (await super.getNonce("pending"));
 
-    return await super.estimateInvokeFee(calls, details);
+    let estFee = await super.estimateInvokeFee(calls, details);
+    console.log("estimated", { suggestedMax: estFee.suggestedMaxFee });
+    estFee.suggestedMaxFee *= EST_FEE_MULTIPLIER;
+    console.log("estimated", { suggestedMax: estFee.suggestedMaxFee });
+
+    return estFee;
   }
 
   async verifyMessageHash(
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,8 +192,6 @@ const Index: NextPage = () => { @@
                           nonce: transactionsDetail.nonce,
                         })
                       ).suggestedMaxFee;
-                      console.log("execute", { estFee: transactionsDetail.maxFee });
                     }
                     if (
@@ Expand Down @@