anymal-protocol 1.0.114 → 1.0.116

package/dist/chunk-43I5M7QS.mjs

@@ -0,0 +1,93 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// src/helpers/CryptoUtils.tsx
+import { ec as EC } from "elliptic";
+var ec = new EC("secp256k1");
+var Network = /* @__PURE__ */ ((Network2) => {
+  Network2["Testnet"] = "testnet";
+  Network2["Localnet"] = "localnet";
+  return Network2;
+})(Network || {});
+var NETWORK_HOSTS = {
+  ["testnet" /* Testnet */]: "https://dev-db.petastic.com",
+  ["localnet" /* Localnet */]: "http://host.docker.internal:9181"
+};
+function loadExistingSecp256k1PrivateKey(hexKey) {
+  if (!hexKey) {
+    throw new Error("Private key hex must be provided");
+  }
+  return ec.keyFromPrivate(hexKey, "hex");
+}
+function serializePublicKeyCompressed(keyPair) {
+  return keyPair.getPublic(true, "hex");
+}
+function base64url(input) {
+  let buf;
+  if (typeof input === "string") buf = Buffer.from(input);
+  else if (input instanceof ArrayBuffer) buf = Buffer.from(input);
+  else buf = input;
+  return buf.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function sha256HashNode(data) {
+  const { createHash } = __require("crypto");
+  return createHash("sha256").update(data).digest();
+}
+async function hashInput(data) {
+  if (typeof window !== "undefined" && window.crypto?.subtle) {
+    const encoder = new TextEncoder();
+    const encoded = encoder.encode(data);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-256", encoded);
+    return Buffer.from(hashBuffer);
+  } else {
+    return sha256HashNode(data);
+  }
+}
+async function generateJWT(sub, aud, keyPair, expiresInSeconds = 24 * 60 * 60) {
+  const iat = Math.floor(Date.now() / 1e3);
+  const exp = iat + expiresInSeconds;
+  const header = { alg: "ES256", typ: "JWT" };
+  const payload = { sub, aud, iat, exp };
+  const encodedHeader = base64url(JSON.stringify(header));
+  const encodedPayload = base64url(JSON.stringify(payload));
+  const signingInput = `${encodedHeader}.${encodedPayload}`;
+  const hash = await hashInput(signingInput);
+  const signature = keyPair.sign(hash, { canonical: true });
+  const rBuf = signature.r.toArrayLike(Buffer, "be", 32);
+  const sBuf = signature.s.toArrayLike(Buffer, "be", 32);
+  const rawSig = Buffer.concat([rBuf, sBuf]);
+  const encodedSig = base64url(rawSig);
+  return `${signingInput}.${encodedSig}`;
+}
+async function createAuthEnvelope(privateKeyHex, network = "testnet" /* Testnet */, options) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const publicKey = serializePublicKeyCompressed(keyPair);
+  const host = NETWORK_HOSTS[network];
+  if (!host) {
+    throw new Error(`Unsupported network: ${network}`);
+  }
+  const token = await generateJWT(publicKey, host, keyPair, options?.expiresInSeconds);
+  return { publicKey, token };
+}
+async function generateAppSignature(privateKeyHex, clientId, redirectUri, state) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const message = `${clientId}:${redirectUri}:${state}`;
+  const hash = await hashInput(message);
+  const signatureDER = keyPair.sign(hash, { canonical: true }).toDER();
+  return Buffer.from(signatureDER).toString("hex");
+}
+
+export {
+  __require,
+  Network,
+  NETWORK_HOSTS,
+  loadExistingSecp256k1PrivateKey,
+  serializePublicKeyCompressed,
+  generateJWT,
+  createAuthEnvelope,
+  generateAppSignature
+};

package/dist/chunk-5UXBNDDZ.mjs

@@ -0,0 +1,93 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// src/helpers/CryptoUtils.tsx
+import { ec as EC } from "elliptic";
+var ec = new EC("secp256k1");
+var Network = /* @__PURE__ */ ((Network2) => {
+  Network2["Testnet"] = "testnet";
+  Network2["Localnet"] = "localnet";
+  return Network2;
+})(Network || {});
+var NETWORK_HOSTS = {
+  ["testnet" /* Testnet */]: "https://dev-db.petastic.com",
+  ["localnet" /* Localnet */]: "http://docker.host.internal:9181"
+};
+function loadExistingSecp256k1PrivateKey(hexKey) {
+  if (!hexKey) {
+    throw new Error("Private key hex must be provided");
+  }
+  return ec.keyFromPrivate(hexKey, "hex");
+}
+function serializePublicKeyCompressed(keyPair) {
+  return keyPair.getPublic(true, "hex");
+}
+function base64url(input) {
+  let buf;
+  if (typeof input === "string") buf = Buffer.from(input);
+  else if (input instanceof ArrayBuffer) buf = Buffer.from(input);
+  else buf = input;
+  return buf.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function sha256HashNode(data) {
+  const { createHash } = __require("crypto");
+  return createHash("sha256").update(data).digest();
+}
+async function hashInput(data) {
+  if (typeof window !== "undefined" && window.crypto?.subtle) {
+    const encoder = new TextEncoder();
+    const encoded = encoder.encode(data);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-256", encoded);
+    return Buffer.from(hashBuffer);
+  } else {
+    return sha256HashNode(data);
+  }
+}
+async function generateJWT(sub, aud, keyPair, expiresInSeconds = 24 * 60 * 60) {
+  const iat = Math.floor(Date.now() / 1e3);
+  const exp = iat + expiresInSeconds;
+  const header = { alg: "ES256", typ: "JWT" };
+  const payload = { sub, aud, iat, exp };
+  const encodedHeader = base64url(JSON.stringify(header));
+  const encodedPayload = base64url(JSON.stringify(payload));
+  const signingInput = `${encodedHeader}.${encodedPayload}`;
+  const hash = await hashInput(signingInput);
+  const signature = keyPair.sign(hash, { canonical: true });
+  const rBuf = signature.r.toArrayLike(Buffer, "be", 32);
+  const sBuf = signature.s.toArrayLike(Buffer, "be", 32);
+  const rawSig = Buffer.concat([rBuf, sBuf]);
+  const encodedSig = base64url(rawSig);
+  return `${signingInput}.${encodedSig}`;
+}
+async function createAuthEnvelope(privateKeyHex, network = "testnet" /* Testnet */, options) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const publicKey = serializePublicKeyCompressed(keyPair);
+  const host = NETWORK_HOSTS[network];
+  if (!host) {
+    throw new Error(`Unsupported network: ${network}`);
+  }
+  const token = await generateJWT(publicKey, host, keyPair, options?.expiresInSeconds);
+  return { publicKey, token };
+}
+async function generateAppSignature(privateKeyHex, clientId, redirectUri, state) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const message = `${clientId}:${redirectUri}:${state}`;
+  const hash = await hashInput(message);
+  const signatureDER = keyPair.sign(hash, { canonical: true }).toDER();
+  return Buffer.from(signatureDER).toString("hex");
+}
+
+export {
+  __require,
+  Network,
+  NETWORK_HOSTS,
+  loadExistingSecp256k1PrivateKey,
+  serializePublicKeyCompressed,
+  generateJWT,
+  createAuthEnvelope,
+  generateAppSignature
+};

package/dist/chunk-DIGESQEI.mjs

@@ -0,0 +1,91 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// src/helpers/CryptoUtils.tsx
+import { ec as EC } from "elliptic";
+var ec = new EC("secp256k1");
+var Network = /* @__PURE__ */ ((Network2) => {
+  Network2["Testnet"] = "testnet";
+  return Network2;
+})(Network || {});
+var NETWORK_HOSTS = {
+  ["testnet" /* Testnet */]: "https://dev-db.petastic.com"
+};
+function loadExistingSecp256k1PrivateKey(hexKey) {
+  if (!hexKey) {
+    throw new Error("Private key hex must be provided");
+  }
+  return ec.keyFromPrivate(hexKey, "hex");
+}
+function serializePublicKeyCompressed(keyPair) {
+  return keyPair.getPublic(true, "hex");
+}
+function base64url(input) {
+  let buf;
+  if (typeof input === "string") buf = Buffer.from(input);
+  else if (input instanceof ArrayBuffer) buf = Buffer.from(input);
+  else buf = input;
+  return buf.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function sha256HashNode(data) {
+  const { createHash } = __require("crypto");
+  return createHash("sha256").update(data).digest();
+}
+async function hashInput(data) {
+  if (typeof window !== "undefined" && window.crypto?.subtle) {
+    const encoder = new TextEncoder();
+    const encoded = encoder.encode(data);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-256", encoded);
+    return Buffer.from(hashBuffer);
+  } else {
+    return sha256HashNode(data);
+  }
+}
+async function generateJWT(sub, aud, keyPair, expiresInSeconds = 24 * 60 * 60) {
+  const iat = Math.floor(Date.now() / 1e3);
+  const exp = iat + expiresInSeconds;
+  const header = { alg: "ES256", typ: "JWT" };
+  const payload = { sub, aud, iat, exp };
+  const encodedHeader = base64url(JSON.stringify(header));
+  const encodedPayload = base64url(JSON.stringify(payload));
+  const signingInput = `${encodedHeader}.${encodedPayload}`;
+  const hash = await hashInput(signingInput);
+  const signature = keyPair.sign(hash, { canonical: true });
+  const rBuf = signature.r.toArrayLike(Buffer, "be", 32);
+  const sBuf = signature.s.toArrayLike(Buffer, "be", 32);
+  const rawSig = Buffer.concat([rBuf, sBuf]);
+  const encodedSig = base64url(rawSig);
+  return `${signingInput}.${encodedSig}`;
+}
+async function createAuthEnvelope(privateKeyHex, network = "testnet" /* Testnet */, options) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const publicKey = serializePublicKeyCompressed(keyPair);
+  const host = NETWORK_HOSTS[network];
+  if (!host) {
+    throw new Error(`Unsupported network: ${network}`);
+  }
+  const token = await generateJWT(publicKey, host, keyPair, options?.expiresInSeconds);
+  return { publicKey, token };
+}
+async function generateAppSignature(privateKeyHex, clientId, redirectUri, state) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const message = `${clientId}:${redirectUri}:${state}`;
+  const hash = await hashInput(message);
+  const signatureDER = keyPair.sign(hash, { canonical: true }).toDER();
+  return Buffer.from(signatureDER).toString("hex");
+}
+
+export {
+  __require,
+  Network,
+  NETWORK_HOSTS,
+  loadExistingSecp256k1PrivateKey,
+  serializePublicKeyCompressed,
+  generateJWT,
+  createAuthEnvelope,
+  generateAppSignature
+};

package/dist/chunk-KEC6WLEL.mjs

@@ -0,0 +1,93 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// src/helpers/CryptoUtils.tsx
+import { ec as EC } from "elliptic";
+var ec = new EC("secp256k1");
+var Network = /* @__PURE__ */ ((Network2) => {
+  Network2["Testnet"] = "testnet";
+  Network2["Localnet"] = "localnet";
+  return Network2;
+})(Network || {});
+var NETWORK_HOSTS = {
+  ["testnet" /* Testnet */]: "dev-db.petastic.com",
+  ["localnet" /* Localnet */]: "host.docker.internal:9181"
+};
+function loadExistingSecp256k1PrivateKey(hexKey) {
+  if (!hexKey) {
+    throw new Error("Private key hex must be provided");
+  }
+  return ec.keyFromPrivate(hexKey, "hex");
+}
+function serializePublicKeyCompressed(keyPair) {
+  return keyPair.getPublic(true, "hex");
+}
+function base64url(input) {
+  let buf;
+  if (typeof input === "string") buf = Buffer.from(input);
+  else if (input instanceof ArrayBuffer) buf = Buffer.from(input);
+  else buf = input;
+  return buf.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function sha256HashNode(data) {
+  const { createHash } = __require("crypto");
+  return createHash("sha256").update(data).digest();
+}
+async function hashInput(data) {
+  if (typeof window !== "undefined" && window.crypto?.subtle) {
+    const encoder = new TextEncoder();
+    const encoded = encoder.encode(data);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-256", encoded);
+    return Buffer.from(hashBuffer);
+  } else {
+    return sha256HashNode(data);
+  }
+}
+async function generateJWT(sub, aud, keyPair, expiresInSeconds = 24 * 60 * 60) {
+  const iat = Math.floor(Date.now() / 1e3);
+  const exp = iat + expiresInSeconds;
+  const header = { alg: "ES256", typ: "JWT" };
+  const payload = { sub, aud, iat, exp };
+  const encodedHeader = base64url(JSON.stringify(header));
+  const encodedPayload = base64url(JSON.stringify(payload));
+  const signingInput = `${encodedHeader}.${encodedPayload}`;
+  const hash = await hashInput(signingInput);
+  const signature = keyPair.sign(hash, { canonical: true });
+  const rBuf = signature.r.toArrayLike(Buffer, "be", 32);
+  const sBuf = signature.s.toArrayLike(Buffer, "be", 32);
+  const rawSig = Buffer.concat([rBuf, sBuf]);
+  const encodedSig = base64url(rawSig);
+  return `${signingInput}.${encodedSig}`;
+}
+async function createAuthEnvelope(privateKeyHex, network = "testnet" /* Testnet */, options) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const publicKey = serializePublicKeyCompressed(keyPair);
+  const host = NETWORK_HOSTS[network];
+  if (!host) {
+    throw new Error(`Unsupported network: ${network}`);
+  }
+  const token = await generateJWT(publicKey, host, keyPair, options?.expiresInSeconds);
+  return { publicKey, token };
+}
+async function generateAppSignature(privateKeyHex, clientId, redirectUri, state) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const message = `${clientId}:${redirectUri}:${state}`;
+  const hash = await hashInput(message);
+  const signatureDER = keyPair.sign(hash, { canonical: true }).toDER();
+  return Buffer.from(signatureDER).toString("hex");
+}
+
+export {
+  __require,
+  Network,
+  NETWORK_HOSTS,
+  loadExistingSecp256k1PrivateKey,
+  serializePublicKeyCompressed,
+  generateJWT,
+  createAuthEnvelope,
+  generateAppSignature
+};

package/dist/chunk-QHK3YPLJ.mjs

@@ -0,0 +1,93 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// src/helpers/CryptoUtils.tsx
+import { ec as EC } from "elliptic";
+var ec = new EC("secp256k1");
+var Network = /* @__PURE__ */ ((Network2) => {
+  Network2["Testnet"] = "testnet";
+  Network2["Localnet"] = "localnet";
+  return Network2;
+})(Network || {});
+var NETWORK_HOSTS = {
+  ["testnet" /* Testnet */]: "https://dev-db.petastic.com",
+  ["localnet" /* Localnet */]: "host.docker.internal:9181"
+};
+function loadExistingSecp256k1PrivateKey(hexKey) {
+  if (!hexKey) {
+    throw new Error("Private key hex must be provided");
+  }
+  return ec.keyFromPrivate(hexKey, "hex");
+}
+function serializePublicKeyCompressed(keyPair) {
+  return keyPair.getPublic(true, "hex");
+}
+function base64url(input) {
+  let buf;
+  if (typeof input === "string") buf = Buffer.from(input);
+  else if (input instanceof ArrayBuffer) buf = Buffer.from(input);
+  else buf = input;
+  return buf.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function sha256HashNode(data) {
+  const { createHash } = __require("crypto");
+  return createHash("sha256").update(data).digest();
+}
+async function hashInput(data) {
+  if (typeof window !== "undefined" && window.crypto?.subtle) {
+    const encoder = new TextEncoder();
+    const encoded = encoder.encode(data);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-256", encoded);
+    return Buffer.from(hashBuffer);
+  } else {
+    return sha256HashNode(data);
+  }
+}
+async function generateJWT(sub, aud, keyPair, expiresInSeconds = 24 * 60 * 60) {
+  const iat = Math.floor(Date.now() / 1e3);
+  const exp = iat + expiresInSeconds;
+  const header = { alg: "ES256", typ: "JWT" };
+  const payload = { sub, aud, iat, exp };
+  const encodedHeader = base64url(JSON.stringify(header));
+  const encodedPayload = base64url(JSON.stringify(payload));
+  const signingInput = `${encodedHeader}.${encodedPayload}`;
+  const hash = await hashInput(signingInput);
+  const signature = keyPair.sign(hash, { canonical: true });
+  const rBuf = signature.r.toArrayLike(Buffer, "be", 32);
+  const sBuf = signature.s.toArrayLike(Buffer, "be", 32);
+  const rawSig = Buffer.concat([rBuf, sBuf]);
+  const encodedSig = base64url(rawSig);
+  return `${signingInput}.${encodedSig}`;
+}
+async function createAuthEnvelope(privateKeyHex, network = "testnet" /* Testnet */, options) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const publicKey = serializePublicKeyCompressed(keyPair);
+  const host = NETWORK_HOSTS[network];
+  if (!host) {
+    throw new Error(`Unsupported network: ${network}`);
+  }
+  const token = await generateJWT(publicKey, host, keyPair, options?.expiresInSeconds);
+  return { publicKey, token };
+}
+async function generateAppSignature(privateKeyHex, clientId, redirectUri, state) {
+  const keyPair = loadExistingSecp256k1PrivateKey(privateKeyHex);
+  const message = `${clientId}:${redirectUri}:${state}`;
+  const hash = await hashInput(message);
+  const signatureDER = keyPair.sign(hash, { canonical: true }).toDER();
+  return Buffer.from(signatureDER).toString("hex");
+}
+
+export {
+  __require,
+  Network,
+  NETWORK_HOSTS,
+  loadExistingSecp256k1PrivateKey,
+  serializePublicKeyCompressed,
+  generateJWT,
+  createAuthEnvelope,
+  generateAppSignature
+};

package/dist/index.js

@@ -1266,6 +1266,44 @@ var ORGANIZATION_IMPL_ABI = [
 
 // src/utils/anymals/useMintAnymalNFT.ts
 var import_react10 = require("react");
+
+// src/helpers/GasEstimateHelper.tsx
+function applyBundlerGasEstimator(account, bundlerClient, options) {
+  const {
+    callGasMultiplier = 1.2,
+    verificationGasMultiplier = 1.2,
+    preVerificationGasMultiplier = 2,
+    debug = true
+  } = options || {};
+  account.userOperation = {
+    estimateGas: async (userOp) => {
+      const estimate = await bundlerClient.estimateUserOperationGas(userOp);
+      const paddedCallGasLimit = BigInt(
+        estimate.callGasLimit * BigInt(Math.ceil(callGasMultiplier * 100)) / 100n
+      );
+      const paddedVerificationGasLimit = BigInt(
+        estimate.verificationGasLimit * BigInt(Math.ceil(verificationGasMultiplier * 100)) / 100n
+      );
+      const paddedPreVerificationGas = BigInt(
+        estimate.preVerificationGas * BigInt(Math.ceil(preVerificationGasMultiplier * 100)) / 100n
+      );
+      if (debug) {
+        console.log("\u{1F4E6} Bundler Gas Estimates:");
+        console.log("  callGasLimit:", paddedCallGasLimit.toString());
+        console.log("  verificationGasLimit:", paddedVerificationGasLimit.toString());
+        console.log("  preVerificationGas:", paddedPreVerificationGas.toString());
+      }
+      return {
+        ...estimate,
+        callGasLimit: paddedCallGasLimit,
+        verificationGasLimit: paddedVerificationGasLimit,
+        preVerificationGas: paddedPreVerificationGas
+      };
+    }
+  };
+}
+
+// src/utils/anymals/useMintAnymalNFT.ts
 function useMintAnymalNFT() {
   return (0, import_react10.useCallback)(
     async (pid, nftId, anymalTxId, dbAuthToken, validationContractAddress, smartAccount, bundlerClient) => {
@@ -1286,6 +1324,7 @@ function useMintAnymalNFT() {
           anymalTxId
         ]
       });
+      applyBundlerGasEstimator(smartAccount, bundlerClient);
       const userOpHash = await bundlerClient.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -1294,7 +1333,7 @@ function useMintAnymalNFT() {
             data: callData
           }
         ],
-        maxPriorityFeePerGas: (0, import_viem.parseGwei)("0.003")
+        paymaster: true
       });
       await bundlerClient.waitForUserOperationReceipt({
         hash: userOpHash,
@@ -1714,6 +1753,7 @@ function useProcessPartialKibblePayment() {
           functionName: "partialPay",
           args
         });
+        applyBundlerGasEstimator(smartAccount, bundlerClient);
         const userOpHash = await bundlerClient.sendUserOperation({
           account: smartAccount,
           calls: [
@@ -1722,7 +1762,7 @@ function useProcessPartialKibblePayment() {
               data: callData
             }
           ],
-          maxPriorityFeePerGas: (0, import_viem2.parseGwei)("0.003")
+          paymaster: true
         });
         const receipt = await bundlerClient.waitForUserOperationReceipt({
           hash: userOpHash,
@@ -1759,6 +1799,7 @@ function useApproveKibbleToken() {
             // amount to approve
           ]
         });
+        applyBundlerGasEstimator(smartAccount, bundlerClient);
         const userOpHash = await bundlerClient.sendUserOperation({
           account: smartAccount,
           calls: [
@@ -1767,8 +1808,7 @@ function useApproveKibbleToken() {
               data: callData
             }
           ],
-          maxPriorityFeePerGas: (0, import_viem3.parseGwei)("0.003")
-          // maxFeePerGas: parseGwei("0.01"),
+          paymaster: true
         });
         await bundlerClient.waitForUserOperationReceipt({
           hash: userOpHash,
@@ -1820,6 +1860,7 @@ function useCreateOrganizationBase() {
           functionName: "createOrganizationProxy",
           args: [ownerAddress, orgName, orgPid]
         });
+        applyBundlerGasEstimator(adminSmartAccount, bundlerClient);
         const userOpHash = await bundlerClient.sendUserOperation({
           account: adminSmartAccount,
           calls: [
@@ -1828,9 +1869,7 @@ function useCreateOrganizationBase() {
               data: callData
             }
           ],
-          maxPriorityFeePerGas: (0, import_viem4.parseGwei)("0.003")
-          // Low priority fee
-          // maxFeePerGas: parseGwei("0.15"), // Max fee cap -- keeps rising at random
+          paymaster: true
         });
         const txReceipt = await bundlerClient.waitForUserOperationReceipt({
           hash: userOpHash,
@@ -1873,7 +1912,7 @@ function useCreateOrganizationBase() {
         const errorMessage = error instanceof Error ? error.message : "An unknown error occurred.";
         return {
           success: false,
-          message: `Error processing organization: ${errorMessage}`
+          message: `Error processing organization here: ${errorMessage}`
         };
       }
     },
@@ -1904,6 +1943,7 @@ function useApproveOrgPartialPayment() {
           functionName: "executeCall",
           args: [kibbleTokenAddress, approveCalldata]
         });
+        applyBundlerGasEstimator(managerSmartAccount, bundlerClient);
         const userOpApproveHash = await bundlerClient.sendUserOperation({
           account: managerSmartAccount,
           calls: [
@@ -1912,8 +1952,7 @@ function useApproveOrgPartialPayment() {
               data: executeApproveCalldata
             }
           ],
-          maxPriorityFeePerGas: (0, import_viem5.parseGwei)("0.003")
-          // maxFeePerGas: parseGwei("0.01"),
+          paymaster: true
         });
         await bundlerClient.waitForUserOperationReceipt({
           hash: userOpApproveHash
@@ -1963,6 +2002,7 @@ function useProcessOrgPartialKibblePayment() {
           functionName: "executeCall",
           args: [partialPaymentModuleAddress, partialPayCalldata]
         });
+        applyBundlerGasEstimator(managerSmartAccount, bundlerClient);
         const userOpPartialPayHash = await bundlerClient.sendUserOperation({
           account: managerSmartAccount,
           calls: [
@@ -1971,8 +2011,7 @@ function useProcessOrgPartialKibblePayment() {
               data: executePartialPayCalldata
             }
           ],
-          maxPriorityFeePerGas: (0, import_viem6.parseGwei)("0.003")
-          // maxFeePerGas: parseGwei("0.01"),
+          paymaster: true
         });
         const receipt = await bundlerClient.waitForUserOperationReceipt({
           hash: userOpPartialPayHash
@@ -2426,6 +2465,7 @@ function useClaimActionReward() {
         functionName: "claimByIndex",
         args: [actionId, claimIndex]
       });
+      applyBundlerGasEstimator(smartAccount, bundlerClient);
       const userOpHash = await bundlerClient.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -2434,7 +2474,7 @@ function useClaimActionReward() {
             data: callData
           }
         ],
-        maxPriorityFeePerGas: (0, import_viem9.parseGwei)("0.003")
+        paymaster: true
       });
       await bundlerClient.waitForUserOperationReceipt({
         hash: userOpHash,
@@ -2469,6 +2509,7 @@ function useClaimOrgActionReward() {
         functionName: "executeCall",
         args: [rewardableActionContractAddress, claimCallData]
       });
+      applyBundlerGasEstimator(smartAccount, bundlerClient);
       const userOpHash = await bundlerClient.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -2477,7 +2518,7 @@ function useClaimOrgActionReward() {
             data: executeClaimCalldata
           }
         ],
-        maxPriorityFeePerGas: (0, import_viem10.parseGwei)("0.003")
+        paymaster: true
       });
       await bundlerClient.waitForUserOperationReceipt({
         hash: userOpHash,

package/dist/index.mjs

@@ -383,7 +383,7 @@ function useFetchNotifications() {
 }
 
 // src/utils/anymals/useMintAnymalNFT.ts
-import { encodeFunctionData, parseGwei } from "viem";
+import { encodeFunctionData } from "viem";
 
 // src/helpers/BlockchainAbiHelper.tsx
 var PET_NFT_ABI = [{ "inputs": [], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [], "name": "AccessControlBadConfirmation", "type": "error" }, { "inputs": [{ "internalType": "address", "name": "account", "type": "address" }, { "internalType": "bytes32", "name": "neededRole", "type": "bytes32" }], "name": "AccessControlUnauthorizedAccount", "type": "error" }, { "inputs": [{ "internalType": "address", "name": "target", "type": "address" }], "name": "AddressEmptyCode", "type": "error" }, { "inputs": [{ "internalType": "address", "name": "implementation", "type": "address" }], "name": "ERC1967InvalidImplementation", "type": "error" }, { "inputs": [], "name": "ERC1967NonPayable", "type": "error" }, { "inputs": [], "name": "EnforcedPause", "type": "error" }, { "inputs": [], "name": "ExpectedPause", "type": "error" }, { "inputs": [], "name": "FailedCall", "type": "error" }, { "inputs": [], "name": "InvalidInitialization", "type": "error" }, { "inputs": [], "name": "NotInitializing", "type": "error" }, { "inputs": [], "name": "UUPSUnauthorizedCallContext", "type": "error" }, { "inputs": [{ "internalType": "bytes32", "name": "slot", "type": "bytes32" }], "name": "UUPSUnsupportedProxiableUUID", "type": "error" }, { "anonymous": false, "inputs": [{ "indexed": false, "internalType": "uint64", "name": "version", "type": "uint64" }], "name": "Initialized", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "user", "type": "address" }, { "indexed": false, "internalType": "string", "name": "pid", "type": "string" }, { "indexed": false, "internalType": "string", "name": "nftId", "type": "string" }, { "indexed": false, "internalType": "string", "name": "metadataURL", "type": "string" }, { "indexed": false, "internalType": "uint256", "name": "campaignId", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "rewardAmount", "type": "uint256" }, { "indexed": false, "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "MetadataApproved", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "user", "type": "address" }, { "indexed": false, "internalType": "string", "name": "anymalTxId", "type": "string" }, { "indexed": false, "internalType": "string", "name": "pid", "type": "string" }, { "indexed": false, "internalType": "string", "name": "nftId", "type": "string" }, { "indexed": false, "internalType": "string", "name": "metadataURL", "type": "string" }, { "indexed": false, "internalType": "uint256", "name": "campaignId", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "rewardAmount", "type": "uint256" }, { "indexed": false, "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "MetadataRejected", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "user", "type": "address" }, { "indexed": false, "internalType": "string", "name": "pid", "type": "string" }, { "indexed": false, "internalType": "string", "name": "nftId", "type": "string" }, { "indexed": false, "internalType": "string", "name": "metadataURL", "type": "string" }, { "indexed": false, "internalType": "uint256", "name": "campaignId", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "rewardAmount", "type": "uint256" }, { "indexed": false, "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "MetadataSubmitted", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": false, "internalType": "address", "name": "account", "type": "address" }], "name": "Paused", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "user", "type": "address" }, { "indexed": false, "internalType": "string", "name": "pid", "type": "string" }, { "indexed": false, "internalType": "string", "name": "nftId", "type": "string" }, { "indexed": false, "internalType": "uint256", "name": "rewardAmount", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "campaignId", "type": "uint256" }, { "indexed": false, "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "RewardDistributed", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "indexed": true, "internalType": "bytes32", "name": "previousAdminRole", "type": "bytes32" }, { "indexed": true, "internalType": "bytes32", "name": "newAdminRole", "type": "bytes32" }], "name": "RoleAdminChanged", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "indexed": true, "internalType": "address", "name": "account", "type": "address" }, { "indexed": true, "internalType": "address", "name": "sender", "type": "address" }], "name": "RoleGranted", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "indexed": true, "internalType": "address", "name": "account", "type": "address" }, { "indexed": true, "internalType": "address", "name": "sender", "type": "address" }], "name": "RoleRevoked", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": false, "internalType": "address", "name": "account", "type": "address" }], "name": "Unpaused", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "implementation", "type": "address" }], "name": "Upgraded", "type": "event" }, { "inputs": [], "name": "APPROVER_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "DEFAULT_ADMIN_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "UPGRADE_INTERFACE_VERSION", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_user", "type": "address" }, { "internalType": "string", "name": "_pid", "type": "string" }, { "internalType": "string", "name": "_nftId", "type": "string" }, { "internalType": "string", "name": "_metadataURL", "type": "string" }, { "internalType": "uint256", "name": "_campaignId", "type": "uint256" }, { "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "approveMetadata", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "campaignCount", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "name": "campaigns", "outputs": [{ "internalType": "string", "name": "name", "type": "string" }, { "internalType": "uint256", "name": "rewardAmount", "type": "uint256" }, { "internalType": "bool", "name": "isActive", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "string", "name": "_name", "type": "string" }, { "internalType": "uint256", "name": "_rewardAmount", "type": "uint256" }], "name": "createCampaign", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "defaultRewardAmount", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }], "name": "getRoleAdmin", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "grantRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "hasRole", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "initialOwner", "type": "address" }, { "internalType": "contract IERC20", "name": "_rewardToken", "type": "address" }, { "internalType": "contract IPetToken", "name": "_petToken", "type": "address" }, { "internalType": "uint256", "name": "_defaultRewardAmount", "type": "uint256" }], "name": "initialize", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "pause", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "paused", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "petToken", "outputs": [{ "internalType": "contract IPetToken", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "proxiableUUID", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "callerConfirmation", "type": "address" }], "name": "renounceRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "revokeRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "rewardToken", "outputs": [{ "internalType": "contract IERC20", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "string", "name": "_pid", "type": "string" }, { "internalType": "string", "name": "_nftId", "type": "string" }, { "internalType": "string", "name": "_metadataURL", "type": "string" }, { "internalType": "uint256", "name": "_campaignId", "type": "uint256" }, { "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "submitMetadata", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "string", "name": "_pid", "type": "string" }, { "internalType": "string", "name": "_nftId", "type": "string" }, { "internalType": "string", "name": "_metadataURL", "type": "string" }, { "internalType": "string", "name": "_campaignName", "type": "string" }, { "internalType": "string", "name": "_anymalTxId", "type": "string" }], "name": "submitMetadataByCampaignName", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes4", "name": "interfaceId", "type": "bytes4" }], "name": "supportsInterface", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "unpause", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_campaignId", "type": "uint256" }, { "internalType": "uint256", "name": "_rewardAmount", "type": "uint256" }, { "internalType": "bool", "name": "_isActive", "type": "bool" }], "name": "updateCampaign", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_rewardAmount", "type": "uint256" }], "name": "updateDefaultReward", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "newImplementation", "type": "address" }, { "internalType": "bytes", "name": "data", "type": "bytes" }], "name": "upgradeToAndCall", "outputs": [], "stateMutability": "payable", "type": "function" }];
@@ -1203,6 +1203,44 @@ var ORGANIZATION_IMPL_ABI = [
 
 // src/utils/anymals/useMintAnymalNFT.ts
 import { useCallback as useCallback10 } from "react";
+
+// src/helpers/GasEstimateHelper.tsx
+function applyBundlerGasEstimator(account, bundlerClient, options) {
+  const {
+    callGasMultiplier = 1.2,
+    verificationGasMultiplier = 1.2,
+    preVerificationGasMultiplier = 2,
+    debug = true
+  } = options || {};
+  account.userOperation = {
+    estimateGas: async (userOp) => {
+      const estimate = await bundlerClient.estimateUserOperationGas(userOp);
+      const paddedCallGasLimit = BigInt(
+        estimate.callGasLimit * BigInt(Math.ceil(callGasMultiplier * 100)) / 100n
+      );
+      const paddedVerificationGasLimit = BigInt(
+        estimate.verificationGasLimit * BigInt(Math.ceil(verificationGasMultiplier * 100)) / 100n
+      );
+      const paddedPreVerificationGas = BigInt(
+        estimate.preVerificationGas * BigInt(Math.ceil(preVerificationGasMultiplier * 100)) / 100n
+      );
+      if (debug) {
+        console.log("\u{1F4E6} Bundler Gas Estimates:");
+        console.log("  callGasLimit:", paddedCallGasLimit.toString());
+        console.log("  verificationGasLimit:", paddedVerificationGasLimit.toString());
+        console.log("  preVerificationGas:", paddedPreVerificationGas.toString());
+      }
+      return {
+        ...estimate,
+        callGasLimit: paddedCallGasLimit,
+        verificationGasLimit: paddedVerificationGasLimit,
+        preVerificationGas: paddedPreVerificationGas
+      };
+    }
+  };
+}
+
+// src/utils/anymals/useMintAnymalNFT.ts
 function useMintAnymalNFT() {
   return useCallback10(
     async (pid, nftId, anymalTxId, dbAuthToken, validationContractAddress, smartAccount, bundlerClient) => {
@@ -1223,6 +1261,7 @@ function useMintAnymalNFT() {
           anymalTxId
         ]
       });
+      applyBundlerGasEstimator(smartAccount, bundlerClient);
       const userOpHash = await bundlerClient.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -1231,7 +1270,7 @@ function useMintAnymalNFT() {
             data: callData
           }
         ],
-        maxPriorityFeePerGas: parseGwei("0.003")
+        paymaster: true
       });
       await bundlerClient.waitForUserOperationReceipt({
         hash: userOpHash,
@@ -1616,7 +1655,7 @@ function useFetchAnymals() {
 }
 
 // src/utils/marketplace/useProcessPartialKibblePayment.ts
-import { encodeFunctionData as encodeFunctionData2, parseGwei as parseGwei2 } from "viem";
+import { encodeFunctionData as encodeFunctionData2 } from "viem";
 import { useCallback as useCallback17 } from "react";
 function useProcessPartialKibblePayment() {
   return useCallback17(
@@ -1651,6 +1690,7 @@ function useProcessPartialKibblePayment() {
           functionName: "partialPay",
           args
         });
+        applyBundlerGasEstimator(smartAccount, bundlerClient);
         const userOpHash = await bundlerClient.sendUserOperation({
           account: smartAccount,
           calls: [
@@ -1659,7 +1699,7 @@ function useProcessPartialKibblePayment() {
               data: callData
             }
           ],
-          maxPriorityFeePerGas: parseGwei2("0.003")
+          paymaster: true
         });
         const receipt = await bundlerClient.waitForUserOperationReceipt({
           hash: userOpHash,
@@ -1680,7 +1720,7 @@ function useProcessPartialKibblePayment() {
 }
 
 // src/utils/marketplace/useApproveKibbleToken.ts
-import { encodeFunctionData as encodeFunctionData3, erc20Abi, parseGwei as parseGwei3 } from "viem";
+import { encodeFunctionData as encodeFunctionData3, erc20Abi } from "viem";
 import { useCallback as useCallback18 } from "react";
 function useApproveKibbleToken() {
   return useCallback18(
@@ -1696,6 +1736,7 @@ function useApproveKibbleToken() {
             // amount to approve
           ]
         });
+        applyBundlerGasEstimator(smartAccount, bundlerClient);
         const userOpHash = await bundlerClient.sendUserOperation({
           account: smartAccount,
           calls: [
@@ -1704,8 +1745,7 @@ function useApproveKibbleToken() {
               data: callData
             }
           ],
-          maxPriorityFeePerGas: parseGwei3("0.003")
-          // maxFeePerGas: parseGwei("0.01"),
+          paymaster: true
         });
         await bundlerClient.waitForUserOperationReceipt({
           hash: userOpHash,
@@ -1730,7 +1770,7 @@ function useApproveKibbleToken() {
 
 // src/utils/organization/useCreateOrganizationBase.ts
 import { useCallback as useCallback19 } from "react";
-import { decodeEventLog, encodeFunctionData as encodeFunctionData4, parseGwei as parseGwei4 } from "viem";
+import { decodeEventLog, encodeFunctionData as encodeFunctionData4 } from "viem";
 function useCreateOrganizationBase() {
   return useCallback19(
     /**
@@ -1757,6 +1797,7 @@ function useCreateOrganizationBase() {
           functionName: "createOrganizationProxy",
           args: [ownerAddress, orgName, orgPid]
         });
+        applyBundlerGasEstimator(adminSmartAccount, bundlerClient);
         const userOpHash = await bundlerClient.sendUserOperation({
           account: adminSmartAccount,
           calls: [
@@ -1765,9 +1806,7 @@ function useCreateOrganizationBase() {
               data: callData
             }
           ],
-          maxPriorityFeePerGas: parseGwei4("0.003")
-          // Low priority fee
-          // maxFeePerGas: parseGwei("0.15"), // Max fee cap -- keeps rising at random
+          paymaster: true
         });
         const txReceipt = await bundlerClient.waitForUserOperationReceipt({
           hash: userOpHash,
@@ -1810,7 +1849,7 @@ function useCreateOrganizationBase() {
         const errorMessage = error instanceof Error ? error.message : "An unknown error occurred.";
         return {
           success: false,
-          message: `Error processing organization: ${errorMessage}`
+          message: `Error processing organization here: ${errorMessage}`
         };
       }
     },
@@ -1820,7 +1859,7 @@ function useCreateOrganizationBase() {
 
 // src/utils/organization/useApproveOrgKibbleToken.ts
 import { useCallback as useCallback20 } from "react";
-import { encodeFunctionData as encodeFunctionData5, erc20Abi as erc20Abi2, parseGwei as parseGwei5 } from "viem";
+import { encodeFunctionData as encodeFunctionData5, erc20Abi as erc20Abi2 } from "viem";
 function useApproveOrgPartialPayment() {
   return useCallback20(
     async (orgContractAddress, kibbleTokenAddress, partialPaymentModuleAddress, managerSmartAccount, bundlerClient, approveAmount) => {
@@ -1841,6 +1880,7 @@ function useApproveOrgPartialPayment() {
           functionName: "executeCall",
           args: [kibbleTokenAddress, approveCalldata]
         });
+        applyBundlerGasEstimator(managerSmartAccount, bundlerClient);
         const userOpApproveHash = await bundlerClient.sendUserOperation({
           account: managerSmartAccount,
           calls: [
@@ -1849,8 +1889,7 @@ function useApproveOrgPartialPayment() {
               data: executeApproveCalldata
             }
           ],
-          maxPriorityFeePerGas: parseGwei5("0.003")
-          // maxFeePerGas: parseGwei("0.01"),
+          paymaster: true
         });
         await bundlerClient.waitForUserOperationReceipt({
           hash: userOpApproveHash
@@ -1870,7 +1909,7 @@ function useApproveOrgPartialPayment() {
 
 // src/utils/organization/useProcessOrgPartialKibblePayment.ts
 import { useCallback as useCallback21 } from "react";
-import { encodeFunctionData as encodeFunctionData6, parseGwei as parseGwei6 } from "viem";
+import { encodeFunctionData as encodeFunctionData6 } from "viem";
 function useProcessOrgPartialKibblePayment() {
   return useCallback21(
     async (orgContractAddress, partialPaymentModuleAddress, managerSmartAccount, bundlerClient, orderId, anymalNftId, pid, amountInTokens, maxTokenPayment, nonce, deadline, backendSignature) => {
@@ -1900,6 +1939,7 @@ function useProcessOrgPartialKibblePayment() {
           functionName: "executeCall",
           args: [partialPaymentModuleAddress, partialPayCalldata]
         });
+        applyBundlerGasEstimator(managerSmartAccount, bundlerClient);
         const userOpPartialPayHash = await bundlerClient.sendUserOperation({
           account: managerSmartAccount,
           calls: [
@@ -1908,8 +1948,7 @@ function useProcessOrgPartialKibblePayment() {
               data: executePartialPayCalldata
             }
           ],
-          maxPriorityFeePerGas: parseGwei6("0.003")
-          // maxFeePerGas: parseGwei("0.01"),
+          paymaster: true
         });
         const receipt = await bundlerClient.waitForUserOperationReceipt({
           hash: userOpPartialPayHash
@@ -2267,7 +2306,7 @@ function useFetchBalance() {
 }
 
 // src/utils/actions/useClaimActionReward.ts
-import { encodeFunctionData as encodeFunctionData7, parseGwei as parseGwei7 } from "viem";
+import { encodeFunctionData as encodeFunctionData7 } from "viem";
 import { useCallback as useCallback28 } from "react";
 function useClaimActionReward() {
   return useCallback28(
@@ -2283,6 +2322,7 @@ function useClaimActionReward() {
         functionName: "claimByIndex",
         args: [actionId, claimIndex]
       });
+      applyBundlerGasEstimator(smartAccount, bundlerClient);
       const userOpHash = await bundlerClient.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -2291,7 +2331,7 @@ function useClaimActionReward() {
             data: callData
           }
         ],
-        maxPriorityFeePerGas: parseGwei7("0.003")
+        paymaster: true
       });
       await bundlerClient.waitForUserOperationReceipt({
         hash: userOpHash,
@@ -2305,7 +2345,7 @@ function useClaimActionReward() {
 }
 
 // src/utils/actions/useClaimOrgActionReward.ts
-import { encodeFunctionData as encodeFunctionData8, parseGwei as parseGwei8 } from "viem";
+import { encodeFunctionData as encodeFunctionData8 } from "viem";
 import { useCallback as useCallback29 } from "react";
 function useClaimOrgActionReward() {
   return useCallback29(
@@ -2326,6 +2366,7 @@ function useClaimOrgActionReward() {
         functionName: "executeCall",
         args: [rewardableActionContractAddress, claimCallData]
       });
+      applyBundlerGasEstimator(smartAccount, bundlerClient);
       const userOpHash = await bundlerClient.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -2334,7 +2375,7 @@ function useClaimOrgActionReward() {
             data: executeClaimCalldata
           }
         ],
-        maxPriorityFeePerGas: parseGwei8("0.003")
+        paymaster: true
       });
       await bundlerClient.waitForUserOperationReceipt({
         hash: userOpHash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anymal-protocol",
-  "version": "1.0.114",
+  "version": "1.0.116",
   "description": "A React/TypeScript-based utility library for reusable functions and hooks inside of the Anymal Ecosystem.",
   "main": "dist/index.js",
   "bin": {