chore: rebase + rebuild noir

yarn-project/aztec.js/src/abis/schnorr_account_contract.json

@@ -48,11 +48,7 @@
           }
         }
       ],
-<<<<<<< HEAD
-      "bytecode": "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",
-=======
-      "bytecode": "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",
->>>>>>> fix: work around no public functions from constructor
+      "bytecode": "H4sIAAAAAAAA/+3d13LbSBYGYIhRIETZVnTO2bJNiZJzoHOQg5zGnuSxLWtcW7VXu7MXezUPtG+wd/tm6+7Fb/1qczFUzenBz6rpKhUBguzzndNAA6QlI0uSZCT5X6t+/qklXzds7+WPnd/X5kfs+urEdFaGxFk1dI7k+0FMby1CXa2N9SEwNozHHUbMAc3PP6Off9LPP61kvf0n30Hc8/X8OewzKb2/Qs9VgxqktB2tQcs9m7y6Dfu6d+q5P6FHznc8z6VpG3eea1RLNo4TxgDb2/Tonhu1tSykycbxSqjO4RgmFN+9p2Vr6abBOPyWpUWWzNbScX2OGffp+miTH7lm9IjtY5Rb29bhz9tZsrGmWG9T3D/zN407VPmn9FyjZEtGhjSepZslf8x+wLVF3+4cMEcxx41zc31uM87Djd2WZL39Snlto1xixN0axB0P4o4EY/grWfHeKr3mVXV9HBbz51pBHniMMS9MJusNMcfIMZEvT5IjxnXJVB9HkxyIP0WOaVvHgutjpo9jmhyIP0OOWWNHGjhcK7oemSXLjgiW7Zuw7CDLrgiWnZuw7CLLngiW3Zuw7CHLvgiWvZuw7CPLgQiW/ZuwIL5738F8mY+tQ7Y+f94/GFiwjlgZGSYiWrI+sbkO2wXqAMNkiXXYKVAHGKZKrMNugTrAUCmxDnsF6gBDtcQ67BeoAwy1P7gOEeJ00yBn14rOXWw5bGvx1+ZHKBZch6n22M7nqCPGtR+hmOgX6+wb1Do5RNapkq0x9ivX51HbPv01H9fUtaLj5ijld8zW0nWfXd3nRowr+g9ry+evGJ+rT1C+iMmfq4/nyyfIcdLW4ceFHa4VjctJspyytfiazFEsuBAno+18Lpmzdfjj7lSQP9bZN6j1eMnWWHOEcS5+X+RcXCvaFzm/08YWzBEYV/SPOsIZe444S/kiJs8RZ/Lls+ToGNciDRyuFY1Lhyzzthbf9QLFggtxMtrOY7Ng6/DH3XyQP9bZN6j1TMnWCGO16Prs2vbp90WuqWtF+2KX8ls0tmCOwLii/7C2seeIc5QvYvIcsZQvnyPHeeNapIHDtaJxOU+WC7YWX5OLFAsuxMloO382v2jr8MfdhSB/rLNvUOtSydYIY+X/7e+SbZ9+X+Saula0L16i/C4bWzBHYFzRf1jb2HPEVcoXMXmOuJIvXyXHNVuH/+6EHa4Vjcs1sly3tXTCWHAhTkbb+buTnq3DH3fXg/zDXDdjnRwi61TJ1lifi4xz8fMZ5+Ja0XHD+d2wtXz57gTjiv5RRzhjz2e3KF/E5PnsZr58ixy3bR1+XNjhWtG43CbLHVuLr8ldigUX4mS0nb87uWvr8MfdnSB/rLNvUOvNkq2x5gjjXPy+yLm4VrQvcn73jC2YIzCu6B91hDP2HPGA8kVMniPu58sPyPHQuBZp4HCtaFwekmXZ1uJr8ohiwYU4GW3nsXlk6/DH3XKQP9bZN6j1fsnWWN+dGOfi90XOxbWifZHze2xswRyBcUX/qCOcseeIp5QvYvIc8SRffkqOFeNapIHDtaJxWSHLM1uLr8lzigUX4mS0nb87eW7r8MfdsyB/rLNvUOuTkq2xvjsxzsXvi5yLa0X7Iuf3wtiCOQLjiv5RRzhjzxGvKF/E5DniZb6M1/HfDLDtla1tvmhc+lmqQpaakKUuZGkIWZpCllEhSypkaQlZMiHLmJClLWQZF7JsEbJsFbJsE7JMCFkmhSxTQpZpIcuMkGVWyLJdyLJDyLJTyLJLyLJbyLJHyLJXyLJPyLJfyHJAyHJQyHJIyHJYyHJEyHJUyHJMyHJcyHJCyHJSyHJKyDInZDktZDkjZDkrZOkIWeaFLAtClq6QZVHIsiRkOSdkOS9kuSBkuShkuSRkuSxkuSJkuSpkuSZkuS5k6QlZbghZbgpZbglZbgtZ7ghZ7gpZ7glZ7gtZHghZHgpZloUsj4Qsj4UsT4QsT4UsK0KWZ0KW50KWF0KWl0KWkZItafL178intH2KnqsE73W/e/x3utfJ6/z5Cr3nTb5c7dP3a3rum3z5TZ/3co1eB7l0fl/zNeI4PVpHrBYZ3ghYXgpZXghZngtZnglZVoQsT4UsT4Qsj4Usj4Qsy0KWh0KWB0KW+0KWe0KWu0KWO0KW20KWW0KWm0KWG0KWnpDlupDlmpDlqpDlipDlspDlkpDlopDlgpDlvJDlnJBlSciyKGTpClkWhCzzQpaOkOWskOWMkOW0kGVOyHJKyHJSyHJCyHJcyHJMyHJUyHJEyHJYyHJIyHJQyHJAyLJfyLJPyLJXyLJHyLJbyLJLyLJTyLJDyLJdyDIrZJkRskwLWaaELJNClgkhyzYhy1YhyxYhy7iQpS1kGROyZEKWlpAlFbKMClmaQpaGkKUuZKkJWapClkofy7e2li7/nnpCJm49Wv6WLN/ZWvw/C31PseBCnIy2898sfG/r8OPzXZA/1tk3qPXVEFm/Kdnq4sa4R5NxLv7eCpyLa0XHDef3g63ly33cMK7oH3WEs0KGGPdWeEv5IibfW+HHfPktOX6ydSymgcO1onH5iSzvbC2+Ju8pFlyIk9F2/r+k3ts6/HH3Lsgf6+wb1Lo0RNYrQ2T9sWRrSs+9pecqgdnNNS1ab1C/H2i5Tjkm+XveB69z7121zdVf07DDtaI5YJUsa7aWjov7M/Xfoxgc95Nt3HmOO5L/IAaer9LyJ1z40utce5c/wuzG8GOf1/Hyh+A9GW3/GDnnNXL0aB2x3GeNHyjXj33cGT1i+3tyN43dro9VciA+4qRB3fBovK/6+n0M6od1HstGUK8Ilm7WJ3aarNcG9XLjOUc2NL7WqUaoUxLUCa3axzJSsuX//U1zNagVz/XY5ubwf9PfNNf6vAevrSVfv45zr0fIneP0aB2x+G+VawKWSh9Lw9birzsxdyTJxnuFwQET3xdq1Lgmro+0j2OUHDzHwdGydfhfw+1377QWPSI+3/fI+DNSNw0crhUdv3zfo7atxe8j4xQLrjatYzvfU23c1uGPm3aQP9bZN6i1OUTWtGRrhP3qZ9fnFts+/XctXFPXio4bvhfVVlvLl+9aMK7oP6wtX3/EmN8n1tPdMJ6u8b838+uwXKPtfL7H9n9V13NyfU7a+v14ssu1ovFEfHfewJz4ae2XF2urf1v7ZXntnyPUx0SQV4X6qdMyzxMxxmeaYvF9t1zj39mYpm0xzr8zfRx8/kV8vC6lZf6/bmYDL18r8ntxbsXrm3luNdvcuhwLrWgfqlHutA+t/OPDX/+yGuxD6Lfap1++7q0Hr+Oa8PVV6DIb4AYBKzmklgdv9Em+mRfAQVu0/b82PdKy1bEAAA==",
       "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f"
     },
     {

yarn-project/end-to-end/src/e2e_token_contract.test.ts

@@ -8,7 +8,14 @@ import {
   AztecAddress,
   computeMessageSecretHash,
 } from '@aztec/aztec.js';
-import { CircuitsWasm, CompleteAddress, Fr, FunctionSelector, GeneratorIndex, PrivateKey } from '@aztec/circuits.js';
+import {
+  CircuitsWasm,
+  CompleteAddress,
+  Fr,
+  FunctionSelector,
+  GeneratorIndex,
+  GrumpkinScalar,
+} from '@aztec/circuits.js';
 import { pedersenPlookupCompressWithHashIndex } from '@aztec/circuits.js/barretenberg';
 import { DebugLogger } from '@aztec/foundation/log';
 import { SchnorrAuthWitnessAccountContract, TokenContract } from '@aztec/noir-contracts/types';
@@ -68,7 +75,7 @@ describe('e2e_token_contract', () => {
     {
       const _accounts = [];
       for (let i = 0; i < 3; i++) {
-        const privateKey = PrivateKey.random();
+        const privateKey = GrumpkinScalar.random();
         const account = new Account(aztecRpcServer, privateKey, new AuthWitnessAccountContract(privateKey));
         const deployTx = await account.deploy();
         await deployTx.wait({ interval: 0.1 });

yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/src/main.nr

@@ -1,16 +1,61 @@
 mod util;
 mod auth_oracle;
-mod storage;
 
 contract SchnorrAuthWitnessAccount {
-    use dep::std::hash::pedersen_with_separator;
-    use dep::aztec::entrypoint::EntrypointPayload;
-    use dep::aztec::constants_gen::GENERATOR_INDEX__SIGNATURE_PAYLOAD;
-    use dep::std::option::Option;
-    use dep::aztec::oracle::compute_selector::compute_selector;
+    use dep::std::{
+        hash::pedersen_with_separator,
+        option::Option,
+    };
+
+    use dep::aztec::{
+        entrypoint::EntrypointPayload,
+        constants_gen::GENERATOR_INDEX__SIGNATURE_PAYLOAD,
+        oracle::compute_selector::compute_selector,
+        context::{
+            PrivateContext, 
+            PublicContext
+        },
+        state_vars::{
+            map::Map,
+            public_state::PublicState,
+        },
+        types::type_serialisation::{
+            field_serialisation::{
+                FieldSerialisationMethods, 
+                FIELD_SERIALISED_LEN,
+            }
+        }
+    };
+
     use crate::util::recover_address;
     use crate::auth_oracle::get_auth_witness;
-    use crate::storage::Storage;
+
+    struct Storage {
+        approved_action: Map<PublicState<Field, FIELD_SERIALISED_LEN>>,
+    }
+
+    impl Storage {
+        fn init(
+            private_context: Option<&mut PrivateContext>,
+            public_context: Option<&mut PublicContext>,
+        ) -> pub Self {
+            Storage {
+                approved_action: Map::new(
+                private_context,
+                public_context,
+                1,
+                |private_context, public_context, slot| {
+                    PublicState::new(
+                        private_context,
+                        public_context,
+                        slot,
+                        FieldSerialisationMethods,
+                    )
+                },
+                ),
+            }
+        }
+    }
 
     #[aztec(private)]
     fn constructor() {}

yarn-project/noir-contracts/src/contracts/token_contract/src/main.nr

@@ -1,4 +1,3 @@
-mod storage;
 mod types;
 mod account_interface;
 mod util;
@@ -12,24 +11,100 @@ mod util;
 contract Token {
     // Libs
     use dep::std::option::Option;
+
     use dep::safe_math::SafeU120;
+
     use dep::value_note::{
         balance_utils,
         utils::{increment, decrement},
-        value_note::{VALUE_NOTE_LEN, ValueNoteMethods},
+        value_note::{VALUE_NOTE_LEN, ValueNoteMethods, ValueNote},
     };
+
     use dep::aztec::{
         note::{
             note_header::NoteHeader,
             utils as note_utils,
         },
+        context::{PrivateContext, PublicContext},
+        state_vars::{map::Map, public_state::PublicState, set::Set},
+        types::type_serialisation::field_serialisation::{
+            FieldSerialisationMethods, FIELD_SERIALISED_LEN,
+        },
+        oracle::compute_selector::compute_selector,
     };
-    use dep::aztec::oracle::compute_selector::compute_selector;
-    use crate::storage::Storage;
-    use crate::types::{AztecAddress, TransparentNote, TransparentNoteMethods};
+
+    use crate::types::{AztecAddress, TransparentNote, TransparentNoteMethods, TRANSPARENT_NOTE_LEN};
     use crate::account_interface::AccountContract;
     use crate::util::compute_message_hash;
 
+
+
+    struct Storage {
+        admin: PublicState<Field, FIELD_SERIALISED_LEN>,
+        minters: Map<PublicState<Field, FIELD_SERIALISED_LEN>>,
+        balances: Map<Set<ValueNote, VALUE_NOTE_LEN>>,
+        total_supply: PublicState<Field, FIELD_SERIALISED_LEN>,
+        pending_shields: Set<TransparentNote, TRANSPARENT_NOTE_LEN>,
+        public_balances: Map<PublicState<Field, FIELD_SERIALISED_LEN>>,
+    }
+
+    impl Storage {
+        fn init(
+            private_context: Option<&mut PrivateContext>,
+            public_context: Option<&mut PublicContext>,
+        ) -> pub Self {
+            Storage {
+                admin: PublicState::new(
+                    private_context,
+                    public_context,
+                    1,
+                    FieldSerialisationMethods,
+                ),
+                minters: Map::new(
+                    private_context,
+                    public_context,
+                    2,
+                    |private_context, public_context, slot| {
+                        PublicState::new(
+                            private_context,
+                            public_context,
+                            slot,
+                            FieldSerialisationMethods,
+                        )
+                    },
+                ),
+                balances: Map::new(
+                    private_context,
+                    public_context,
+                    3,
+                    |private_context, public_context, slot| {
+                        Set::new(private_context, public_context, slot, ValueNoteMethods)
+                    },
+                ),
+                total_supply: PublicState::new(
+                    private_context,
+                    public_context,
+                    4,
+                    FieldSerialisationMethods,
+                ),
+                pending_shields: Set::new(private_context, public_context, 5, TransparentNoteMethods),
+                public_balances: Map::new(
+                    private_context,
+                    public_context,
+                    6,
+                    |private_context, public_context, slot| {
+                        PublicState::new(
+                            private_context,
+                            public_context,
+                            slot,
+                            FieldSerialisationMethods,
+                        )
+                    },
+                ),
+            }
+        }
+    }
+
     #[aztec(private)]
     fn constructor() {
         // Currently not possible to execute public calls from constructor as code not yet available to sequencer.