Switched from mina-fungible-token to fungible-token-contract

packages/cli/package.json

@@ -25,7 +25,7 @@
     "dotenv": "^17.2.3",
     "inquirer": "^9.3.0",
     "kleur": "^4.1.5",
-    "mina-fungible-token": "^1.1.0",
+    "fungible-token-contract": "^0.0.1",
     "reflect-metadata": "^0.1.13",
     "spectaql": "3.0.5",
     "ts-node": "^10.9.1",

packages/cli/src/scripts/bridge/deposit.ts

@@ -45,7 +45,7 @@ export default async function (
     PublicKey,
     UInt64,
   } = await import("o1js");
-  const { FungibleToken } = await import("mina-fungible-token");
+  const { FungibleToken } = await import("fungible-token-contract");
 
   const { runtime, protocol } = await loadUserModules();
   const tokenId = Field(bridgeArgs.tokenId);
@@ -157,7 +157,7 @@ export default async function (
       if (isCustomToken) {
         await new FungibleToken(
           tokenOwnerPrivateKey.toPublicKey()
-        )!.approveAccountUpdates([au, dispatch.self]);
+        )!.approveAccountUpdatesCustom([au, dispatch.self]);
       }
     }
   );

packages/cli/src/scripts/bridge/redeem.ts

@@ -38,7 +38,7 @@ export default async function (
     Provable,
     UInt64,
   } = await import("o1js");
-  const { FungibleToken } = await import("mina-fungible-token");
+  const { FungibleToken } = await import("fungible-token-contract");
   const { DefaultConfigs, DefaultModules } = await import("@proto-kit/stack");
   const { runtime, protocol } = await loadUserModules();
   const tokenId = Field(bridgeArgs.tokenId);
@@ -121,7 +121,7 @@ export default async function (
       if (isCustomToken) {
         await new FungibleToken(
           tokenOwnerPrivateKey.toPublicKey()
-        )!.approveAccountUpdate(bridgeContract.self);
+        )!.approveAccountUpdateCustom(bridgeContract.self);
       }
     }
   );

packages/cli/src/scripts/settlement/deploy-token.ts

@@ -37,7 +37,6 @@ export default async function (
   } = await import("@proto-kit/sequencer");
   const {
     AccountUpdate,
-    Bool,
     fetchAccount,
     Mina,
     PrivateKey,
@@ -46,10 +45,14 @@ export default async function (
     UInt64,
     UInt8,
   } = await import("o1js");
-  const { FungibleToken, FungibleTokenAdmin } = await import(
-    "mina-fungible-token"
-  );
+  const { FungibleToken } = await import("fungible-token-contract");
   const { DefaultConfigs, DefaultModules } = await import("@proto-kit/stack");
+  const {
+    BurnDynamicProofConfig,
+    MintDynamicProofConfig,
+    TransferDynamicProofConfig,
+    UpdatesDynamicProofConfig,
+  } = await import("fungible-token-contract");
 
   const { runtime, protocol } = await loadUserModules();
   const appChain = AppChain.from({
@@ -137,12 +140,6 @@ export default async function (
       async () => {
         AccountUpdate.fundNewAccount(feepayerPrivateKey.toPublicKey(), 3);
 
-        const admin = new FungibleTokenAdmin(tokenAdminKey.toPublicKey());
-        await admin.deploy({
-          adminPublicKey: feepayerPrivateKey.toPublicKey(),
-        });
-        admin.self.account.permissions.set(permissions.bridgeContractToken());
-
         const fungibleToken = new FungibleToken(tokenOwnerKey.toPublicKey());
         await fungibleToken.deploy({
           src: "",
@@ -153,10 +150,14 @@ export default async function (
           permissions.bridgeContractToken()
         );
 
-        await fungibleToken.initialize(
-          tokenAdminKey.toPublicKey(),
+        await fungibleToken!.initialize(
+          // TODO Add specific, different key for this
+          feepayerPrivateKey.toPublicKey(),
           UInt8.from(9),
-          Bool(false)
+          MintDynamicProofConfig.default,
+          BurnDynamicProofConfig.default,
+          TransferDynamicProofConfig.default,
+          UpdatesDynamicProofConfig.default
         );
       }
     );

packages/cli/src/utils/pathResolver.ts

@@ -3,6 +3,7 @@ import fs from "fs";
 
 export function resolveChainPath(isFolderRequired?: boolean): string {
   let currentDir = process.cwd();
+  // eslint-disable-next-line no-constant-condition
   while (true) {
     const candidate = path.join(currentDir, "packages", "chain");
 

packages/sequencer/package.json

@@ -36,7 +36,7 @@
     "ascii-table3": "^0.9.0",
     "compute-gcd": "^1.2.1",
     "lodash-es": "^4.17.21",
-    "mina-fungible-token": "^1.1.0",
+    "fungible-token-contract": "^0.0.1",
     "reflect-metadata": "^0.1.13",
     "ts-pattern": "^4.3.0"
   },

packages/sequencer/src/index.ts

@@ -118,7 +118,6 @@ export * from "./settlement/transactions/MinaSimulationService";
 export * from "./settlement/utils/ArchiveNode";
 export * from "./settlement/utils/SettlementUtils";
 export * from "./settlement/utils/FungibleTokenContractModule";
-export * from "./settlement/utils/FungibleTokenAdminContractModule";
 export * from "./logging/Tracer";
 export * from "./logging/trace";
 export * from "./logging/ConsoleTracingFactory";

packages/sequencer/src/settlement/BridgingModule.ts

@@ -44,7 +44,7 @@ import {
   reduceSequential,
 } from "@proto-kit/common";
 import { match, Pattern } from "ts-pattern";
-import { FungibleToken } from "mina-fungible-token";
+import { FungibleToken } from "fungible-token-contract";
 // eslint-disable-next-line import/no-extraneous-dependencies
 import groupBy from "lodash/groupBy";
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -230,7 +230,7 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
    * @param options
    */
   public async deployTokenBridge(
-    owner: TokenContract | undefined,
+    owner: FungibleToken | undefined,
     contractKey: PublicKey,
     options: {
       nonce?: number;
@@ -258,7 +258,7 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
         await settlementContract.addTokenBridge(tokenId, contractKey);
 
         if (owner !== undefined) {
-          await owner.approveAccountUpdate(settlementContract.self);
+          await owner.approveAccountUpdateCustom(settlementContract.self);
         }
       }
     );
@@ -399,7 +399,7 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
         }) => {
           return this.sendRollupTransactionsBase(
             async (au: AccountUpdate) => {
-              await tokenOwner.approveAccountUpdate(au);
+              await tokenOwner.approveAccountUpdateCustom(au);
             },
             tokenOwner.deriveTokenId(),
             events,

packages/sequencer/src/settlement/utils/FungibleTokenContractModule.ts

@@ -3,8 +3,8 @@ import {
   ContractModule,
   SmartContractClassFromInterface,
 } from "@proto-kit/protocol";
-import { FungibleToken } from "mina-fungible-token";
 import { CompileArtifact, CompileRegistry } from "@proto-kit/common";
+import { FungibleToken } from "fungible-token-contract";
 
 @injectable()
 export class FungibleTokenContractModule extends ContractModule<FungibleToken> {

packages/sequencer/test-integration/Settlement-devnet.test.ts

@@ -1,5 +1,5 @@
 import { describe } from "@jest/globals";
-import { FungibleToken } from "mina-fungible-token";
+import { FungibleToken } from "fungible-token-contract";
 import { PrivateKey } from "o1js";
 
 import { settlementTestFn } from "../test/settlement/Settlement";

packages/sequencer/test-integration/Settlement-lightnet.test.ts

@@ -1,6 +1,6 @@
 import { PrivateKey } from "o1js";
 import { log } from "@proto-kit/common";
-import { FungibleToken } from "mina-fungible-token";
+import { FungibleToken } from "fungible-token-contract";
 
 import { settlementTestFn } from "../test/settlement/Settlement";
 

packages/sequencer/test-proven/Settlement-lightnet-worker.test.ts

@@ -1,5 +1,5 @@
 import { log } from "@proto-kit/common";
-import { FungibleToken } from "mina-fungible-token";
+import { FungibleToken } from "fungible-token-contract";
 import { BullQueueConfig } from "@proto-kit/deployment";
 import { afterAll, beforeAll } from "@jest/globals";
 

packages/sequencer/test-proven/Settlement-proven.test.ts

@@ -1,4 +1,4 @@
-import { FungibleToken } from "mina-fungible-token";
+import { FungibleToken } from "fungible-token-contract";
 
 import { MinaBaseLayerConfig } from "../src";
 import { settlementTestFn } from "../test/settlement/Settlement";

packages/sequencer/test/settlement/Settlement.test.ts

@@ -1,4 +1,4 @@
-import { FungibleToken } from "mina-fungible-token";
+import { FungibleToken } from "fungible-token-contract";
 
 import { MinaBaseLayerConfig } from "../../src";