@silvana-one/nft 0.2.11 → 1.0.0

package/dist/node/index.cjs

@@ -67,6 +67,7 @@ __export(index_exports, {
   NFT: () => NFT,
   NFTAddress: () => NFTAddress,
   NFTAdmin: () => NFTAdmin,
+  NFTAdminAllowFlags: () => NFTAdminAllowFlags,
   NFTAdvancedAdmin: () => NFTAdvancedAdmin,
   NFTAdvancedAdminContract: () => NFTAdvancedAdminContract,
   NFTData: () => NFTData,
@@ -83,6 +84,7 @@ __export(index_exports, {
   NFTState: () => NFTState,
   NFTStateStruct: () => NFTStateStruct,
   NFTTransactionContext: () => NFTTransactionContext,
+  NFTUpdateEvent: () => NFTUpdateEvent,
   NFTUpdateProof: () => NFTUpdateProof,
   NonFungibleTokenContractsFactory: () => NonFungibleTokenContractsFactory,
   Offer: () => Offer,
@@ -92,11 +94,17 @@ __export(index_exports, {
   PauseEvent: () => PauseEvent,
   PauseNFTEvent: () => PauseNFTEvent,
   SellEvent: () => SellEvent,
+  SetAdminEvent: () => SetAdminEvent,
+  SetBaseURLEvent: () => SetBaseURLEvent,
+  SetNameEvent: () => SetNameEvent,
+  SetRoyaltyFeeEvent: () => SetRoyaltyFeeEvent,
+  SetTransferFeeEvent: () => SetTransferFeeEvent,
   TEXT_TREE_HEIGHT: () => TEXT_TREE_HEIGHT,
   Text: () => Text,
+  TransferByProofParams: () => TransferByProofParams,
+  TransferBySignatureParams: () => TransferBySignatureParams,
   TransferEvent: () => TransferEvent,
   TransferExtendedParams: () => TransferExtendedParams,
-  TransferParams: () => TransferParams,
   UInt64Option: () => UInt64Option,
   Update: () => Update,
   UpdateEvent: () => UpdateEvent,
@@ -197,7 +205,10 @@ var NFTImmutableState = class _NFTImmutableState extends (0, import_o1js.Struct)
   /** The token ID associated with the NFT (readonly). */
   tokenId: import_o1js.Field,
   // readonly
-  /** The unique identifier of the NFT within the collection (readonly). */
+  /** The identifier of the NFT within the collection to be used off-chain(readonly).
+   * It can be set to any value chosen by the creator for the new NFTs
+   * and by default is set to 0. To uniquely identify the NFT, use the pair (NFT address, tokenId) or (collection address, NFT address)
+   */
   id: import_o1js.UInt64
   // readonly
 }) {
@@ -269,7 +280,7 @@ var NFTState = class _NFTState extends (0, import_o1js.Struct)({
   /** The off-chain storage information (e.g., IPFS hash). */
   storage: import_storage.Storage,
   /** The version number of the NFT state. */
-  version: import_o1js.UInt32,
+  version: import_o1js.UInt64,
   /** Indicates whether the NFT contract is currently paused. */
   isPaused: import_o1js.Bool,
   /** The hash of the verification key used for metadata proofs. */
@@ -301,6 +312,7 @@ var NFTState = class _NFTState extends (0, import_o1js.Struct)({
     a.metadataVerificationKeyHash.assertEquals(b.metadataVerificationKeyHash);
     a.creator.assertEquals(b.creator);
     NFTTransactionContext.assertEqual(a.context, b.context);
+    a.oracleAddress.assertEquals(b.oracleAddress);
   }
   /**
    * Creates a new NFTState from an NFTStateStruct and other parameters.
@@ -344,16 +356,24 @@ var NFTData = class _NFTData extends (0, import_o1js.Struct)({
   /** The approved address of the NFT. */
   approved: import_o1js.PublicKey,
   /** The version number of the NFT state. */
-  version: import_o1js.UInt32,
+  version: import_o1js.UInt64,
   /** The unique identifier of the NFT within the collection. */
   id: import_o1js.UInt64,
-  /** Determines whether the NFT's ownership can be changed via a zero-knowledge proof (readonly). */
+  /** Determines whether the NFT's ownership can be changed via a zero-knowledge proof (readonly).
+   *
+   * It can be used only with update() and updateWithOracle() methods and
+   * in this case overrides both canTransfer and canApprove flags used in the transfer methods
+   */
   canChangeOwnerByProof: import_o1js.Bool,
   // readonly
-  /** Specifies if the NFT's ownership can be transferred (readonly). */
+  /** Specifies if the NFT's ownership can be transferred (readonly). Applies
+   * to transfer methods and can be bypassed by the update() and updateWithOracle() methods
+   */
   canTransfer: import_o1js.Bool,
   // readonly
-  /** Specifies if the NFT's approved address can be changed (readonly). */
+  /** Specifies if the NFT's approved address can be changed (readonly). Transfer methods reset approved address to PublicKey.empty()
+   *  on transfer independently from the canApprove flag value
+   */
   canApprove: import_o1js.Bool,
   // readonly
   /** Indicates whether the NFT's metadata can be updated (readonly). */
@@ -387,7 +407,7 @@ var NFTData = class _NFTData extends (0, import_o1js.Struct)({
     return new _NFTData({
       owner: typeof owner === "string" ? import_o1js.PublicKey.fromBase58(owner) : owner,
       approved: approved ? typeof approved === "string" ? import_o1js.PublicKey.fromBase58(approved) : approved : import_o1js.PublicKey.empty(),
-      version: import_o1js.UInt32.from(version ?? 0),
+      version: import_o1js.UInt64.from(BigInt(version ?? 0)),
       id: import_o1js.UInt64.from(BigInt(id ?? 0)),
       canChangeOwnerByProof: (0, import_o1js.Bool)(canChangeOwnerByProof ?? false),
       canTransfer: (0, import_o1js.Bool)(canTransfer ?? true),
@@ -406,14 +426,10 @@ var NFTData = class _NFTData extends (0, import_o1js.Struct)({
    * @returns The packed Field representation of the NFTData.
    */
   pack() {
-    const id = this.id.value.toBits(64);
-    const version = this.version.value.toBits(32);
     return new NFTDataPacked({
       ownerX: this.owner.x,
       approvedX: this.approved.x,
       data: import_o1js.Field.fromBits([
-        ...id,
-        ...version,
         this.canChangeOwnerByProof,
         this.canTransfer,
         this.canApprove,
@@ -426,7 +442,7 @@ var NFTData = class _NFTData extends (0, import_o1js.Struct)({
         this.requireOwnerAuthorizationToUpgrade,
         this.owner.isOdd,
         this.approved.isOdd
-      ])
+      ]).add((0, import_o1js.Field)(this.id.value).mul((0, import_o1js.Field)(2 ** 12))).add((0, import_o1js.Field)(this.version.value).mul((0, import_o1js.Field)(2 ** (12 + 64))))
     });
   }
   /**
@@ -435,42 +451,52 @@ var NFTData = class _NFTData extends (0, import_o1js.Struct)({
    * @returns A new NFTData instance.
    */
   static unpack(packed) {
-    const bits = packed.data.toBits(64 + 32 + 12);
-    const id = import_o1js.UInt64.Unsafe.fromField(import_o1js.Field.fromBits(bits.slice(0, 64)));
-    const version = import_o1js.UInt32.Unsafe.fromField(import_o1js.Field.fromBits(bits.slice(64, 64 + 32)));
-    const canChangeOwnerByProof = bits[64 + 32 + 0];
-    const canTransfer = bits[64 + 32 + 1];
-    const canApprove = bits[64 + 32 + 2];
-    const canChangeMetadata = bits[64 + 32 + 3];
-    const canChangeStorage = bits[64 + 32 + 4];
-    const canChangeName = bits[64 + 32 + 5];
-    const canChangeMetadataVerificationKeyHash = bits[64 + 32 + 6];
-    const canPause = bits[64 + 32 + 7];
-    const isPaused = bits[64 + 32 + 8];
-    const requireOwnerAuthorizationToUpgrade = bits[64 + 32 + 9];
-    const ownerIsOdd = bits[64 + 32 + 10];
-    const approvedIsOdd = bits[64 + 32 + 11];
-    const owner = import_o1js.PublicKey.from({ x: packed.ownerX, isOdd: ownerIsOdd });
-    const approved = import_o1js.PublicKey.from({
-      x: packed.approvedX,
-      isOdd: approvedIsOdd
-    });
-    return new _NFTData({
-      owner,
-      approved,
-      id,
-      version,
-      canChangeOwnerByProof,
-      canTransfer,
-      canApprove,
-      canChangeMetadata,
-      canChangeStorage,
-      canChangeName,
-      canChangeMetadataVerificationKeyHash,
-      canPause,
-      isPaused,
-      requireOwnerAuthorizationToUpgrade
+    const unpacked = import_o1js.Provable.witness(_NFTData, () => {
+      const bits = import_o1js.Gadgets.and(packed.data, (0, import_o1js.Field)(0xfffn), 12 + 64 + 64).toBits(12);
+      const idField = import_o1js.Gadgets.and(packed.data, (0, import_o1js.Field)(0xffffffffffffffff000n), 12 + 64 + 64);
+      const idBits = idField.toBits(64 + 12);
+      const id = import_o1js.UInt64.Unsafe.fromField(import_o1js.Field.fromBits(idBits.slice(12, 64 + 12)));
+      id.value.mul((0, import_o1js.Field)(2 ** 12)).assertEquals(idField);
+      const versionField = import_o1js.Gadgets.and(packed.data, (0, import_o1js.Field)(0xffffffffffffffff0000000000000000000n), 64 + 64 + 12);
+      const versionBits = versionField.toBits(12 + 64 + 64);
+      const version = import_o1js.UInt64.Unsafe.fromField(import_o1js.Field.fromBits(versionBits.slice(12 + 64, 12 + 64 + 64)));
+      version.value.mul((0, import_o1js.Field)(2 ** (12 + 64))).assertEquals(versionField);
+      const canChangeOwnerByProof = bits[0];
+      const canTransfer = bits[1];
+      const canApprove = bits[2];
+      const canChangeMetadata = bits[3];
+      const canChangeStorage = bits[4];
+      const canChangeName = bits[5];
+      const canChangeMetadataVerificationKeyHash = bits[6];
+      const canPause = bits[7];
+      const isPaused = bits[8];
+      const requireOwnerAuthorizationToUpgrade = bits[9];
+      const ownerIsOdd = bits[10];
+      const approvedIsOdd = bits[11];
+      const owner = import_o1js.PublicKey.from({ x: packed.ownerX, isOdd: ownerIsOdd });
+      const approved = import_o1js.PublicKey.from({
+        x: packed.approvedX,
+        isOdd: approvedIsOdd
+      });
+      return new _NFTData({
+        owner,
+        approved,
+        id,
+        version,
+        canChangeOwnerByProof,
+        canTransfer,
+        canApprove,
+        canChangeMetadata,
+        canChangeStorage,
+        canChangeName,
+        canChangeMetadataVerificationKeyHash,
+        canPause,
+        isPaused,
+        requireOwnerAuthorizationToUpgrade
+      });
     });
+    NFTDataPacked.assertEqual(unpacked.pack(), packed);
+    return unpacked;
   }
 };
 var MAX_ROYALTY_FEE = 1e5;
@@ -485,7 +511,9 @@ var CollectionData = class _CollectionData extends (0, import_o1js.Struct)({
   /** If true, the minting is stopped and cannot be resumed. */
   mintingIsLimited: import_o1js.Bool,
   /** Indicates whether the collection is currently paused. */
-  isPaused: import_o1js.Bool
+  isPaused: import_o1js.Bool,
+  /** The public key part (isOdd) of the pending creator. The x field is written to the contract state as pendingCreatorX */
+  pendingCreatorIsOdd: import_o1js.Bool
 }) {
   /**
    * Creates a new CollectionData instance with specified parameters.
@@ -499,7 +527,8 @@ var CollectionData = class _CollectionData extends (0, import_o1js.Struct)({
       transferFee: import_o1js.UInt64.from(BigInt(transferFee ?? 0)),
       requireTransferApproval: (0, import_o1js.Bool)(requireTransferApproval ?? false),
       mintingIsLimited: (0, import_o1js.Bool)(mintingIsLimited ?? false),
-      isPaused: (0, import_o1js.Bool)(isPaused ?? false)
+      isPaused: (0, import_o1js.Bool)(isPaused ?? false),
+      pendingCreatorIsOdd: (0, import_o1js.Bool)(import_o1js.PublicKey.empty().isOdd)
     });
   }
   /**
@@ -511,9 +540,8 @@ var CollectionData = class _CollectionData extends (0, import_o1js.Struct)({
       this.isPaused,
       this.requireTransferApproval,
       this.mintingIsLimited,
-      ...this.royaltyFee.value.toBits(32),
-      ...this.transferFee.value.toBits(64)
-    ]);
+      this.pendingCreatorIsOdd
+    ]).add((0, import_o1js.Field)(this.royaltyFee.value).mul((0, import_o1js.Field)(2 ** 4))).add((0, import_o1js.Field)(this.transferFee.value).mul((0, import_o1js.Field)(2 ** (4 + 32))));
   }
   /**
    * Unpacks a CollectionDataPacked instance into a CollectionData instance.
@@ -521,28 +549,33 @@ var CollectionData = class _CollectionData extends (0, import_o1js.Struct)({
    * @returns A new CollectionData instance.
    */
   static unpack(packed) {
-    const bits = packed.toBits(3 + 32 + 64);
-    const royaltyFee = import_o1js.UInt32.Unsafe.fromField(import_o1js.Field.fromBits(bits.slice(3, 3 + 32)));
-    const transferFee = import_o1js.UInt64.Unsafe.fromField(import_o1js.Field.fromBits(bits.slice(3 + 32, 3 + 32 + 64)));
-    return new _CollectionData({
-      isPaused: bits[0],
-      requireTransferApproval: bits[1],
-      mintingIsLimited: bits[2],
-      royaltyFee,
-      transferFee
+    const unpacked = import_o1js.Provable.witness(_CollectionData, () => {
+      const bits = import_o1js.Gadgets.and(packed, (0, import_o1js.Field)(0xfn), 4 + 32 + 64).toBits(4);
+      const royaltyFeeField = import_o1js.Gadgets.and(packed, (0, import_o1js.Field)(0xffffffff0n), 4 + 32 + 64);
+      const royaltyFeeBits = royaltyFeeField.toBits(4 + 32);
+      const royaltyFee = import_o1js.UInt32.Unsafe.fromField(import_o1js.Field.fromBits(royaltyFeeBits.slice(4, 4 + 32)));
+      royaltyFee.value.mul((0, import_o1js.Field)(2 ** 4)).assertEquals(royaltyFeeField);
+      const transferFeeField = import_o1js.Gadgets.and(packed, (0, import_o1js.Field)(0xffffffffffffffff000000000n), 4 + 32 + 64);
+      const transferFeeBits = transferFeeField.toBits(4 + 32 + 64);
+      const transferFee = import_o1js.UInt64.Unsafe.fromField(import_o1js.Field.fromBits(transferFeeBits.slice(4 + 32, 4 + 32 + 64)));
+      transferFee.value.mul((0, import_o1js.Field)(2 ** (4 + 32))).assertEquals(transferFeeField);
+      return new _CollectionData({
+        isPaused: bits[0],
+        requireTransferApproval: bits[1],
+        mintingIsLimited: bits[2],
+        pendingCreatorIsOdd: bits[3],
+        royaltyFee,
+        transferFee
+      });
     });
+    unpacked.pack().assertEquals(packed);
+    return unpacked;
   }
   static isPaused(packed) {
-    return packed.toBits(3 + 32 + 64)[0];
+    return packed.toBits(4 + 32 + 64)[0];
   }
   static requireTransferApproval(packed) {
-    return packed.toBits(3 + 32 + 64)[1];
-  }
-  static mintingIsLimited(packed) {
-    const bits = packed.toBits(3 + 32 + 64);
-    const isPaused = bits[0];
-    const mintingIsLimited = bits[2];
-    return isPaused.or(mintingIsLimited);
+    return packed.toBits(4 + 32 + 64)[1];
   }
 };
 var MintParams = class extends (0, import_o1js.Struct)({
@@ -579,7 +612,18 @@ var MintRequest = class extends (0, import_o1js.Struct)({
   // should be interpreted by the admin contract
 }) {
 };
-var TransferParams = class extends (0, import_o1js.Struct)({
+var TransferBySignatureParams = class extends (0, import_o1js.Struct)({
+  /** The address of the NFT contract. */
+  address: import_o1js.PublicKey,
+  /** The receiver's public key. */
+  to: import_o1js.PublicKey,
+  /** Optional price for the transfer. */
+  price: UInt64Option,
+  /** Custom value that can be interpreted by the owner or approved contract. */
+  context: NFTTransactionContext
+}) {
+};
+var TransferByProofParams = class extends (0, import_o1js.Struct)({
   /** The address of the NFT contract. */
   address: import_o1js.PublicKey,
   /** The sender's public key. */
@@ -633,7 +677,15 @@ var MintEvent = class extends (0, import_o1js3.Struct)({
   /** The initial state of the NFT at the time of minting. */
   initialState: NFTStateStruct,
   /** The public key address of the minted NFT. */
-  address: import_o1js3.PublicKey
+  address: import_o1js3.PublicKey,
+  /** The token ID of the minted NFT. */
+  tokenId: import_o1js3.Field,
+  /** The fee paid for the minting.
+   *  This fee is controlled by the admin contract
+   *  and is not checked by the Collection contract
+   *  Please check the admin contract code before using this fee
+   */
+  fee: import_o1js3.UInt64
 }) {
 };
 var UpdateEvent = class extends (0, import_o1js3.Struct)({
@@ -648,7 +700,7 @@ var UpdateEvent = class extends (0, import_o1js3.Struct)({
   /** The approved address of the NFT after the update. */
   approved: import_o1js3.PublicKey,
   /** The version number of the NFT state. */
-  version: import_o1js3.UInt32,
+  version: import_o1js3.UInt64,
   /** Indicates whether the NFT is paused after the update. */
   isPaused: import_o1js3.Bool,
   /** The hash of the verification key used for metadata proofs. */
@@ -693,7 +745,7 @@ var UpgradeVerificationKeyEvent = class extends (0, import_o1js3.Struct)({
   verificationKeyHash: import_o1js3.Field,
   /** The public key address of the NFT whose verification key is upgraded. */
   address: import_o1js3.PublicKey,
-  /** The version number of the NFT state after the upgrade. */
+  /** The tokenId of the upgraded contract */
   tokenId: import_o1js3.Field
 }) {
 };
@@ -709,6 +761,36 @@ var LimitMintingEvent = class extends (0, import_o1js3.Struct)({
   mintingLimited: import_o1js3.Bool
 }) {
 };
+var NFTUpdateEvent = class extends (0, import_o1js3.Struct)({
+  /** The public key address of the NFT. */
+  address: import_o1js3.PublicKey
+}) {
+};
+var SetNameEvent = class extends (0, import_o1js3.Struct)({
+  /** The updated name of the Collection. */
+  name: import_o1js3.Field
+}) {
+};
+var SetBaseURLEvent = class extends (0, import_o1js3.Struct)({
+  /** The updated base URL of the Collection. */
+  baseURL: import_o1js3.Field
+}) {
+};
+var SetRoyaltyFeeEvent = class extends (0, import_o1js3.Struct)({
+  /** The updated royalty fee of the Collection. */
+  royaltyFee: import_o1js3.UInt32
+}) {
+};
+var SetTransferFeeEvent = class extends (0, import_o1js3.Struct)({
+  /** The updated transfer fee of the Collection. */
+  transferFee: import_o1js3.UInt64
+}) {
+};
+var SetAdminEvent = class extends (0, import_o1js3.Struct)({
+  /** The updated admin contract of the Collection. */
+  admin: import_o1js3.PublicKey
+}) {
+};
 
 // dist/node/interfaces/pausable.js
 var import_o1js4 = require("o1js");
@@ -1429,6 +1511,7 @@ var import_storage4 = require("@silvana-one/storage");
 var NftErrors = {
   cannotChangeMetadataVerificationKeyHash: "Cannot change metadata verification key hash",
   cannotChangeOwner: "Cannot change owner",
+  cannotChangeApproval: "Cannot change approval",
   cannotChangeStorage: "Cannot change storage",
   cannotChangePauseState: "Cannot change pause state",
   noPermissionToPause: "No permission to pause",
@@ -1530,6 +1613,7 @@ var NFT = class extends import_o1js10.SmartContract {
     data.owner = output.owner;
     data.approved = output.approved;
     data.version = output.version;
+    data.isPaused = output.isPaused;
     this.packedData.set(data.pack());
     const event = new UpdateEvent({
       name: output.name,
@@ -1580,6 +1664,7 @@ var NFT = class extends import_o1js10.SmartContract {
   async approveAddress(approved) {
     const data = NFTData.unpack(this.packedData.getAndRequireEquals());
     data.isPaused.assertFalse(NftErrors.nftIsPaused);
+    data.canApprove.assertTrue(NftErrors.cannotChangeApproval);
     data.approved = approved;
     this.packedData.set(data.pack());
     this.emitEvent("approve", approved);
@@ -1720,38 +1805,40 @@ function mulDiv(params) {
     if (denominatorBigInt === 0n) {
       return { result: import_o1js11.Field.from(0n), remainder: import_o1js11.Field.from(0n) };
     }
-    const result = valueBigInt * multiplierBigInt / denominatorBigInt;
-    const remainder = valueBigInt * multiplierBigInt - result * denominatorBigInt;
-    return { result: import_o1js11.Field.from(result), remainder: import_o1js11.Field.from(remainder) };
+    const result2 = valueBigInt * multiplierBigInt / denominatorBigInt;
+    const remainder2 = valueBigInt * multiplierBigInt - result2 * denominatorBigInt;
+    return { result: import_o1js11.Field.from(result2), remainder: import_o1js11.Field.from(remainder2) };
   });
   import_o1js11.Gadgets.rangeCheck64(fields.result);
+  const result = import_o1js11.UInt64.Unsafe.fromField(fields.result);
   import_o1js11.Gadgets.rangeCheck64(fields.remainder);
-  fields.remainder.assertLessThan(denominator.value);
-  fields.result.mul(denominator.value).add(fields.remainder).assertEquals(value.value.mul(multiplier.value));
+  const remainder = import_o1js11.UInt64.Unsafe.fromField(fields.remainder);
+  remainder.assertLessThan(denominator);
+  result.value.mul(denominator.value).add(remainder.value).assertEquals(value.value.mul(multiplier.value));
   return {
-    result: import_o1js11.UInt64.Unsafe.fromField(fields.result),
-    remainder: import_o1js11.UInt64.Unsafe.fromField(fields.remainder)
+    result,
+    remainder
   };
 }
 
 // dist/node/vk.js
 var nftVerificationKeys = {
   devnet: {
-    o1js: "2.2.0",
+    o1js: "2.3.0",
     vk: {
       NFT: {
-        hash: "11840382732064931640435917684245815329181717734233274982467687213333743677377",
-        data: "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",
+        hash: "9783798445384315170525620826037823720996093317060506623212107011216804106668",
+        data: "AADUTaZ5kJK+C2TL7P/tc4MlgEq5zWOLFDtgDU/u9ry3Es1Ek79TcLqIWg8s6TJJcXzM0D/6xz1y8FQn2tGjjcspfNtNRAmG3FdldAatVpnkTwS6Otpm88gl7lOPX8bRJjhHfEtdvEsQ0OudcDzB5iCqu268zqkBvXrXT3xaNN+sIIqLTtxltMz4RS/2layxzL6mg1J+kkTsNIJsg6MufeMI6Xn5pAYOaWFqgo0N0WZsnF3EYcYq1LcDucyyFS2RqRninioewrlEDzjY8y6rmf9+GibQasJCE+mkbfB4wCOuFMiSrRIN/73BODz9siBxs/bU/p7xffJsOL8JvitK7ngRyG3PfGGdW22njv9MYxNhb/YhKnPA0qPTOQjxg1a/Pg8NyjB9RM7eypPJNLFaWFzNM4JRxjI7wGVVOfE0D7DUAL32SzQ1Jmr4mILqDhnDREu2ETq0Lb+c1cxPgb4x1nYbWcSgdAOtKJBvXHkWs7JlJdL1q9yiRrzYb1kPMPNGACnSB3N3Omm//FhxitOOM4yucxZyKpKst/otZu51/gGBDW5tIwKYpfl5ETSNvDFY+9rLUHv+LxSz+yq6cUFKExI6AE9HlD6HwaNGFN1JIKThwSeWYK495HcxDdPoYX2PeyYrCHOcjTAabDR/naVmK/1ujdzqbdn6Jznl1q9mQORtbjuavhgVmpC5Q7SrwYYPkqb/HBWsxMcdrB842bKWsszzPYQxR6cfCwjXzq9Txe7fh1bzOKY6WO7ysYpefFM+yY85IlYCzX1/97FEaPGF4lBMe2ONgwPMq3VJ6Yxzfnor4zPMyH1pW2dm2QmV0Ep2NYO7fVGPn83abwq34GMgZmriFh3M7XzlYX54q3CeG861Z+HPZHukv+oVlUyWtWGk4E4PNlm61kXaLF7ECDy2+s73Ris1HbVSbbCOMkAok4Ytwi0FGwrSFSvRbb7s5Mbnfg6zvkKYwbNMjff5OlJPUcK5GMaYp2Ii2+7t+j3Wx8wSwdqlat61zS/PuZtaxiT0DL8+CU8hCSExJSW6IrVBC1YQPo3nnNw0EyT0Gr7+ohwIxxyEjFSeILih3SZcR1A6aEZfieRbCLhAVP9PgIlJEKc9Kh+EpRqK17Vyq98iBsGM9riQLCa8SO2wsOnYS0zS8CIP6hwFKbTs7Ueq7fnmRsuHpuwI/BW7ilCHLoJ/D9fJ4h+DHeZijuM3U31QTU555rWwJ48EWT4y8Wmh84sEIrEUFDA9GS8I+Rgl5eE6QsQm09cJ2/FTzuIf2ps4+WcWf20huAyxrUOJxM1alZvTDTcAY9GPkPnFqQ46Uuch5x0k1Q1sxkgplNx2+uE6xGFUloYB5DKDdApgafJbVZ5YBrghBstiDkOVkOPTsRWM9BbJB5A4Ult8q4V+rNyRmqyyzOMhYEW2kj8yWr5CImCBZW0QPHzBXr/xZCcUH2VBZMKMqCly/9VkHR5LlMGgG5UlibSkoZvI2EOl1pFPW7F9dZ6JM18zW3VHNNM4W1drrTxbta0wX2Hp6lmtmOPOxjvYSrQiLBSFvouZ29tALODGK+21jErmEUoMJsRiRS6/cIkErD1tSO4qe86XPXYQ5niN34QsGWawOmVJIXoobD9vEvJHGpylpTg5i4HXBZu31nN/bezAQ0bp0k5k2iI4jo91gFoPItUXpBk2rLNZHMUhZOKT81yhJLnE5ihfrTQLgplzqRo7Dc7lQdohdyvzCi8Bxx/beoojY0ixWBVAw5bWK9/5KjImxG/2c38hBZ+2QYS/el2BEMe8mBUJqQ6bn/wVKngn6KsXEuIHf4Fs4JRA3xbWwP/9jrxFzYJ9pOW4ehETRBneHurW/1Myw/sOAebVzbhcEMVYeg2x4S2bgFHRteOBKgAkwfQFD/kvT+Cj6cYKcFgAQchhccMvUYC7IHdFFJ1vBRbWpWKwrXMrpXhP9R0/jhiIDG9iEYdRcW2Gc8SoxEMYa4Yp6VK1DaZ8X4YG1x6tVj/KLG+MoA7S9SoHhnNacyJJboJiczKR2kWcZswBrCughfCRlonVt+xj7zQeVyyaKql/9PHQKj49dpZYAeMtkq3k1P6Q/ivGrXXJ3y2ktO0usnVat5iQ7Q4Gi2Dvbpvm72q0bAeZDvlH4QTmFzJ0wApj1zXt1XK2z1nA9RSH7f6sI5JskSLQlnXfdUEW52vnOTGE4uZK2P4g5YlAiAVddmI0zGXoamMWlv9MaDFHKlcJtA9IZZZeC+cLzWhE177Y6VXumacpK7i70LwRR9ghnykqf5SuYTzlAVLaufgsR0LDwNStGwrF6JtPMsoD9DVNKrpQ+tNNUfYovOM1iwk2BXvz9BydiqZzFhmfIYXSkScpVvuThbsPxBZ1LqfCaX4f5Rz28GZILf0d9xPjsWFSCRk=",
         type: "nft"
       }
     }
   },
   mainnet: {
-    o1js: "2.2.0",
+    o1js: "2.3.0",
     vk: {
       NFT: {
-        hash: "11510318025893859422482952918693907155880273225165466507725691048640041393360",
-        data: "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",
+        hash: "22175359608429605539570936386638550990144108869927626059283446793366639887120",
+        data: "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",
         type: "nft"
       }
     }
@@ -1780,7 +1867,8 @@ var CollectionErrors = {
   adminContractAddressNotSet: "Admin contract address is not set",
   onlyOwnerCanUpgradeVerificationKey: "Only owner can upgrade verification key",
   invalidRoyaltyFee: "Royalty fee is too high, cannot be more than 100%",
-  invalidOracleAddress: "Oracle address is invalid"
+  invalidOracleAddress: "Oracle address is invalid",
+  pendingCreatorIsEmpty: "Pending creator address is empty"
 };
 function CollectionFactory(params) {
   const { adminContract, ownerContract, approvalContract, updateContract } = params;
@@ -1792,24 +1880,26 @@ function CollectionFactory(params) {
       this.admin = (0, import_o1js12.State)();
       this.baseURL = (0, import_o1js12.State)();
       this.packedData = (0, import_o1js12.State)();
+      this.pendingCreatorX = (0, import_o1js12.State)();
       this.events = {
         mint: MintEvent,
-        update: import_o1js12.PublicKey,
+        update: NFTUpdateEvent,
         transfer: TransferEvent,
         approve: ApproveEvent,
         upgradeNFTVerificationKey: UpgradeVerificationKeyEvent,
-        upgradeVerificationKey: import_o1js12.Field,
+        upgradeVerificationKey: UpgradeVerificationKeyEvent,
         limitMinting: LimitMintingEvent,
         pause: PauseEvent,
         resume: PauseEvent,
         pauseNFT: PauseNFTEvent,
         resumeNFT: PauseNFTEvent,
-        ownershipChange: OwnershipChangeEvent,
-        setName: import_o1js12.Field,
-        setBaseURL: import_o1js12.Field,
-        setRoyaltyFee: import_o1js12.UInt32,
-        setTransferFee: import_o1js12.UInt64,
-        setAdmin: import_o1js12.PublicKey
+        ownershipTransfer: OwnershipChangeEvent,
+        ownershipAccepted: OwnershipChangeEvent,
+        setName: SetNameEvent,
+        setBaseURL: SetBaseURLEvent,
+        setRoyaltyFee: SetRoyaltyFeeEvent,
+        setTransferFee: SetTransferFeeEvent,
+        setAdmin: SetAdminEvent
       };
     }
     /**
@@ -1826,6 +1916,7 @@ function CollectionFactory(params) {
       this.packedData.set(CollectionData.new({
         isPaused: true
       }).pack());
+      this.pendingCreatorX.set(import_o1js12.PublicKey.empty().x);
       this.account.zkappUri.set(props.url);
       this.account.tokenSymbol.set(props.symbol);
       this.account.permissions.set({
@@ -1834,8 +1925,8 @@ function CollectionFactory(params) {
         setPermissions: import_o1js12.Permissions.impossible(),
         access: import_o1js12.Permissions.proof(),
         send: import_o1js12.Permissions.proof(),
-        setZkappUri: import_o1js12.Permissions.none(),
-        setTokenSymbol: import_o1js12.Permissions.none()
+        setZkappUri: import_o1js12.Permissions.proof(),
+        setTokenSymbol: import_o1js12.Permissions.proof()
       });
     }
     /**
@@ -1923,7 +2014,9 @@ function CollectionFactory(params) {
      * @returns The packed data of the collection.
      */
     async ensureNotPaused() {
-      CollectionData.isPaused(this.packedData.getAndRequireEquals()).assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
+      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      return collectionData;
     }
     /**
      * Mints a new NFT directly by the creator.
@@ -1940,7 +2033,8 @@ function CollectionFactory(params) {
      * @param params - The mint parameters containing details of the NFT to be minted.
      */
     async mintByCreator(params2) {
-      CollectionData.mintingIsLimited(this.packedData.getAndRequireEquals()).assertFalse(CollectionErrors.cannotMint);
+      const collectionData = await this.ensureNotPaused();
+      collectionData.mintingIsLimited.assertFalse(CollectionErrors.cannotMint);
       const creatorUpdate = await this.ensureCreatorSignature();
       creatorUpdate.balance.subInPlace(1e9);
       await this._mint(params2);
@@ -1951,9 +2045,12 @@ function CollectionFactory(params) {
      * @param mintRequest - The minting request containing parameters and proofs.
      */
     async mint(mintRequest) {
-      CollectionData.mintingIsLimited(this.packedData.getAndRequireEquals()).assertFalse(CollectionErrors.cannotMint);
+      const collectionData = await this.ensureNotPaused();
+      collectionData.mintingIsLimited.assertFalse(CollectionErrors.cannotMint);
       const adminContract2 = this.getAdminContract();
       const mintParams = (await adminContract2.canMint(mintRequest)).assertSome(CollectionErrors.cannotMint);
+      mintParams.address.assertEquals(mintRequest.address);
+      mintParams.data.owner.assertEquals(mintRequest.owner);
       mintParams.address.equals(this.address).assertFalse(CollectionErrors.cannotMintMasterNFT);
       await this._mint(mintParams);
     }
@@ -1965,11 +2062,13 @@ function CollectionFactory(params) {
      * @returns The MintEvent emitted.
      */
     async _mint(params2) {
-      const { name, address, data, metadata, storage, metadataVerificationKeyHash, expiry } = params2;
+      const { name, address, data, metadata, storage, metadataVerificationKeyHash, expiry, fee, tokenId } = params2;
       this.network.globalSlotSinceGenesis.requireBetween(import_o1js12.UInt32.zero, expiry);
-      data.version.assertEquals(import_o1js12.UInt32.zero);
+      data.version.assertEquals(import_o1js12.UInt64.zero);
+      data.isPaused.equals((0, import_o1js12.Bool)(false)).or(data.canPause.equals((0, import_o1js12.Bool)(true))).assertTrue(CollectionErrors.cannotMint);
       const packedData = data.pack();
-      const tokenId = this.deriveTokenId();
+      const collectionTokenId = this.deriveTokenId();
+      collectionTokenId.assertEquals(tokenId);
       const update = import_o1js12.AccountUpdate.createSigned(address, tokenId);
       update.body.useFullCommitment = (0, import_o1js12.Bool)(true);
       update.account.isNew.getAndRequireEquals().assertTrue();
@@ -1989,10 +2088,11 @@ function CollectionFactory(params) {
       });
       const mainnetVerificationKeyHash = (0, import_o1js12.Field)(nftVerificationKeys.mainnet.vk.NFT.hash);
       const devnetVerificationKeyHash = (0, import_o1js12.Field)(nftVerificationKeys.devnet.vk.NFT.hash);
-      const isMainnet = import_o1js12.Provable.witness(import_o1js12.Bool, () => {
-        return (0, import_o1js12.Bool)(import_o1js12.Mina.getNetworkId() === "mainnet");
-      });
-      verificationKey.hash.assertEquals(import_o1js12.Provable.if(isMainnet, mainnetVerificationKeyHash, devnetVerificationKeyHash));
+      if (import_o1js12.Mina.getNetworkId() === "mainnet") {
+        verificationKey.hash.assertEquals(mainnetVerificationKeyHash);
+      } else {
+        verificationKey.hash.assertEquals(devnetVerificationKeyHash);
+      }
       update.body.update.verificationKey = {
         isSome: (0, import_o1js12.Bool)(true),
         value: verificationKey
@@ -2025,7 +2125,9 @@ function CollectionFactory(params) {
       }));
       const event = new MintEvent({
         initialState,
-        address
+        address,
+        tokenId,
+        fee
       });
       this.emitEvent("mint", event);
       return event;
@@ -2037,6 +2139,8 @@ function CollectionFactory(params) {
      * @param vk - The verification key.
      */
     async update(proof, vk) {
+      const oracleAddress = proof.publicInput.oracleAddress;
+      oracleAddress.equals(import_o1js12.PublicKey.empty()).assertTrue(CollectionErrors.invalidOracleAddress);
       await this._update(proof, vk);
     }
     /**
@@ -2072,7 +2176,9 @@ function CollectionFactory(params) {
       const metadataVerificationKeyHash = await nft.update(proof.publicInput, proof.publicOutput, creator);
       metadataVerificationKeyHash.assertEquals(vk.hash);
       proof.verify(vk);
-      this.emitEvent("update", proof.publicInput.immutableState.address);
+      this.emitEvent("update", new NFTUpdateEvent({
+        address: proof.publicInput.immutableState.address
+      }));
     }
     /**
      * Approves an address to transfer an NFT.
@@ -2091,10 +2197,11 @@ function CollectionFactory(params) {
     /**
      * Transfers ownership of an NFT without admin approval.
      *
-     * @param address - The address of the NFT.
-     * @param to - The recipient's public key.
+     * @param nftAddress - The address of the NFT.
+     * @param approved - The approved public key.
      */
     async approveAddressByProof(nftAddress, approved) {
+      await this.ensureNotPaused();
       const tokenId = this.deriveTokenId();
       const nft = new NFT(nftAddress, tokenId);
       const owner = await nft.approveAddress(approved);
@@ -2114,8 +2221,7 @@ function CollectionFactory(params) {
      */
     async transferBySignature(params2) {
       const { address, to, price, context } = params2;
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       collectionData.requireTransferApproval.assertFalse(CollectionErrors.transferApprovalRequired);
       const transferEventDraft = new TransferExtendedParams({
         from: import_o1js12.PublicKey.empty(),
@@ -2147,8 +2253,8 @@ function CollectionFactory(params) {
      */
     async transferByProof(params2) {
       const { address, from, to, price, context } = params2;
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
+      collectionData.requireTransferApproval.assertFalse(CollectionErrors.transferApprovalRequired);
       const transferEventDraft = new TransferExtendedParams({
         from,
         to,
@@ -2179,10 +2285,9 @@ function CollectionFactory(params) {
      *
      * @param params - The transfer parameters.
      */
-    async approvedTransferByProof(params2) {
+    async adminApprovedTransferByProof(params2) {
       const { address, from, to, price, context } = params2;
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       const transferEventDraft = new TransferExtendedParams({
         from,
         to,
@@ -2216,10 +2321,9 @@ function CollectionFactory(params) {
      * @param to - The recipient's public key.
      * @param price - The price of the NFT (optional).
      */
-    async approvedTransferBySignature(params2) {
+    async adminApprovedTransferBySignature(params2) {
       const { address, to, price, context } = params2;
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       const transferEventDraft = new TransferExtendedParams({
         from: import_o1js12.PublicKey.empty(),
         // will be added later
@@ -2243,14 +2347,21 @@ function CollectionFactory(params) {
       const adminContract2 = this.getAdminContract();
       const canTransfer = await adminContract2.canTransfer(transferEvent);
       canTransfer.assertTrue();
-      this.emitEvent("transfer", transferEvent);
     }
     /**
      * Internal method to transfer an NFT.
      *
-     * @param address - The address of the NFT.
-     * @param to - The recipient's public key.
+     * This method handles the transfer logic and fee calculation. The fee is determined as follows:
+     * - If a price is provided, the fee is calculated as (price * royaltyFee / MAX_ROYALTY_FEE)
+     * - If no price is provided, the fixed transferFee is used to handle two cases:
+     *  when NFT is being sold and the price is not provided to the contract
+     *  when NFT is being transferred by the owner (without price)
+     * - If the sender is the creator, no fee is charged
+     * - The minimum fee is always the transferFee (unless sender is creator)
+     *
+     * @param transferEventDraft - The transfer event draft, containing the information about the transfer
      * @param transferFee - The transfer fee amount.
+     * @param royaltyFee - The royalty fee amount.
      * @returns The TransferEvent emitted.
      */
     async _transfer(params2) {
@@ -2305,6 +2416,7 @@ function CollectionFactory(params) {
      * @param vk - The new verification key.
      */
     async upgradeNFTVerificationKeyBySignature(address, vk) {
+      await this.ensureNotPaused();
       const sender = this.sender.getAndRequireSignature();
       const data = await this._upgrade(address, vk);
       data.owner.equals(sender).or(data.isOwnerApprovalRequired.not()).assertTrue(CollectionErrors.onlyOwnerCanUpgradeVerificationKey);
@@ -2316,6 +2428,7 @@ function CollectionFactory(params) {
      * @param vk - The new verification key.
      */
     async upgradeNFTVerificationKeyByProof(address, vk) {
+      await this.ensureNotPaused();
       const data = await this._upgrade(address, vk);
       const ownerContract2 = this.getOwnerContract(data.owner);
       const canUpgrade = await ownerContract2.canChangeVerificationKey(this.address, address, vk);
@@ -2342,19 +2455,23 @@ function CollectionFactory(params) {
      * @param vk - The new verification key.
      */
     async upgradeVerificationKey(vk) {
+      await this.ensureNotPaused();
       const adminContract2 = this.getAdminContract();
       const canUpgrade = await adminContract2.canChangeVerificationKey(vk, this.address, this.tokenId);
       canUpgrade.assertTrue(CollectionErrors.cannotUpgradeVerificationKey);
       this.account.verificationKey.set(vk);
-      this.emitEvent("upgradeVerificationKey", vk.hash);
+      this.emitEvent("upgradeVerificationKey", new UpgradeVerificationKeyEvent({
+        address: this.address,
+        tokenId: this.tokenId,
+        verificationKeyHash: vk.hash
+      }));
     }
     /**
      * Limits further minting of NFTs in the collection.
      */
     async limitMinting() {
       await this.ensureCreatorSignature();
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       collectionData.mintingIsLimited = (0, import_o1js12.Bool)(true);
       this.packedData.set(collectionData.pack());
       this.emitEvent("limitMinting", new LimitMintingEvent({ mintingLimited: (0, import_o1js12.Bool)(true) }));
@@ -2363,8 +2480,7 @@ function CollectionFactory(params) {
      * Pauses the collection, disabling certain actions.
      */
     async pause() {
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       const adminContract2 = this.getAdminContract();
       const canPause = await adminContract2.canPause();
       canPause.assertTrue(CollectionErrors.noPermissionToPause);
@@ -2391,6 +2507,7 @@ function CollectionFactory(params) {
      * @param address - The address of the NFT to pause.
      */
     async pauseNFTBySignature(address) {
+      await this.ensureNotPaused();
       const tokenId = this.deriveTokenId();
       const nft = new NFT(address, tokenId);
       const owner = await nft.pause();
@@ -2403,6 +2520,7 @@ function CollectionFactory(params) {
      * @param address - The address of the NFT to pause.
      */
     async pauseNFTByProof(address) {
+      await this.ensureNotPaused();
       const tokenId = this.deriveTokenId();
       const nft = new NFT(address, tokenId);
       const owner = await nft.pause();
@@ -2417,6 +2535,7 @@ function CollectionFactory(params) {
      * @param address - The address of the NFT to resume.
      */
     async resumeNFT(address) {
+      await this.ensureNotPaused();
       const tokenId = this.deriveTokenId();
       const nft = new NFT(address, tokenId);
       const owner = await nft.resume();
@@ -2429,6 +2548,7 @@ function CollectionFactory(params) {
      * @param address - The address of the NFT to resume.
      */
     async resumeNFTByProof(address) {
+      await this.ensureNotPaused();
       const tokenId = this.deriveTokenId();
       const nft = new NFT(address, tokenId);
       const owner = await nft.resume();
@@ -2451,7 +2571,7 @@ function CollectionFactory(params) {
       const canChangeName = await adminContract2.canChangeName(name);
       canChangeName.assertTrue(CollectionErrors.noPermissionToChangeName);
       this.collectionName.set(name);
-      this.emitEvent("setName", name);
+      this.emitEvent("setName", new SetNameEvent({ name }));
     }
     /**
      * Updates the base URL for the collection's metadata.
@@ -2467,7 +2587,7 @@ function CollectionFactory(params) {
       const canChangeBaseUri = await adminContract2.canChangeBaseUri(baseURL);
       canChangeBaseUri.assertTrue(CollectionErrors.noPermissionToChangeBaseUri);
       this.baseURL.set(baseURL);
-      this.emitEvent("setBaseURL", baseURL);
+      this.emitEvent("setBaseURL", new SetBaseURLEvent({ baseURL }));
     }
     /**
      * Sets a new admin address for the collection.
@@ -2483,7 +2603,7 @@ function CollectionFactory(params) {
       const canSetAdmin = await adminContract2.canSetAdmin(admin);
       canSetAdmin.assertTrue(CollectionErrors.noPermissionToSetAdmin);
       this.admin.set(admin);
-      this.emitEvent("setAdmin", admin);
+      this.emitEvent("setAdmin", new SetAdminEvent({ admin }));
     }
     /**
      * Updates the royalty fee for the collection.
@@ -2494,15 +2614,14 @@ function CollectionFactory(params) {
      * @throws {Error} If caller lacks permission to change royalty fee
      */
     async setRoyaltyFee(royaltyFee) {
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       royaltyFee.assertLessThanOrEqual(import_o1js12.UInt32.from(MAX_ROYALTY_FEE), CollectionErrors.invalidRoyaltyFee);
       const adminContract2 = this.getAdminContract();
       const canChangeRoyalty = await adminContract2.canChangeRoyalty(royaltyFee);
       canChangeRoyalty.assertTrue(CollectionErrors.noPermissionToChangeRoyalty);
       collectionData.royaltyFee = royaltyFee;
       this.packedData.set(collectionData.pack());
-      this.emitEvent("setRoyaltyFee", royaltyFee);
+      this.emitEvent("setRoyaltyFee", new SetRoyaltyFeeEvent({ royaltyFee }));
     }
     /**
      * Updates the transfer fee for the collection.
@@ -2513,35 +2632,71 @@ function CollectionFactory(params) {
      * @throws {Error} If caller lacks permission to change transfer fee
      */
     async setTransferFee(transferFee) {
-      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
-      collectionData.isPaused.assertFalse(CollectionErrors.collectionPaused);
+      const collectionData = await this.ensureNotPaused();
       const adminContract2 = this.getAdminContract();
       const canChangeTransferFee = await adminContract2.canChangeTransferFee(transferFee);
       canChangeTransferFee.assertTrue(CollectionErrors.noPermissionToChangeTransferFee);
       collectionData.transferFee = transferFee;
       this.packedData.set(collectionData.pack());
-      this.emitEvent("setTransferFee", transferFee);
+      this.emitEvent("setTransferFee", new SetTransferFeeEvent({ transferFee }));
     }
     /**
-     * Transfers ownership of the collection to a new owner.
+     * Transfers ownership of the collection to a new creator.
+     * This method is called transferOwnership as the Collection is implementing OwnableContract interface
+     * For the Collection, the creator is the owner of the collection
      *
-     * @param to - The public key of the new owner.
-     * @returns The public key of the old owner.
+     * @param to - The public key of the new creator.
+     * @returns The public key of the old creator.
      */
     async transferOwnership(to) {
       await this.ensureCreatorSignature();
-      await this.ensureNotPaused();
+      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
+      collectionData.isPaused.assertFalse(CollectionErrors.collectionNotPaused);
       const adminContract2 = this.getAdminContract();
       const canChangeCreator = await adminContract2.canChangeCreator(to);
       canChangeCreator.assertTrue(CollectionErrors.noPermissionToChangeCreator);
       const from = this.creator.getAndRequireEquals();
-      this.creator.set(to);
-      this.emitEvent("ownershipChange", new OwnershipChangeEvent({
+      this.pendingCreatorX.set(to.x);
+      collectionData.pendingCreatorIsOdd = to.isOdd;
+      this.packedData.set(collectionData.pack());
+      this.emitEvent("ownershipTransfer", new OwnershipChangeEvent({
         from,
         to
       }));
       return from;
     }
+    /**
+     * Transfers ownership of the collection to a new owner.
+     *
+     * @param to - The public key of the new owner.
+     * @returns The public key of the old owner.
+     */
+    async acceptOwnership() {
+      const collectionData = CollectionData.unpack(this.packedData.getAndRequireEquals());
+      collectionData.isPaused.assertFalse(CollectionErrors.collectionNotPaused);
+      const pendingCreatorX = this.pendingCreatorX.getAndRequireEquals();
+      const pendingCreator = import_o1js12.PublicKey.from({
+        x: pendingCreatorX,
+        isOdd: collectionData.pendingCreatorIsOdd
+      });
+      const emptyPublicKey = import_o1js12.PublicKey.empty();
+      pendingCreator.equals(emptyPublicKey).assertFalse(CollectionErrors.pendingCreatorIsEmpty);
+      const pendingCreatorUpdate = import_o1js12.AccountUpdate.createSigned(pendingCreator);
+      pendingCreatorUpdate.body.useFullCommitment = (0, import_o1js12.Bool)(true);
+      const adminContract2 = this.getAdminContract();
+      const canChangeCreator = await adminContract2.canChangeCreator(pendingCreator);
+      canChangeCreator.assertTrue(CollectionErrors.noPermissionToChangeCreator);
+      const from = this.creator.getAndRequireEquals();
+      this.pendingCreatorX.set(emptyPublicKey.x);
+      collectionData.pendingCreatorIsOdd = (0, import_o1js12.Bool)(emptyPublicKey.isOdd);
+      this.creator.set(pendingCreator);
+      this.packedData.set(collectionData.pack());
+      this.emitEvent("ownershipAccepted", new OwnershipChangeEvent({
+        from,
+        to: pendingCreator
+      }));
+      return from;
+    }
     async getNFTState(address) {
       const tokenId = this.deriveTokenId();
       const nft = new NFT(address, tokenId);
@@ -2569,6 +2724,10 @@ function CollectionFactory(params) {
     (0, import_o1js12.state)(import_o1js12.Field),
     (0, import_tslib6.__metadata)("design:type", Object)
   ], Collection2.prototype, "packedData", void 0);
+  (0, import_tslib6.__decorate)([
+    (0, import_o1js12.state)(import_o1js12.Field),
+    (0, import_tslib6.__metadata)("design:type", Object)
+  ], Collection2.prototype, "pendingCreatorX", void 0);
   (0, import_tslib6.__decorate)([
     import_o1js12.method,
     (0, import_tslib6.__metadata)("design:type", Function),
@@ -2626,27 +2785,27 @@ function CollectionFactory(params) {
   (0, import_tslib6.__decorate)([
     import_o1js12.method,
     (0, import_tslib6.__metadata)("design:type", Function),
-    (0, import_tslib6.__metadata)("design:paramtypes", [TransferParams]),
+    (0, import_tslib6.__metadata)("design:paramtypes", [TransferBySignatureParams]),
     (0, import_tslib6.__metadata)("design:returntype", Promise)
   ], Collection2.prototype, "transferBySignature", null);
   (0, import_tslib6.__decorate)([
     import_o1js12.method,
     (0, import_tslib6.__metadata)("design:type", Function),
-    (0, import_tslib6.__metadata)("design:paramtypes", [TransferParams]),
+    (0, import_tslib6.__metadata)("design:paramtypes", [TransferByProofParams]),
     (0, import_tslib6.__metadata)("design:returntype", Promise)
   ], Collection2.prototype, "transferByProof", null);
   (0, import_tslib6.__decorate)([
     import_o1js12.method,
     (0, import_tslib6.__metadata)("design:type", Function),
-    (0, import_tslib6.__metadata)("design:paramtypes", [TransferParams]),
+    (0, import_tslib6.__metadata)("design:paramtypes", [TransferByProofParams]),
     (0, import_tslib6.__metadata)("design:returntype", Promise)
-  ], Collection2.prototype, "approvedTransferByProof", null);
+  ], Collection2.prototype, "adminApprovedTransferByProof", null);
   (0, import_tslib6.__decorate)([
     import_o1js12.method,
     (0, import_tslib6.__metadata)("design:type", Function),
-    (0, import_tslib6.__metadata)("design:paramtypes", [TransferParams]),
+    (0, import_tslib6.__metadata)("design:paramtypes", [TransferBySignatureParams]),
     (0, import_tslib6.__metadata)("design:returntype", Promise)
-  ], Collection2.prototype, "approvedTransferBySignature", null);
+  ], Collection2.prototype, "adminApprovedTransferBySignature", null);
   (0, import_tslib6.__decorate)([
     import_o1js12.method,
     (0, import_tslib6.__metadata)("design:type", Function),
@@ -2749,6 +2908,12 @@ function CollectionFactory(params) {
     (0, import_tslib6.__metadata)("design:paramtypes", [import_o1js12.PublicKey]),
     (0, import_tslib6.__metadata)("design:returntype", Promise)
   ], Collection2.prototype, "transferOwnership", null);
+  (0, import_tslib6.__decorate)([
+    import_o1js12.method.returns(import_o1js12.PublicKey),
+    (0, import_tslib6.__metadata)("design:type", Function),
+    (0, import_tslib6.__metadata)("design:paramtypes", []),
+    (0, import_tslib6.__metadata)("design:returntype", Promise)
+  ], Collection2.prototype, "acceptOwnership", null);
   (0, import_tslib6.__decorate)([
     import_o1js12.method.returns(NFTStateStruct),
     (0, import_tslib6.__metadata)("design:type", Function),
@@ -2761,14 +2926,47 @@ function CollectionFactory(params) {
 // dist/node/contracts/admin.js
 var import_tslib7 = require("tslib");
 var import_o1js13 = require("o1js");
+var NFTAdminAllowFlags = class _NFTAdminAllowFlags extends (0, import_o1js13.Struct)({
+  allowChangeRoyalty: import_o1js13.Bool,
+  allowChangeTransferFee: import_o1js13.Bool,
+  allowPauseCollection: import_o1js13.Bool
+}) {
+  /**
+   * Packs the NFTAdminAllowFlags into a UInt8 representation for efficient storage.
+   * @returns The packed UInt8 instance.
+   */
+  pack() {
+    return import_o1js13.UInt8.from(import_o1js13.Field.fromBits([
+      this.allowChangeRoyalty,
+      this.allowChangeTransferFee,
+      this.allowPauseCollection
+    ]));
+  }
+  /**
+   * Unpacks a UInt8 instance into a NFTAdminAllowFlags instance.
+   * @param packed The packed UInt8 instance.
+   * @returns A new NFTAdminAllowFlags instance.
+   */
+  static unpack(packed) {
+    const bits = packed.value.toBits(3);
+    const allowChangeRoyalty = bits[0];
+    const allowChangeTransferFee = bits[1];
+    const allowPauseCollection = bits[2];
+    return new _NFTAdminAllowFlags({
+      allowChangeRoyalty,
+      allowChangeTransferFee,
+      allowPauseCollection
+    });
+  }
+};
 var NFTAdmin = class extends import_o1js13.SmartContract {
   constructor() {
     super(...arguments);
     this.admin = (0, import_o1js13.State)();
+    this.pendingAdmin = (0, import_o1js13.State)();
     this.isPaused = (0, import_o1js13.State)();
     this.canBePaused = (0, import_o1js13.State)();
-    this.allowChangeRoyalty = (0, import_o1js13.State)();
-    this.allowChangeTransferFee = (0, import_o1js13.State)();
+    this.flags = (0, import_o1js13.State)();
     this.events = {
       /** Emitted when the verification key is upgraded. */
       upgradeVerificationKey: import_o1js13.Field,
@@ -2777,7 +2975,9 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
       /** Emitted when the contract is resumed. */
       resume: PauseEvent,
       /** Emitted when ownership of the contract changes. */
-      ownershipChange: OwnershipChangeEvent
+      ownershipTransfer: OwnershipChangeEvent,
+      /** Emitted when ownership of the contract is accepted. */
+      ownershipAccepted: OwnershipChangeEvent
     };
   }
   /**
@@ -2786,11 +2986,18 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
    */
   async deploy(props) {
     await super.deploy(props);
+    const isPaused = props.isPaused ?? (0, import_o1js13.Bool)(false);
+    const canBePaused = props.canBePaused ?? (0, import_o1js13.Bool)(true);
+    (0, import_o1js13.assert)(isPaused.equals((0, import_o1js13.Bool)(false)).or(canBePaused.equals((0, import_o1js13.Bool)(true))), "Cannot deploy paused contract that cannot be resumed");
     this.admin.set(props.admin);
-    this.isPaused.set(props.isPaused ?? (0, import_o1js13.Bool)(false));
-    this.canBePaused.set(props.canBePaused ?? (0, import_o1js13.Bool)(true));
-    this.allowChangeRoyalty.set(props.allowChangeRoyalty ?? (0, import_o1js13.Bool)(false));
-    this.allowChangeTransferFee.set(props.allowChangeTransferFee ?? (0, import_o1js13.Bool)(false));
+    this.pendingAdmin.set(import_o1js13.PublicKey.empty());
+    this.isPaused.set(isPaused);
+    this.canBePaused.set(canBePaused);
+    this.flags.set(new NFTAdminAllowFlags({
+      allowChangeRoyalty: props.allowChangeRoyalty ?? (0, import_o1js13.Bool)(false),
+      allowChangeTransferFee: props.allowChangeTransferFee ?? (0, import_o1js13.Bool)(false),
+      allowPauseCollection: props.allowPauseCollection ?? (0, import_o1js13.Bool)(true)
+    }).pack());
     this.account.zkappUri.set(props.uri);
     this.account.permissions.set({
       ...import_o1js13.Permissions.default(),
@@ -2800,8 +3007,8 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
       setPermissions: import_o1js13.Permissions.impossible(),
       access: import_o1js13.Permissions.proof(),
       send: import_o1js13.Permissions.proof(),
-      setZkappUri: import_o1js13.Permissions.none(),
-      setTokenSymbol: import_o1js13.Permissions.none()
+      setZkappUri: import_o1js13.Permissions.proof(),
+      setTokenSymbol: import_o1js13.Permissions.proof()
     });
   }
   /**
@@ -2830,6 +3037,8 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
    * @returns A `MintParamsOption` indicating if minting is permitted.
    */
   async canMint(mintRequest) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return MintParamsOption.none();
   }
   /**
@@ -2840,6 +3049,8 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
    * @returns A `Bool` indicating whether the update is allowed.
    */
   async canUpdate(input, output) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return (0, import_o1js13.Bool)(true);
   }
   /**
@@ -2848,6 +3059,8 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
    * @returns A `Bool` indicating whether the transfer is allowed.
    */
   async canTransfer(transferEvent) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return (0, import_o1js13.Bool)(true);
   }
   /**
@@ -2873,20 +3086,40 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
   /**
    * Transfers ownership of the contract to a new admin.
    * @param to - The public key of the new owner.
-   * @returns The public key of the previous owner.
+   * @returns The public key of the previous admin.
    */
   async transferOwnership(to) {
     const isPaused = this.isPaused.getAndRequireEquals();
-    isPaused.assertTrue("Contract is paused");
+    isPaused.assertFalse("Contract is paused");
     await this.ensureOwnerSignature();
     const from = this.admin.getAndRequireEquals();
-    this.admin.set(to);
-    this.emitEvent("ownershipChange", new OwnershipChangeEvent({
+    this.pendingAdmin.set(to);
+    this.emitEvent("ownershipTransfer", new OwnershipChangeEvent({
       from,
       to
     }));
     return from;
   }
+  /**
+   * Accept transfer of the ownership of the contract.
+   * @returns The public key of the previous admin.
+   */
+  async acceptOwnership() {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
+    const admin = this.admin.getAndRequireEquals();
+    const pendingAdmin = this.pendingAdmin.getAndRequireEquals();
+    pendingAdmin.equals(import_o1js13.PublicKey.empty()).assertFalse("Pending admin is not set");
+    const pendingAminUpdate = import_o1js13.AccountUpdate.createSigned(pendingAdmin);
+    pendingAminUpdate.body.useFullCommitment = (0, import_o1js13.Bool)(true);
+    this.admin.set(pendingAdmin);
+    this.pendingAdmin.set(import_o1js13.PublicKey.empty());
+    this.emitEvent("ownershipAccepted", new OwnershipChangeEvent({
+      from: admin,
+      to: pendingAdmin
+    }));
+    return admin;
+  }
   async canChangeVerificationKey(vk, address, tokenId) {
     await this.ensureOwnerSignature();
     return (0, import_o1js13.Bool)(true);
@@ -2895,53 +3128,73 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
    * Determines if the name can be changed for a Collection.
    */
   async canChangeName(name) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return (0, import_o1js13.Bool)(false);
   }
   /**
    * Determines if the creator can be changed for a Collection.
    */
   async canChangeCreator(creator) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return (0, import_o1js13.Bool)(false);
   }
   /**
    * Determines if the base URI can be changed for a Collection.
    */
   async canChangeBaseUri(baseUri) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return (0, import_o1js13.Bool)(false);
   }
   /**
    * Determines if the royalty fee can be changed for a Collection.
    */
   async canChangeRoyalty(royaltyFee) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     await this.ensureOwnerSignature();
-    return this.allowChangeRoyalty.getAndRequireEquals();
+    const flags = NFTAdminAllowFlags.unpack(this.flags.getAndRequireEquals());
+    return flags.allowChangeRoyalty;
   }
   /**
    * Determines if the transfer fee can be changed for a Collection.
    */
   async canChangeTransferFee(transferFee) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     await this.ensureOwnerSignature();
-    return this.allowChangeTransferFee.getAndRequireEquals();
+    const flags = NFTAdminAllowFlags.unpack(this.flags.getAndRequireEquals());
+    return flags.allowChangeTransferFee;
   }
   /**
    * Determines if the admin contract can be changed for a Collection.
    */
   async canSetAdmin(admin) {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     return (0, import_o1js13.Bool)(false);
   }
   /**
    * Determines if the collection can be paused.
    */
   async canPause() {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     await this.ensureOwnerSignature();
-    return this.canBePaused.getAndRequireEquals();
+    const flags = NFTAdminAllowFlags.unpack(this.flags.getAndRequireEquals());
+    return flags.allowPauseCollection;
   }
   /**
    * Determines if the collection can be resumed.
    */
   async canResume() {
+    const isPaused = this.isPaused.getAndRequireEquals();
+    isPaused.assertFalse("Contract is paused");
     await this.ensureOwnerSignature();
-    return this.canBePaused.getAndRequireEquals();
+    const flags = NFTAdminAllowFlags.unpack(this.flags.getAndRequireEquals());
+    return flags.allowPauseCollection;
   }
 };
 (0, import_tslib7.__decorate)([
@@ -2949,21 +3202,21 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
   (0, import_tslib7.__metadata)("design:type", Object)
 ], NFTAdmin.prototype, "admin", void 0);
 (0, import_tslib7.__decorate)([
-  (0, import_o1js13.state)(import_o1js13.Bool),
+  (0, import_o1js13.state)(import_o1js13.PublicKey),
   (0, import_tslib7.__metadata)("design:type", Object)
-], NFTAdmin.prototype, "isPaused", void 0);
+], NFTAdmin.prototype, "pendingAdmin", void 0);
 (0, import_tslib7.__decorate)([
   (0, import_o1js13.state)(import_o1js13.Bool),
   (0, import_tslib7.__metadata)("design:type", Object)
-], NFTAdmin.prototype, "canBePaused", void 0);
+], NFTAdmin.prototype, "isPaused", void 0);
 (0, import_tslib7.__decorate)([
   (0, import_o1js13.state)(import_o1js13.Bool),
   (0, import_tslib7.__metadata)("design:type", Object)
-], NFTAdmin.prototype, "allowChangeRoyalty", void 0);
+], NFTAdmin.prototype, "canBePaused", void 0);
 (0, import_tslib7.__decorate)([
-  (0, import_o1js13.state)(import_o1js13.Bool),
+  (0, import_o1js13.state)(import_o1js13.UInt8),
   (0, import_tslib7.__metadata)("design:type", Object)
-], NFTAdmin.prototype, "allowChangeTransferFee", void 0);
+], NFTAdmin.prototype, "flags", void 0);
 (0, import_tslib7.__decorate)([
   import_o1js13.method,
   (0, import_tslib7.__metadata)("design:type", Function),
@@ -3006,6 +3259,12 @@ var NFTAdmin = class extends import_o1js13.SmartContract {
   (0, import_tslib7.__metadata)("design:paramtypes", [import_o1js13.PublicKey]),
   (0, import_tslib7.__metadata)("design:returntype", Promise)
 ], NFTAdmin.prototype, "transferOwnership", null);
+(0, import_tslib7.__decorate)([
+  import_o1js13.method.returns(import_o1js13.PublicKey),
+  (0, import_tslib7.__metadata)("design:type", Function),
+  (0, import_tslib7.__metadata)("design:paramtypes", []),
+  (0, import_tslib7.__metadata)("design:returntype", Promise)
+], NFTAdmin.prototype, "acceptOwnership", null);
 (0, import_tslib7.__decorate)([
   import_o1js13.method.returns(import_o1js13.Bool),
   (0, import_tslib7.__metadata)("design:type", Function),
@@ -4075,9 +4334,8 @@ function BidFactory(params) {
       const buyer = this.buyer.getAndRequireEquals();
       const Collection2 = collectionContract();
       const collection = new Collection2(nftAddress.collection);
-      await collection.transferBySignature(new TransferParams({
+      await collection.transferBySignature(new TransferBySignatureParams({
         address: nftAddress.nft,
-        from: import_o1js21.PublicKey.empty(),
         to: buyer,
         price: UInt64Option.fromValue(price),
         context: new NFTTransactionContext({
@@ -4090,9 +4348,8 @@ function BidFactory(params) {
       const buyer = this.buyer.getAndRequireEquals();
       const Collection2 = collectionContract();
       const collection = new Collection2(nftAddress.collection);
-      await collection.approvedTransferBySignature(new TransferParams({
+      await collection.adminApprovedTransferBySignature(new TransferBySignatureParams({
         address: nftAddress.nft,
-        from: import_o1js21.PublicKey.empty(),
         to: buyer,
         price: UInt64Option.fromValue(price),
         context: new NFTTransactionContext({
@@ -4463,7 +4720,7 @@ function AuctionFactory(params) {
       this.settled = (0, import_o1js23.State)((0, import_o1js23.Bool)(false));
       this.events = {
         bid: AuctionBidEvent,
-        settleAuction: TransferParams,
+        settleAuction: TransferByProofParams,
         canTransfer: TransferEvent,
         settlePayment: import_o1js23.UInt64,
         settleAuctioneerPayment: import_o1js23.UInt64,
@@ -4562,7 +4819,7 @@ function AuctionFactory(params) {
       auction.bidder.equals(import_o1js23.PublicKey.empty()).assertFalse("No bidder");
       bidAmount.assertGreaterThanOrEqual(auction.minimumPrice, "Bidder does not have enough balance");
       const collection = this.getCollectionContract(auction.collection);
-      const transferParams = new TransferParams({
+      const transferParams = new TransferByProofParams({
         address: nftAddress,
         from: this.address,
         to: auction.bidder,
@@ -4586,7 +4843,7 @@ function AuctionFactory(params) {
       this.network.globalSlotSinceGenesis.requireBetween(auction.auctionEndTime.add(auction.withdrawPeriod), import_o1js23.UInt32.MAXINT());
       const nftAddress = auction.nft;
       const collection = this.getCollectionContract(auction.collection);
-      const transferParams = new TransferParams({
+      const transferParams = new TransferByProofParams({
         address: nftAddress,
         from: this.address,
         to: auction.owner,
@@ -5561,6 +5818,7 @@ var AdvancedOffer = AdvancedApproval;
   NFT,
   NFTAddress,
   NFTAdmin,
+  NFTAdminAllowFlags,
   NFTAdvancedAdmin,
   NFTAdvancedAdminContract,
   NFTData,
@@ -5577,6 +5835,7 @@ var AdvancedOffer = AdvancedApproval;
   NFTState,
   NFTStateStruct,
   NFTTransactionContext,
+  NFTUpdateEvent,
   NFTUpdateProof,
   NonFungibleTokenContractsFactory,
   Offer,
@@ -5586,11 +5845,17 @@ var AdvancedOffer = AdvancedApproval;
   PauseEvent,
   PauseNFTEvent,
   SellEvent,
+  SetAdminEvent,
+  SetBaseURLEvent,
+  SetNameEvent,
+  SetRoyaltyFeeEvent,
+  SetTransferFeeEvent,
   TEXT_TREE_HEIGHT,
   Text,
+  TransferByProofParams,
+  TransferBySignatureParams,
   TransferEvent,
   TransferExtendedParams,
-  TransferParams,
   UInt64Option,
   Update,
   UpdateEvent,