Merge branch 'master' into janb/e2e-2-rpc-servers

AztecProtocol · Jul 19, 2023 · f8e6a8f · f8e6a8f
2 parents cd2d471 + 2e25f8a
commit f8e6a8f
Show file tree

Hide file tree

Showing 125 changed files with 588 additions and 512 deletions.
diff --git a/yarn-project/acir-simulator/src/client/private_execution.test.ts b/yarn-project/acir-simulator/src/client/private_execution.test.ts
@@ -35,7 +35,7 @@ import {
   PendingCommitmentsContractAbi,
   TestContractAbi,
   ZkTokenContractAbi,
-} from '@aztec/noir-contracts/examples';
+} from '@aztec/noir-contracts/artifacts';
 import { PackedArguments, TxExecutionRequest } from '@aztec/types';
 
 import { jest } from '@jest/globals';

diff --git a/yarn-project/acir-simulator/src/client/unconstrained_execution.test.ts b/yarn-project/acir-simulator/src/client/unconstrained_execution.test.ts
@@ -5,7 +5,7 @@ import { encodeArguments } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, Point } from '@aztec/foundation/fields';
-import { ZkTokenContractAbi } from '@aztec/noir-contracts/examples';
+import { ZkTokenContractAbi } from '@aztec/noir-contracts/artifacts';
 import { ExecutionRequest } from '@aztec/types';
 
 import { mock } from 'jest-mock-extended';

diff --git a/yarn-project/acir-simulator/src/public/index.test.ts b/yarn-project/acir-simulator/src/public/index.test.ts
@@ -19,7 +19,7 @@ import {
   ParentContractAbi,
   PublicTokenContractAbi,
   TestContractAbi,
-} from '@aztec/noir-contracts/examples';
+} from '@aztec/noir-contracts/artifacts';
 
 import { MockProxy, mock } from 'jest-mock-extended';
 import { type MemDown, default as memdown } from 'memdown';

diff --git a/yarn-project/aztec-cli/src/index.ts b/yarn-project/aztec-cli/src/index.ts
@@ -14,7 +14,7 @@ import { randomBytes } from '@aztec/foundation/crypto';
 import { JsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
 import { ContractData, L2BlockL2Logs, TxHash } from '@aztec/types';
 
 import { Command } from 'commander';

diff --git a/yarn-project/aztec-sandbox/src/examples/uniswap_trade_on_l1_from_l2.ts b/yarn-project/aztec-sandbox/src/examples/uniswap_trade_on_l1_from_l2.ts
@@ -10,7 +10,7 @@ import {
 } from '@aztec/aztec.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
-import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
 import { NonNativeTokenContract, UniswapContract } from '@aztec/noir-contracts/types';
 import { AztecRPC, TxStatus } from '@aztec/types';
 

diff --git a/yarn-project/aztec-sandbox/src/examples/zk_token_contract.ts b/yarn-project/aztec-sandbox/src/examples/zk_token_contract.ts
@@ -1,7 +1,7 @@
 import { Contract, Wallet, createAccounts, createAztecRpcClient } from '@aztec/aztec.js';
 import { AztecAddress, Fr } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
 import { ZkTokenContract } from '@aztec/noir-contracts/types';
 
 const logger = createDebugLogger('aztec:http-rpc-client');

diff --git a/yarn-project/circuits.js/src/cbind/constants.in.ts b/yarn-project/circuits.js/src/cbind/constants.in.ts
@@ -38,7 +38,7 @@ async function main(): Promise<void> {
     processEnumNoir(privateStateNoteGeneratorIndexEnum, 'PRIVATE_STATE_NOTE_GENERATOR_INDEX__') +
     processEnumNoir(privateStateTypeEnum, 'PRIVATE_STATE_TYPE__');
 
-  const noirTargetPath = join(__dirname, '../../../noir-contracts/src/libs/noir-aztec/src/constants_gen.nr');
+  const noirTargetPath = join(__dirname, '../../../noir-libs/noir-aztec/src/constants_gen.nr');
   fs.writeFileSync(noirTargetPath, resultNoir);
 }
 

diff --git a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
@@ -16,7 +16,7 @@ import {
   EcdsaAccountContractAbi,
   SchnorrMultiKeyAccountContractAbi,
   SchnorrSingleKeyAccountContractAbi,
-} from '@aztec/noir-contracts/examples';
+} from '@aztec/noir-contracts/artifacts';
 import { ChildContract } from '@aztec/noir-contracts/types';
 import { PublicKey } from '@aztec/types';
 

diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -2,7 +2,7 @@ import { AztecNodeService } from '@aztec/aztec-node';
 import { AztecRPCServer } from '@aztec/aztec-rpc';
 import { ContractDeployer, Fr } from '@aztec/aztec.js';
 import { DebugLogger } from '@aztec/foundation/log';
-import { TestContractAbi } from '@aztec/noir-contracts/examples';
+import { TestContractAbi } from '@aztec/noir-contracts/artifacts';
 import { TxStatus } from '@aztec/types';
 
 import times from 'lodash.times';

diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts
@@ -3,7 +3,7 @@ import { AztecRPCServer } from '@aztec/aztec-rpc';
 import { AztecAddress, ContractDeployer, Fr } from '@aztec/aztec.js';
 import { getContractDeploymentInfo } from '@aztec/circuits.js';
 import { DebugLogger } from '@aztec/foundation/log';
-import { TestContractAbi } from '@aztec/noir-contracts/examples';
+import { TestContractAbi } from '@aztec/noir-contracts/artifacts';
 import { TxStatus } from '@aztec/types';
 
 import { setup } from './utils.js';

diff --git a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
@@ -4,7 +4,7 @@ import { AztecAddress, Contract, ContractDeployer, Fr, Wallet } from '@aztec/azt
 import { ContractAbi } from '@aztec/foundation/abi';
 import { DebugLogger } from '@aztec/foundation/log';
 import { toBigInt } from '@aztec/foundation/serialize';
-import { ChildContractAbi, ParentContractAbi } from '@aztec/noir-contracts/examples';
+import { ChildContractAbi, ParentContractAbi } from '@aztec/noir-contracts/artifacts';
 import { ChildContract, ParentContract } from '@aztec/noir-contracts/types';
 import { TxStatus } from '@aztec/types';
 

diff --git a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts
@@ -10,7 +10,7 @@ import { CircuitsWasm, Point, getContractDeploymentInfo } from '@aztec/circuits.
 import { computeContractAddressFromPartial } from '@aztec/circuits.js/abis';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { DebugLogger } from '@aztec/foundation/log';
-import { TestContractAbi } from '@aztec/noir-contracts/examples';
+import { TestContractAbi } from '@aztec/noir-contracts/artifacts';
 import { BootstrapNode, P2PConfig, createLibP2PPeerId, exportLibP2PPeerIdToString } from '@aztec/p2p';
 import { TxStatus } from '@aztec/types';
 

diff --git a/yarn-project/end-to-end/src/utils.ts b/yarn-project/end-to-end/src/utils.ts
@@ -22,7 +22,7 @@ import { randomBytes } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger, Logger, createDebugLogger } from '@aztec/foundation/log';
 import { PortalERC20Abi, PortalERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
-import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
 import { NonNativeTokenContract } from '@aztec/noir-contracts/types';
 import { AztecNode, TxStatus } from '@aztec/types';
 

diff --git a/yarn-project/noir-contracts/README.md b/yarn-project/noir-contracts/README.md
@@ -96,12 +96,12 @@ This package contains the source code and the Aztec ABIs for the example contrac
    compiler_version = "0.7.1"
 
    [dependencies]
-   aztec = { path = "../../libs/noir-aztec" }
+   aztec = { path = "../../../../noir-libs/noir-aztec" }
    ```
 
 4. Replace the content of the generated `example_contract/src/main.nr` file with your contract code.
 5. Go to `noir-contracts` root folder and run `yarn noir:build example` to compile the contract.
-6. Export the abi in `src/examples/index.ts` to be able to use the contract in the rest of the project:
+6. Export the abi in `src/artifacts/index.ts` to be able to use the contract in the rest of the project:
    ```
    import ExampleContractJson from './example_contract.json' assert { type: 'json' };
    export const ExampleContractAbi = ExampleContractJson as ContractAbi;

diff --git a/yarn-project/noir-contracts/package.json b/yarn-project/noir-contracts/package.json
@@ -4,7 +4,7 @@
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./examples": "./dest/examples/index.js",
+    "./artifacts": "./dest/artifacts/index.js",
     "./types": "./dest/types/index.js"
   },
   "typedoc": {

diff --git a/...ontracts/src/examples/child_contract.json → ...ntracts/src/artifacts/child_contract.json b/...ontracts/src/examples/child_contract.json → ...ntracts/src/artifacts/child_contract.json
diff --git a/yarn-project/noir-contracts/src/artifacts/ecdsa_account_contract.json b/yarn-project/noir-contracts/src/artifacts/ecdsa_account_contract.json
diff --git a/...c/examples/gullible_account_contract.json → .../artifacts/gullible_account_contract.json b/...c/examples/gullible_account_contract.json → .../artifacts/gullible_account_contract.json
diff --git a/...ject/noir-contracts/src/examples/index.ts → ...ect/noir-contracts/src/artifacts/index.ts b/...ject/noir-contracts/src/examples/index.ts → ...ect/noir-contracts/src/artifacts/index.ts
diff --git a/...c/examples/non_native_token_contract.json → .../artifacts/non_native_token_contract.json b/...c/examples/non_native_token_contract.json → .../artifacts/non_native_token_contract.json
diff --git a/...ntracts/src/examples/parent_contract.json → ...tracts/src/artifacts/parent_contract.json b/...ntracts/src/examples/parent_contract.json → ...tracts/src/artifacts/parent_contract.json
diff --git a/...xamples/pending_commitments_contract.json → ...tifacts/pending_commitments_contract.json b/...xamples/pending_commitments_contract.json → ...tifacts/pending_commitments_contract.json
diff --git a/...src/examples/public_private_contract.json → ...rc/artifacts/public_private_contract.json b/...src/examples/public_private_contract.json → ...rc/artifacts/public_private_contract.json
diff --git a/...s/src/examples/public_token_contract.json → .../src/artifacts/public_token_contract.json b/...s/src/examples/public_token_contract.json → .../src/artifacts/public_token_contract.json
diff --git a/...xamples/rollup_native_asset_contract.json → ...tifacts/rollup_native_asset_contract.json b/...xamples/rollup_native_asset_contract.json → ...tifacts/rollup_native_asset_contract.json
diff --git a/yarn-project/noir-contracts/src/artifacts/schnorr_account_contract.json b/yarn-project/noir-contracts/src/artifacts/schnorr_account_contract.json
diff --git a/yarn-project/noir-contracts/src/artifacts/schnorr_multi_key_account_contract.json b/yarn-project/noir-contracts/src/artifacts/schnorr_multi_key_account_contract.json
diff --git a/yarn-project/noir-contracts/src/artifacts/schnorr_single_key_account_contract.json b/yarn-project/noir-contracts/src/artifacts/schnorr_single_key_account_contract.json
diff --git a/...contracts/src/examples/test_contract.json → ...ontracts/src/artifacts/test_contract.json b/...contracts/src/examples/test_contract.json → ...ontracts/src/artifacts/test_contract.json
diff --git a/...tracts/src/examples/uniswap_contract.json → ...racts/src/artifacts/uniswap_contract.json b/...tracts/src/examples/uniswap_contract.json → ...racts/src/artifacts/uniswap_contract.json