chore(release): 1.0.14

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ss-2",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "author": "Q3 Labs",
   "license": "MIT",
   "private": true,

packages/nextjs/app/debug/_components/contract/utilsDisplay.tsx

@@ -47,6 +47,7 @@ export function getTopErrorMessage(state: FormErrorMessageState): string {
 const baseNumberType = new Set([
   "core::integer::u512",
   "core::integer::u256",
+  "core::zeroable::NonZero::<core::integer::u256>",
   "core::integer::u128",
   "core::integer::u64",
   "core::integer::u32",
@@ -67,6 +68,7 @@ const baseType = new Set([
   "core::felt252",
   "core::integer::u512",
   "core::integer::u256",
+  "core::zeroable::NonZero::<core::integer::u256>",
   "core::integer::u128",
   "core::integer::u64",
   "core::integer::u32",

packages/nextjs/components/scaffold-stark/Faucet.tsx

@@ -110,30 +110,34 @@ export const Faucet = () => {
               ✕
             </label>
           </div>
-          <div className="flex flex-col gap-8">
-            <AddressInput
-              placeholder="Destination Address"
-              value={inputAddress ?? ""}
-              onChange={(value) => setInputAddress(value as AddressType)}
-            />
-            <StarkInput
-              placeholder="Amount to send"
-              value={sendValue}
-              onChange={(value) => setSendValue(value)}
-            />
+          <div className="flex flex-col gap-6">
+            <div className="flex flex-col gap-2">
+              <AddressInput
+                placeholder="Destination Address"
+                value={inputAddress ?? ""}
+                onChange={(value) => setInputAddress(value as AddressType)}
+              />
+            </div>
+            <div className="flex flex-col gap-2">
+              <StarkInput
+                placeholder="Amount to send"
+                value={sendValue}
+                onChange={(value) => setSendValue(value)}
+              />
+            </div>
+            <button
+              className="h-10 btn cursor-pointer btn-sm px-2 rounded-[4px] bg-btn-wallet border-[#4f4ab7] border hover:bg-[#385183]"
+              onClick={sendSTRK}
+              disabled={loading}
+            >
+              {!loading ? (
+                <BanknotesIcon className="h-6 w-6" />
+              ) : (
+                <span className="loading loading-spinner loading-sm"></span>
+              )}
+              <span>Send</span>
+            </button>
           </div>
-          <button
-            className="h-10 btn cursor-pointer btn-sm px-2 rounded-[4px] bg-btn-wallet border-[#4f4ab7] border hover:bg-[#385183]"
-            onClick={sendSTRK}
-            disabled={loading}
-          >
-            {!loading ? (
-              <BanknotesIcon className="h-6 w-6" />
-            ) : (
-              <span className="loading loading-spinner loading-sm"></span>
-            )}
-            <span>Send</span>
-          </button>
         </>
       </GenericModal>
     </div>

packages/nextjs/hooks/scaffold-stark/__tests__/useScaffoldEventHistory.test.ts

@@ -22,7 +22,7 @@ vi.mock("@starknet-react/core", () => ({
 
 describe("useScaffoldEventHistory", () => {
   const mockContractName = "YourContract";
-  const mockEventName = "contracts::YourContract::YourContract::EventParser";
+  const mockEventName = "EventParser";
   const mockTargetNetwork = {
     id: "testnet",
     rpcUrls: {

packages/nextjs/hooks/scaffold-stark/useScaffoldEventHistory.ts

@@ -75,6 +75,29 @@ export const useScaffoldEventHistory = <
     });
   }, [targetNetwork.rpcUrls.public.http]);
 
+  // Get back event full name
+  const matchingAbiEvents = useMemo(() => {
+    return (deployedContractData?.abi as Abi)?.filter(
+      (part) =>
+        part.type === "event" &&
+        part.name.split("::").slice(-1)[0] === (eventName as string),
+    ) as ExtractAbiEvent<ContractAbi<TContractName>, TEventName>[];
+  }, [deployedContractData, deployedContractLoading]);
+  // const matchingAbiEvents =
+
+  if (matchingAbiEvents?.length === 0) {
+    throw new Error(`Event ${eventName as string} not found in contract ABI`);
+  }
+
+  if (matchingAbiEvents?.length > 1) {
+    throw new Error(
+      `Ambiguous event "${eventName as string}". ABI contains ${matchingAbiEvents.length} events with that name`,
+    );
+  }
+
+  const eventAbi = matchingAbiEvents?.[0];
+  const fullName = eventAbi?.name;
+
   const readEvents = async (fromBlock?: bigint) => {
     if (!enabled) {
       setIsLoading(false);
@@ -92,7 +115,9 @@ export const useScaffoldEventHistory = <
       }
 
       const event = (deployedContractData.abi as Abi).find(
-        (part) => part.type === "event" && part.name === eventName,
+        (part) =>
+          part.type === "event" &&
+          part.name.split("::").slice(-1)[0] === eventName,
       ) as ExtractAbiEvent<ContractAbi<TContractName>, TEventName>;
 
       const blockNumber = (await publicClient.getBlockLatestAccepted())
@@ -102,9 +127,7 @@ export const useScaffoldEventHistory = <
         (fromBlock && blockNumber >= fromBlock) ||
         blockNumber >= fromBlockUpdated
       ) {
-        let keys: string[][] = [
-          [hash.getSelectorFromName(event.name.split("::").slice(-1)[0])],
-        ];
+        let keys: string[][] = [[hash.getSelectorFromName(eventName)]];
         if (filters) {
           keys = keys.concat(
             composeEventFilterKeys(filters, event, deployedContractData.abi),
@@ -217,7 +240,7 @@ export const useScaffoldEventHistory = <
           CallData.getAbiStruct(deployedContractData.abi),
           CallData.getAbiEnum(deployedContractData.abi),
         );
-        const args = parsed.length ? parsed[0][eventName] : {};
+        const args = parsed.length ? parsed[0][fullName] : {};
         const { event: rawEvent, ...rest } = event;
         return {
           type: rawEvent.members,

packages/nextjs/utils/scaffold-stark/contract.ts

@@ -360,6 +360,10 @@ export type EventFilters<
     }
 >;*/
 
+type BaseName<S extends string> = S extends `${infer _Prefix}::${infer Rest}`
+  ? BaseName<Rest>
+  : S;
+
 export type UseScaffoldEventHistoryConfig<
   TContractName extends ContractName,
   TEventName extends ExtractAbiEventNames<ContractAbi<TContractName>>,
@@ -368,7 +372,8 @@ export type UseScaffoldEventHistoryConfig<
   TReceiptData extends boolean = false,
 > = {
   contractName: TContractName;
-  eventName: IsContractDeclarationMissing<string, TEventName>;
+  eventName: // | IsContractDeclarationMissing<string, TEventName>
+  BaseName<IsContractDeclarationMissing<string, TEventName>>;
   fromBlock: bigint;
   filters?: { [key: string]: any };
   blockData?: TBlockData;

packages/nextjs/utils/scaffold-stark/types.ts

@@ -23,7 +23,8 @@ export const isCairoBigInt = (type: string): type is CairoBigInt =>
   /core::integer::(u|i)(64|128)$/.test(type);
 
 export const isCairoU256 = (type: string): type is CairoU256 =>
-  /core::integer::u256$/.test(type);
+  /core::integer::u256$/.test(type) ||
+  /core::zeroable::NonZero::<core::integer::u256>$/.test(type);
 
 export const isCairoContractAddress = (
   type: string,