@zoralabs/protocol-sdk 0.7.4 → 0.7.5

package/dist/sparks/mints-queries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mints-queries.d.ts","sourceRoot":"","sources":["../../src/sparks/mints-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,eAAO,MAAM,oCAAoC,YAAa,OAAO;;;;;CAiBpE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,EAAE,EAAE,MAAM,CAAC;QACX,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,iBAAiB,EAAE,kBAAkB,EAAE,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uCAAuC,wBAC7B,kBAAkB,EAAE,qBACtB,MAAM;;;CAyC1B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,WAAW,wBACD,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,WAK3D,CAAC"}

package/dist/{mints/mints-contracts.d.ts → sparks/sparks-contracts.d.ts}

@@ -14,7 +14,8 @@ import { Account, Address, ContractFunctionRevertedError, Hex, PublicClient, Rea
  *
  * @returns The parameters for the `mintWithEth` function call, including the ABI, contract address, function name, arguments, value, and account.
  */
-export declare const mintWithEthParams: ({ quantity, recipient, chainId, pricePerMint, account, }: {
+export declare const mintWithEthParams: ({ tokenId, quantity, recipient, chainId, pricePerMint, account, }: {
+    tokenId: bigint;
     quantity: bigint;
     recipient?: Address;
     chainId: keyof typeof zoraMints1155Config.address;
@@ -1004,4 +1005,4 @@ export declare function decodeCallFailedError(error: ContractFunctionRevertedErr
     errorName: "UnknownUserAction";
 };
 export {};
-//# sourceMappingURL=mints-contracts.d.ts.map
+//# sourceMappingURL=sparks-contracts.d.ts.map

package/dist/sparks/sparks-contracts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sparks-contracts.d.ts","sourceRoot":"","sources":["../../src/sparks/sparks-contracts.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "abitype": "^1.0.2",
-    "@zoralabs/protocol-deployments": "^0.2.1"
+    "@zoralabs/protocol-deployments": "^0.2.2"
   },
   "peerDependencies": {
     "viem": "^2.13.2"

package/src/index.ts

@@ -14,11 +14,9 @@ export * from "./mint/mint-client";
 
 export * from "./create/1155-create-helper";
 
-export * from "./mints/mints-queries";
+export * from "./sparks/mints-queries";
 
-export * from "./mints/mints-contracts";
-
-export * from "./mints/mints-eth-unwrapper-and-caller";
+export * from "./sparks/sparks-contracts";
 
 export {
   type ContractCreationConfigWithOptionalAdditionalAdmins,

package/src/premint/preminter.test.ts

@@ -172,7 +172,7 @@ async function setupContracts({
 
 const zoraSepoliaAnvilTest = makeAnvilTest({
   forkUrl: forkUrls.zoraSepolia,
-  forkBlockNumber: 9467979,
+  forkBlockNumber: 11974559,
   anvilChainId: zoraSepolia.id,
 });
 

package/src/{mints/mints-contracts.test.ts → sparks/sparks-contracts-test.ts}

@@ -13,6 +13,9 @@ import {
   zoraMintsManagerImplAddress,
   PremintMintArguments,
   premintTypedDataDefinition,
+  zoraSparks1155Address,
+  zoraSparks1155ABI,
+  zoraSparksManagerImplABI,
 } from "@zoralabs/protocol-deployments";
 import {
   Address,
@@ -29,7 +32,7 @@ import {
   CollectMintArguments,
   decodeCallFailedError,
   makePermitToCollectPremintOrNonPremint,
-} from "./mints-contracts";
+} from "./sparks-contracts";
 import { getPremintCollectionAddress } from "src/premint/preminter";
 import { PremintConfigVersion } from "src/premint/contract-types";
 import { zora } from "viem/chains";
@@ -40,11 +43,11 @@ import {
 } from "src/test-utils";
 import { PublicClient } from "src/utils";
 
-const mintsMainnetDeployedBlock = 15372992;
+const sparksMainnetDeployedBlock = 17655716;
 
 const anvilTest = makeAnvilTest({
   forkUrl: forkUrls.zoraMainnet,
-  forkBlockNumber: mintsMainnetDeployedBlock,
+  forkBlockNumber: sparksMainnetDeployedBlock,
   anvilChainId: zora.id,
 });
 
@@ -74,7 +77,7 @@ const setupContractUsingPremint = async ({
     contractAdmin: creatorAccount!,
   });
 
-  contractConfig.contractName = "Testing contract for MINTS";
+  contractConfig.contractName = "Testing contract for SPARKS";
 
   const contractAddress = await getPremintCollectionAddress({
     contract: contractConfig,
@@ -100,27 +103,26 @@ const setupContractUsingPremint = async ({
   };
 };
 
-export const collectMINTsWithEth = async ({
+const tokenId = 1n;
+
+export const collectSPARKsWithEth = async ({
+  pricePerMint,
   publicClient,
   walletClient,
   chainId,
   collectorAccount,
   quantityToMint,
 }: {
+  pricePerMint: bigint;
   publicClient: PublicClient;
   chainId: keyof typeof zoraMintsManagerImplAddress;
   collectorAccount: Address;
   quantityToMint: bigint;
   walletClient: WalletClient;
 }) => {
-  const pricePerMint = await publicClient.readContract({
-    abi: zoraMintsManagerImplABI,
-    address: zoraMintsManagerImplAddress[chainId],
-    functionName: "getEthPrice",
-  });
-
   const { request } = await publicClient.simulateContract(
     mintWithEthParams({
+      tokenId,
       chainId: chainId,
       quantity: quantityToMint,
       recipient: collectorAccount!,
@@ -130,18 +132,13 @@ export const collectMINTsWithEth = async ({
   );
 
   await waitForSuccess(await walletClient.writeContract(request), publicClient);
-  const mintsTokenId = await publicClient.readContract({
-    abi: zoraMintsManagerImplABI,
-    address: zoraMintsManagerImplAddress[chainId],
-    functionName: "mintableEthToken",
-  });
 
-  return mintsTokenId;
+  return tokenId;
 };
 
-describe("MINTs collecting and redeeming.", () => {
+describe("SPARKs collecting and redeeming.", () => {
   anvilTest(
-    "can collect MINTs with ETH",
+    "can collect SPARKs with ETH",
     async ({
       viemClients: { testClient, walletClient, publicClient, chain },
     }) => {
@@ -153,17 +150,19 @@ describe("MINTs collecting and redeeming.", () => {
         value: parseEther("10"),
       });
 
-      const chainId = chain.id as keyof typeof zoraMintsManagerImplAddress;
+      const chainId = chain.id as keyof typeof zoraSparks1155Address;
 
       const pricePerMint = await publicClient.readContract({
-        abi: zoraMintsManagerImplABI,
-        address: zoraMintsManagerImplAddress[chainId],
-        functionName: "getEthPrice",
+        abi: zoraSparks1155ABI,
+        address: zoraSparks1155Address[chainId],
+        functionName: "tokenPrice",
+        args: [tokenId],
       });
 
       const simulated = await publicClient.simulateContract(
         mintWithEthParams({
           chainId: chainId,
+          tokenId,
           quantity: initialMintsQuantityToMint,
           pricePerMint,
           account: collectorAccount!,
@@ -176,19 +175,19 @@ describe("MINTs collecting and redeeming.", () => {
       );
 
       // check that the balance is correct
-      const totalMintsBalance = await publicClient.readContract(
-        mintsBalanceOfAccountParams({
-          account: collectorAccount!,
-          chainId: chainId,
-        }),
-      );
+      const totalSparksBalance = await publicClient.readContract({
+        abi: zoraSparks1155ABI,
+        address: zoraSparks1155Address[chainId],
+        functionName: "balanceOfAccount",
+        args: [collectorAccount!],
+      });
 
-      expect(totalMintsBalance).toEqual(initialMintsQuantityToMint);
+      expect(totalSparksBalance).toEqual(initialMintsQuantityToMint);
     },
     20_000,
   );
-  anvilTest(
-    "can use MINTs to collect premint and non-premint",
+  anvilTest.skip(
+    "can use SPARKs to collect premint and non-premint",
     async ({
       viemClients: { walletClient, publicClient, testClient, chain },
     }) => {
@@ -216,21 +215,29 @@ describe("MINTs collecting and redeeming.", () => {
         value: parseEther("10"),
       });
 
-      const initialMINTsBalance = await publicClient.readContract(
+      const initialSPARKsBalance = await publicClient.readContract(
         mintsBalanceOfAccountParams({
           account: collectorAccount!,
           chainId: chainId,
         }),
       );
 
-      // 2. Collect some MINTs
+      const tokenPrice = await publicClient.readContract({
+        abi: zoraSparks1155ABI,
+        address: zoraSparks1155Address[chainId],
+        functionName: "tokenPrice",
+        args: [tokenId],
+      });
+
+      // 2. Collect some SPARKs
       const initialMintsQuantityToMint = 20n;
 
-      const mintsTokenId = await collectMINTsWithEth({
-        publicClient,
-        walletClient,
+      await collectSPARKsWithEth({
         chainId,
         collectorAccount: collectorAccount!,
+        pricePerMint: tokenPrice,
+        publicClient,
+        walletClient,
         quantityToMint: initialMintsQuantityToMint,
       });
 
@@ -241,9 +248,9 @@ describe("MINTs collecting and redeeming.", () => {
             chainId: chainId,
           }),
         ),
-      ).toEqual(initialMINTsBalance + initialMintsQuantityToMint);
+      ).toEqual(initialSPARKsBalance + initialMintsQuantityToMint);
 
-      // 3. Use MINTS to collect the premint
+      // 3. Use SPARKS to collect the premint
       const mintArguments: PremintMintArguments = {
         mintComment: "Hi!",
         mintRecipient: collectorAccount!,
@@ -252,11 +259,11 @@ describe("MINTs collecting and redeeming.", () => {
 
       const firstQuantityToCollect = 4n;
 
-      // 4. Collect Premint using MINT
+      // 4. Collect Premint using SPARK
 
       const collectPremintSimulated = await publicClient.simulateContract(
         collectPremintV2WithMintsParams({
-          tokenIds: [mintsTokenId],
+          tokenIds: [sparksTokenId],
           quantities: [firstQuantityToCollect],
           chainId: chainId,
           contractCreationConfig: contractConfig,
@@ -276,12 +283,12 @@ describe("MINTs collecting and redeeming.", () => {
         abi: zoraCreator1155ImplABI,
         address: contractAddress,
         functionName: "balanceOf",
-        args: [collectorAccount!, mintsTokenId],
+        args: [collectorAccount!, sparksTokenId],
       });
 
       expect(erc1155Balance).toBe(firstQuantityToCollect);
 
-      // 4. Use MINTs to collect from the created contract non-premint.
+      // 4. Use SPARKs to collect from the created contract non-premint.
       const secondQuantityToCollect = 3n;
 
       const collectMintArguments: CollectMintArguments = {
@@ -294,7 +301,7 @@ describe("MINTs collecting and redeeming.", () => {
 
       const collectSimulated = await publicClient.simulateContract(
         collectWithMintsParams({
-          tokenIds: [mintsTokenId],
+          tokenIds: [sparksTokenId],
           quantities: [secondQuantityToCollect],
           account: collectorAccount!,
           chainId: chainId,
@@ -314,7 +321,7 @@ describe("MINTs collecting and redeeming.", () => {
         abi: zoraCreator1155ImplABI,
         address: contractAddress,
         functionName: "balanceOf",
-        args: [collectorAccount!, mintsTokenId],
+        args: [collectorAccount!, sparksTokenId],
       });
 
       expect(erc1155BalanceAfter).toBe(
@@ -329,14 +336,14 @@ describe("MINTs collecting and redeeming.", () => {
       );
 
       expect(totalMintsBalance).toBe(
-        initialMINTsBalance +
+        initialSPARKsBalance +
           initialMintsQuantityToMint -
           (firstQuantityToCollect + secondQuantityToCollect),
       );
     },
     20_000,
   );
-  anvilTest(
+  anvilTest.skip(
     "can decode errors from transferBatchToManagerAndCall",
     async ({
       viemClients: { walletClient, publicClient, testClient, chain },
@@ -361,8 +368,8 @@ describe("MINTs collecting and redeeming.", () => {
         value: parseEther("10"),
       });
 
-      // 2. Collect some MINTs
-      const mintsTokenId = await collectMINTsWithEth({
+      // 2. Collect some SPARKs
+      const mintsTokenId = await collectSPARKsWithEth({
         publicClient,
         walletClient,
         chainId,
@@ -370,7 +377,7 @@ describe("MINTs collecting and redeeming.", () => {
         quantityToMint: 10n,
       });
 
-      // 3. Use MINTS to collect the premint
+      // 3. Use SPARKS to collect the premint
       const mintArguments: PremintMintArguments = {
         mintComment: "",
         mintRecipient: collectorAccount!,
@@ -415,8 +422,8 @@ describe("MINTs collecting and redeeming.", () => {
     },
     20_000,
   );
-  anvilTest(
-    "can use MINTs to gaslessly collect premint",
+  anvilTest.skip(
+    "can use SPARKs to gaslessly collect premint",
     async ({
       viemClients: { walletClient, publicClient, testClient, chain },
     }) => {
@@ -442,10 +449,10 @@ describe("MINTs collecting and redeeming.", () => {
         value: parseEther("10"),
       });
 
-      // 2. Collect some MINTs
+      // 2. Collect some SPARKs
       const initialMintsQuantityToMint = 20n;
 
-      const mintsTokenId = await collectMINTsWithEth({
+      const mintsTokenId = await collectSPARKsWithEth({
         publicClient,
         walletClient,
         chainId,
@@ -460,14 +467,14 @@ describe("MINTs collecting and redeeming.", () => {
         }),
       );
 
-      // 3. Use MINTS to collect the premint
+      // 3. Use SPARKS to collect the premint
       const mintArguments: PremintMintArguments = {
         mintComment: "Hi!",
         mintRecipient: collectorAccount!,
         mintRewardsRecipients: [],
       };
 
-      // 4. Collect Premint using MINT
+      // 4. Collect Premint using SPARK
 
       // now sign a message to collect.
       // get random integer:
@@ -486,7 +493,7 @@ describe("MINTs collecting and redeeming.", () => {
         chainId,
         deadline,
         tokenIds: [mintsTokenId],
-        // this quantity of MINTs will be used to collect premint
+        // this quantity of SPARKs will be used to collect premint
         // and will be burned.  This same quantity is the quantity of
         // premint to collect.
         quantities: [premintQuantityToCollect],

package/src/{mints/mints-contracts.ts → sparks/sparks-contracts.ts}

@@ -5,6 +5,8 @@ import {
   zoraMintsManagerImplABI,
   zoraMintsManagerImplAddress,
   zoraMintsManagerImplConfig,
+  zoraSparksManagerImplABI,
+  zoraSparksManagerImplAddress,
 } from "@zoralabs/protocol-deployments";
 import { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from "abitype";
 import {
@@ -41,12 +43,14 @@ const addressOrAccountAddress = (address: Address | Account) =>
  * @returns The parameters for the `mintWithEth` function call, including the ABI, contract address, function name, arguments, value, and account.
  */
 export const mintWithEthParams = ({
+  tokenId,
   quantity,
   recipient,
   chainId,
   pricePerMint,
   account,
 }: {
+  tokenId: bigint;
   quantity: bigint;
   recipient?: Address;
   chainId: keyof typeof zoraMints1155Config.address;
@@ -54,10 +58,10 @@ export const mintWithEthParams = ({
   account: Address | Account;
 }) =>
   makeContractParameters({
-    abi: zoraMintsManagerImplConfig.abi,
-    address: zoraMintsManagerImplConfig.address[chainId],
+    abi: zoraSparksManagerImplABI,
+    address: zoraSparksManagerImplAddress[chainId],
     functionName: "mintWithEth",
-    args: [quantity, recipient || addressOrAccountAddress(account)],
+    args: [tokenId, quantity, recipient || addressOrAccountAddress(account)],
     value: pricePerMint * quantity,
     account,
   });

package/src/sparks/sparks-sponsored-sparks-spender.test.ts

@@ -0,0 +1,183 @@
+import { encodeFunctionData, parseEther } from "viem";
+import { zora, base } from "viem/chains";
+import { describe, expect } from "vitest";
+import { forkUrls, makeAnvilTest } from "src/anvil";
+import {
+  iSponsoredSparksSpenderActionABI,
+  sponsoredSparksSpenderABI,
+  zoraSparks1155Address,
+  zoraSparksManagerImplAddress,
+} from "@zoralabs/protocol-deployments";
+import {
+  sponsoredSparksSpenderAddress,
+  sponsoredSparksBatchTypedDataDefinition,
+  SponsoredSparksBatch,
+} from "@zoralabs/protocol-deployments";
+import { zoraSparks1155ABI } from "@zoralabs/protocol-deployments";
+import { zoraSparksManagerImplABI } from "@zoralabs/protocol-deployments";
+
+const anvilTest = makeAnvilTest({
+  forkUrl: forkUrls.zoraMainnet,
+  anvilChainId: zora.id,
+  forkBlockNumber: 17667435,
+});
+describe("Sponsored Mints Spender with Relay", () => {
+  anvilTest(
+    "can sponsor a mint and relay the mint to another chain",
+    async ({
+      viemClients: { testClient, walletClient, publicClient, chain },
+    }) => {
+      const tokenIds: bigint[] = [1n];
+      const quantityToMint = 10_000n;
+      const quantitiesToUnwrap: bigint[] = [5_000n];
+
+      const tokenPrice = await publicClient.readContract({
+        abi: zoraSparks1155ABI,
+        address: zoraSparks1155Address[zora.id],
+        functionName: "tokenPrice",
+        args: [1n],
+      });
+
+      const collector = (await walletClient.getAddresses())[1]!;
+
+      await testClient.setBalance({
+        address: collector,
+        value: parseEther("10"),
+      });
+
+      const { request } = await publicClient.simulateContract({
+        abi: zoraSparksManagerImplABI,
+        address: zoraSparksManagerImplAddress[zora.id],
+        chain,
+        account: collector,
+        functionName: "mintWithEth",
+        args: [1n, quantityToMint, collector],
+        value: tokenPrice * quantityToMint,
+      });
+
+      const mintHash = await walletClient.writeContract(request);
+
+      expect(
+        (
+          await publicClient.waitForTransactionReceipt({
+            hash: mintHash,
+          })
+        ).status,
+      ).toBe("success");
+
+      const redeemAmount = quantitiesToUnwrap[0]! * tokenPrice;
+
+      // @ts-ignore
+      const response = await fetch("https://api.relay.link/execute/bridge", {
+        method: "POST",
+        body: JSON.stringify({
+          user: sponsoredSparksSpenderAddress[zora.id],
+          recipient: collector,
+          originChainId: zora.id,
+          destinationChainId: base.id,
+          currency: "eth",
+          amount: Number(redeemAmount),
+        }),
+        headers: {
+          accept: "application/json",
+          "content-type": "application/json",
+        },
+      });
+      const jsonResponse = await response.json();
+
+      const transactionStep = jsonResponse.steps.find(
+        (step: any) => step.kind === "transaction",
+      );
+      const transactionItem = transactionStep.items[0];
+
+      const verifier = (await walletClient.getAddresses())[0]!;
+
+      const sponsoredCallData: SponsoredSparksBatch = {
+        verifier: verifier,
+        from: collector,
+        destination: transactionItem.data.to,
+        data: transactionItem.data.data,
+        totalAmount: transactionItem.data.value,
+        expectedRedeemAmount: redeemAmount,
+        ids: tokenIds,
+        quantities: quantitiesToUnwrap,
+        nonce: BigInt(Math.floor(Math.random() * 1000000)),
+        deadline: BigInt(Math.floor(new Date().getTime() / 1000 + 60)),
+      } as const;
+
+      const typedData = sponsoredSparksBatchTypedDataDefinition({
+        chainId: zora.id,
+        message: sponsoredCallData,
+      });
+
+      const owner = await publicClient.readContract({
+        abi: sponsoredSparksSpenderABI,
+        address: sponsoredSparksSpenderAddress[zora.id],
+        functionName: "owner",
+      });
+
+      await testClient.impersonateAccount({
+        address: owner,
+      });
+
+      await testClient.setBalance({
+        address: owner,
+        value: parseEther("10"),
+      });
+
+      const { request: request2 } = await publicClient.simulateContract({
+        abi: sponsoredSparksSpenderABI,
+        address: sponsoredSparksSpenderAddress[zora.id],
+        chain,
+        account: owner,
+        functionName: "setVerifierStatus",
+        args: [verifier, true],
+      });
+
+      const hash = await walletClient.writeContract(request2);
+
+      const receipt = await publicClient.waitForTransactionReceipt({
+        hash,
+      });
+
+      expect(receipt.status).toBe("success");
+
+      const signature = await walletClient.signTypedData({
+        ...typedData,
+        account: verifier,
+      });
+
+      const receiveSignatureFunction = encodeFunctionData({
+        abi: iSponsoredSparksSpenderActionABI,
+        functionName: "sponsoredMintBatch",
+        args: [sponsoredCallData, signature],
+      });
+
+      // send user op with safeBatchTransferFrom
+      // transferring to the SponsoredMintsSender with calldata to unwrap and spend addt'l ETH to relay
+      const writeResponse = await publicClient.simulateContract({
+        address: zoraSparks1155Address[zora.id],
+        abi: [...zoraSparks1155ABI, ...sponsoredSparksSpenderABI],
+        functionName: "safeBatchTransferFrom",
+        args: [
+          collector,
+          sponsoredSparksSpenderAddress[zora.id],
+          tokenIds,
+          quantitiesToUnwrap,
+          receiveSignatureFunction,
+        ],
+        account: collector,
+      });
+
+      const transferHash = await walletClient.writeContract(
+        writeResponse.request,
+      );
+
+      const transferReceipt = await publicClient.waitForTransactionReceipt({
+        hash: transferHash,
+      });
+
+      expect(transferReceipt.status).toBe("success");
+    },
+  );
+});

package/dist/mints/mints-contracts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mints-contracts.d.ts","sourceRoot":"","sources":["../../src/mints/mints-contracts.ts"],"names":[],"mappings":"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qBAAqB,CAAC,KAAK,EAAE,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUzE"}