anymal-protocol 1.0.138 → 1.0.140

package/dist/index.d.mts

@@ -431,6 +431,7 @@ declare const ORG_FUNCTION = "executeCall";
 declare function useCoinbaseCreateOrganizationWallet(): (orgPid: string, orgName: string, ownerAddress: string, orgContractAddress: `0x${string}`, evmAddress: `0x${string}`) => Promise<{
     success: boolean;
     message: string;
+    proxyAddress?: string;
     status: string;
 }>;
 

package/dist/index.d.ts

@@ -431,6 +431,7 @@ declare const ORG_FUNCTION = "executeCall";
 declare function useCoinbaseCreateOrganizationWallet(): (orgPid: string, orgName: string, ownerAddress: string, orgContractAddress: `0x${string}`, evmAddress: `0x${string}`) => Promise<{
     success: boolean;
     message: string;
+    proxyAddress?: string;
     status: string;
 }>;
 

package/dist/index.js

@@ -3013,8 +3013,17 @@ function useCoinbaseMintAnymalNFT() {
 
 // src/utils/coinbase/useCoinbaseCreateOrganizationWallet.ts
 var import_react13 = require("react");
+var import_viem3 = require("viem");
+var import_chains2 = require("viem/chains");
 function useCoinbaseCreateOrganizationWallet() {
-  const { sendOperationFn, status } = useSendCoinbaseUserOperation();
+  const { sendOperationFn, data, status } = useSendCoinbaseUserOperation();
+  const publicClient = (0, import_react13.useMemo)(
+    () => (0, import_viem3.createPublicClient)({
+      chain: import_chains2.baseSepolia,
+      transport: (0, import_viem3.http)()
+    }),
+    []
+  );
   return (0, import_react13.useCallback)(
     /**
      * Creates a new organization on-chain.
@@ -3024,31 +3033,78 @@ function useCoinbaseCreateOrganizationWallet() {
      * @param ownerAddress - The wallet address of the user who will be the default manager.
      * @param orgContractAddress - The contract address of the organization beacon.
      * @param evmAddress - The Coinbase smart account address of the admin.
-     * @returns A promise with success status, message, and status.
+     * @returns A promise with success status, message, and optional proxyAddress.
      */
     async (orgPid, orgName, ownerAddress, orgContractAddress, evmAddress) => {
       if (!orgPid || !orgName || !ownerAddress || !orgContractAddress || !evmAddress) {
         return {
           success: false,
           message: "Missing required parameters for organization creation.",
-          status: "error."
+          status: "error"
+        };
+      }
+      try {
+        const result = await sendOperationFn(
+          evmAddress,
+          orgContractAddress,
+          ORGANIZATION_BEACON_ABI,
+          "createOrganizationProxy",
+          [ownerAddress, orgName, orgPid]
+        );
+        if (!result.success) {
+          return { ...result, status: "error" };
+        }
+        let proxyAddress;
+        try {
+          const txHash = data?.receipts?.[0]?.transactionHash || data?.transactionHash;
+          if (txHash) {
+            const receipt = await publicClient.getTransactionReceipt({
+              hash: txHash
+            });
+            for (const log of receipt.logs) {
+              try {
+                const decoded = (0, import_viem3.decodeEventLog)({
+                  abi: ORGANIZATION_BEACON_ABI,
+                  data: log.data,
+                  topics: log.topics
+                });
+                if (decoded.eventName === "NewOrganizationCreated") {
+                  proxyAddress = decoded.args.proxyAddress;
+                  break;
+                }
+              } catch {
+              }
+            }
+          }
+        } catch (e) {
+          console.error("Failed to get transaction receipt:", e);
+        }
+        if (!proxyAddress) {
+          return {
+            ...result,
+            status
+          };
+        }
+        return {
+          ...result,
+          proxyAddress,
+          status
+        };
+      } catch (error) {
+        console.error("Org wallet creation error", error);
+        return {
+          success: false,
+          message: "Error",
+          status: "error"
         };
       }
-      const result = await sendOperationFn(
-        evmAddress,
-        orgContractAddress,
-        ORGANIZATION_BEACON_ABI,
-        "createOrganizationProxy",
-        [ownerAddress, orgName, orgPid]
-      );
-      return { ...result, status };
     },
-    [sendOperationFn, status]
+    [sendOperationFn, data, publicClient, status]
   );
 }
 
 // src/utils/anymals/useMintAnymalNFT.ts
-var import_viem4 = require("viem");
+var import_viem5 = require("viem");
 var import_react14 = require("react");
 
 // src/helpers/GasEstimateHelper.tsx
@@ -3093,18 +3149,18 @@ async function applyBundlerGasEstimator(account, bundlerClient, options) {
 }
 
 // src/helpers/HumanRevert.tsx
-var import_viem3 = require("viem");
+var import_viem4 = require("viem");
 function humanRevert(raw, shortMessage) {
   if (!raw) return shortMessage ?? "Simulation reverted";
   try {
-    const { errorName, args } = (0, import_viem3.decodeErrorResult)({
+    const { errorName, args } = (0, import_viem4.decodeErrorResult)({
       abi: ERROR_ABI,
       data: raw
     });
     return `${errorName}(${args.map(String).join(", ")})`;
   } catch {
     if (raw.startsWith("0x08c379a0") && raw.length >= 138) {
-      return (0, import_viem3.hexToString)(`0x${raw.slice(138)}`);
+      return (0, import_viem4.hexToString)(`0x${raw.slice(138)}`);
     }
     return `${raw.slice(0, 10)}\u2026`;
   }
@@ -3146,7 +3202,7 @@ function useMintAnymalNFT() {
         "petastic-signup-campaign-1",
         anymalTxId
       ];
-      const callData = (0, import_viem4.encodeFunctionData)({
+      const callData = (0, import_viem5.encodeFunctionData)({
         abi: PET_NFT_ABI,
         functionName,
         args
@@ -3333,7 +3389,7 @@ function useUploadAnymalImage() {
 var import_react17 = require("react");
 
 // src/helpers/ProcessDirectPartialPayment.tsx
-var import_viem5 = require("viem");
+var import_viem6 = require("viem");
 
 // src/helpers/SendUserOpWithRetries.tsx
 async function sendUserOpWithRetries(bundlerClient, params, retries = 3, delay = 1e3) {
@@ -3393,7 +3449,7 @@ async function processDirectPartialPayment(marketplaceContract, smartAccount, bu
       deadline,
       backendSignature
     ];
-    const partialPayCalldata = (0, import_viem5.encodeFunctionData)({
+    const partialPayCalldata = (0, import_viem6.encodeFunctionData)({
       abi: MARKETPLACE_ABI,
       functionName,
       args
@@ -3489,20 +3545,20 @@ function useProcessPartialKibblePayment() {
 var import_react18 = require("react");
 
 // src/helpers/ProcessDirectKibbleApproval.tsx
-var import_viem6 = require("viem");
+var import_viem7 = require("viem");
 async function processDirectKibbleApproval(kibbleTokenAddress, spenderAddress, smartAccount, bundlerClient, approveAmount) {
   try {
     const functionName = "approve";
     const args = [spenderAddress, approveAmount];
-    const approveCalldata = (0, import_viem6.encodeFunctionData)({
-      abi: import_viem6.erc20Abi,
+    const approveCalldata = (0, import_viem7.encodeFunctionData)({
+      abi: import_viem7.erc20Abi,
       functionName,
       args
     });
     await simulateCall(
       bundlerClient.client,
       kibbleTokenAddress,
-      import_viem6.erc20Abi,
+      import_viem7.erc20Abi,
       functionName,
       args,
       smartAccount.address
@@ -3559,7 +3615,7 @@ function useApproveKibbleToken() {
 
 // src/utils/organization/useCreateOrganizationBase.ts
 var import_react19 = require("react");
-var import_viem7 = require("viem");
+var import_viem8 = require("viem");
 function useCreateOrganizationBase() {
   return (0, import_react19.useCallback)(
     /**
@@ -3583,7 +3639,7 @@ function useCreateOrganizationBase() {
       try {
         const functionName = "createOrganizationProxy";
         const args = [ownerAddress, orgName, orgPid];
-        const callData = (0, import_viem7.encodeFunctionData)({
+        const callData = (0, import_viem8.encodeFunctionData)({
           abi: ORGANIZATION_BEACON_ABI,
           functionName,
           args
@@ -3621,7 +3677,7 @@ function useCreateOrganizationBase() {
         let proxyAddress;
         for (const log of txReceipt.logs) {
           try {
-            const decoded = (0, import_viem7.decodeEventLog)({
+            const decoded = (0, import_viem8.decodeEventLog)({
               abi: ORGANIZATION_BEACON_ABI,
               data: log.data,
               topics: log.topics
@@ -3660,10 +3716,10 @@ function useCreateOrganizationBase() {
 var import_react20 = require("react");
 
 // src/helpers/ProcessOrgKibbleApproval.tsx
-var import_viem9 = require("viem");
+var import_viem10 = require("viem");
 
 // src/helpers/WaitForAllowance.tsx
-var import_viem8 = require("viem");
+var import_viem9 = require("viem");
 async function waitForAllowance(publicClient, tokenAddress, ownerAddress, spenderAddress, expectedAmount) {
   const MAX_RETRIES = 10;
   const RETRY_INTERVAL = 2e3;
@@ -3672,7 +3728,7 @@ async function waitForAllowance(publicClient, tokenAddress, ownerAddress, spende
     try {
       const currentAllowance = await publicClient.readContract({
         address: tokenAddress,
-        abi: import_viem8.erc20Abi,
+        abi: import_viem9.erc20Abi,
         functionName: "allowance",
         args: [ownerAddress, spenderAddress]
       });
@@ -3697,13 +3753,13 @@ async function processOrgKibbleApproval(orgContractAddress, kibbleTokenAddress,
     if (approveAmount <= 0n) {
       return { success: false, message: "Approval amount must be greater than zero." };
     }
-    const approveCalldata = (0, import_viem9.encodeFunctionData)({
-      abi: import_viem9.erc20Abi,
+    const approveCalldata = (0, import_viem10.encodeFunctionData)({
+      abi: import_viem10.erc20Abi,
       functionName: "approve",
       args: [partialPaymentModuleAddress, approveAmount]
     });
     const args = [kibbleTokenAddress, approveCalldata];
-    const executeApproveCalldata = (0, import_viem9.encodeFunctionData)({
+    const executeApproveCalldata = (0, import_viem10.encodeFunctionData)({
       abi: ORGANIZATION_IMPL_ABI,
       functionName: ORG_FUNCTION,
       args
@@ -3790,10 +3846,10 @@ function useApproveOrgPartialPayment() {
 var import_react21 = require("react");
 
 // src/helpers/ProcessOrgPartialPayment.tsx
-var import_viem10 = require("viem");
+var import_viem11 = require("viem");
 async function processOrgPartialPayment(orgContractAddress, partialPaymentModuleAddress, managerSmartAccount, bundlerClient, orderId, anymalNftId, pid, amountInTokens, maxTokenPayment, nonce, deadline, backendSignature) {
   try {
-    const partialPayCalldata = (0, import_viem10.encodeFunctionData)({
+    const partialPayCalldata = (0, import_viem11.encodeFunctionData)({
       abi: MARKETPLACE_ABI,
       functionName: "partialPay",
       args: [
@@ -3808,7 +3864,7 @@ async function processOrgPartialPayment(orgContractAddress, partialPaymentModule
       ]
     });
     const args = [partialPaymentModuleAddress, partialPayCalldata];
-    const executePartialPayCalldata = (0, import_viem10.encodeFunctionData)({
+    const executePartialPayCalldata = (0, import_viem11.encodeFunctionData)({
       abi: ORGANIZATION_IMPL_ABI,
       functionName: ORG_FUNCTION,
       args
@@ -3924,7 +3980,7 @@ function useUpdateOrgWalletAddress() {
 }
 
 // src/utils/organization/useMintOrgAnymalNFT.ts
-var import_viem11 = require("viem");
+var import_viem12 = require("viem");
 var import_react23 = require("react");
 function useMintOrgAnymalNFT() {
   return (0, import_react23.useCallback)(
@@ -3943,13 +3999,13 @@ function useMintOrgAnymalNFT() {
         "petastic-signup-campaign-1",
         anymalTxId
       ];
-      const callData = (0, import_viem11.encodeFunctionData)({
+      const callData = (0, import_viem12.encodeFunctionData)({
         abi: PET_NFT_ABI,
         functionName,
         args
       });
       const executeArgs = [validationContractAddress, callData];
-      const executeSubmitMetaCalldata = (0, import_viem11.encodeFunctionData)({
+      const executeSubmitMetaCalldata = (0, import_viem12.encodeFunctionData)({
         abi: ORGANIZATION_IMPL_ABI,
         functionName: ORG_FUNCTION,
         args: executeArgs
@@ -3982,10 +4038,10 @@ function useMintOrgAnymalNFT() {
 
 // src/helpers/NonceHelper.tsx
 var import_uuid = require("uuid");
-var import_viem12 = require("viem");
+var import_viem13 = require("viem");
 var generateBytes32Nonce = () => {
   const uuid3 = (0, import_uuid.v4)().replace(/-/g, "");
-  return (0, import_viem12.padHex)(`0x${uuid3}`, { size: 32 });
+  return (0, import_viem13.padHex)(`0x${uuid3}`, { size: 32 });
 };
 
 // src/helpers/CryptoUtils.tsx
@@ -4441,16 +4497,16 @@ function useCreateOrganizationAppData() {
 
 // src/utils/balance/useFetchBalance.ts
 var import_react28 = require("react");
-var import_viem13 = require("viem");
+var import_viem14 = require("viem");
 function useFetchBalance() {
   return (0, import_react28.useCallback)(
     async (publicClient, walletAddress, kibbleTokenAddress) => {
       try {
         const balance = await publicClient.readContract({
-          address: (0, import_viem13.getAddress)(kibbleTokenAddress),
-          abi: import_viem13.erc20Abi,
+          address: (0, import_viem14.getAddress)(kibbleTokenAddress),
+          abi: import_viem14.erc20Abi,
           functionName: "balanceOf",
-          args: [(0, import_viem13.getAddress)(walletAddress)]
+          args: [(0, import_viem14.getAddress)(walletAddress)]
         });
         return Number(balance);
       } catch (error) {
@@ -4462,7 +4518,7 @@ function useFetchBalance() {
 }
 
 // src/utils/actions/useClaimActionReward.ts
-var import_viem14 = require("viem");
+var import_viem15 = require("viem");
 var import_react29 = require("react");
 function useClaimActionReward() {
   return (0, import_react29.useCallback)(
@@ -4475,7 +4531,7 @@ function useClaimActionReward() {
       }
       const args = [actionId, claimIndex];
       const functionName = "claimByIndex";
-      const callData = (0, import_viem14.encodeFunctionData)({
+      const callData = (0, import_viem15.encodeFunctionData)({
         abi: REWARDABLE_ACTIONS_ABI,
         functionName,
         args
@@ -4511,7 +4567,7 @@ function useClaimActionReward() {
 }
 
 // src/utils/actions/useClaimOrgActionReward.ts
-var import_viem15 = require("viem");
+var import_viem16 = require("viem");
 var import_react30 = require("react");
 function useClaimOrgActionReward() {
   return (0, import_react30.useCallback)(
@@ -4522,13 +4578,13 @@ function useClaimOrgActionReward() {
           message: "Missing web3auth account info or contract address."
         };
       }
-      const claimCallData = (0, import_viem15.encodeFunctionData)({
+      const claimCallData = (0, import_viem16.encodeFunctionData)({
         abi: REWARDABLE_ACTIONS_ABI,
         functionName: "claimByIndex",
         args: [actionId, claimIndex]
       });
       const args = [rewardableActionContractAddress, claimCallData];
-      const executeClaimCalldata = (0, import_viem15.encodeFunctionData)({
+      const executeClaimCalldata = (0, import_viem16.encodeFunctionData)({
         abi: ORGANIZATION_IMPL_ABI,
         functionName: ORG_FUNCTION,
         args

package/dist/index.mjs

@@ -2933,9 +2933,18 @@ function useCoinbaseMintAnymalNFT() {
 }
 
 // src/utils/coinbase/useCoinbaseCreateOrganizationWallet.ts
-import { useCallback as useCallback13 } from "react";
+import { useCallback as useCallback13, useMemo as useMemo2 } from "react";
+import { createPublicClient as createPublicClient2, decodeEventLog, http as http2 } from "viem";
+import { baseSepolia as baseSepolia2 } from "viem/chains";
 function useCoinbaseCreateOrganizationWallet() {
-  const { sendOperationFn, status } = useSendCoinbaseUserOperation();
+  const { sendOperationFn, data, status } = useSendCoinbaseUserOperation();
+  const publicClient = useMemo2(
+    () => createPublicClient2({
+      chain: baseSepolia2,
+      transport: http2()
+    }),
+    []
+  );
   return useCallback13(
     /**
      * Creates a new organization on-chain.
@@ -2945,26 +2954,73 @@ function useCoinbaseCreateOrganizationWallet() {
      * @param ownerAddress - The wallet address of the user who will be the default manager.
      * @param orgContractAddress - The contract address of the organization beacon.
      * @param evmAddress - The Coinbase smart account address of the admin.
-     * @returns A promise with success status, message, and status.
+     * @returns A promise with success status, message, and optional proxyAddress.
      */
     async (orgPid, orgName, ownerAddress, orgContractAddress, evmAddress) => {
       if (!orgPid || !orgName || !ownerAddress || !orgContractAddress || !evmAddress) {
         return {
           success: false,
           message: "Missing required parameters for organization creation.",
-          status: "error."
+          status: "error"
+        };
+      }
+      try {
+        const result = await sendOperationFn(
+          evmAddress,
+          orgContractAddress,
+          ORGANIZATION_BEACON_ABI,
+          "createOrganizationProxy",
+          [ownerAddress, orgName, orgPid]
+        );
+        if (!result.success) {
+          return { ...result, status: "error" };
+        }
+        let proxyAddress;
+        try {
+          const txHash = data?.receipts?.[0]?.transactionHash || data?.transactionHash;
+          if (txHash) {
+            const receipt = await publicClient.getTransactionReceipt({
+              hash: txHash
+            });
+            for (const log of receipt.logs) {
+              try {
+                const decoded = decodeEventLog({
+                  abi: ORGANIZATION_BEACON_ABI,
+                  data: log.data,
+                  topics: log.topics
+                });
+                if (decoded.eventName === "NewOrganizationCreated") {
+                  proxyAddress = decoded.args.proxyAddress;
+                  break;
+                }
+              } catch {
+              }
+            }
+          }
+        } catch (e) {
+          console.error("Failed to get transaction receipt:", e);
+        }
+        if (!proxyAddress) {
+          return {
+            ...result,
+            status
+          };
+        }
+        return {
+          ...result,
+          proxyAddress,
+          status
+        };
+      } catch (error) {
+        console.error("Org wallet creation error", error);
+        return {
+          success: false,
+          message: "Error",
+          status: "error"
         };
       }
-      const result = await sendOperationFn(
-        evmAddress,
-        orgContractAddress,
-        ORGANIZATION_BEACON_ABI,
-        "createOrganizationProxy",
-        [ownerAddress, orgName, orgPid]
-      );
-      return { ...result, status };
     },
-    [sendOperationFn, status]
+    [sendOperationFn, data, publicClient, status]
   );
 }
 
@@ -3480,7 +3536,7 @@ function useApproveKibbleToken() {
 
 // src/utils/organization/useCreateOrganizationBase.ts
 import { useCallback as useCallback19 } from "react";
-import { decodeEventLog, encodeFunctionData as encodeFunctionData5 } from "viem";
+import { decodeEventLog as decodeEventLog2, encodeFunctionData as encodeFunctionData5 } from "viem";
 function useCreateOrganizationBase() {
   return useCallback19(
     /**
@@ -3542,7 +3598,7 @@ function useCreateOrganizationBase() {
         let proxyAddress;
         for (const log of txReceipt.logs) {
           try {
-            const decoded = decodeEventLog({
+            const decoded = decodeEventLog2({
               abi: ORGANIZATION_BEACON_ABI,
               data: log.data,
               topics: log.topics

package/package.json

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