@openzeppelin/compact-deployer 0.4.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/README.md +13 -10
- package/dist/deployer.js +2 -2
- package/dist/deployer.js.map +1 -1
- package/dist/loaders/artifact.d.ts +1 -8
- package/dist/loaders/artifact.js +17 -1
- package/dist/loaders/artifact.js.map +1 -1
- package/dist/providers/build.js +15 -2
- package/dist/providers/build.js.map +1 -1
- package/dist/providers/network.js +5 -5
- package/dist/providers/network.js.map +1 -1
- package/dist/services/chain-state.d.ts +1 -1
- package/dist/services/chain-state.js +5 -2
- package/dist/services/chain-state.js.map +1 -1
- package/dist/services/deploy-tx.d.ts +24 -16
- package/dist/services/deploy-tx.js +18 -12
- package/dist/services/deploy-tx.js.map +1 -1
- package/dist/services/maintenance-tx.d.ts +4 -1
- package/dist/services/maintenance-tx.js +2 -3
- package/dist/services/maintenance-tx.js.map +1 -1
- package/dist/services/wallet-cache.d.ts +4 -4
- package/dist/services/wallet-cache.js.map +1 -1
- package/dist/services/wallet-sync.d.ts +2 -1
- package/dist/services/wallet-sync.js +13 -21
- package/dist/services/wallet-sync.js.map +1 -1
- package/dist/wallet/handler.js +1 -2
- package/dist/wallet/handler.js.map +1 -1
- package/package.json +17 -18
- package/proof-server.yml +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,26 @@ file.
|
|
|
6
6
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
|
7
7
|
and this package adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
8
8
|
|
|
9
|
+
## Unreleased
|
|
10
|
+
|
|
11
|
+
### Changed (breaking)
|
|
12
|
+
|
|
13
|
+
- midnight-js moves to `5.0.0` with:
|
|
14
|
+
- `@midnight-ntwrk/compact-js` `3.0.0`
|
|
15
|
+
- `@midnightntwrk/ledger-v9` `1.0.0`
|
|
16
|
+
- `@midnight-ntwrk/testkit-js` `5.0.0`
|
|
17
|
+
- `@midnightntwrk/wallet-sdk-facade` `5.0.0`, with the other wallet SDK packages at the versions `@midnightntwrk/wallet-sdk` `2.0.0` pins
|
|
18
|
+
Minimums from midnight-js: proof server `9.0.0`, indexer `4.4.0-rc.6`, and a node newer than `2.1.0-rc.4`, which refuses every call it builds. Verified stack, the one `proof-server.yml` and the integration suite pin: proof server `9.0.1`, node `2.1.101`, indexer `4.4.101`. Pin `@midnightntwrk/ledger-v9`, `@midnightntwrk/onchain-runtime-v4` and `@midnight-ntwrk/platform-js` to one copy each (#220)
|
|
19
|
+
- `Artifact.load` throws `ArtifactNotFoundError` for an artifact without `compiler/contract-manifest.json`, which compactc 0.36.0 writes and midnight-js checks every key and circuit against; without the check, the first key read failed with midnight-js's `ZkArtifactIntegrityError` naming provider options the deployer does not expose (#220)
|
|
20
|
+
|
|
21
|
+
### Changed
|
|
22
|
+
|
|
23
|
+
- `DeployerOptions.privateStateProvider` takes the midnight-js 5.0.0 provider, which reads and writes a contract's states through `forContract(address)`. Signing keys stay on the provider (#220)
|
|
24
|
+
|
|
25
|
+
### Fixed
|
|
26
|
+
|
|
27
|
+
- `proof_server = "auto"` boots `midnightntwrk/proof-server:9.0.1`. The `9.0.0-rc.6` it booted cannot prove circuits compiled with compactc 0.36.0: deploys succeed, and the first circuit call fails at `/check` with `unrecognised discriminant` (#215)
|
|
28
|
+
|
|
9
29
|
## 0.4.0 (2026-11-05)
|
|
10
30
|
|
|
11
31
|
### Changed
|
package/README.md
CHANGED
|
@@ -40,26 +40,29 @@ The deployer pins one Midnight stack, and artifacts have to be compiled against
|
|
|
40
40
|
| Component | Version |
|
|
41
41
|
|---|---|
|
|
42
42
|
| `@midnight-ntwrk/compact-runtime` | 0.21.0 |
|
|
43
|
-
| `@midnightntwrk/ledger-v9` | 1.0.0
|
|
44
|
-
| `@midnight-ntwrk/compact-js` |
|
|
45
|
-
| `@midnight-ntwrk/midnight-js-*` | 5.0.0
|
|
46
|
-
| `@midnight-ntwrk/testkit-js` | 5.0.0
|
|
47
|
-
| `@midnightntwrk/wallet-sdk-facade` | 5.0.0
|
|
43
|
+
| `@midnightntwrk/ledger-v9` | 1.0.0 |
|
|
44
|
+
| `@midnight-ntwrk/compact-js` | 3.0.0 |
|
|
45
|
+
| `@midnight-ntwrk/midnight-js-*` | 5.0.0 |
|
|
46
|
+
| `@midnight-ntwrk/testkit-js` | 5.0.0 |
|
|
47
|
+
| `@midnightntwrk/wallet-sdk-facade` | 5.0.0 |
|
|
48
48
|
| Compact compiler | 0.36.0 |
|
|
49
|
+
| Proof server (`proof_server = "auto"`) | 9.0.1 |
|
|
49
50
|
|
|
50
|
-
Compile with `compact compile +0.36.0`. An older artifact fails when it loads with `Version mismatch`. Recompiling changes every verifier key (ZKIR v3, `[v7]` header), so a maintenance update of a contract deployed from 0.34 artifacts rotates all of its keys and invalidates proofs in flight.
|
|
51
|
+
Compile with `compact compile +0.36.0`. An older artifact fails when it loads with `Version mismatch`. Recompiling changes every verifier key (ZKIR v3, `[v7]` header), so a maintenance update of a contract deployed from 0.34 artifacts rotates all of its keys and invalidates proofs in flight. midnight-js checks every key and circuit it loads against the artifact's `compiler/contract-manifest.json`, which the compiler writes next to `keys/` and `zkir/`, so the deployer refuses an artifact without it at load time; keep the whole artifact directory together.
|
|
51
52
|
|
|
52
53
|
The ledger and the wallet SDK sit under the `@midnightntwrk` scope, no hyphen. Everything else keeps `@midnight-ntwrk`.
|
|
53
54
|
|
|
54
|
-
Every package manager needs
|
|
55
|
+
Every package manager needs three pins, because the stack's packages ask for the protocol packages with ranges and a second copy of any of them breaks every deploy. With npm:
|
|
55
56
|
|
|
56
57
|
```json
|
|
57
58
|
"overrides": {
|
|
58
|
-
"@midnightntwrk/ledger-v9": "1.0.0
|
|
59
|
+
"@midnightntwrk/ledger-v9": "1.0.0",
|
|
60
|
+
"@midnightntwrk/onchain-runtime-v4": "4.0.0",
|
|
61
|
+
"@midnight-ntwrk/platform-js": "3.0.0"
|
|
59
62
|
}
|
|
60
63
|
```
|
|
61
64
|
|
|
62
|
-
yarn takes the same
|
|
65
|
+
yarn takes the same entries under `resolutions`, and pnpm under `pnpm.overrides`. Nothing else in the stack floats.
|
|
63
66
|
|
|
64
67
|
## CLI
|
|
65
68
|
|
|
@@ -227,7 +230,7 @@ circuits_per_tx = 8
|
|
|
227
230
|
|
|
228
231
|
`proof_server`: a URL pins the server; `"auto"` spawns a `testcontainers`-managed proof-server container for the deploy; omitting it falls back to `PROOF_SERVER_PORT`, then to `http://127.0.0.1:6300`.
|
|
229
232
|
|
|
230
|
-
`"auto"` needs Docker and boots the `proof-server.yml` shipped in this package, pinning `midnightntwrk/proof-server:9.0.
|
|
233
|
+
`"auto"` needs Docker and boots the `proof-server.yml` shipped in this package, pinning `midnightntwrk/proof-server:9.0.1`. To boot a different image, put your own `proof-server.yml` in the directory you run `compact-deploy` from; it wins over the packaged one.
|
|
231
234
|
|
|
232
235
|
### Patterns
|
|
233
236
|
|
package/dist/deployer.js
CHANGED
|
@@ -198,7 +198,7 @@ export class Deployer {
|
|
|
198
198
|
// Surface the wallet's derived bech32m addresses right away so
|
|
199
199
|
// the user can sanity-check they match the seed they intended
|
|
200
200
|
// *before* settling in for a long shielded sync.
|
|
201
|
-
await logWalletAddresses(wallet, logger);
|
|
201
|
+
await logWalletAddresses(wallet, logger, env.networkId);
|
|
202
202
|
await syncAndVerifyFunds({
|
|
203
203
|
wallet,
|
|
204
204
|
timeoutMs: syncTimeoutMs,
|
|
@@ -625,7 +625,6 @@ export class Deployer {
|
|
|
625
625
|
return;
|
|
626
626
|
}
|
|
627
627
|
s.logger.debug(`Storing the maintenance signing key for ${address}`);
|
|
628
|
-
providers.privateStateProvider.setContractAddress(address);
|
|
629
628
|
await providers.privateStateProvider.setSigningKey(address, s.signingKey.ledgerKey);
|
|
630
629
|
}
|
|
631
630
|
/**
|
|
@@ -781,6 +780,7 @@ export class Deployer {
|
|
|
781
780
|
circuits: batch,
|
|
782
781
|
// Counter read fresh from the snapshot above.
|
|
783
782
|
unprovenTx: buildInsertTx({
|
|
783
|
+
networkId: providers.config.networkId,
|
|
784
784
|
update: buildInsertUpdate({
|
|
785
785
|
address,
|
|
786
786
|
counter: snapshot.counter,
|
package/dist/deployer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../src/deployer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../src/deployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
import { CompiledContract, type Contract } from '@midnight-ntwrk/compact-js';
|
|
2
2
|
import type { ZKConfigProvider } from '@midnight-ntwrk/midnight-js-types';
|
|
3
3
|
import { type FileOrModuleRef } from '../config/schema.ts';
|
|
4
|
-
/**
|
|
5
|
-
* A compactc artifact bundle on disk:
|
|
6
|
-
* <artifact>/contract/index.{cjs,js} — Contract class
|
|
7
|
-
* <artifact>/keys/<circuit>.{prover,verifier}
|
|
8
|
-
* <artifact>/zkir/<circuit>.bzkir
|
|
9
|
-
* Witnesses live outside the bundle, referenced via `[contracts.X].witnesses`.
|
|
10
|
-
*/
|
|
11
4
|
type AnyContract = Contract.Any;
|
|
12
5
|
/**
|
|
13
6
|
* `unknown` private state would not satisfy either SDK entry point that takes
|
|
@@ -39,7 +32,7 @@ export declare class Artifact {
|
|
|
39
32
|
* transaction rather than mid-way through the inserts.
|
|
40
33
|
*/
|
|
41
34
|
verifierKeys(zkConfigProvider: ZKConfigProvider<string>): Promise<ArtifactKeys>;
|
|
42
|
-
/** Resolve, validate, and import the bundle. Throws {@link ArtifactNotFoundError} on missing dir/entry/keys/zkir. */
|
|
35
|
+
/** Resolve, validate, and import the bundle. Throws {@link ArtifactNotFoundError} on missing dir/entry/keys/zkir/manifest. */
|
|
43
36
|
static load(opts: LoadArtifactOptions): Promise<Artifact>;
|
|
44
37
|
}
|
|
45
38
|
export {};
|
package/dist/loaders/artifact.js
CHANGED
|
@@ -5,6 +5,16 @@ import { isFileRef, isModuleRef, } from "../config/schema.js";
|
|
|
5
5
|
import { ArtifactNotFoundError, ConfigError } from "../errors.js";
|
|
6
6
|
import { findArtifactEntry, resolveUnderRoot } from "./artifact-path.js";
|
|
7
7
|
import { LoaderContext } from "./context.js";
|
|
8
|
+
/**
|
|
9
|
+
* A compactc artifact bundle on disk:
|
|
10
|
+
* <artifact>/contract/index.{cjs,js} — Contract class
|
|
11
|
+
* <artifact>/keys/<circuit>.{prover,verifier}
|
|
12
|
+
* <artifact>/zkir/<circuit>.bzkir
|
|
13
|
+
* <artifact>/compiler/contract-manifest.json — digests midnight-js checks keys and zkir against
|
|
14
|
+
* Witnesses live outside the bundle, referenced via `[contracts.X].witnesses`.
|
|
15
|
+
*/
|
|
16
|
+
/** Written by compactc 0.36.0 and newer; midnight-js checks every key and zkir file against it. */
|
|
17
|
+
const MANIFEST_PATH = 'compiler/contract-manifest.json';
|
|
8
18
|
export class Artifact {
|
|
9
19
|
compiledContract;
|
|
10
20
|
artifactPath;
|
|
@@ -33,7 +43,7 @@ export class Artifact {
|
|
|
33
43
|
}
|
|
34
44
|
return keys;
|
|
35
45
|
}
|
|
36
|
-
/** Resolve, validate, and import the bundle. Throws {@link ArtifactNotFoundError} on missing dir/entry/keys/zkir. */
|
|
46
|
+
/** Resolve, validate, and import the bundle. Throws {@link ArtifactNotFoundError} on missing dir/entry/keys/zkir/manifest. */
|
|
37
47
|
static async load(opts) {
|
|
38
48
|
const { rootDir, artifactsDir, artifact, contractName, witnesses } = opts;
|
|
39
49
|
const ctx = new LoaderContext(rootDir);
|
|
@@ -54,6 +64,12 @@ export class Artifact {
|
|
|
54
64
|
if (!existsSync(keysDir) || !existsSync(zkirDir)) {
|
|
55
65
|
throw new ArtifactNotFoundError(`${artifactPath} (missing keys/ or zkir/ subdirectory)`);
|
|
56
66
|
}
|
|
67
|
+
// midnight-js refuses every key read without the manifest, with a message
|
|
68
|
+
// that names provider options this package does not expose. Catch it here
|
|
69
|
+
// as the one thing it is: an artifact an older compiler produced.
|
|
70
|
+
if (!existsSync(resolve(artifactPath, MANIFEST_PATH))) {
|
|
71
|
+
throw new ArtifactNotFoundError(`${artifactPath} (missing ${MANIFEST_PATH}; compile with \`compact compile +0.36.0\`, which writes it)`);
|
|
72
|
+
}
|
|
57
73
|
const circuitNames = collectCircuitNames(zkirDir);
|
|
58
74
|
const Ctor = await importContractCtor(ctx, entry);
|
|
59
75
|
const witnessImpls = opts.witnessImpls ??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/loaders/artifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAiB,MAAM,4BAA4B,CAAC;AAG7E,OAAO,EAEL,SAAS,EACT,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/loaders/artifact.ts"],"names":[],"mappings":"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"}
|
package/dist/providers/build.js
CHANGED
|
@@ -5,17 +5,30 @@ import { DEFAULT_CONFIG as LEVEL_DEFAULTS, levelPrivateStateProvider, } from '@m
|
|
|
5
5
|
import { NodeZkConfigProvider } from '@midnight-ntwrk/midnight-js-node-zk-config-provider';
|
|
6
6
|
import { ConfigError } from "../errors.js";
|
|
7
7
|
import { derivePrivateStatePassword } from "./private-state-password.js";
|
|
8
|
+
/**
|
|
9
|
+
* Lifetime of every intent midnight-js builds for a deploy: one hour, the
|
|
10
|
+
* fixed value 4.x used and the value `ttlOneHour()` gives the intents this
|
|
11
|
+
* package builds itself.
|
|
12
|
+
*/
|
|
13
|
+
const TX_TTL_SECONDS = 3600;
|
|
8
14
|
export function buildProviders({ env, wallet, contractName, contract, zkConfigPath, rootDir, privateStateProvider, privateStateSecret, }) {
|
|
9
15
|
const zkConfigProvider = new NodeZkConfigProvider(zkConfigPath);
|
|
10
16
|
const resolvedPrivateStateProvider = privateStateProvider ??
|
|
11
17
|
defaultLevelPrivateStateProvider(wallet, contract, contractName, rootDir, privateStateSecret);
|
|
12
18
|
return {
|
|
13
19
|
privateStateProvider: resolvedPrivateStateProvider,
|
|
14
|
-
publicDataProvider: indexerPublicDataProvider(
|
|
20
|
+
publicDataProvider: indexerPublicDataProvider({
|
|
21
|
+
queryURL: env.indexer,
|
|
22
|
+
subscriptionURL: env.indexerWS,
|
|
23
|
+
}),
|
|
15
24
|
zkConfigProvider,
|
|
16
|
-
proofProvider: httpClientProofProvider(
|
|
25
|
+
proofProvider: httpClientProofProvider({
|
|
26
|
+
url: env.proofServer,
|
|
27
|
+
zkConfigProvider,
|
|
28
|
+
}),
|
|
17
29
|
walletProvider: wallet,
|
|
18
30
|
midnightProvider: wallet,
|
|
31
|
+
config: { networkId: env.networkId, ttlSeconds: TX_TTL_SECONDS },
|
|
19
32
|
};
|
|
20
33
|
}
|
|
21
34
|
function defaultLevelPrivateStateProvider(wallet, contract, contractName, rootDir, privateStateSecret) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/providers/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAAE,MAAM,0DAA0D,CAAC;AACrG,OAAO,EACL,cAAc,IAAI,cAAc,EAChC,yBAAyB,GAC1B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAU3F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/providers/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAAE,MAAM,0DAA0D,CAAC;AACrG,OAAO,EACL,cAAc,IAAI,cAAc,EAChC,yBAAyB,GAC1B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAU3F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAEzE;;;;GAIG;AACH,MAAM,cAAc,GAAG,IAAI,CAAC;AAmB5B,MAAM,UAAU,cAAc,CAAC,EAC7B,GAAG,EACH,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,oBAAoB,EACpB,kBAAkB,GACI;IACtB,MAAM,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEhE,MAAM,4BAA4B,GAChC,oBAAoB;QACpB,gCAAgC,CAC9B,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,kBAAkB,CACnB,CAAC;IAEJ,OAAO;QACL,oBAAoB,EAAE,4BAA4B;QAClD,kBAAkB,EAAE,yBAAyB,CAAC;YAC5C,QAAQ,EAAE,GAAG,CAAC,OAAO;YACrB,eAAe,EAAE,GAAG,CAAC,SAAS;SAC/B,CAAC;QACF,gBAAgB;QAChB,aAAa,EAAE,uBAAuB,CAAC;YACrC,GAAG,EAAE,GAAG,CAAC,WAAW;YACpB,gBAAgB;SACjB,CAAC;QACF,cAAc,EAAE,MAAM;QACtB,gBAAgB,EAAE,MAAM;QACxB,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,gCAAgC,CACvC,MAA8B,EAC9B,QAAwB,EACxB,YAAoB,EACpB,OAAe,EACf,kBAAsC;IAEtC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,0EAA0E;QAC1E,yEAAyE;QACzE,2EAA2E;QAC3E,MAAM,IAAI,WAAW,CACnB,4HAA4H,CAC7H,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;IAChE,OAAO,yBAAyB,CAAC;QAC/B,sEAAsE;QACtE,qEAAqE;QACrE,iEAAiE;QACjE,qEAAqE;QACrE,kEAAkE;QAClE,cAAc,EAAE,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,cAAc,CAAC;QAC/D,qBAAqB,EACnB,QAAQ,CAAC,wBAAwB,IAAI,GAAG,YAAY,gBAAgB;QACtE,SAAS,EAAE,MAAM,CAAC,gBAAgB,EAAE;QACpC,8BAA8B,EAAE,GAAG,EAAE,CAAC,QAAQ;KAC/C,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { setNetworkId } from '@midnight-ntwrk/midnight-js-network-id';
|
|
2
1
|
import { ConfigError } from "../errors.js";
|
|
3
2
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
3
|
+
* Build the `EnvironmentConfiguration` every provider and wallet is
|
|
4
|
+
* constructed from. midnight-js reads the network id from the provider
|
|
5
|
+
* set's `config`, so this is the one place it enters. `KNOWN_NETWORK_IDS`
|
|
6
|
+
* is closed so a typo fails fast here instead of as a generic midnight-js
|
|
7
|
+
* error later.
|
|
7
8
|
*/
|
|
8
9
|
const KNOWN_NETWORK_IDS = new Set([
|
|
9
10
|
'undeployed',
|
|
@@ -17,7 +18,6 @@ export function applyNetwork(network, proofServerUrl) {
|
|
|
17
18
|
if (!KNOWN_NETWORK_IDS.has(network.network_id)) {
|
|
18
19
|
throw new ConfigError(`Unknown network_id "${network.network_id}" (expected one of: ${[...KNOWN_NETWORK_IDS].join(', ')})`);
|
|
19
20
|
}
|
|
20
|
-
setNetworkId(network.network_id);
|
|
21
21
|
const env = {
|
|
22
22
|
walletNetworkId: network.network_id,
|
|
23
23
|
networkId: network.network_id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/providers/network.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/providers/network.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;GAMG;AAEH,MAAM,iBAAiB,GAAwB,IAAI,GAAG,CAAC;IACrD,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,SAAS;IACT,SAAS;IACT,SAAS;CACV,CAAC,CAAC;AAMH,MAAM,UAAU,YAAY,CAC1B,OAAsB,EACtB,cAAsB;IAEtB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,WAAW,CACnB,uBAAuB,OAAO,CAAC,UAAU,uBAAuB,CAAC,GAAG,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACrG,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAA6B;QACpC,eAAe,EACb,OAAO,CAAC,UAAyD;QACnE,SAAS,EAAE,OAAO,CAAC,UAAU;QAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,OAAO,CAAC,UAAU;QAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,OAAO;QACvB,WAAW,EAAE,cAAc;QAC3B,+DAA+D;QAC/D,gEAAgE;QAChE,wDAAwD;QACxD,MAAM,EAAE,SAAS;KAClB,CAAC;IAEF,OAAO,EAAE,GAAG,EAAE,CAAC;AACjB,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* makes about which circuits to insert comes from here.
|
|
7
7
|
*/
|
|
8
8
|
import type { PublicDataProvider } from '@midnight-ntwrk/midnight-js-types';
|
|
9
|
-
import type
|
|
9
|
+
import { type SignatureVerifyingKey } from '@midnightntwrk/ledger-v9';
|
|
10
10
|
import type { ArtifactKeys } from '../loaders/artifact.ts';
|
|
11
11
|
/** One chain read of a contract's operations and maintenance authority. */
|
|
12
12
|
export interface ChainSnapshot {
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* makes about which circuits to insert comes from here.
|
|
7
7
|
*/
|
|
8
8
|
import { verifierKeysEqual } from '@midnight-ntwrk/midnight-js-contracts';
|
|
9
|
+
import { ContractState as LedgerContractState, } from '@midnightntwrk/ledger-v9';
|
|
9
10
|
import { ConfigError, FragmentDeployError } from "../errors.js";
|
|
10
11
|
import { operationNames } from "./contract-state.js";
|
|
11
12
|
import { remaining, sortCircuits } from "./deploy-plan.js";
|
|
@@ -14,9 +15,11 @@ import { formatVerifyingKey, signatureKeysEqual } from "./maintenance-tx.js";
|
|
|
14
15
|
const DEFAULT_STATE_POLL_MS = 2_000;
|
|
15
16
|
/** Snapshot of `address`, or `undefined` when no contract exists there. */
|
|
16
17
|
export async function readSnapshot(publicDataProvider, address) {
|
|
17
|
-
const
|
|
18
|
-
if (
|
|
18
|
+
const read = await publicDataProvider.queryContractState(address);
|
|
19
|
+
if (read === null)
|
|
19
20
|
return undefined;
|
|
21
|
+
// The read carries the state as bytes; the ledger's own class decodes it.
|
|
22
|
+
const state = read.contractState.deserialize({ v9: LedgerContractState });
|
|
20
23
|
const circuits = sortCircuits(operationNames(state));
|
|
21
24
|
const verifierKeys = new Map();
|
|
22
25
|
for (const name of circuits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain-state.js","sourceRoot":"","sources":["../../src/services/chain-state.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"chain-state.js","sourceRoot":"","sources":["../../src/services/chain-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import { type
|
|
3
|
-
import { type SigningKey } from '@midnightntwrk/ledger-v9';
|
|
1
|
+
import { type Ledger9ContractProviders, submitTxAsync } from '@midnight-ntwrk/midnight-js-contracts';
|
|
2
|
+
import { type FinalizedTxRead, type PrivateStateProvider } from '@midnight-ntwrk/midnight-js-types';
|
|
3
|
+
import { type SigningKey, Transaction } from '@midnightntwrk/ledger-v9';
|
|
4
4
|
import type { ContractConfig } from '../config/schema.ts';
|
|
5
5
|
import type { ConfirmedDeploymentRecord, PartialDeploymentRecord, PendingDeploymentRecord } from '../deployments.ts';
|
|
6
6
|
import type { Artifact } from '../loaders/artifact.ts';
|
|
@@ -10,8 +10,16 @@ import type { Artifact } from '../loaders/artifact.ts';
|
|
|
10
10
|
* dropped WebSocket hangs the CLI with no way out but Ctrl-C.
|
|
11
11
|
*/
|
|
12
12
|
export declare const DEFAULT_TX_TIMEOUT_MS = 600000;
|
|
13
|
-
/** An unproven tx as `submitTxAsync` accepts it. */
|
|
13
|
+
/** An unproven tx as `submitTxAsync` accepts it: a handle carrying its ledger era. */
|
|
14
14
|
export type UnprovenTx = Parameters<typeof submitTxAsync>[1]['unprovenTx'];
|
|
15
|
+
/** An unproven tx as the ledger builds it, before it is sealed into a handle. */
|
|
16
|
+
export type LedgerUnprovenTx = ReturnType<typeof Transaction.fromParts>;
|
|
17
|
+
/**
|
|
18
|
+
* Seal a transaction this package built into the handle midnight-js submits.
|
|
19
|
+
* Every artifact the deployer loads is a ledger 9 build (runtime 0.21), so the
|
|
20
|
+
* era is fixed here.
|
|
21
|
+
*/
|
|
22
|
+
export declare function sealUnprovenTx(tx: LedgerUnprovenTx): UnprovenTx;
|
|
15
23
|
/** The signing key as the private-state store accepts it. */
|
|
16
24
|
type PersistedSigningKey = Parameters<PrivateStateProvider['setSigningKey']>[1];
|
|
17
25
|
/**
|
|
@@ -30,7 +38,7 @@ interface UnsubmittedDeploy {
|
|
|
30
38
|
};
|
|
31
39
|
}
|
|
32
40
|
export interface SubmitDeployArgs {
|
|
33
|
-
providers:
|
|
41
|
+
providers: Ledger9ContractProviders;
|
|
34
42
|
contractName: string;
|
|
35
43
|
contract: ContractConfig;
|
|
36
44
|
artifact: Artifact;
|
|
@@ -64,7 +72,7 @@ export interface SubmittedDeploy {
|
|
|
64
72
|
*/
|
|
65
73
|
export declare function submitDeploy(submitArgs: SubmitDeployArgs): Promise<SubmittedDeploy>;
|
|
66
74
|
export interface AwaitDeployFinalizationArgs {
|
|
67
|
-
providers:
|
|
75
|
+
providers: Ledger9ContractProviders;
|
|
68
76
|
contractName: string;
|
|
69
77
|
submitted: SubmittedDeploy;
|
|
70
78
|
txTimeoutMs: number;
|
|
@@ -89,11 +97,11 @@ export interface SplitCircuits {
|
|
|
89
97
|
* insert share the ceiling and the status rule while reporting differently.
|
|
90
98
|
*/
|
|
91
99
|
export declare function awaitFinalization({ providers, txId, txTimeoutMs, fail, }: {
|
|
92
|
-
providers:
|
|
100
|
+
providers: Ledger9ContractProviders;
|
|
93
101
|
txId: string;
|
|
94
102
|
txTimeoutMs: number;
|
|
95
103
|
fail: FinalizationFail;
|
|
96
|
-
}): Promise<
|
|
104
|
+
}): Promise<FinalizedTxRead>;
|
|
97
105
|
/**
|
|
98
106
|
* Settle the deploy transaction by address rather than by a recorded id.
|
|
99
107
|
*
|
|
@@ -102,11 +110,11 @@ export declare function awaitFinalization({ providers, txId, txTimeoutMs, fail,
|
|
|
102
110
|
* case it returns data that has nothing to do with this address.
|
|
103
111
|
*/
|
|
104
112
|
export declare function awaitDeployTxData({ providers, address, txTimeoutMs, fail, }: {
|
|
105
|
-
providers:
|
|
113
|
+
providers: Ledger9ContractProviders;
|
|
106
114
|
address: string;
|
|
107
115
|
txTimeoutMs: number;
|
|
108
116
|
fail: FinalizationFail;
|
|
109
|
-
}): Promise<
|
|
117
|
+
}): Promise<FinalizedTxRead>;
|
|
110
118
|
/**
|
|
111
119
|
* One wait, one ceiling, one `SucceedEntirely` rule. `fail` supplies
|
|
112
120
|
* the caller's error type and learns whether the ceiling was what stopped it,
|
|
@@ -118,11 +126,11 @@ type FinalizationFail = (reason: string, detail?: {
|
|
|
118
126
|
timedOut?: boolean;
|
|
119
127
|
}) => Error;
|
|
120
128
|
/** Wait for the deploy tx to land. Its record, if any, survives every failure. */
|
|
121
|
-
export declare function awaitDeployFinalization({ providers, contractName, submitted, txTimeoutMs, recovery, circuits, }: AwaitDeployFinalizationArgs): Promise<
|
|
129
|
+
export declare function awaitDeployFinalization({ providers, contractName, submitted, txTimeoutMs, recovery, circuits, }: AwaitDeployFinalizationArgs): Promise<FinalizedTxRead>;
|
|
122
130
|
export interface SubmitInsertArgs {
|
|
123
|
-
providers:
|
|
131
|
+
providers: Ledger9ContractProviders;
|
|
124
132
|
contractName: string;
|
|
125
|
-
unprovenTx:
|
|
133
|
+
unprovenTx: LedgerUnprovenTx;
|
|
126
134
|
/** Circuits in this batch. Named in a block-limit refusal. */
|
|
127
135
|
circuits: readonly string[];
|
|
128
136
|
}
|
|
@@ -132,7 +140,7 @@ export interface SubmitInsertArgs {
|
|
|
132
140
|
*/
|
|
133
141
|
export declare function submitInsert({ providers, contractName, unprovenTx, circuits, }: SubmitInsertArgs): Promise<string>;
|
|
134
142
|
export interface AwaitFragmentFinalizationArgs {
|
|
135
|
-
providers:
|
|
143
|
+
providers: Ledger9ContractProviders;
|
|
136
144
|
address: string;
|
|
137
145
|
txId: string;
|
|
138
146
|
txTimeoutMs: number;
|
|
@@ -146,9 +154,9 @@ export interface AwaitFragmentFinalizationArgs {
|
|
|
146
154
|
* applied update must not be treated as landed: verify would then be skipped
|
|
147
155
|
* for those circuits.
|
|
148
156
|
*/
|
|
149
|
-
export declare function awaitFragmentFinalization({ providers, address, txId, txTimeoutMs, circuitsOnChain, circuitsPending, }: AwaitFragmentFinalizationArgs): Promise<
|
|
157
|
+
export declare function awaitFragmentFinalization({ providers, address, txId, txTimeoutMs, circuitsOnChain, circuitsPending, }: AwaitFragmentFinalizationArgs): Promise<FinalizedTxRead>;
|
|
150
158
|
export interface PersistDeployPrivateStateArgs {
|
|
151
|
-
providers:
|
|
159
|
+
providers: Ledger9ContractProviders;
|
|
152
160
|
contract: ContractConfig;
|
|
153
161
|
submitted: SubmittedDeploy;
|
|
154
162
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ContractExecutable } from '@midnight-ntwrk/compact-js';
|
|
2
2
|
import { createUnprovenDeployTx, submitTxAsync, } from '@midnight-ntwrk/midnight-js-contracts';
|
|
3
|
-
import {
|
|
4
|
-
import { exitResultOrError, makeContractExecutableRuntime, SucceedEntirely, } from '@midnight-ntwrk/midnight-js-types';
|
|
3
|
+
import { exitResultOrError, LedgerTransaction, makeLedger9ContractExecutableRuntime, SucceedEntirely, } from '@midnight-ntwrk/midnight-js-types';
|
|
5
4
|
import { parseCoinPublicKeyToHex, ttlOneHour, } from '@midnight-ntwrk/midnight-js-utils';
|
|
6
5
|
import { ContractDeploy, Intent, Transaction, } from '@midnightntwrk/ledger-v9';
|
|
7
6
|
import { BlockLimitError, ConfigError, DeployError, DeployTxFailedError, FragmentDeployError, } from "../errors.js";
|
|
@@ -27,6 +26,14 @@ function isBlockLimitRejection(error) {
|
|
|
27
26
|
const text = formatError(error);
|
|
28
27
|
return text.includes('1010') && /exhaust the block limits/i.test(text);
|
|
29
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* Seal a transaction this package built into the handle midnight-js submits.
|
|
31
|
+
* Every artifact the deployer loads is a ledger 9 build (runtime 0.21), so the
|
|
32
|
+
* era is fixed here.
|
|
33
|
+
*/
|
|
34
|
+
export function sealUnprovenTx(tx) {
|
|
35
|
+
return LedgerTransaction.seal('v9', 'Unproven', tx);
|
|
36
|
+
}
|
|
30
37
|
/**
|
|
31
38
|
* Build and submit the deploy tx, returning as soon as the node accepts it.
|
|
32
39
|
* Split from the wait for finalization so the caller can persist `txId`
|
|
@@ -98,11 +105,9 @@ function buildFullDeploy({ providers, contract, artifact, signingKey, args, init
|
|
|
98
105
|
*/
|
|
99
106
|
async function buildPrunedDeploy({ providers, contractName, contract, artifact, signingKey, args, initialPrivateState, circuits, }) {
|
|
100
107
|
const executable = ContractExecutable.make(artifact.compiledContract);
|
|
101
|
-
const
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
signingKey,
|
|
105
|
-
});
|
|
108
|
+
const { networkId } = providers.config;
|
|
109
|
+
const coinPublicKey = parseCoinPublicKeyToHex(providers.walletProvider.getCoinPublicKey(), networkId);
|
|
110
|
+
const runtime = makeLedger9ContractExecutableRuntime(providers.zkConfigProvider, { coinPublicKey, signingKey });
|
|
106
111
|
const privateStateIn = contract.private_state_id !== undefined ? initialPrivateState : undefined;
|
|
107
112
|
const constructed = exitResultOrError(await runtime.runPromiseExit(executable.initialize(privateStateIn, ...args)));
|
|
108
113
|
const { contractState } = constructed.public;
|
|
@@ -114,11 +119,11 @@ async function buildPrunedDeploy({ providers, contractName, contract, artifact,
|
|
|
114
119
|
throw new ConfigError(`Constructor of "${contractName}" creates or spends ${coinCount} Zswap coin(s), which a fragmented deploy cannot carry. Remove circuits_per_tx, or deploy a contract small enough for a single tx.`);
|
|
115
120
|
}
|
|
116
121
|
const deploy = new ContractDeploy(pruneState({ state: contractState, keep: sortCircuits(circuits) }));
|
|
117
|
-
const unprovenTx = Transaction.fromParts(
|
|
122
|
+
const unprovenTx = Transaction.fromParts(networkId, undefined, undefined, Intent.new(ttlOneHour()).addDeploy(deploy));
|
|
118
123
|
return {
|
|
119
124
|
public: { contractAddress: deploy.address },
|
|
120
125
|
private: {
|
|
121
|
-
unprovenTx,
|
|
126
|
+
unprovenTx: sealUnprovenTx(unprovenTx),
|
|
122
127
|
signingKey: constructed.private.signingKey,
|
|
123
128
|
initialPrivateState: privateState,
|
|
124
129
|
},
|
|
@@ -176,7 +181,7 @@ export function awaitDeployFinalization({ providers, contractName, submitted, tx
|
|
|
176
181
|
* {@link submitDeploy} does so the caller can halve the batch and retry.
|
|
177
182
|
*/
|
|
178
183
|
export function submitInsert({ providers, contractName, unprovenTx, circuits, }) {
|
|
179
|
-
return submitClassified(`Verifier-key insert for "${contractName}"`, circuits.length, () => submitTxAsync(providers, { unprovenTx }));
|
|
184
|
+
return submitClassified(`Verifier-key insert for "${contractName}"`, circuits.length, () => submitTxAsync(providers, { unprovenTx: sealUnprovenTx(unprovenTx) }));
|
|
180
185
|
}
|
|
181
186
|
/**
|
|
182
187
|
* Wait for one transaction of a fragmented deploy to land, under the
|
|
@@ -206,9 +211,10 @@ export function awaitFragmentFinalization({ providers, address, txId, txTimeoutM
|
|
|
206
211
|
*/
|
|
207
212
|
export async function persistDeployPrivateState({ providers, contract, submitted, }) {
|
|
208
213
|
const { address, unsubmitted } = submitted;
|
|
209
|
-
providers.privateStateProvider.setContractAddress(address);
|
|
210
214
|
if (contract.private_state_id !== undefined) {
|
|
211
|
-
await providers.privateStateProvider
|
|
215
|
+
await providers.privateStateProvider
|
|
216
|
+
.forContract(address)
|
|
217
|
+
.set(contract.private_state_id, unsubmitted.private.initialPrivateState);
|
|
212
218
|
}
|
|
213
219
|
await providers.privateStateProvider.setSigningKey(address, unsubmitted.private.signingKey);
|
|
214
220
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-tx.js","sourceRoot":"","sources":["../../src/services/deploy-tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"deploy-tx.js","sourceRoot":"","sources":["../../src/services/deploy-tx.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* chain state for each, which costs a tx per circuit. This module assembles
|
|
6
6
|
* many `VerifierKeyInsert`s into a single signed `MaintenanceUpdate`.
|
|
7
7
|
*/
|
|
8
|
+
import type { NetworkId } from '@midnight-ntwrk/midnight-js-types';
|
|
8
9
|
import { ContractOperationVersionedVerifierKey, MaintenanceUpdate, type SignatureVerifyingKey, type SigningKey, Transaction } from '@midnightntwrk/ledger-v9';
|
|
9
10
|
/**
|
|
10
11
|
* `verifierKey` under the version its header declares. The ledger rejects a
|
|
@@ -53,9 +54,11 @@ export declare function signatureKeysEqual(a: SignatureVerifyingKey, b: Signatur
|
|
|
53
54
|
export declare function buildInsertUpdate({ address, inserts, counter, signingKey, signerIndex, }: BuildInsertUpdateArgs): MaintenanceUpdate;
|
|
54
55
|
export interface BuildInsertTxArgs {
|
|
55
56
|
update: MaintenanceUpdate;
|
|
57
|
+
/** The network the providers were built for; a transaction names its network. */
|
|
58
|
+
networkId: NetworkId;
|
|
56
59
|
}
|
|
57
60
|
/**
|
|
58
61
|
* Wrap a signed update in an unproven tx. No Zswap offer: a maintenance update
|
|
59
62
|
* creates no coins, and the wallet adds the dust fee spend when it balances.
|
|
60
63
|
*/
|
|
61
|
-
export declare function buildInsertTx({ update, }: BuildInsertTxArgs): ReturnType<typeof Transaction.fromParts>;
|
|
64
|
+
export declare function buildInsertTx({ update, networkId, }: BuildInsertTxArgs): ReturnType<typeof Transaction.fromParts>;
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* chain state for each, which costs a tx per circuit. This module assembles
|
|
6
6
|
* many `VerifierKeyInsert`s into a single signed `MaintenanceUpdate`.
|
|
7
7
|
*/
|
|
8
|
-
import { getNetworkId } from '@midnight-ntwrk/midnight-js-network-id';
|
|
9
8
|
import { ttlOneHour } from '@midnight-ntwrk/midnight-js-utils';
|
|
10
9
|
import { ContractOperationVersionedVerifierKey, Intent, MaintenanceUpdate, signatureVerifyingKey, signData, Transaction, VerifierKeyInsert, } from '@midnightntwrk/ledger-v9';
|
|
11
10
|
import { DeployError } from "../errors.js";
|
|
@@ -69,8 +68,8 @@ export function buildInsertUpdate({ address, inserts, counter, signingKey, signe
|
|
|
69
68
|
* Wrap a signed update in an unproven tx. No Zswap offer: a maintenance update
|
|
70
69
|
* creates no coins, and the wallet adds the dust fee spend when it balances.
|
|
71
70
|
*/
|
|
72
|
-
export function buildInsertTx({ update, }) {
|
|
71
|
+
export function buildInsertTx({ update, networkId, }) {
|
|
73
72
|
const intent = Intent.new(ttlOneHour()).addMaintenanceUpdate(update);
|
|
74
|
-
return Transaction.fromParts(
|
|
73
|
+
return Transaction.fromParts(networkId, undefined, undefined, intent);
|
|
75
74
|
}
|
|
76
75
|
//# sourceMappingURL=maintenance-tx.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenance-tx.js","sourceRoot":"","sources":["../../src/services/maintenance-tx.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"maintenance-tx.js","sourceRoot":"","sources":["../../src/services/maintenance-tx.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EACL,qCAAqC,EACrC,MAAM,EACN,iBAAiB,EAGjB,qBAAqB,EACrB,QAAQ,EACR,WAAW,EACX,iBAAiB,GAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI3C;;;GAGG;AACH,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC;IACxC,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;CACkC,CAAyB,CAAC;AAEtE;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAiB,EACjB,WAAuB;IAEvB,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,qBAAqB,EAAE,CAAC;QAC5C,IAAI,CAAC;YACH,OAAO,IAAI,qCAAqC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,MAAM,IAAI,WAAW,CACnB,6BAA6B,SAAS,gCAAgC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAChG,CAAC;AACJ,CAAC;AA4BD,4FAA4F;AAC5F,MAAM,UAAU,cAAc,CAAC,UAAsB;IACnD,OAAO,qBAAqB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAA0B;IAC3D,OAAO,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;AACnC,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,kBAAkB,CAChC,CAAwB,EACxB,CAAwB;IAExB,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,EAChC,OAAO,EACP,OAAO,EACP,OAAO,EACP,UAAU,EACV,WAAW,GACW;IACtB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,uDAAuD;QACvD,MAAM,IAAI,WAAW,CAAC,gDAAgD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CACzB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,CAC7B,IAAI,iBAAiB,CACnB,SAAS,EACT,oBAAoB,CAAC,SAAS,EAAE,WAAW,CAAC,CAC7C,CACJ,CAAC;IACF,iEAAiE;IACjE,8CAA8C;IAC9C,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAChE,OAAO,MAAM,CAAC,YAAY,CACxB,MAAM,CAAC,WAAW,CAAC,EACnB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CACxC,CAAC;AACJ,CAAC;AAQD;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,MAAM,EACN,SAAS,GACS;IAClB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACrE,OAAO,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type DustWalletOptions, type EnvironmentConfiguration } from '@midnight-ntwrk/testkit-js';
|
|
2
|
-
import { type DustWalletAPI } from '@midnightntwrk/wallet-sdk-dust-wallet';
|
|
3
|
-
import type { ShieldedWalletAPI } from '@midnightntwrk/wallet-sdk-shielded';
|
|
2
|
+
import { type DustKeysByEpoch, type DustWalletAPI } from '@midnightntwrk/wallet-sdk-dust-wallet';
|
|
3
|
+
import type { ShieldedKeysByEpoch, ShieldedWalletAPI } from '@midnightntwrk/wallet-sdk-shielded';
|
|
4
4
|
import { type UnshieldedKeystore, type UnshieldedWalletAPI } from '@midnightntwrk/wallet-sdk-unshielded-wallet';
|
|
5
5
|
import type { Logger } from 'pino';
|
|
6
6
|
/** Opaque testkit-js `FluentWalletBuilder.config` (not exported by testkit). */
|
|
@@ -62,7 +62,7 @@ export declare class WalletCache {
|
|
|
62
62
|
config: ConfigShape;
|
|
63
63
|
seed: Uint8Array;
|
|
64
64
|
skipCache: boolean;
|
|
65
|
-
}): Promise<ShieldedWalletAPI
|
|
65
|
+
}): Promise<ShieldedWalletAPI<ShieldedKeysByEpoch>>;
|
|
66
66
|
/**
|
|
67
67
|
* Restore dust wallet from cache, else build fresh. Routes through
|
|
68
68
|
* `DustWallet(config).restore(...)` because testkit doesn't expose a
|
|
@@ -74,7 +74,7 @@ export declare class WalletCache {
|
|
|
74
74
|
seed: Uint8Array;
|
|
75
75
|
dustOptions: DustWalletOptions;
|
|
76
76
|
skipCache: boolean;
|
|
77
|
-
}): Promise<DustWalletAPI
|
|
77
|
+
}): Promise<DustWalletAPI<DustKeysByEpoch>>;
|
|
78
78
|
/**
|
|
79
79
|
* Restore the unshielded wallet from cache, else build fresh. Routes
|
|
80
80
|
* through `UnshieldedWallet(config).restore(...)` because testkit
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-cache.js","sourceRoot":"","sources":["../../src/services/wallet-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,SAAS,EACT,YAAY,EACZ,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EACL,8BAA8B,EAG9B,aAAa,EACb,uBAAuB,GACxB,MAAM,4BAA4B,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"wallet-cache.js","sourceRoot":"","sources":["../../src/services/wallet-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { NetworkId } from '@midnight-ntwrk/midnight-js-types';
|
|
1
2
|
import type { MidnightWalletProvider } from '@midnight-ntwrk/testkit-js';
|
|
2
3
|
import type { Logger } from 'pino';
|
|
3
4
|
/**
|
|
@@ -22,7 +23,7 @@ export declare const SYNC_MAX_GAP = 50n;
|
|
|
22
23
|
* the seed before a long sync. Best-effort: warn-and-continue on
|
|
23
24
|
* failure.
|
|
24
25
|
*/
|
|
25
|
-
export declare function logWalletAddresses(wallet: MidnightWalletProvider, logger: Logger): Promise<void>;
|
|
26
|
+
export declare function logWalletAddresses(wallet: MidnightWalletProvider, logger: Logger, networkId: NetworkId): Promise<void>;
|
|
26
27
|
/**
|
|
27
28
|
* The two sub-wallet progress shapes, mirrored structurally: neither
|
|
28
29
|
* `SyncProgress` (`wallet-sdk-abstractions`, used by shielded and dust)
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { getNetworkId } from '@midnight-ntwrk/midnight-js-network-id';
|
|
2
1
|
import { shieldedToken, unshieldedToken } from '@midnightntwrk/ledger-v9';
|
|
3
2
|
import { DustAddress, ShieldedAddress, UnshieldedAddress, } from '@midnightntwrk/wallet-sdk-address-format';
|
|
4
|
-
import {
|
|
3
|
+
import { isAwaiting } from '@midnightntwrk/wallet-sdk-facade';
|
|
5
4
|
import * as Rx from 'rxjs';
|
|
6
5
|
import { UnfundedWalletError, WalletError } from "../errors.js";
|
|
7
6
|
import { formatError } from "./error-format.js";
|
|
@@ -27,9 +26,8 @@ export const SYNC_MAX_GAP = 50n;
|
|
|
27
26
|
* the seed before a long sync. Best-effort: warn-and-continue on
|
|
28
27
|
* failure.
|
|
29
28
|
*/
|
|
30
|
-
export async function logWalletAddresses(wallet, logger) {
|
|
29
|
+
export async function logWalletAddresses(wallet, logger, networkId) {
|
|
31
30
|
try {
|
|
32
|
-
const networkId = getNetworkId();
|
|
33
31
|
const [shieldedState, unshieldedState, dustState] = await Promise.all([
|
|
34
32
|
Rx.firstValueFrom(wallet.wallet.shielded.state),
|
|
35
33
|
Rx.firstValueFrom(wallet.wallet.unshielded.state),
|
|
@@ -81,25 +79,20 @@ export function describeProgress(p) {
|
|
|
81
79
|
*/
|
|
82
80
|
export async function readDustTip(wallet) {
|
|
83
81
|
const state = await Rx.firstValueFrom(wallet.wallet.state());
|
|
84
|
-
return state.dust.
|
|
82
|
+
return state.dust.progress.highestRelevantWalletIndex;
|
|
85
83
|
}
|
|
86
84
|
/**
|
|
87
85
|
* Whether the wallet has caught up with a spend submitted at `appliedBeyond`.
|
|
88
86
|
*
|
|
89
87
|
* Two conditions, because neither alone is enough. The dust index is a global
|
|
90
88
|
* event id, so on a busy chain an unrelated event can carry it past the mark
|
|
91
|
-
* before our own spend applies. The facade's
|
|
92
|
-
* transactions it
|
|
93
|
-
* without a pending set is unsettled: the index alone cannot prove the spend
|
|
94
|
-
* applied.
|
|
89
|
+
* before our own spend applies. The facade's lifecycle records name the
|
|
90
|
+
* transactions it still awaits an answer on, which is exactly our spend.
|
|
95
91
|
*/
|
|
96
92
|
function dustCaughtUp(state, appliedBeyond) {
|
|
97
|
-
if (state.dust.
|
|
93
|
+
if (state.dust.progress.appliedIndex <= appliedBeyond)
|
|
98
94
|
return false;
|
|
99
|
-
|
|
100
|
-
if (pending === undefined)
|
|
101
|
-
return false;
|
|
102
|
-
return PendingTransactions.allPending(pending).length === 0;
|
|
95
|
+
return !state.lifecycle.some(isAwaiting);
|
|
103
96
|
}
|
|
104
97
|
/**
|
|
105
98
|
* Wait for the wallet to have applied dust events past `appliedBeyond` and to
|
|
@@ -154,9 +147,9 @@ export async function syncAndVerifyFunds(args) {
|
|
|
154
147
|
const unshieldedBal = s.unshielded.balances[unshieldedToken().raw] ?? 0n;
|
|
155
148
|
const dustBal = s.dust.balance(new Date());
|
|
156
149
|
logger.info(`Still syncing (${elapsedHms} elapsed). ` +
|
|
157
|
-
`shielded ${describeProgress(s.shielded.
|
|
150
|
+
`shielded ${describeProgress(s.shielded.progress)} balance=${shieldedBal}; ` +
|
|
158
151
|
`unshielded ${describeProgress(s.unshielded.progress)} balance=${unshieldedBal}; ` +
|
|
159
|
-
`dust ${describeProgress(s.dust.
|
|
152
|
+
`dust ${describeProgress(s.dust.progress)} balance=${dustBal}`);
|
|
160
153
|
});
|
|
161
154
|
// Periodic checkpoint: snapshot the wallet caches every 5 min so a
|
|
162
155
|
// user who Ctrl+C's a long preprod first-run can resume from the
|
|
@@ -197,13 +190,12 @@ export async function syncAndVerifyFunds(args) {
|
|
|
197
190
|
const bal = s.unshielded.balances[unshieldedToken().raw] ?? 0n;
|
|
198
191
|
logger.info(`Unshielded sync complete — NIGHT balance: ${bal}`);
|
|
199
192
|
}
|
|
200
|
-
if (!seenComplete.dust && s.dust.
|
|
193
|
+
if (!seenComplete.dust && s.dust.progress.isStrictlyComplete()) {
|
|
201
194
|
seenComplete.dust = true;
|
|
202
195
|
const bal = s.dust.balance(new Date());
|
|
203
196
|
logger.info(`Dust sync complete — dust balance: ${bal}`);
|
|
204
197
|
}
|
|
205
|
-
if (!seenComplete.shielded &&
|
|
206
|
-
s.shielded.state.progress.isStrictlyComplete()) {
|
|
198
|
+
if (!seenComplete.shielded && s.shielded.progress.isStrictlyComplete()) {
|
|
207
199
|
seenComplete.shielded = true;
|
|
208
200
|
const bal = s.shielded.balances[shieldedToken().raw] ?? 0n;
|
|
209
201
|
logger.info(`Shielded sync complete — shielded balance: ${bal}`);
|
|
@@ -215,8 +207,8 @@ export async function syncAndVerifyFunds(args) {
|
|
|
215
207
|
// Tolerant tip gate: all three sub-wallets within SYNC_MAX_GAP
|
|
216
208
|
// events of the tip. Strict `s.isSynced` never fires on a live
|
|
217
209
|
// chain because the global dust stream keeps advancing (#115).
|
|
218
|
-
Rx.filter((s) => s.shielded.
|
|
219
|
-
s.dust.
|
|
210
|
+
Rx.filter((s) => s.shielded.progress.isCompleteWithin(SYNC_MAX_GAP) &&
|
|
211
|
+
s.dust.progress.isCompleteWithin(SYNC_MAX_GAP) &&
|
|
220
212
|
s.unshielded.progress.isCompleteWithin(SYNC_MAX_GAP)), Rx.timeout({
|
|
221
213
|
each: timeoutMs,
|
|
222
214
|
with: () => Rx.throwError(() => new WalletError(`Wallet sync timeout after ${timeoutMs}ms`)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-sync.js","sourceRoot":"","sources":["../../src/services/wallet-sync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wallet-sync.js","sourceRoot":"","sources":["../../src/services/wallet-sync.ts"],"names":[],"mappings":"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"}
|
package/dist/wallet/handler.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { DEFAULT_DUST_OPTIONS, FluentWalletBuilder, MidnightWalletProvider, logger as testkitLogger, WalletFactory, WalletSeeds, } from '@midnight-ntwrk/testkit-js';
|
|
2
|
-
import { DustSecretKey, ZswapSecretKeys } from '@midnightntwrk/ledger-v9';
|
|
3
2
|
import { createKeystore, } from '@midnightntwrk/wallet-sdk-unshielded-wallet';
|
|
4
3
|
import { formatError } from "../services/error-format.js";
|
|
5
4
|
import { WalletCache } from "../services/wallet-cache.js";
|
|
@@ -127,7 +126,7 @@ export class WalletHandler {
|
|
|
127
126
|
skipCache: opts.skipWalletCache === true,
|
|
128
127
|
});
|
|
129
128
|
const walletFacade = await WalletFactory.createWalletFacade(config, shieldedWallet, unshieldedWallet, dustWallet);
|
|
130
|
-
const provider = await MidnightWalletProvider.withWallet(logger, env, walletFacade,
|
|
129
|
+
const provider = await MidnightWalletProvider.withWallet(logger, env, walletFacade, walletSeeds, unshieldedKeystore);
|
|
131
130
|
return new WalletHandler(provider, unshieldedKeystore, logger, cache);
|
|
132
131
|
}
|
|
133
132
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/wallet/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAGpB,mBAAmB,EACnB,sBAAsB,EACtB,MAAM,IAAI,aAAa,EACvB,aAAa,EACb,WAAW,GACZ,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/wallet/handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openzeppelin/compact-deployer",
|
|
3
3
|
"description": "Forge-style deployer library for Midnight Compact contracts",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.5.0",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"compact",
|
|
7
7
|
"midnight",
|
|
@@ -106,24 +106,23 @@
|
|
|
106
106
|
"vitest": "^4.1.9"
|
|
107
107
|
},
|
|
108
108
|
"dependencies": {
|
|
109
|
-
"@midnight-ntwrk/compact-js": "
|
|
109
|
+
"@midnight-ntwrk/compact-js": "3.0.0",
|
|
110
110
|
"@midnight-ntwrk/compact-runtime": "0.21.0",
|
|
111
|
-
"@midnight-ntwrk/midnight-js-contracts": "5.0.0
|
|
112
|
-
"@midnight-ntwrk/midnight-js-http-client-proof-provider": "5.0.0
|
|
113
|
-
"@midnight-ntwrk/midnight-js-indexer-public-data-provider": "5.0.0
|
|
114
|
-
"@midnight-ntwrk/midnight-js-level-private-state-provider": "5.0.0
|
|
115
|
-
"@midnight-ntwrk/midnight-js-
|
|
116
|
-
"@midnight-ntwrk/midnight-js-
|
|
117
|
-
"@midnight-ntwrk/midnight-js-
|
|
118
|
-
"@midnight-ntwrk/
|
|
119
|
-
"@
|
|
120
|
-
"@midnightntwrk/
|
|
121
|
-
"@midnightntwrk/wallet-sdk-
|
|
122
|
-
"@midnightntwrk/wallet-sdk-
|
|
123
|
-
"@midnightntwrk/wallet-sdk-
|
|
124
|
-
"@midnightntwrk/wallet-sdk-
|
|
125
|
-
"@midnightntwrk/wallet-sdk-
|
|
126
|
-
"@midnightntwrk/wallet-sdk-unshielded-wallet": "4.0.0-beta.2",
|
|
111
|
+
"@midnight-ntwrk/midnight-js-contracts": "5.0.0",
|
|
112
|
+
"@midnight-ntwrk/midnight-js-http-client-proof-provider": "5.0.0",
|
|
113
|
+
"@midnight-ntwrk/midnight-js-indexer-public-data-provider": "5.0.0",
|
|
114
|
+
"@midnight-ntwrk/midnight-js-level-private-state-provider": "5.0.0",
|
|
115
|
+
"@midnight-ntwrk/midnight-js-node-zk-config-provider": "5.0.0",
|
|
116
|
+
"@midnight-ntwrk/midnight-js-types": "5.0.0",
|
|
117
|
+
"@midnight-ntwrk/midnight-js-utils": "5.0.0",
|
|
118
|
+
"@midnight-ntwrk/testkit-js": "5.0.0",
|
|
119
|
+
"@midnightntwrk/ledger-v9": "1.0.0",
|
|
120
|
+
"@midnightntwrk/wallet-sdk-address-format": "4.0.0",
|
|
121
|
+
"@midnightntwrk/wallet-sdk-capabilities": "4.0.0",
|
|
122
|
+
"@midnightntwrk/wallet-sdk-dust-wallet": "5.0.0",
|
|
123
|
+
"@midnightntwrk/wallet-sdk-facade": "5.0.0",
|
|
124
|
+
"@midnightntwrk/wallet-sdk-shielded": "4.0.0",
|
|
125
|
+
"@midnightntwrk/wallet-sdk-unshielded-wallet": "4.0.0",
|
|
127
126
|
"@scure/bip39": "^1.2.1",
|
|
128
127
|
"pino": "^9.7.0",
|
|
129
128
|
"rxjs": "^7.8.1",
|
package/proof-server.yml
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
services:
|
|
7
7
|
proof-server:
|
|
8
8
|
# Pinned to a release, not `:latest`, so `auto` cannot move under a deploy.
|
|
9
|
-
image: 'midnightntwrk/proof-server:9.0.
|
|
9
|
+
image: 'midnightntwrk/proof-server:9.0.1'
|
|
10
10
|
container_name: 'proof-server_$TESTCONTAINERS_UID'
|
|
11
11
|
command: ['midnight-proof-server -v']
|
|
12
12
|
# Host port 0: Docker picks a free one, so concurrent deploys cannot collide.
|