diff --git a/yarn-project/aztec-node/src/aztec-node/config.ts b/yarn-project/aztec-node/src/aztec-node/config.ts index 4f724369710f..29c5fd51b7a1 100644 --- a/yarn-project/aztec-node/src/aztec-node/config.ts +++ b/yarn-project/aztec-node/src/aztec-node/config.ts @@ -10,7 +10,6 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config'; import { type KeyStore, - type KeyStoreConfig, type ValidatorKeyStore, ethPrivateKeySchema, keyStoreConfigMappings, @@ -47,7 +46,6 @@ export type AztecNodeConfig = ArchiverConfig & Pick & P2PConfig & DataStoreConfig & - KeyStoreConfig & SentinelConfig & SharedNodeConfig & GenesisStateConfig & diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index da265720eae1..13e7f07bb0b9 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -36,6 +36,7 @@ "@aztec/foundation": "workspace:^", "@aztec/l1-artifacts": "workspace:^", "@aztec/merkle-tree": "workspace:^", + "@aztec/node-keystore": "workspace:^", "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js", "@aztec/noir-contracts.js": "workspace:^", "@aztec/noir-protocol-circuits-types": "workspace:^", diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts index 76ebd831df1d..692ce3274dea 100644 --- a/yarn-project/sequencer-client/src/config.ts +++ b/yarn-project/sequencer-client/src/config.ts @@ -12,6 +12,7 @@ import { pickConfigMappings, } from '@aztec/foundation/config'; import { EthAddress } from '@aztec/foundation/eth-address'; +import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore'; import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config'; @@ -33,6 +34,7 @@ export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2; * Configuration settings for the SequencerClient. */ export type SequencerClientConfig = PublisherConfig & + KeyStoreConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & @@ -149,6 +151,7 @@ export const sequencerConfigMappings: ConfigMappingsType = { export const sequencerClientConfigMappings: ConfigMappingsType = { ...validatorClientConfigMappings, ...sequencerConfigMappings, + ...keyStoreConfigMappings, ...l1ReaderConfigMappings, ...getTxSenderConfigMappings('SEQ'), ...getPublisherConfigMappings('SEQ'), diff --git a/yarn-project/sequencer-client/tsconfig.json b/yarn-project/sequencer-client/tsconfig.json index 285344e28768..8384eac8abba 100644 --- a/yarn-project/sequencer-client/tsconfig.json +++ b/yarn-project/sequencer-client/tsconfig.json @@ -36,6 +36,9 @@ { "path": "../merkle-tree" }, + { + "path": "../node-keystore" + }, { "path": "../noir-contracts.js" }, diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index e488b93cd01f..3b895051ca3e 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -1314,6 +1314,7 @@ __metadata: "@aztec/kv-store": "workspace:^" "@aztec/l1-artifacts": "workspace:^" "@aztec/merkle-tree": "workspace:^" + "@aztec/node-keystore": "workspace:^" "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js" "@aztec/noir-contracts.js": "workspace:^" "@aztec/noir-protocol-circuits-types": "workspace:^"