feat(multi_call_entrypoint): demote to non-protocol contract

dbanks12 · dbanks12 · commit 234146bd93b5 · 2026-05-17T10:12:45.000Z
diff --git a/barretenberg/cpp/pil/vm2/constants_gen.pil b/barretenberg/cpp/pil/vm2/constants_gen.pil
@@ -17,7 +17,6 @@ namespace constants;
     pol MAX_PROTOCOL_CONTRACTS = 11;
     pol CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
     pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-    pol MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
     pol FEE_JUICE_ADDRESS = 5;
     pol FEE_JUICE_BALANCES_SLOT = 1;
     pol UPDATED_CLASS_IDS_SLOT = 1;
diff --git a/barretenberg/cpp/src/barretenberg/aztec/aztec_constants.hpp b/barretenberg/cpp/src/barretenberg/aztec/aztec_constants.hpp
@@ -23,7 +23,6 @@
 #define MAX_PROTOCOL_CONTRACTS 11
 #define CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS 2
 #define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 3
-#define MULTI_CALL_ENTRYPOINT_ADDRESS 4
 #define FEE_JUICE_ADDRESS 5
 #define FEE_JUICE_BALANCES_SLOT 1
 #define UPDATED_CLASS_IDS_SLOT 1
diff --git a/noir-projects/noir-contracts/Nargo.toml b/noir-projects/noir-contracts/Nargo.toml
@@ -28,11 +28,11 @@ members = [
     "contracts/fees/sponsored_fpc_contract",
     "contracts/message_discovery/handshake_registry_contract",
     "contracts/standard/auth_registry_contract",
+    "contracts/standard/multi_call_entrypoint_contract",
     "contracts/standard/public_checks_contract",
     "contracts/protocol/contract_class_registry_contract",
     "contracts/protocol/contract_instance_registry_contract",
     "contracts/protocol/fee_juice_contract",
-    "contracts/protocol/multi_call_entrypoint_contract",
     "contracts/protocol_interface/contract_instance_registry_interface",
     "contracts/protocol_interface/fee_juice_interface",
     "contracts/test/generic_proxy_contract",
diff --git a/noir-projects/noir-contracts/contracts/standard/multi_call_entrypoint_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/standard/multi_call_entrypoint_contract/Nargo.toml
diff --git a/noir-projects/noir-contracts/contracts/standard/multi_call_entrypoint_contract/src/main.nr b/noir-projects/noir-contracts/contracts/standard/multi_call_entrypoint_contract/src/main.nr
diff --git a/noir-projects/noir-contracts/protocol_contracts.json b/noir-projects/noir-contracts/protocol_contracts.json
@@ -1,6 +1,5 @@
 [
   "contract_instance_registry_contract-ContractInstanceRegistry",
   "contract_class_registry_contract-ContractClassRegistry",
-  "multi_call_entrypoint_contract-MultiCallEntrypoint",
   "fee_juice_contract-FeeJuice"
 ]
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -230,7 +230,6 @@ pub global MAX_PROTOCOL_CONTRACTS: u32 = 11;
 // Address 0 is not a protocol contract.
 pub global CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS: AztecAddress = AztecAddress::from_field(2);
 pub global CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS: AztecAddress = AztecAddress::from_field(3);
-pub global MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(4);
 pub global FEE_JUICE_ADDRESS: AztecAddress = AztecAddress::from_field(5);
 
 // `SIDE_EFFECT_MASKING_ADDRESS` is used by the protocol circuits to silo the padding side effects. It's not a protocol
diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
@@ -69,6 +69,7 @@
     "@aztec/bb-prover": "workspace:^",
     "@aztec/blob-client": "workspace:^",
     "@aztec/blob-lib": "workspace:^",
+    "@aztec/standard-contracts": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/epoch-cache": "workspace:^",
     "@aztec/ethereum": "workspace:^",
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -47,6 +47,7 @@ import {
   type Watcher,
   createSlasher,
 } from '@aztec/slasher';
+import { STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS } from '@aztec/standard-contracts/multi-call-entrypoint';
 import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
@@ -1618,7 +1619,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
       classRegistry: ProtocolContractAddress.ContractClassRegistry,
       feeJuice: ProtocolContractAddress.FeeJuice,
       instanceRegistry: ProtocolContractAddress.ContractInstanceRegistry,
-      multiCallEntrypoint: ProtocolContractAddress.MultiCallEntrypoint,
+      multiCallEntrypoint: STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS,
     });
   }
 
diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json
@@ -18,6 +18,9 @@
     {
       "path": "../blob-lib"
     },
+    {
+      "path": "../standard-contracts"
+    },
     {
       "path": "../constants"
     },
diff --git a/yarn-project/aztec.js/src/api/protocol.ts b/yarn-project/aztec.js/src/api/protocol.ts
@@ -4,4 +4,3 @@ export { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 export { ContractClassRegistryContract } from '../contract/protocol_contracts/contract-class-registry.js';
 export { ContractInstanceRegistryContract } from '../contract/protocol_contracts/contract-instance-registry.js';
 export { FeeJuiceContract } from '../contract/protocol_contracts/fee-juice.js';
-export { MultiCallEntrypointContract } from '../contract/protocol_contracts/multi-call-entrypoint.js';
diff --git a/yarn-project/constants/src/constants.gen.ts b/yarn-project/constants/src/constants.gen.ts
@@ -119,7 +119,6 @@ export const CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE = 207215432245133460609083704
 export const MAX_PROTOCOL_CONTRACTS = 11;
 export const CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
 export const CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-export const MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
 export const FEE_JUICE_ADDRESS = 5;
 export const SIDE_EFFECT_MASKING_ADDRESS = 19523154334483583633304358390644137470227519736821975910774528428729027989987n;
 export const NULL_MSG_SENDER_CONTRACT_ADDRESS = 21888242871839275222246405745257275088548364400416034343698204186575808495616n;
diff --git a/yarn-project/constants/src/scripts/constants.in.ts b/yarn-project/constants/src/scripts/constants.in.ts
@@ -25,7 +25,6 @@ const CPP_CONSTANTS = [
   'MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS',
   'CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS',
   'CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS',
-  'MULTI_CALL_ENTRYPOINT_ADDRESS',
   'FEE_JUICE_ADDRESS',
   'TX_DA_GAS_OVERHEAD',
   'FEE_JUICE_BALANCES_SLOT',
@@ -172,7 +171,6 @@ const PIL_CONSTANTS = [
   'UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN',
   'CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS',
   'CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS',
-  'MULTI_CALL_ENTRYPOINT_ADDRESS',
   'FEE_JUICE_ADDRESS',
   'FEE_JUICE_BALANCES_SLOT',
   'TIMESTAMP_OF_CHANGE_BIT_SIZE',
diff --git a/yarn-project/entrypoints/package.json b/yarn-project/entrypoints/package.json
@@ -67,6 +67,7 @@
     ]
   },
   "dependencies": {
+    "@aztec/standard-contracts": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
diff --git a/yarn-project/entrypoints/src/default_multi_call_entrypoint.ts b/yarn-project/entrypoints/src/default_multi_call_entrypoint.ts
@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS } from '@aztec/standard-contracts/multi-call-entrypoint/address';
 import { type FunctionAbi, FunctionCall, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
@@ -12,7 +12,7 @@ import type { ChainInfo, EntrypointInterface } from './interfaces.js';
  * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
  */
 export class DefaultMultiCallEntrypoint implements EntrypointInterface {
-  constructor(private address: AztecAddress = ProtocolContractAddress.MultiCallEntrypoint) {}
+  constructor(private address: AztecAddress = STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS) {}
 
   async createTxExecutionRequest(
     exec: ExecutionPayload,
diff --git a/yarn-project/entrypoints/tsconfig.json b/yarn-project/entrypoints/tsconfig.json
@@ -6,6 +6,9 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
+    {
+      "path": "../standard-contracts"
+    },
     {
       "path": "../constants"
     },
diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts
diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/lazy.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/lazy.ts
diff --git a/yarn-project/protocol-contracts/src/provider/bundle.ts b/yarn-project/protocol-contracts/src/provider/bundle.ts
@@ -4,15 +4,13 @@ import { ContractClassRegistryArtifact } from '../class-registry/index.js';
 import { FeeJuiceArtifact } from '../fee-juice/index.js';
 import { ContractInstanceRegistryArtifact } from '../instance-registry/index.js';
 import { makeProtocolContract } from '../make_protocol_contract.js';
-import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
 
 export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
   ContractInstanceRegistry: ContractInstanceRegistryArtifact,
   ContractClassRegistry: ContractClassRegistryArtifact,
-  MultiCallEntrypoint: MultiCallEntrypointArtifact,
   FeeJuice: FeeJuiceArtifact,
 };
 
diff --git a/yarn-project/protocol-contracts/src/provider/lazy.ts b/yarn-project/protocol-contracts/src/provider/lazy.ts
@@ -1,7 +1,6 @@
 import { getCanonicalClassRegistry } from '../class-registry/lazy.js';
 import { getCanonicalFeeJuice } from '../fee-juice/lazy.js';
 import { getCanonicalInstanceRegistry } from '../instance-registry/lazy.js';
-import { getCanonicalMultiCallEntrypoint } from '../multi-call-entrypoint/lazy.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
@@ -13,8 +12,6 @@ export class LazyProtocolContractsProvider implements ProtocolContractsProvider
         return getCanonicalInstanceRegistry();
       case 'ContractClassRegistry':
         return getCanonicalClassRegistry();
-      case 'MultiCallEntrypoint':
-        return getCanonicalMultiCallEntrypoint();
       case 'FeeJuice':
         return getCanonicalFeeJuice();
       default:
diff --git a/yarn-project/protocol-contracts/src/scripts/generate_data.ts b/yarn-project/protocol-contracts/src/scripts/generate_data.ts
@@ -8,7 +8,6 @@ import {
   CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
   FEE_JUICE_ADDRESS,
   MAX_PROTOCOL_CONTRACTS,
-  MULTI_CALL_ENTRYPOINT_ADDRESS,
 } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -40,7 +39,6 @@ const salt = new Fr(1);
 const contractAddressMapping: { [name: string]: number } = {
   ContractInstanceRegistry: CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
   ContractClassRegistry: CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS,
-  MultiCallEntrypoint: MULTI_CALL_ENTRYPOINT_ADDRESS,
   FeeJuice: FEE_JUICE_ADDRESS,
 };
 
diff --git a/yarn-project/standard-contracts/package.json b/yarn-project/standard-contracts/package.json
@@ -9,7 +9,8 @@
     "./*": "./dest/*/index.js",
     "./*/lazy": "./dest/*/lazy.js",
     "./auth-registry/address": "./dest/auth-registry/address.js",
-    "./public-checks/address": "./dest/public-checks/address.js"
+    "./public-checks/address": "./dest/public-checks/address.js",
+    "./multi-call-entrypoint/address": "./dest/multi-call-entrypoint/address.js"
   },
   "typedocOptions": {
     "entryPoints": [
diff --git a/yarn-project/standard-contracts/src/index.ts b/yarn-project/standard-contracts/src/index.ts
@@ -1,2 +1,3 @@
 export * from './auth-registry/index.js';
+export * from './multi-call-entrypoint/index.js';
 export * from './public-checks/index.js';
diff --git a/yarn-project/standard-contracts/src/multi-call-entrypoint/address.ts b/yarn-project/standard-contracts/src/multi-call-entrypoint/address.ts
@@ -0,0 +1,7 @@
+// Address-only leaf export for browser bundles: importing from
+// `@aztec/standard-contracts/multi-call-entrypoint/address` avoids dragging in the
+// `MultiCallEntrypoint.json` static import.
+import { StandardContractAddress, StandardContractClassId } from '../standard_contract_data.js';
+
+export const STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS = StandardContractAddress.MultiCallEntrypoint;
+export const STANDARD_MULTI_CALL_ENTRYPOINT_CLASS_ID = StandardContractClassId.MultiCallEntrypoint;
diff --git a/yarn-project/standard-contracts/src/multi-call-entrypoint/index.ts b/yarn-project/standard-contracts/src/multi-call-entrypoint/index.ts
@@ -0,0 +1,20 @@
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' with { type: 'json' };
+import { makeStandardContract } from '../make_standard_contract.js';
+import type { StandardContract } from '../standard_contract.js';
+
+export { STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS, STANDARD_MULTI_CALL_ENTRYPOINT_CLASS_ID } from './address.js';
+
+export const MultiCallEntrypointArtifact = loadContractArtifact(MultiCallEntrypointJson as NoirCompiledContract);
+
+let standardContract: StandardContract;
+
+/** Returns the standard deployment of the multi-call entrypoint. */
+export function getStandardMultiCallEntrypoint(): Promise<StandardContract> {
+  if (!standardContract) {
+    standardContract = makeStandardContract('MultiCallEntrypoint', MultiCallEntrypointArtifact);
+  }
+  return Promise.resolve(standardContract);
+}
diff --git a/yarn-project/standard-contracts/src/multi-call-entrypoint/lazy.ts b/yarn-project/standard-contracts/src/multi-call-entrypoint/lazy.ts
@@ -0,0 +1,31 @@
+import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { makeStandardContract } from '../make_standard_contract.js';
+import type { StandardContract } from '../standard_contract.js';
+
+export { STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS, STANDARD_MULTI_CALL_ENTRYPOINT_CLASS_ID } from './address.js';
+
+let standardContract: StandardContract;
+let standardContractArtifact: ContractArtifact;
+
+export async function getMultiCallEntrypointArtifact(): Promise<ContractArtifact> {
+  if (!standardContractArtifact) {
+    // Cannot assert this import as it's incompatible with bundlers like vite
+    // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+    // Even if now supported by all major browsers, the MIME type is replaced with
+    // "text/javascript"
+    // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
+    const { default: multiCallEntrypointJson } = await import('../../artifacts/MultiCallEntrypoint.json');
+    standardContractArtifact = loadContractArtifact(multiCallEntrypointJson);
+  }
+  return standardContractArtifact;
+}
+
+/** Returns the standard deployment of the multi-call entrypoint. */
+export async function getStandardMultiCallEntrypoint(): Promise<StandardContract> {
+  if (!standardContract) {
+    const artifact = await getMultiCallEntrypointArtifact();
+    standardContract = makeStandardContract('MultiCallEntrypoint', artifact);
+  }
+  return standardContract;
+}
diff --git a/yarn-project/standard-contracts/src/scripts/generate_data.ts b/yarn-project/standard-contracts/src/scripts/generate_data.ts
@@ -41,6 +41,7 @@ const deployer = AztecAddress.zero();
 // a new standard contract.
 const standardContracts: { name: string; src: string; nrConst: string | null }[] = [
   { name: 'AuthRegistry', src: 'auth_registry_contract-AuthRegistry', nrConst: 'STANDARD_AUTH_REGISTRY_ADDRESS' },
+  { name: 'MultiCallEntrypoint', src: 'multi_call_entrypoint_contract-MultiCallEntrypoint', nrConst: null },
   { name: 'PublicChecks', src: 'public_checks_contract-PublicChecks', nrConst: 'STANDARD_PUBLIC_CHECKS_ADDRESS' },
 ];
 
diff --git a/yarn-project/standard-contracts/src/standard_contract_data.ts b/yarn-project/standard-contracts/src/standard_contract_data.ts
@@ -3,22 +3,25 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-export const standardContractNames = ['AuthRegistry', 'PublicChecks'] as const;
+export const standardContractNames = ['AuthRegistry', 'MultiCallEntrypoint', 'PublicChecks'] as const;
 
 export type StandardContractName = (typeof standardContractNames)[number];
 
 export const StandardContractSalt: Record<StandardContractName, Fr> = {
   AuthRegistry: new Fr(1),
+  MultiCallEntrypoint: new Fr(1),
   PublicChecks: new Fr(1),
 };
 
 export const StandardContractAddress: Record<StandardContractName, AztecAddress> = {
   AuthRegistry: AztecAddress.fromString('0x130fb3e9097456e6d3c486381ec788599d293fd5c0f178bc7e3724c0434faf42'),
+  MultiCallEntrypoint: AztecAddress.fromString('0x1e614f211eaa30a123fe91f50a3ad6333846b0d7f389198ae9a5414f28c37bb0'),
   PublicChecks: AztecAddress.fromString('0x0ed9aa9b8262bd0afb923764799e058ad10cf0de3e01dcf955055b11fdb20d70'),
 };
 
 export const StandardContractClassId: Record<StandardContractName, Fr> = {
   AuthRegistry: Fr.fromString('0x1bf882a1928c8e72e1e8e0e9595c721d5f5bae6466c24b39da40df04effdb1d7'),
+  MultiCallEntrypoint: Fr.fromString('0x124e40a58bff73a71ff76248d089540874cff6cc533af61a2abba8ad38c13e53'),
   PublicChecks: Fr.fromString('0x1853dc3b22d13d7fb93a089c366125098bf0f4a169255e12fc3765b3c08c3b6d'),
 };
 
@@ -31,6 +34,11 @@ export const StandardContractClassIdPreimage: Record<
     privateFunctionsRoot: Fr.fromString('0x06e0363cea8d971d0c2988a13fc88774092b2858adc5ee0876ed2f9ad05e2f63'),
     publicBytecodeCommitment: Fr.fromString('0x2545f39893766508ce37bb5cea5e4dcab04c6f7f79f3089b1c076876e9d268b2'),
   },
+  MultiCallEntrypoint: {
+    artifactHash: Fr.fromString('0x111a5c01d590689e44fe17f639135cc1636393df6abadbaa832ceb02e6b17f4f'),
+    privateFunctionsRoot: Fr.fromString('0x1497e05e2f823193577378ed04f91211331c657f7794113716315f52beff0a6a'),
+    publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+  },
   PublicChecks: {
     artifactHash: Fr.fromString('0x2b11692497c9a3f1f44f4694d1ffb1e521d8cd6ba0e2ef3878026fe9c12fd854'),
     privateFunctionsRoot: Fr.fromString('0x202860adb1b8975971eeaf571aaaa88a27f4035290d58532ae7d60b0dfaad54c'),
@@ -40,6 +48,7 @@ export const StandardContractClassIdPreimage: Record<
 
 export const StandardContractInitializationHash: Record<StandardContractName, Fr> = {
   AuthRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+  MultiCallEntrypoint: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
   PublicChecks: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 };
 
@@ -55,5 +64,13 @@ export const StandardContractPrivateFunctions: Record<
       vkHash: Fr.fromString('0x0e6dcc7becc25a6ee2e1322f2cc0ff6b59abff1bce27ca9906c079103e3d2c36'),
     },
   ],
+  MultiCallEntrypoint: [
+    {
+      selector: FunctionSelector.fromField(
+        Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f04908a9'),
+      ),
+      vkHash: Fr.fromString('0x06d65a5559a8f078b79b10786980ba9b3b11516210124599f1eb26edbd315d0a'),
+    },
+  ],
   PublicChecks: [],
 };
diff --git a/yarn-project/wallets/package.json b/yarn-project/wallets/package.json
@@ -29,6 +29,7 @@
   "dependencies": {
     "@aztec/accounts": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
+    "@aztec/standard-contracts": "workspace:^",
     "@aztec/entrypoints": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
diff --git a/yarn-project/wallets/src/embedded/account-contract-providers/bundle.ts b/yarn-project/wallets/src/embedded/account-contract-providers/bundle.ts
diff --git a/yarn-project/wallets/src/embedded/account-contract-providers/lazy.ts b/yarn-project/wallets/src/embedded/account-contract-providers/lazy.ts
diff --git a/yarn-project/wallets/tsconfig.json b/yarn-project/wallets/tsconfig.json
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"contract_instance_registry_contract-ContractInstanceRegistry",`
`3`	`3`	`"contract_class_registry_contract-ContractClassRegistry",`
`4`		`- "multi_call_entrypoint_contract-MultiCallEntrypoint",`
`5`	`4`	`"fee_juice_contract-FeeJuice"`
`6`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`{`
`19`	`19`	`"path": "../blob-lib"`
`20`	`20`	`},`
	`21`	`+ {`
	`22`	`+ "path": "../standard-contracts"`
	`23`	`+ },`
`21`	`24`	`{`
`22`	`25`	`"path": "../constants"`
`23`	`26`	`},`