@aztec/prover-node 2.0.0-rc.7 → 2.0.2-rc.1

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAIL,KAAK,QAAQ,EACb,KAAK,cAAc,EAEpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,sBAAsB,EAAgD,MAAM,6BAA6B,CAAC;AACxH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AA6CF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AAkED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,wBAM/D"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAA+C,MAAM,sBAAsB,CAAC;AACvH,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,sBAAsB,EAAgD,MAAM,6BAA6B,CAAC;AACxH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AA6CF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AA0DD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,wBAM/D"}

package/dest/config.js

@@ -2,7 +2,7 @@ import { archiverConfigMappings } from '@aztec/archiver/config';
 import { genesisStateConfigMappings } from '@aztec/ethereum';
 import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 import { dataConfigMappings } from '@aztec/kv-store/config';
-import { keyStoreConfigMappings } from '@aztec/node-keystore';
+import { ethPrivateKeySchema, keyStoreConfigMappings } from '@aztec/node-keystore';
 import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { p2pConfigMappings } from '@aztec/p2p/config';
 import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
@@ -79,14 +79,12 @@ export function getProverNodeAgentConfigFromEnv() {
     };
 }
 function createKeyStoreFromWeb3Signer(config) {
-    // See what we have been given for proverId.
-    const proverId = config.proverId ? config.proverId.toString() : undefined;
     // If we don't have a valid prover Id then we can't build a valid key store with remote signers
-    if (proverId === undefined) {
+    if (config.proverId === undefined) {
         return undefined;
     }
     // Also, we need at least one publisher address.
-    const publishers = config.publisherAddresses ? config.publisherAddresses.map((k)=>k.toChecksumString()) : [];
+    const publishers = config.publisherAddresses ?? [];
     if (publishers.length === 0) {
         return undefined;
     }
@@ -94,7 +92,7 @@ function createKeyStoreFromWeb3Signer(config) {
         schemaVersion: 1,
         slasher: undefined,
         prover: {
-            id: proverId,
+            id: config.proverId,
             publisher: publishers
         },
         remoteSigner: config.web3SignerUrl,
@@ -104,21 +102,19 @@ function createKeyStoreFromWeb3Signer(config) {
 }
 function createKeyStoreFromPublisherKeys(config) {
     // Extract the publisher keys from the provided config.
-    const publisherKeys = config.publisherPrivateKeys ? config.publisherPrivateKeys.map((k)=>k.getValue()) : [];
+    const publisherKeys = config.publisherPrivateKeys ? config.publisherPrivateKeys.map((k)=>ethPrivateKeySchema.parse(k.getValue())) : [];
     // There must be at least 1.
     if (publisherKeys.length === 0) {
         return undefined;
     }
-    // Now see what we have been given for proverId.
-    const proverId = config.proverId ? config.proverId.toString() : undefined;
     // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
     // Otherwise create one of the form ("0x12345678....." as EthAccount).
     const keyStore = {
         schemaVersion: 1,
         slasher: undefined,
-        prover: proverId === undefined ? publisherKeys[0] : {
-            id: proverId,
-            publisher: publisherKeys.map((key)=>key)
+        prover: config.proverId === undefined ? publisherKeys[0] : {
+            id: config.proverId,
+            publisher: publisherKeys
         },
         remoteSigner: undefined,
         validators: undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.2-rc.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -56,27 +56,27 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.0.0-rc.7",
-    "@aztec/bb-prover": "2.0.0-rc.7",
-    "@aztec/blob-lib": "2.0.0-rc.7",
-    "@aztec/blob-sink": "2.0.0-rc.7",
-    "@aztec/constants": "2.0.0-rc.7",
-    "@aztec/epoch-cache": "2.0.0-rc.7",
-    "@aztec/ethereum": "2.0.0-rc.7",
-    "@aztec/foundation": "2.0.0-rc.7",
-    "@aztec/kv-store": "2.0.0-rc.7",
-    "@aztec/l1-artifacts": "2.0.0-rc.7",
-    "@aztec/node-keystore": "2.0.0-rc.7",
-    "@aztec/node-lib": "2.0.0-rc.7",
-    "@aztec/noir-protocol-circuits-types": "2.0.0-rc.7",
-    "@aztec/p2p": "2.0.0-rc.7",
-    "@aztec/protocol-contracts": "2.0.0-rc.7",
-    "@aztec/prover-client": "2.0.0-rc.7",
-    "@aztec/sequencer-client": "2.0.0-rc.7",
-    "@aztec/simulator": "2.0.0-rc.7",
-    "@aztec/stdlib": "2.0.0-rc.7",
-    "@aztec/telemetry-client": "2.0.0-rc.7",
-    "@aztec/world-state": "2.0.0-rc.7",
+    "@aztec/archiver": "2.0.2-rc.1",
+    "@aztec/bb-prover": "2.0.2-rc.1",
+    "@aztec/blob-lib": "2.0.2-rc.1",
+    "@aztec/blob-sink": "2.0.2-rc.1",
+    "@aztec/constants": "2.0.2-rc.1",
+    "@aztec/epoch-cache": "2.0.2-rc.1",
+    "@aztec/ethereum": "2.0.2-rc.1",
+    "@aztec/foundation": "2.0.2-rc.1",
+    "@aztec/kv-store": "2.0.2-rc.1",
+    "@aztec/l1-artifacts": "2.0.2-rc.1",
+    "@aztec/node-keystore": "2.0.2-rc.1",
+    "@aztec/node-lib": "2.0.2-rc.1",
+    "@aztec/noir-protocol-circuits-types": "2.0.2-rc.1",
+    "@aztec/p2p": "2.0.2-rc.1",
+    "@aztec/protocol-contracts": "2.0.2-rc.1",
+    "@aztec/prover-client": "2.0.2-rc.1",
+    "@aztec/sequencer-client": "2.0.2-rc.1",
+    "@aztec/simulator": "2.0.2-rc.1",
+    "@aztec/stdlib": "2.0.2-rc.1",
+    "@aztec/telemetry-client": "2.0.2-rc.1",
+    "@aztec/world-state": "2.0.2-rc.1",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.23.7"

package/src/config.ts

@@ -3,14 +3,7 @@ import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
 import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum';
 import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
-import {
-  type EthAccount,
-  type EthAddressHex,
-  type EthRemoteSignerAccount,
-  type KeyStore,
-  type KeyStoreConfig,
-  keyStoreConfigMappings,
-} from '@aztec/node-keystore';
+import { type KeyStore, type KeyStoreConfig, ethPrivateKeySchema, keyStoreConfigMappings } from '@aztec/node-keystore';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
@@ -126,18 +119,13 @@ export function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig
 }
 
 function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
-  // See what we have been given for proverId.
-  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : undefined;
-
   // If we don't have a valid prover Id then we can't build a valid key store with remote signers
-  if (proverId === undefined) {
+  if (config.proverId === undefined) {
     return undefined;
   }
 
   // Also, we need at least one publisher address.
-  const publishers = config.publisherAddresses
-    ? config.publisherAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount)
-    : [];
+  const publishers = config.publisherAddresses ?? [];
 
   if (publishers.length === 0) {
     return undefined;
@@ -147,7 +135,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
     schemaVersion: 1,
     slasher: undefined,
     prover: {
-      id: proverId,
+      id: config.proverId,
       publisher: publishers,
     },
     remoteSigner: config.web3SignerUrl,
@@ -159,7 +147,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
 function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
   // Extract the publisher keys from the provided config.
   const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map(k => k.getValue() as EthAddressHex)
+    ? config.publisherPrivateKeys.map(k => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   // There must be at least 1.
@@ -167,9 +155,6 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
     return undefined;
   }
 
-  // Now see what we have been given for proverId.
-  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : undefined;
-
   // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
   // Otherwise create one of the form ("0x12345678....." as EthAccount).
 
@@ -177,11 +162,11 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
     schemaVersion: 1,
     slasher: undefined,
     prover:
-      proverId === undefined
-        ? (publisherKeys[0] as EthAccount)
+      config.proverId === undefined
+        ? publisherKeys[0]
         : {
-            id: proverId,
-            publisher: publisherKeys.map(key => key as EthAccount),
+            id: config.proverId,
+            publisher: publisherKeys,
           },
     remoteSigner: undefined,
     validators: undefined,