Skip to content

Commit ec44f51

Browse files
Consume compact tools from NPM instead of local packages (OpenZeppelin#523)
1 parent de13830 commit ec44f51

59 files changed

Lines changed: 58 additions & 5911 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

contracts/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@
2424
"#test-utils/address.js": "./test-utils/address.js"
2525
},
2626
"scripts": {
27-
"compact": "compact-compiler",
27+
"compact": "compact-compiler --exclude '*/archive/*'",
2828
"compact:access": "compact-compiler --dir access",
2929
"compact:archive": "compact-compiler --dir archive",
3030
"compact:security": "compact-compiler --dir security",
3131
"compact:token": "compact-compiler --dir token",
3232
"compact:utils": "compact-compiler --dir utils",
33-
"build": "compact-builder",
34-
"test": "compact-compiler --skip-zk && vitest run",
33+
"build": "compact-builder --out dist --clean-dist --exclude '*/archive/*' --exclude 'Mock*' --exclude '*.mock.compact' --copy package.json --copy ../README.md && find dist -type d -empty -delete",
34+
"test": "SKIP_ZK=true yarn run compact && vitest run",
3535
"types": "tsc -p tsconfig.json --noEmit",
3636
"clean": "git clean -fXd"
3737
},
3838
"engines": {
3939
"node": ">=22"
4040
},
4141
"dependencies": {
42-
"@openzeppelin-compact/compact": "workspace:^"
42+
"@openzeppelin/compact-cli": "^0.0.1"
4343
},
4444
"devDependencies": {
45-
"@openzeppelin-compact/contracts-simulator": "workspace:^",
45+
"@openzeppelin/compact-simulator": "^0.0.1",
4646
"@tsconfig/node24": "^24.0.4",
4747
"@types/node": "25.7.0",
4848
"ts-node": "^10.9.2",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
type ContractAddress,
77
type Either,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
type ContractAddress,
77
type Either,

contracts/src/access/test/simulators/ShieldedAccessControlSimulator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { MerkleTreePath } from '@midnight-ntwrk/compact-runtime';
22
import {
33
type BaseSimulatorOptions,
44
createSimulator,
5-
} from '@openzeppelin-compact/contracts-simulator';
5+
} from '@openzeppelin/compact-simulator';
66
import {
77
ledger,
88
Contract as MockShieldedAccessControl,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
type ContractAddress,
77
type Either,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
ledger,
77
Contract as MockInitializable,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
ledger,
77
Contract as MockPausable,

contracts/src/token/test/simulators/FungibleTokenSimulator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
type ContractAddress,
77
type Either,

contracts/src/token/test/simulators/MultiTokenSimulator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
type ContractAddress,
77
type Either,

contracts/src/token/test/simulators/NonFungibleTokenSimulator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
type BaseSimulatorOptions,
33
createSimulator,
4-
} from '@openzeppelin-compact/contracts-simulator';
4+
} from '@openzeppelin/compact-simulator';
55
import {
66
type ContractAddress,
77
type Either,

0 commit comments

Comments
 (0)