diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo index 2be7fa7603f..91492d1465b 100644 --- a/barretenberg/.gitrepo +++ b/barretenberg/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/barretenberg branch = master - commit = bef9e485a04357d998c6e043713180822ebae7c5 - parent = 49f80b30db59e2454347c4b742d536e317305f2e + commit = 5e751b81cd5e5f34d9286d5a19ea6d4853566480 + parent = 887c01103255ea4cbbb6cb33c8771d47123b3bff method = merge cmdver = 0.4.6 diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo index 5d7bcc0557d..4696364255e 100644 --- a/noir-projects/aztec-nr/.gitrepo +++ b/noir-projects/aztec-nr/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/aztec-nr branch = master - commit = 3d8f1980d1a62c2e4255135a5c10d93755776679 + commit = 6344f8f2ef40886a0047d49c5685adec9ff1911f method = merge cmdver = 0.4.6 - parent = 8e7c4b1fadd98fc0345705ee243d76eb5cc2008f + parent = b535302b6f9b3ff8d27c1c104060ab7b19af0fb7 diff --git a/yarn-project/bot/src/factory.ts b/yarn-project/bot/src/factory.ts index 2a72653005a..d41ddf174ff 100644 --- a/yarn-project/bot/src/factory.ts +++ b/yarn-project/bot/src/factory.ts @@ -6,6 +6,7 @@ import { type DeployOptions, createDebugLogger, createPXEClient, + retryUntil, } from '@aztec/aztec.js'; import { type AztecNode, type FunctionCall, type PXE } from '@aztec/circuit-types'; import { Fr, deriveSigningKey } from '@aztec/circuits.js'; @@ -65,7 +66,18 @@ export class BotFactory { const isInit = await this.pxe.isContractInitialized(account.getAddress()); if (isInit) { this.log.info(`Account at ${account.getAddress().toString()} already initialized`); - return account.register(); + const wallet = await account.register(); + const blockNumber = await this.pxe.getBlockNumber(); + await retryUntil( + async () => { + const status = await this.pxe.getSyncStatus(); + return blockNumber <= status.blocks; + }, + 'pxe synch', + 3600, + 1, + ); + return wallet; } else { this.log.info(`Initializing account at ${account.getAddress().toString()}`); const sentTx = account.deploy();