Fixes after rebase

yarn-project/noir-contracts/src/artifacts/escrow_contract.json

@@ -0,0 +1,51 @@
+{
+  "name": "Escrow",
+  "functions": [
+    {
+      "name": "constructor",
+      "functionType": "secret",
+      "parameters": [
+        {
+          "name": "owner",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "public"
+        }
+      ],
+      "returnTypes": [],
+      "bytecode": "H4sIAAAAAAAA/+2c93MTRxzFF7mASUIgplfTO5yaJVENJjh2TIkDoRcby2CKDcYUQwohvffeSCG9T/LvZXIv/grOGgV+uHcavxnvzM07yfbq89m721vd7flv59xNN1hG+UvMXyptvfC6quh1ta0HS+F1g2XSq0+l8plEPp6Mt3uJXEc27aXSHfXZeDaezqY7E9lkMp9NZTO5jlzGy8VTyXy8K51LdnmDZWKgLi9kiZJzkgjnZBHOKSKcU0U4p4lwThfhnCHCOVOEc5YI52wRzjkinHUinHNFOOeJcM4X4VwgwrlQhHORCOdiEc4lIpxLRTiXiXAuF+FcIcK5UoRzlQjnahFOT4QzLsKZIHKCDdcY66y+Wn/5x18mWk6ynGw5xXKq5TTL6ZYzLGdazrKcbTnHss5yruU8y/mWCywXWi6yXGy5xHKp5TLL5ZYrLFdarrJcbelZxi0Tgb9L+kvKDS3sbZh2GvtavQhnRoQzK8KZE+FcI8K5VoRznQjnehHODSKcG0U4G0Q4N4lwbhbhbHT8Me/4ApsbHPulLestM5ZZy5zlGsu1luss11tusNxo2WC5yXKzZaO7Pebc4i8PutL3+0u1pxeuxGsdtz0LZWtgvdIyFnivwrI6AidX9DnF7TiuxHvUD49iI22NoN4mxzswo/Ju4m8jr1wHV8xFc3A9FFgfObhC1hmzBmXX2+yG98EF72b+Nrq1ozYZc7NliyvfWa3FRXPgPRxYHznwQtbZYg3KrrfVDe8DD96t/G10azhb2CELl3Bjlijb/GW7G1rYQ/QdxLYqdtphLtsCTjv95ZGi3ytVGohMsbu0oReuUIflUTFGNbppC6yPtaxxtzvXUYH3irdDtaNv70RVoN6aQP2Fz0bHO8ZfJtjrnt7+7q6Bxr58e3++c3tvfz4oV+qsEQuIVRS9hw+sKvrboHjhZ6NdoPePskf1QpZyDQHaXDR756OB9ZEhQMg626xB2fXucsN7CADvXfxtFAlrq7Gyhwl/Of4pDqWCzMkcTu4mbhdm+5WrUyb6D+mUHwusj3TKIevcbQ3KrnePG96dMrz38LfRHW+HeOEKvU3/jzNs3XvL1J5hOfeJcO4X4TwgwnlQhPOQCOdhEc4jZM4oBt87I/A+KrJ92kU4O0Q4j4lwdopw5kU4u0Q4j4twnhDh7BbhPCnCeUqE87QI5xkRzh4Rzl4RzrMinOdEOPtEOM+LcPaLcF4Q4bwownlJhPOyCOeACOcVEc6rEXHGiji9cOW/OVIs58dFnGNE5ydEnCuIzk+KOFcSnZ8Sca4iOl8Tca4mOj8t4ryF6HxdxHkv0fkZEed9ROdnRZz3E52fE3E+QHR+XsT5INH5BRHnQ0TnF0WcDxOdXxJxPkJ0flnE+SjR+RUR53ai86sizh1E59dEnI8RnV8Xce4kOr8h4pwnOr8p4txFdH5LxPk40fltEecTROd3RJy7ic7vijifJDq/J+J8iuj8vojzaaLzByLOZ4jOH4o49xCdPxJx7iU6fyzifJbo/ImI8zmi86cizn1E589EnM8TnT8Xce4nOn8h4nyB6HxDxPki0flLEedLROevRJwvE52/FnEeIDp/I+J8heh8U8T5KtH5WxHn0UTn70ScxxCdvxdxriE6/yDiPJbo/KOI8z1E559EnO8lOv8s4nwf0fkXEedxROdfRZzvJzr/JuI8nuj8u4jzBKLzHyLODxCd/yQ611o9hf+djOdG8BxF4X/rYsyMMSTGVBhj4JyLcxD6ZPRROGaxD2ObwhH1ZaxOPB+E52Xw/Aiep7jmL5hvf91fMB8b85MxXxfzVzGfE/MbMd8P898wHwzzozBfCPNnMJ8E8ysw3wD333E/Gvdncb8S9+9wPwv3d3C/A9f/cT0c14dxvRTXD3E97Ya/4HoLrj/g+zi+n+L7Gr6/YDyP8S3Gexj/YDyA8yPOF+g/0Z/g+ML+hvb/FzTT1mMrhgAA",
+      "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f"
+    },
+    {
+      "name": "withdraw",
+      "functionType": "secret",
+      "parameters": [
+        {
+          "name": "token",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "amount",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "recipient",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "public"
+        }
+      ],
+      "returnTypes": [],
+      "bytecode": "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",
+      "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f"
+    }
+  ]
+}

yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml

@@ -3,5 +3,4 @@ authors = [""]
 compiler_version = "0.1"
 
 [dependencies]
-aztec = { path = "../../libs/noir-aztec" }
-custom_notes = { path = "../../libs/custom-notes" }
+aztec = { path = "../../../../noir-libs/noir-aztec" }

yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr

@@ -3,7 +3,7 @@ use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::oracle::get_secret_key::get_secret_key;
 use dep::aztec::oracle::get_public_key::get_public_key;
-use dep::custom_notes::utils::compute_siloed_note_hash;
+use dep::aztec::note::utils::compute_siloed_note_hash;
 
 global ADDRESS_NOTE_LEN: Field = 2;
 

yarn-project/noir-contracts/src/types/escrow.ts

@@ -11,9 +11,9 @@ import {
 } from '@aztec/aztec.js';
 import { ContractAbi } from '@aztec/foundation/abi';
 import { Fr, Point } from '@aztec/foundation/fields';
-import { AztecRPC } from '@aztec/types';
+import { AztecRPC, PublicKey } from '@aztec/types';
 
-import { EscrowContractAbi } from '../examples/index.js';
+import { EscrowContractAbi } from '../artifacts/index.js';
 
 /**
  * Type-safe interface for contract Escrow;
@@ -40,7 +40,7 @@ export class EscrowContract extends Contract {
    */
   public static deployWithPublicKey(
     rpc: AztecRPC,
-    publicKey: Point,
+    publicKey: PublicKey,
     owner: Fr | bigint | number | { toField: () => Fr },
   ) {
     return new DeployMethod(publicKey, rpc, EscrowContractAbi, Array.from(arguments).slice(2));