mc fix.

celo-org · Aug 16, 2023 · 93eff77 · 93eff77
1 parent e0833e3
commit 93eff77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/celo-org/gas-snap.git"
   },
   "source": {
-    "shasum": "Aglj//sQdE+aaLIrYZNEA9WcyK0iWd3JH+JGANbCXRQ=",
+    "shasum": "4BXNaoFgU0KEg0USjhSjven6VJ2SGRbHJDAHbwM31CQ=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snap/src/currency.ts b/packages/snap/src/currency.ts
@@ -151,8 +151,8 @@ export async function getOptimalFeeCurrency(
   const gasLimit = (await wallet.estimateGas(tx)).mul(5);
   const celoBalance = await wallet.getBalance();
   const tokenAddresses = await feeCurrencyWhitelistContract.getWhitelist();
-
-  if (gasLimit.add(tx.value ?? 0) >= celoBalance) {
+  const gasLimitPlusValue = gasLimit.add(tx.value ?? 0);
+  if (gasLimitPlusValue.gt(celoBalance)) {
     console.log('using stable token for gas');
     const tokens: Contract[] = tokenAddresses.map(
       (tokenAddress: string) =>

diff --git a/packages/snap/src/index.ts b/packages/snap/src/index.ts
@@ -37,6 +37,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => {
   const provider = new CeloProvider(network.url);
   const keyPair = await getKeyPair(snap, tx.from);
   const wallet = new CeloWallet(keyPair.privateKey).connect(provider);
+  tx.from = tx.from ? tx.from : wallet.address;
   if (tx.value === constants.Zero) {
     delete tx.value;
   }