refactor(contracts): inline witnesses into the simulators

.act.env

@@ -0,0 +1 @@
+COMPACT_INSTALLER_URL=https://github.com/midnightntwrk/compact/releases/latest/download/compact-installer.sh

.gitignore

@@ -46,3 +46,5 @@ coverage
 *~
 
 *temp
+.claude/
+.act.env

contracts/src/access/test/AccessControl.test.ts

@@ -1,7 +1,7 @@
 import { convertFieldToBytes } from '@midnight-ntwrk/compact-runtime';
 import { beforeEach, describe, expect, it } from 'vitest';
 import * as utils from '#test-utils/address.js';
-import { AccessControlSimulator } from './simulators/AccessControlSimulator.js';
+import { AccessControlSimulator } from './mocks/AccessControlSimulator.js';
 
 // PKs
 const [OPERATOR_1, Z_OPERATOR_1] = utils.generateEitherPubKeyPair('OPERATOR_1');

contracts/src/access/test/Ownable.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 import * as utils from '#test-utils/address.js';
-import { OwnableSimulator } from './simulators/OwnableSimulator.js';
+import { OwnableSimulator } from './mocks/OwnableSimulator.js';
 
 // PKs
 const [OWNER, Z_OWNER] = utils.generateEitherPubKeyPair('OWNER');

contracts/src/access/test/ZOwnablePK.test.ts

@@ -6,9 +6,11 @@ import {
 } from '@midnight-ntwrk/compact-runtime';
 import { beforeEach, describe, expect, it } from 'vitest';
 import * as utils from '#test-utils/address.js';
-import type { ZswapCoinPublicKey } from '../../../artifacts/MockOwnable/contract/index.js';
-import { ZOwnablePKPrivateState } from '../witnesses/ZOwnablePKWitnesses.js';
-import { ZOwnablePKSimulator } from './simulators/ZOwnablePKSimulator.js';
+import type { ZswapCoinPublicKey } from '../../../artifacts/Ownable.mock/contract/index.js';
+import {
+  generate as generateZOwnablePKState,
+  ZOwnablePKSimulator,
+} from './mocks/ZOwnablePKSimulator.js';
 
 // PKs
 const [OWNER, Z_OWNER] = utils.generatePubKeyPair('OWNER');
@@ -139,7 +141,7 @@ describe('ZOwnablePK', () => {
   describe('after initialization', () => {
     beforeEach(() => {
       // Create private state object and generate nonce
-      const PS = ZOwnablePKPrivateState.generate();
+      const PS = generateZOwnablePKState();
       // Bind nonce for convenience
       secretNonce = PS.secretNonce;
       // Prepare owner ID with gen nonce
@@ -171,7 +173,7 @@ describe('ZOwnablePK', () => {
 
       beforeEach(() => {
         // Prepare new owner commitment
-        newOwnerNonce = ZOwnablePKPrivateState.generate().secretNonce;
+        newOwnerNonce = generateZOwnablePKState().secretNonce;
         newCounter = INIT_COUNTER + 1n;
         newIdHash = createIdHash(Z_NEW_OWNER, newOwnerNonce);
         newOwnerCommitment = buildCommitment(

contracts/src/access/test/simulators/AccessControlSimulator.ts → contracts/src/access/test/mocks/AccessControlSimulator.ts

@@ -8,11 +8,11 @@ import {
   ledger,
   Contract as MockAccessControl,
   type ZswapCoinPublicKey,
-} from '../../../../artifacts/MockAccessControl/contract/index.js';
-import {
-  AccessControlPrivateState,
-  AccessControlWitnesses,
-} from '../../witnesses/AccessControlWitnesses.js';
+} from '../../../../artifacts/AccessControl.mock/contract/index.js';
+
+type AccessControlPrivateState = Record<string, never>;
+const AccessControlPrivateState: AccessControlPrivateState = {};
+const AccessControlWitnesses = () => ({});
 
 /**
  * Type constructor args

contracts/src/access/test/simulators/OwnableSimulator.ts → contracts/src/access/test/mocks/OwnableSimulator.ts

@@ -8,11 +8,11 @@ import {
   ledger,
   Contract as MockOwnable,
   type ZswapCoinPublicKey,
-} from '../../../../artifacts/MockOwnable/contract/index.js';
-import {
-  OwnablePrivateState,
-  OwnableWitnesses,
-} from '../../witnesses/OwnableWitnesses.js';
+} from '../../../../artifacts/Ownable.mock/contract/index.js';
+
+type OwnablePrivateState = Record<string, never>;
+const OwnablePrivateState: OwnablePrivateState = {};
+const OwnableWitnesses = () => ({});
 
 /**
  * Type constructor args

contracts/src/access/test/simulators/ZOwnablePKSimulator.ts → contracts/src/access/test/mocks/ZOwnablePKSimulator.ts

@@ -1,18 +1,37 @@
+import { getRandomValues } from 'node:crypto';
+import type { WitnessContext } from '@midnight-ntwrk/compact-runtime';
 import {
   type BaseSimulatorOptions,
   createSimulator,
 } from '@openzeppelin-compact/contracts-simulator';
+import type { Ledger } from '../../../../artifacts/ZOwnablePK.mock/contract/index.js';
 import {
   type ContractAddress,
   type Either,
   ledger,
   Contract as MockZOwnablePK,
   type ZswapCoinPublicKey,
-} from '../../../../artifacts/MockZOwnablePK/contract/index.js';
-import {
-  ZOwnablePKPrivateState,
-  ZOwnablePKWitnesses,
-} from '../../witnesses/ZOwnablePKWitnesses.js';
+} from '../../../../artifacts/ZOwnablePK.mock/contract/index.js';
+
+export type ZOwnablePKPrivateState = {
+  secretNonce: Buffer;
+};
+
+export const generate = (): ZOwnablePKPrivateState => ({
+  secretNonce: getRandomValues(Buffer.alloc(32)),
+});
+
+export const withNonce = (nonce: Buffer): ZOwnablePKPrivateState => ({
+  secretNonce: nonce,
+});
+
+const ZOwnablePKWitnesses = () => ({
+  wit_secretNonce(
+    context: WitnessContext<Ledger, ZOwnablePKPrivateState>,
+  ): [ZOwnablePKPrivateState, Uint8Array] {
+    return [context.privateState, context.privateState.secretNonce];
+  },
+});
 
 /**
  * Type constructor args
@@ -42,7 +61,7 @@ const ZOwnablePKSimulatorBase: any = createSimulator<
 >({
   contractFactory: (witnesses) =>
     new MockZOwnablePK<ZOwnablePKPrivateState>(witnesses),
-  defaultPrivateState: () => ZOwnablePKPrivateState.generate(),
+  defaultPrivateState: () => generate(),
   contractArgs: (owner, instanceSalt, isInit) => {
     return [owner, instanceSalt, isInit];
   },

contracts/src/access/test/mocks/MockAccessControl.compact → contracts/src/access/test/mocks/contracts/AccessControl.mock.compact

@@ -4,7 +4,7 @@ pragma language_version >= 0.21.0;
 
 import CompactStandardLibrary;
 
-import "../../AccessControl" prefix AccessControl_;
+import "../../../AccessControl" prefix AccessControl_;
 
 export { ZswapCoinPublicKey, ContractAddress, Either, Maybe, AccessControl_DEFAULT_ADMIN_ROLE };
 

contracts/src/access/test/mocks/MockOwnable.compact → contracts/src/access/test/mocks/contracts/Ownable.mock.compact

@@ -4,7 +4,7 @@ pragma language_version >= 0.21.0;
 
 import CompactStandardLibrary;
 
-import "../../Ownable" prefix Ownable_;
+import "../../../Ownable" prefix Ownable_;
 
 export { ZswapCoinPublicKey, ContractAddress, Either, Maybe };
 

contracts/src/access/test/mocks/MockZOwnablePK.compact → contracts/src/access/test/mocks/contracts/ZOwnablePK.mock.compact

@@ -3,7 +3,7 @@
 pragma language_version >= 0.21.0;
 
 import CompactStandardLibrary;
-import "../../ZOwnablePK" prefix ZOwnablePK_;
+import "../../../ZOwnablePK" prefix ZOwnablePK_;
 
 export { ZswapCoinPublicKey, ContractAddress, Either, Maybe };
 export { ZOwnablePK__ownerCommitment, ZOwnablePK__counter };

contracts/src/archive/test/ShieldedToken.test.ts

@@ -6,8 +6,8 @@ import {
   tokenType,
 } from '@midnight-ntwrk/onchain-runtime';
 import { beforeEach, describe, expect, it } from 'vitest';
-import type { Maybe } from '../../../artifacts/MockShieldedToken/contract/index.js'; // Combined imports
-import { ShieldedTokenSimulator } from './simulators/ShieldedTokenSimulator.js';
+import type { Maybe } from '../../../artifacts/ShieldedToken.mock/contract/index.js'; // Combined imports
+import { ShieldedTokenSimulator } from './mocks/ShieldedTokenSimulator.js';
 import * as utils from './utils/address.js';
 
 const NO_STRING: Maybe<string> = {

contracts/src/archive/test/simulators/ShieldedTokenSimulator.ts → contracts/src/archive/test/mocks/ShieldedTokenSimulator.ts

@@ -18,13 +18,12 @@ import {
   Contract as MockShielded,
   type SendResult,
   type ZswapCoinPublicKey,
-} from '../../../../artifacts/MockShieldedToken/contract/index.js'; // Combined imports
-import {
-  type ShieldedTokenPrivateState,
-  ShieldedTokenWitnesses,
-} from '../../witnesses/ShieldedTokenWitnesses.js';
+} from '../../../../artifacts/ShieldedToken.mock/contract/index.js';
 import type { IContractSimulator } from '../types/test.js';
 
+type ShieldedTokenPrivateState = Record<string, never>;
+const ShieldedTokenWitnesses = {};
+
 /**
  * @description A simulator implementation of a shielded token contract for testing purposes.
  * @template P - The private state type, fixed to ShieldedTokenPrivateState.

contracts/src/archive/test/mocks/MockShieldedToken.compact → contracts/src/archive/test/mocks/contracts/ShieldedToken.mock.compact

@@ -3,7 +3,7 @@
 pragma language_version >= 0.21.0;
 
 import CompactStandardLibrary;
-import "../../ShieldedToken" prefix ShieldedToken_;
+import "../../../ShieldedToken" prefix ShieldedToken_;
 
 export {
   ZswapCoinPublicKey,

contracts/src/archive/test/utils/address.ts

@@ -3,7 +3,7 @@ import {
   encodeCoinPublicKey,
 } from '@midnight-ntwrk/compact-runtime';
 import { encodeContractAddress } from '@midnight-ntwrk/ledger-v7';
-import type * as Compact from '../../../../artifacts/MockShieldedToken/contract/index.js';
+import type * as Compact from '../../../../artifacts/ShieldedToken.mock/contract/index.js';
 
 const PREFIX_ADDRESS = '0200';
 

contracts/src/security/test/Initializable.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it } from 'vitest';
-import { InitializableSimulator } from './simulators/InitializableSimulator.js';
+import { InitializableSimulator } from './mocks/InitializableSimulator.js';
 
 let initializable: InitializableSimulator;
 

contracts/src/security/test/Pausable.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it } from 'vitest';
-import { PausableSimulator } from './simulators/PausableSimulator.js';
+import { PausableSimulator } from './mocks/PausableSimulator.js';
 
 let pausable: PausableSimulator;
 

contracts/src/security/test/simulators/InitializableSimulator.ts → contracts/src/security/test/mocks/InitializableSimulator.ts

@@ -5,11 +5,11 @@ import {
 import {
   ledger,
   Contract as MockInitializable,
-} from '../../../../artifacts/MockInitializable/contract/index.js';
-import {
-  InitializablePrivateState,
-  InitializableWitnesses,
-} from '../../witnesses/InitializableWitnesses.js';
+} from '../../../../artifacts/Initializable.mock/contract/index.js';
+
+type InitializablePrivateState = Record<string, never>;
+const InitializablePrivateState: InitializablePrivateState = {};
+const InitializableWitnesses = () => ({});
 
 /**
  * Type constructor args

contracts/src/security/test/simulators/PausableSimulator.ts → contracts/src/security/test/mocks/PausableSimulator.ts

@@ -5,11 +5,11 @@ import {
 import {
   ledger,
   Contract as MockPausable,
-} from '../../../../artifacts/MockPausable/contract/index.js';
-import {
-  PausablePrivateState,
-  PausableWitnesses,
-} from '../../witnesses/PausableWitnesses.js';
+} from '../../../../artifacts/Pausable.mock/contract/index.js';
+
+type PausablePrivateState = Record<string, never>;
+const PausablePrivateState: PausablePrivateState = {};
+const PausableWitnesses = () => ({});
 
 /**
  * Type constructor args

contracts/src/security/test/mocks/MockInitializable.compact → contracts/src/security/test/mocks/contracts/Initializable.mock.compact

@@ -1,7 +1,7 @@
 pragma language_version >= 0.21.0;
 
 import CompactStandardLibrary;
-import "../../Initializable" prefix Initializable_;
+import "../../../Initializable" prefix Initializable_;
 
 export { Initializable__isInitialized };
 

contracts/src/security/test/mocks/MockPausable.compact → contracts/src/security/test/mocks/contracts/Pausable.mock.compact

@@ -1,7 +1,7 @@
 pragma language_version >= 0.21.0;
 
 import CompactStandardLibrary;
-import "../../Pausable" prefix Pausable_;
+import "../../../Pausable" prefix Pausable_;
 
 export { Pausable__isPaused };
 

contracts/src/token/test/FungibleToken.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import * as utils from '#test-utils/address.js';
-import { FungibleTokenSimulator } from './simulators/FungibleTokenSimulator.js';
+import { FungibleTokenSimulator } from './mocks/FungibleTokenSimulator.js';
 
 // Metadata
 const EMPTY_STRING = '';