OpenZeppelin · andrew-fleming · Jul 13, 2025 · Jul 13, 2025 · Jul 13, 2025 · Jul 13, 2025
diff --git a/contracts/utils/src/test/types/test.ts b/contracts/utils/src/test/types/test.ts
@@ -4,9 +4,9 @@
   "private": true,
   "packageManager": "[email protected]",
   "workspaces": [
-    "compact/",
-    "contracts/*/",
-    "docs/"
+    "docs/",
+    "packages/*",
+    "packages/contracts/*"
   ],
   "scripts": {
     "docs": "npx turbo run docs --filter=docs",

@@ -0,0 +1,31 @@
+{
+  "name": "@openzeppelin-compact/compact-std",
+  "private": true,
+  "version": "0.0.1",
+  "description": "",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "compact": "compact-compiler",
+    "build": "compact-builder && tsc",
+    "test": "vitest run",
+    "types": "tsc -p tsconfig.json --noEmit",
+    "clean": "git clean -fXd"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "22.14.0",
+    "fast-check": "^3.15.0",
+    "typescript": "^5.8.3",
+    "vitest": "^3.1.4"
+  },
+  "dependencies": {
+    "@midnight-ntwrk/compact-runtime": "^0.8.1",
+    "@midnight-ntwrk/midnight-js-network-id": "^2.0.1",
+    "@midnight-ntwrk/zswap": "^4.0.0",
+    "@openzeppelin-compact/compact": "workspace:^"
+  }
+}
@@ -0,0 +1,20 @@
+pragma language_version >= 0.14.0;
+
+import CompactStandardLibrary;
+
+/**
+ * @description Standard structs from CompactStandardLibrary for use in contracts and TypeScript.
+ */
+export {
+  Maybe,              // Encapsulates an optionally present value
+  Either,             // Disjoint union of two types
+  CurvePoint,         // Point on the proof system's embedded curve
+  MerkleTreeDigest,   // Root hash of a Merkle tree
+  MerkleTreePathEntry,// Entry in a Merkle tree path
+  MerkleTreePath,     // Path in a Merkle tree leading to a leaf
+  ContractAddress,    // Address of a contract
+  CoinInfo,           // Description of a newly created coin
+  QualifiedCoinInfo,  // Description of an existing coin in the ledger
+  ZswapCoinPublicKey, // Public key for coin outputs
+  SendResult          // Result of send/send_immediate operations
+};
@@ -0,0 +1,129 @@
+import { describe, expectTypeOf, it } from 'vitest';
+import type {
+  CoinInfo,
+  ContractAddress,
+  CurvePoint,
+  Either,
+  Maybe,
+  MerkleTreeDigest,
+  MerkleTreePath,
+  MerkleTreePathEntry,
+  QualifiedCoinInfo,
+  SendResult,
+  ZswapCoinPublicKey,
+} from './index';
+
+describe('@midnight-dapps/compact-std', () => {
+  it('should export Maybe type correctly', () => {
+    const maybeNumber: Maybe<number> = { is_some: true, value: 42 };
+    expectTypeOf(maybeNumber).toEqualTypeOf<{
+      is_some: boolean;
+      value: number;
+    }>();
+  });
+
+  it('should export Either type correctly', () => {
+    const eitherStringNumber: Either<string, number> = {
+      is_left: true,
+      left: 'test',
+      right: 0,
+    };
+    expectTypeOf(eitherStringNumber).toEqualTypeOf<{
+      is_left: boolean;
+      left: string;
+      right: number;
+    }>();
+  });
+
+  it('should export CurvePoint type correctly', () => {
+    const curvePoint: CurvePoint = { x: BigInt(1), y: BigInt(2) };
+    expectTypeOf(curvePoint).toEqualTypeOf<{ x: bigint; y: bigint }>();
+  });
+
+  it('should export MerkleTreeDigest type correctly', () => {
+    const digest: MerkleTreeDigest = { field: BigInt(123) };
+    expectTypeOf(digest).toEqualTypeOf<{ field: bigint }>();
+  });
+
+  it('should export MerkleTreePathEntry type correctly', () => {
+    const entry: MerkleTreePathEntry = {
+      sibling: { field: BigInt(456) },
+      goes_left: false,
+    };
+    expectTypeOf(entry).toEqualTypeOf<{
+      sibling: { field: bigint };
+      goes_left: boolean;
+    }>();
+  });
+
+  it('should export MerkleTreePath type correctly', () => {
+    const path: MerkleTreePath<Uint8Array> = {
+      leaf: new Uint8Array([1, 2, 3]),
+      path: [{ sibling: { field: BigInt(789) }, goes_left: true }],
+    };
+    expectTypeOf(path).toEqualTypeOf<{
+      leaf: Uint8Array;
+      path: { sibling: { field: bigint }; goes_left: boolean }[];
+    }>();
+  });
+
+  it('should export ContractAddress type correctly', () => {
+    const address: ContractAddress = { bytes: new Uint8Array(32) };
+    expectTypeOf(address).toEqualTypeOf<{ bytes: Uint8Array }>();
+  });
+
+  it('should export CoinInfo type correctly', () => {
+    const coin: CoinInfo = {
+      nonce: new Uint8Array(32),
+      color: new Uint8Array(32),
+      value: BigInt(100),
+    };
+    expectTypeOf(coin).toEqualTypeOf<{
+      nonce: Uint8Array;
+      color: Uint8Array;
+      value: bigint;
+    }>();
+  });
+
+  it('should export QualifiedCoinInfo type correctly', () => {
+    const qualifiedCoin: QualifiedCoinInfo = {
+      nonce: new Uint8Array(32),
+      color: new Uint8Array(32),
+      value: BigInt(200),
+      mt_index: BigInt(1),
+    };
+    expectTypeOf(qualifiedCoin).toEqualTypeOf<{
+      nonce: Uint8Array;
+      color: Uint8Array;
+      value: bigint;
+      mt_index: bigint;
+    }>();
+  });
+
+  it('should export ZswapCoinPublicKey type correctly', () => {
+    const pubKey: ZswapCoinPublicKey = { bytes: new Uint8Array(32) };
+    expectTypeOf(pubKey).toEqualTypeOf<{ bytes: Uint8Array }>();
+  });
+
+  it('should export SendResult type correctly', () => {
+    const result: SendResult = {
+      change: {
+        is_some: false,
+        value: {
+          nonce: new Uint8Array(32),
+          color: new Uint8Array(32),
+          value: BigInt(0),
+        },
+      },
+      sent: {
+        nonce: new Uint8Array(32),
+        color: new Uint8Array(32),
+        value: BigInt(50),
+      },
+    };
+    expectTypeOf(result).toEqualTypeOf<{
+      change: Maybe<CoinInfo>;
+      sent: CoinInfo;
+    }>();
+  });
+});
@@ -0,0 +1,18 @@
+/**
+ * @module @midnight-dapps/compact-stdlib
+ * @description Re-exports custom structs from CompactStandardLibrary for use in TypeScript code.
+ * Excludes standard runtime types from @midnight-ntwrk/compact-runtime.
+ */
+export type {
+  Maybe,
+  Either,
+  CurvePoint,
+  MerkleTreeDigest,
+  MerkleTreePathEntry,
+  MerkleTreePath,
+  ContractAddress,
+  CoinInfo,
+  QualifiedCoinInfo,
+  ZswapCoinPublicKey,
+  SendResult,
+} from './artifacts/Index/contract/index.cjs';
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": [
+    "src/test/**/*.ts"
+  ],
+  "compilerOptions": {}
+}
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "outDir": "dist",
+    "rootDir": "src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist", "src/artifacts"]
+}
@@ -0,0 +1,10 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    environment: 'node',
+    globals: true,
+    include: ['**/*.test.ts'],
+    hookTimeout: 100000,
+  },
+});
diff --git a/contracts/archive/package.json → packages/contracts/archive/package.json b/contracts/archive/package.json → packages/contracts/archive/package.json
diff --git a/contracts/archive/src/ShieldedToken.compact → ...ntracts/archive/src/ShieldedToken.compact b/contracts/archive/src/ShieldedToken.compact → ...ntracts/archive/src/ShieldedToken.compact
@@ -31,7 +31,7 @@ pragma language_version >= 0.15.0;
  */
 module ShieldedToken { // DO NOT USE IN PRODUCTION!
   import CompactStandardLibrary;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
 
   // Public state
   export ledger _counter: Counter;

diff --git a/...ts/archive/src/test/ShieldedToken.test.ts → ...ts/archive/src/test/ShieldedToken.test.ts b/...ts/archive/src/test/ShieldedToken.test.ts → ...ts/archive/src/test/ShieldedToken.test.ts
diff --git a/.../src/test/mocks/MockShieldedToken.compact → .../src/test/mocks/MockShieldedToken.compact b/.../src/test/mocks/MockShieldedToken.compact → .../src/test/mocks/MockShieldedToken.compact
diff --git a/...test/simulators/ShieldedTokenSimulator.ts → ...test/simulators/ShieldedTokenSimulator.ts b/...test/simulators/ShieldedTokenSimulator.ts → ...test/simulators/ShieldedTokenSimulator.ts
diff --git a/contracts/archive/src/test/types/string.ts → ...ontracts/archive/src/test/types/string.ts b/contracts/archive/src/test/types/string.ts → ...ontracts/archive/src/test/types/string.ts
diff --git a/contracts/archive/src/test/types/test.ts → .../contracts/archive/src/test/types/test.ts b/contracts/archive/src/test/types/test.ts → .../contracts/archive/src/test/types/test.ts
diff --git a/contracts/archive/src/test/utils/address.ts → ...ntracts/archive/src/test/utils/address.ts b/contracts/archive/src/test/utils/address.ts → ...ntracts/archive/src/test/utils/address.ts
diff --git a/contracts/archive/src/test/utils/test.ts → .../contracts/archive/src/test/utils/test.ts b/contracts/archive/src/test/utils/test.ts → .../contracts/archive/src/test/utils/test.ts
diff --git a/...e/src/witnesses/ShieldedTokenWitnesses.ts → ...e/src/witnesses/ShieldedTokenWitnesses.ts b/...e/src/witnesses/ShieldedTokenWitnesses.ts → ...e/src/witnesses/ShieldedTokenWitnesses.ts
diff --git a/contracts/archive/tsconfig.build.json → ...ges/contracts/archive/tsconfig.build.json b/contracts/archive/tsconfig.build.json → ...ges/contracts/archive/tsconfig.build.json
diff --git a/contracts/archive/tsconfig.json → packages/contracts/archive/tsconfig.json b/contracts/archive/tsconfig.json → packages/contracts/archive/tsconfig.json
diff --git a/contracts/archive/vitest.config.ts → packages/contracts/archive/vitest.config.ts b/contracts/archive/vitest.config.ts → packages/contracts/archive/vitest.config.ts
diff --git a/contracts/fungibleToken/package.json → ...ages/contracts/fungibleToken/package.json b/contracts/fungibleToken/package.json → ...ages/contracts/fungibleToken/package.json
diff --git a/...s/fungibleToken/src/FungibleToken.compact → ...s/fungibleToken/src/FungibleToken.compact b/...s/fungibleToken/src/FungibleToken.compact → ...s/fungibleToken/src/FungibleToken.compact
@@ -40,8 +40,8 @@ pragma language_version >= 0.15.0;
  */
 module FungibleToken {
   import CompactStandardLibrary;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Initializable" prefix Initializable_;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Initializable" prefix Initializable_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
 
   /**
    * @description Mapping from account addresses to their token balances.

diff --git a/...gibleToken/src/test/FungibleToken.test.ts → ...gibleToken/src/test/FungibleToken.test.ts b/...gibleToken/src/test/FungibleToken.test.ts → ...gibleToken/src/test/FungibleToken.test.ts
diff --git a/.../src/test/mocks/MockFungibleToken.compact → .../src/test/mocks/MockFungibleToken.compact b/.../src/test/mocks/MockFungibleToken.compact → .../src/test/mocks/MockFungibleToken.compact
diff --git a/...test/simulators/FungibleTokenSimulator.ts → ...test/simulators/FungibleTokenSimulator.ts b/...test/simulators/FungibleTokenSimulator.ts → ...test/simulators/FungibleTokenSimulator.ts
diff --git a/...ts/fungibleToken/src/test/types/string.ts → ...ts/fungibleToken/src/test/types/string.ts b/...ts/fungibleToken/src/test/types/string.ts → ...ts/fungibleToken/src/test/types/string.ts
diff --git a/...acts/fungibleToken/src/test/types/test.ts → ...acts/fungibleToken/src/test/types/test.ts b/...acts/fungibleToken/src/test/types/test.ts → ...acts/fungibleToken/src/test/types/test.ts
diff --git a/...s/fungibleToken/src/test/utils/address.ts → ...s/fungibleToken/src/test/utils/address.ts b/...s/fungibleToken/src/test/utils/address.ts → ...s/fungibleToken/src/test/utils/address.ts
diff --git a/...acts/fungibleToken/src/test/utils/test.ts → ...acts/fungibleToken/src/test/utils/test.ts b/...acts/fungibleToken/src/test/utils/test.ts → ...acts/fungibleToken/src/test/utils/test.ts
diff --git a/...n/src/witnesses/FungibleTokenWitnesses.ts → ...n/src/witnesses/FungibleTokenWitnesses.ts b/...n/src/witnesses/FungibleTokenWitnesses.ts → ...n/src/witnesses/FungibleTokenWitnesses.ts
diff --git a/contracts/fungibleToken/tsconfig.build.json → ...ntracts/fungibleToken/tsconfig.build.json b/contracts/fungibleToken/tsconfig.build.json → ...ntracts/fungibleToken/tsconfig.build.json
diff --git a/contracts/fungibleToken/tsconfig.json → ...ges/contracts/fungibleToken/tsconfig.json b/contracts/fungibleToken/tsconfig.json → ...ges/contracts/fungibleToken/tsconfig.json
diff --git a/contracts/fungibleToken/vitest.config.ts → .../contracts/fungibleToken/vitest.config.ts b/contracts/fungibleToken/vitest.config.ts → .../contracts/fungibleToken/vitest.config.ts
diff --git a/contracts/multiToken/package.json → packages/contracts/multiToken/package.json b/contracts/multiToken/package.json → packages/contracts/multiToken/package.json
diff --git a/contracts/multiToken/src/MultiToken.compact → ...ntracts/multiToken/src/MultiToken.compact b/contracts/multiToken/src/MultiToken.compact → ...ntracts/multiToken/src/MultiToken.compact
@@ -63,8 +63,8 @@ pragma language_version >= 0.15.0;
  */
 module MultiToken {
   import CompactStandardLibrary;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Initializable" prefix Initializable_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Initializable" prefix Initializable_;
 
   /**
    * @description Mapping from token ID to account balances.

diff --git a/...ts/multiToken/src/test/MultiToken.test.ts → ...ts/multiToken/src/test/MultiToken.test.ts b/...ts/multiToken/src/test/MultiToken.test.ts → ...ts/multiToken/src/test/MultiToken.test.ts
diff --git a/...ken/src/test/mocks/MockMultiToken.compact → ...ken/src/test/mocks/MockMultiToken.compact b/...ken/src/test/mocks/MockMultiToken.compact → ...ken/src/test/mocks/MockMultiToken.compact
diff --git a/...rc/test/simulators/MultiTokenSimulator.ts → ...rc/test/simulators/MultiTokenSimulator.ts b/...rc/test/simulators/MultiTokenSimulator.ts → ...rc/test/simulators/MultiTokenSimulator.ts
diff --git a/...racts/multiToken/src/test/types/string.ts → ...racts/multiToken/src/test/types/string.ts b/...racts/multiToken/src/test/types/string.ts → ...racts/multiToken/src/test/types/string.ts
diff --git a/contracts/multiToken/src/test/types/test.ts → ...ntracts/multiToken/src/test/types/test.ts b/contracts/multiToken/src/test/types/test.ts → ...ntracts/multiToken/src/test/types/test.ts
diff --git a/...acts/multiToken/src/test/utils/address.ts → ...acts/multiToken/src/test/utils/address.ts b/...acts/multiToken/src/test/utils/address.ts → ...acts/multiToken/src/test/utils/address.ts
diff --git a/contracts/multiToken/src/test/utils/test.ts → ...ntracts/multiToken/src/test/utils/test.ts b/contracts/multiToken/src/test/utils/test.ts → ...ntracts/multiToken/src/test/utils/test.ts
diff --git a/...oken/src/witnesses/MultiTokenWitnesses.ts → ...oken/src/witnesses/MultiTokenWitnesses.ts b/...oken/src/witnesses/MultiTokenWitnesses.ts → ...oken/src/witnesses/MultiTokenWitnesses.ts
diff --git a/contracts/multiToken/tsconfig.build.json → .../contracts/multiToken/tsconfig.build.json b/contracts/multiToken/tsconfig.build.json → .../contracts/multiToken/tsconfig.build.json
diff --git a/contracts/multiToken/tsconfig.json → packages/contracts/multiToken/tsconfig.json b/contracts/multiToken/tsconfig.json → packages/contracts/multiToken/tsconfig.json
diff --git a/contracts/multiToken/vitest.config.ts → ...ges/contracts/multiToken/vitest.config.ts b/contracts/multiToken/vitest.config.ts → ...ges/contracts/multiToken/vitest.config.ts
diff --git a/contracts/nonFungibleToken/package.json → ...s/contracts/nonFungibleToken/package.json b/contracts/nonFungibleToken/package.json → ...s/contracts/nonFungibleToken/package.json
@@ -24,6 +24,8 @@
     "@openzeppelin-compact/compact": "workspace:^"
   },
   "devDependencies": {
+    "@openzeppelin-compact/compact-std": "workspace:^",
+    "@openzeppelin-compact/testing": "workspace:^",
     "@types/node": "22.14.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.2.2",

diff --git a/...ungibleToken/src/NonFungibleToken.compact → ...ungibleToken/src/NonFungibleToken.compact b/...ungibleToken/src/NonFungibleToken.compact → ...ungibleToken/src/NonFungibleToken.compact
@@ -40,8 +40,8 @@ pragma language_version >= 0.15.0;
 
 module NonFungibleToken {
   import CompactStandardLibrary;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
-  import "../../node_modules/@openzeppelin-compact/utils/src/Initializable" prefix Initializable_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Utils" prefix Utils_;
+  import "../../../node_modules/@openzeppelin-compact/utils/src/Initializable" prefix Initializable_;
 
   /// Public state
   export sealed ledger _name: Opaque<"string">;

diff --git a/...c/test/mocks/MockNonFungibleToken.compact → ...c/test/mocks/MockNonFungibleToken.compact b/...c/test/mocks/MockNonFungibleToken.compact → ...c/test/mocks/MockNonFungibleToken.compact
@@ -1,11 +1,8 @@
 pragma language_version >= 0.15.0;
 
 import CompactStandardLibrary;
-
 import "../../NonFungibleToken" prefix NonFungibleToken_;
 
-export { ZswapCoinPublicKey, ContractAddress, Either, Maybe };
-
 /**
  * @description `init` is a param for testing.
  * If `init` is true, initialize the contract with `_name` and `_symbol`.