@effectstream/midnight-contracts 0.104.1 → 0.200.2

package/README.md

@@ -77,8 +77,8 @@ To deploy against a non-default stack, pass `NetworkUrls`:
 
 ```typescript
 const network: NetworkUrls = {
-  indexer: "http://localhost:8088/api/v3/graphql",
-  indexerWS: "ws://localhost:8088/api/v3/graphql/ws",
+  indexer: "http://localhost:8088/api/v4/graphql",
+  indexerWS: "ws://localhost:8088/api/v4/graphql/ws",
   node: "http://localhost:9944",
   proofServer: "http://localhost:6300",
 };
@@ -127,7 +127,7 @@ Wallet and dust helpers, exported from the package root:
 
 - `buildWalletFacade(...)`: builds the wallet facade the deploy and batcher paths run on.
 - `registerNightForDust(...)`, `getInitialDustState(...)`: register NIGHT to generate dust and read the starting state.
-- `waitForDustFunds(wallet, opts)` / `waitForDustFundsWithRetry(...)`: block until a wallet has spendable dust — the step that makes a freshly funded wallet usable.
+- `waitForDustFunds(wallet, opts)` / `waitForDustFundsWithRetry(...)`: block until `dust.availableCoins` contains a spendable coin — a positive aggregate balance alone does not make a freshly funded wallet fee-ready.
 - `saveDustState(...)` / `loadDustState(...)`: persist and restore dust state across restarts, avoiding a re-sync.
 - `resolveFacadeDustBalance(...)`: current dust balance for a facade.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/midnight-contracts",
-  "version": "0.104.1",
+  "version": "0.200.2",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -11,6 +11,11 @@
   "bugs": {
     "url": "https://github.com/effectstream/effectstream/issues"
   },
+  "scripts": {
+    "test": "bun test ./test",
+    "test:integration:rc-stack": "bun run ./test/integration-rc-stack.ts",
+    "typecheck": "tsc -p tsconfig.json"
+  },
   "exports": {
     ".": "./src/mod.ts",
     "./read-contract": "./src/read-contract.ts",
@@ -21,29 +26,42 @@
     "./types": "./src/types.ts"
   },
   "dependencies": {
-    "@effectstream/utils": "0.104.1",
+    "@effectstream/utils": "0.200.2",
+    "@midnight-ntwrk/compact-js": "2.5.5-rc.7",
+    "@midnight-ntwrk/compact-runtime": "0.18.0-rc.1",
+    "@midnight-ntwrk/midnight-js-contracts": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-http-client-proof-provider": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-indexer-public-data-provider": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-level-private-state-provider": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-network-id": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-node-zk-config-provider": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-protocol": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-types": "5.0.0-beta.6",
+    "@midnight-ntwrk/midnight-js-utils": "5.0.0-beta.6",
+    "@midnight-ntwrk/platform-js": "3.0.0",
+    "@midnightntwrk/ledger-v9": "1.0.0-rc.3",
+    "@midnightntwrk/onchain-runtime-v4": "4.0.0-rc.3",
+    "@midnightntwrk/wallet-sdk": "2.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-abstractions": "3.0.0-beta.0",
+    "@midnightntwrk/wallet-sdk-address-format": "4.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-capabilities": "4.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-dust-wallet": "5.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-facade": "5.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-hd": "3.1.0-beta.1",
+    "@midnightntwrk/wallet-sdk-indexer-client": "1.3.0-beta.1",
+    "@midnightntwrk/wallet-sdk-node-client": "2.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-prover-client": "2.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-runtime": "1.0.6-beta.0",
+    "@midnightntwrk/wallet-sdk-shielded": "4.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-unshielded-wallet": "4.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-utilities": "1.2.0",
     "@scure/bip39": "^2.0.1",
+    "bn.js": "5.2.3",
     "dotenv": "^16.4.7",
-    "rxjs": "^7.8.2",
-    "@midnightntwrk/wallet-sdk-address-format": "3.1.2",
-    "@midnight-ntwrk/midnight-js-network-id": "4.1.1",
-    "@midnight-ntwrk/midnight-js-types": "4.1.1",
-    "@midnight-ntwrk/midnight-js-utils": "4.1.1",
-    "@midnight-ntwrk/onchain-runtime-v3": "3.0.0",
-    "@midnight-ntwrk/midnight-js-contracts": "4.1.1",
-    "@midnight-ntwrk/midnight-js-indexer-public-data-provider": "4.1.1",
-    "@midnight-ntwrk/midnight-js-http-client-proof-provider": "4.1.1",
-    "@midnight-ntwrk/midnight-js-node-zk-config-provider": "4.1.1",
-    "@midnight-ntwrk/midnight-js-level-private-state-provider": "4.1.1",
-    "@midnightntwrk/wallet-sdk-abstractions": "2.1.0",
-    "@midnightntwrk/wallet-sdk-facade": "4.1.0",
-    "@midnightntwrk/wallet-sdk-hd": "3.0.3",
-    "@midnightntwrk/wallet-sdk-shielded": "3.0.2",
-    "@midnightntwrk/wallet-sdk-dust-wallet": "4.2.0",
-    "@midnightntwrk/wallet-sdk-unshielded-wallet": "3.1.0",
-    "@midnight-ntwrk/ledger-v8": "8.1.0",
-    "@midnight-ntwrk/compact-js": "2.5.1",
-    "@midnightntwrk/wallet-sdk-capabilities": "3.3.1"
+    "rxjs": "7.8.2"
+  },
+  "devDependencies": {
+    "typescript": "5.9.3"
   },
   "description": "Midnight network contract interfaces for EffectStream"
 }

package/src/build-wallet.ts

@@ -2,7 +2,7 @@ const log = console;
 import { Buffer } from "node:buffer";
 
 import type { NetworkId } from "@midnightntwrk/wallet-sdk-abstractions";
-import { shieldedToken } from "@midnight-ntwrk/ledger-v8";
+import { nativeToken } from "@midnightntwrk/ledger-v9";
 import type { WalletFacade } from "@midnightntwrk/wallet-sdk-facade";
 
 import { 
@@ -38,7 +38,7 @@ export async function buildWalletAndWaitForFunds(
     log.info(`Wallet address: ${address}`);
     log.info(`Dust address: ${result.dustAddress}`);
   
-    let balance = initialState.balances[shieldedToken().tag] ?? 0n;
+    let balance = initialState.balances[nativeToken().raw] ?? 0n;
     console.log("initialState", safeStringifyProgress(initialState));
     const syncTimeoutMs = resolveWalletSyncTimeoutMs();
     if (balance === 0n) {
@@ -98,4 +98,4 @@ return {
     left: { bytes: coinBytes },
     right: { bytes: encBytes.subarray(0, 32) },
 };
-}
+}

package/src/deploy-phased.ts

@@ -36,7 +36,7 @@ import {
   Intent,
   sampleSigningKey,
   Transaction,
-} from "@midnight-ntwrk/ledger-v8";
+} from "@midnightntwrk/ledger-v9";
 
 import { CONSTANTS } from "./constants.ts";
 import type { DeployConfig, WalletResult } from "./types.ts";
@@ -155,7 +155,7 @@ export async function deployMidnightContractPhased(
     const derivedSigningKey = initResult.private.signingKey;
     const fullContractState = initResult.public.contractState;
 
-    // Convert the compact-runtime contract state to a ledger-v8 contract state,
+    // Convert the compact-runtime contract state to a ledger-v9 contract state,
     // then build a stripped copy that keeps the initial data + maintenance
     // authority but drops every circuit operation (i.e. no verifier keys).
     const fullLedgerState = ContractState.deserialize(
@@ -187,7 +187,7 @@ export async function deployMidnightContractPhased(
     );
     const signedRecipe = await walletResult.wallet.signRecipe(
       recipe,
-      (payload) => walletResult.unshieldedKeystore.signData(payload),
+      (payload) => walletResult.unshieldedKeystore.signDataAsync(payload),
     );
     const finalizedTx = await walletResult.wallet.finalizeRecipe(signedRecipe);
     const txId = await walletResult.wallet.submitTransaction(finalizedTx);

package/src/deploy.ts

@@ -1,7 +1,7 @@
 // TODO Remove references to "src/managed" as this is not standard.
 
 // Single WASM instance for ContractState / ContractMaintenanceAuthority.
-import "@midnight-ntwrk/onchain-runtime-v3";
+import "@midnightntwrk/onchain-runtime-v4";
 
 import { setNetworkId } from "@midnight-ntwrk/midnight-js-network-id";
 import { Buffer } from "node:buffer";
@@ -11,7 +11,7 @@ import { getEnv, cwd } from "@effectstream/utils/runtime";
 import { deployContract } from "@midnight-ntwrk/midnight-js-contracts";
 import type { PrivateStateId } from "@midnight-ntwrk/midnight-js-types";
 import { CompiledContract, type Witnesses, type Contract } from "@midnight-ntwrk/compact-js";
-import type { SigningKey } from "@midnight-ntwrk/ledger-v8";
+import type { SigningKey } from "@midnightntwrk/ledger-v9";
 import type { NetworkId } from "@midnightntwrk/wallet-sdk-abstractions";
 import * as path from "node:path";
 
@@ -126,15 +126,15 @@ export async function deployMidnightContract(
 
   // Merge network URLs with defaults
   const { id: networkIdOverride, ...endpoints } = networkUrls ?? {};
+  const resolvedNetworkId = (networkIdOverride ??
+    midnightNetworkConfig.id) as NetworkId.NetworkId;
   const resolvedNetworkUrls: Required<NetworkUrls> = {
-    id: 'placeholder-value',
+    id: resolvedNetworkId,
     indexer: endpoints.indexer ?? midnightNetworkConfig.indexer,
     indexerWS: endpoints.indexerWS ?? midnightNetworkConfig.indexerWS,
     node: endpoints.node ?? midnightNetworkConfig.node,
     proofServer: endpoints.proofServer ?? midnightNetworkConfig.proofServer,
   };
-  const resolvedNetworkId = (networkIdOverride ??
-    midnightNetworkConfig.id) as NetworkId.NetworkId;
 
   log.info(
     `Preflight resolved endpoints -> indexerHttp=${resolvedNetworkUrls.indexer}, indexerWs=${resolvedNetworkUrls.indexerWS}, node=${resolvedNetworkUrls.node}, proofServer=${resolvedNetworkUrls.proofServer}, networkId=${resolvedNetworkId}`,
@@ -143,7 +143,7 @@ export async function deployMidnightContract(
   setNetworkId(resolvedNetworkId);
 
   let walletResult: WalletResult | null = opts?.walletResult ?? null;
-  let providers: ReturnType<typeof configureMidnightNodeProviders> | null = null;
+  let providers: Awaited<ReturnType<typeof configureMidnightNodeProviders>> | null = null;
 
   try {
     if (!walletResult) {
@@ -201,7 +201,7 @@ export async function deployMidnightContract(
     // Use a separate LevelDB directory for deployment to avoid lock conflicts with batcher
     const deployPrivateStateStoreName = `${privateStateStoreName}-deploy`;
 
-    providers = configureMidnightNodeProviders(
+    providers = await configureMidnightNodeProviders(
       wallet,
       zswapSecretKeys,
       walletZswapSecretKeys,

package/src/get-wallet-info-cli.ts

@@ -10,9 +10,9 @@
 // Run: bun run src/get-wallet-info-cli.ts [--seed <hex>] [--balance]
 import dotenv from "dotenv";
 import { parseArgs } from "node:util";
-import { shieldedToken } from "@midnight-ntwrk/ledger-v8";
+import { nativeToken } from "@midnightntwrk/ledger-v9";
 import { setNetworkId } from "@midnight-ntwrk/midnight-js-network-id";
-import { NetworkId } from "@midnightntwrk/wallet-sdk-abstractions";
+import type { NetworkId } from "@midnightntwrk/wallet-sdk-abstractions";
 import * as Rx from "rxjs";
 import type { NetworkUrls } from "./types.ts";
 import { midnightNetworkConfig } from "./midnight-env.ts";
@@ -48,8 +48,9 @@ async function main() {
   }
 
   const envSeed = getEnv("MIDNIGHT_WALLET_SEED");
-  const argSeed = parsedArgs.seed;
-  let seed = argSeed || envSeed;
+  const argSeed =
+    typeof parsedArgs.seed === "string" ? parsedArgs.seed : undefined;
+  let seed: string | undefined = argSeed || envSeed;
 
   if (!seed) {
     log.info("No seed provided. Generating a new random 32-byte hex seed...");
@@ -78,39 +79,19 @@ async function main() {
   const node = getEnv("MIDNIGHT_NODE_URL") || midnightNetworkConfig.node;
   const proofServer = getEnv("MIDNIGHT_PROOF_SERVER_URL") || midnightNetworkConfig.proofServer;
 
+  const networkIdRaw = getEnv("MIDNIGHT_NETWORK_ID") || "undeployed";
+  // NetworkId intentionally accepts future/custom IDs; preserve the selected
+  // identifier instead of coercing supported IDs (for example qanet) to a
+  // different network.
+  const networkId = networkIdRaw.toLowerCase() as NetworkId.NetworkId;
   const networkUrls: Required<NetworkUrls> = {
-    id: "placeholder-value",
+    id: networkId,
     indexer,
     indexerWS,
     node,
-    proofServer
+    proofServer,
   };
 
-  const networkIdRaw = getEnv("MIDNIGHT_NETWORK_ID") || "undeployed";
-
-  let networkId: NetworkId.NetworkId;
-  switch (networkIdRaw.toLowerCase()) {
-    case "undeployed":
-      networkId = NetworkId.NetworkId.Undeployed;
-      break;
-    case "testnet":
-    case "testnet-02":
-      networkId = NetworkId.NetworkId.TestNet;
-      break;
-    case "devnet":
-    case "qanet":
-      networkId = NetworkId.NetworkId.DevNet;
-      break;
-    case "preview":
-      networkId = "preview" as NetworkId.NetworkId;
-      log.info(`Using preview network (addresses will have mn_addr_preview prefix)`);
-      break;
-    default:
-      log.warn(`Unknown network ID "${networkIdRaw}", using as-is. Valid values: undeployed, testnet, devnet, preview`);
-      networkId = networkIdRaw as NetworkId.NetworkId;
-  }
-  networkUrls.id = networkId;
-
   log.info(`Using network ID: ${networkId}`);
   log.info(`Indexer: ${indexer}`);
   log.info(`Indexer WS: ${indexerWS}`);
@@ -141,7 +122,7 @@ async function main() {
       let unshieldedBalance = 0n;
       let dustBalance = 0n;
 
-      const tokenId = shieldedToken().tag;
+      const tokenId = nativeToken().raw;
       shieldedBalance = initialState.balances[tokenId] ?? 0n;
 
       const syncTimeoutMs = resolveWalletSyncTimeoutMs();
@@ -173,7 +154,10 @@ async function main() {
           if (dustBalance === 0n) {
             log.info("Dust balance is 0. Attempting to sync dust wallet...");
             try {
-              dustBalance = await waitForDustFunds(walletResult.wallet, { timeoutMs: syncTimeoutMs });
+              dustBalance = (await waitForDustFunds(
+                walletResult.wallet,
+                { timeoutMs: syncTimeoutMs },
+              )).balance;
             } catch(_e) {
               log.warn("Dust sync timed out or returned no funds.");
             }
@@ -183,7 +167,10 @@ async function main() {
             log.info("Dust is 0 but unshielded funds available. Registering for dust generation...");
             const success = await registerNightForDust(walletResult);
             if (success) {
-              dustBalance = await waitForDustFunds(walletResult.wallet, { timeoutMs: 30000 });
+              dustBalance = (await waitForDustFunds(
+                walletResult.wallet,
+                { timeoutMs: 30000 },
+              )).balance;
             }
           }
         } catch (_e) {