Skip to content

Commit c3574ac

Browse files
benesjanbenesjan
committed
chore: updating hardcoded public dispatch with stream deserialize
1 parent 8d2c62e commit c3574ac

File tree

3 files changed

+18
-24
lines changed
  • noir-projects/noir-contracts/contracts/protocol
    • auth_registry_contract/src
    • contract_instance_registry_contract/src
    • fee_juice_contract/src

3 files changed

+18
-24
lines changed

‎noir-projects/noir-contracts/contracts/protocol/auth_registry_contract/src/main.nr‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -297,24 +297,24 @@ pub contract AuthRegistry {
297297
let input_calldata: [Field; 2] =
298298
avm::calldata_copy(1, <Field as Serialize>::N + <bool as Serialize>::N);
299299
let mut reader: Reader<2> = Reader::new(input_calldata);
300-
let arg0: Field = reader.read_struct(<Field as Deserialize>::deserialize);
301-
let arg1: bool = reader.read_struct(<bool as Deserialize>::deserialize);
300+
let arg0: Field = <Field as Deserialize>::stream_deserialize(&mut reader);
301+
let arg1: bool = <bool as Deserialize>::stream_deserialize(&mut reader);
302302
set_authorized(arg0, arg1);
303303
avm::avm_return([].as_vector());
304304
};
305305
if selector == SET_REJECT_ALL_SELECTOR {
306306
let input_calldata: [Field; 1] = avm::calldata_copy(1, <bool as Serialize>::N);
307307
let mut reader: Reader<1> = Reader::new(input_calldata);
308-
let arg0: bool = reader.read_struct(<bool as Deserialize>::deserialize);
308+
let arg0: bool = <bool as Deserialize>::stream_deserialize(&mut reader);
309309
set_reject_all(arg0);
310310
avm::avm_return([].as_vector());
311311
};
312312
if selector == CONSUME_SELECTOR {
313313
let input_calldata: [Field; 2] =
314314
avm::calldata_copy(1, <AztecAddress as Serialize>::N + <Field as Serialize>::N);
315315
let mut reader: Reader<2> = Reader::new(input_calldata);
316-
let arg0: AztecAddress = reader.read_struct(<AztecAddress as Deserialize>::deserialize);
317-
let arg1: Field = reader.read_struct(<Field as Deserialize>::deserialize);
316+
let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
317+
let arg1: Field = <Field as Deserialize>::stream_deserialize(&mut reader);
318318
let return_value: [Field; 1] = <Field as Serialize>::serialize(consume(arg0, arg1));
319319
avm::avm_return(return_value.as_vector());
320320
};
@@ -324,25 +324,25 @@ pub contract AuthRegistry {
324324
(<AztecAddress as Serialize>::N + <Field as Serialize>::N) + <bool as Serialize>::N,
325325
);
326326
let mut reader: Reader<3> = Reader::new(input_calldata);
327-
let arg0: AztecAddress = reader.read_struct(<AztecAddress as Deserialize>::deserialize);
328-
let arg1: Field = reader.read_struct(<Field as Deserialize>::deserialize);
329-
let arg2: bool = reader.read_struct(<bool as Deserialize>::deserialize);
327+
let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
328+
let arg1: Field = <Field as Deserialize>::stream_deserialize(&mut reader);
329+
let arg2: bool = <bool as Deserialize>::stream_deserialize(&mut reader);
330330
_set_authorized(arg0, arg1, arg2);
331331
avm::avm_return([].as_vector());
332332
};
333333
if selector == IS_REJECT_ALL_SELECTOR {
334334
let input_calldata: [Field; 1] = avm::calldata_copy(1, <AztecAddress as Serialize>::N);
335335
let mut reader: Reader<1> = Reader::new(input_calldata);
336-
let arg0: AztecAddress = reader.read_struct(<AztecAddress as Deserialize>::deserialize);
336+
let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
337337
let return_value: [Field; 1] = <bool as Serialize>::serialize(is_reject_all(arg0));
338338
avm::avm_return(return_value.as_vector());
339339
};
340340
if selector == IS_CONSUMABLE_SELECTOR {
341341
let input_calldata: [Field; 2] =
342342
avm::calldata_copy(1, <AztecAddress as Serialize>::N + <Field as Serialize>::N);
343343
let mut reader: Reader<2> = Reader::new(input_calldata);
344-
let arg0: AztecAddress = reader.read_struct(<AztecAddress as Deserialize>::deserialize);
345-
let arg1: Field = reader.read_struct(<Field as Deserialize>::deserialize);
344+
let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
345+
let arg1: Field = <Field as Deserialize>::stream_deserialize(&mut reader);
346346
let return_value: [Field; 1] =
347347
<bool as Serialize>::serialize(is_consumable(arg0, arg1));
348348
avm::avm_return(return_value.as_vector());

‎noir-projects/noir-contracts/contracts/protocol/contract_instance_registry_contract/src/main.nr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,14 @@ pub contract ContractInstanceRegistry {
295295
avm::calldata_copy(1, <ContractClassId as Serialize>::N);
296296
let mut reader: Reader<1> = Reader::new(input_calldata);
297297
let arg0: ContractClassId =
298-
reader.read_struct(<ContractClassId as Deserialize>::deserialize);
298+
<ContractClassId as Deserialize>::stream_deserialize(&mut reader);
299299
update(arg0);
300300
avm::avm_return([].as_vector());
301301
};
302302
if selector == SET_UPDATE_DELAY_SELECTOR {
303303
let input_calldata: [Field; 1] = avm::calldata_copy(1, <u64 as Serialize>::N);
304304
let mut reader: Reader<1> = Reader::new(input_calldata);
305-
let arg0: u64 = reader.read_struct(<u64 as Deserialize>::deserialize);
305+
let arg0: u64 = <u64 as Deserialize>::stream_deserialize(&mut reader);
306306
set_update_delay(arg0);
307307
avm::avm_return([].as_vector());
308308
};

‎noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/main.nr‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub contract FeeJuice {
77
abis::function_selector::FunctionSelector,
88
address::{AztecAddress, EthAddress},
99
constants::FEE_JUICE_ADDRESS,
10-
traits::ToField,
10+
traits::{Deserialize, ToField},
1111
},
1212
state_vars::{Map, PublicMutable},
1313
};
@@ -204,11 +204,8 @@ pub contract FeeJuice {
204204
);
205205
let mut reader: aztec::protocol::utils::reader::Reader<2> =
206206
aztec::protocol::utils::reader::Reader::<2>::new(input_calldata);
207-
let arg0: AztecAddress = reader.read_struct(
208-
<AztecAddress as aztec::protocol::traits::Deserialize>::deserialize,
209-
);
210-
let arg1: u128 =
211-
reader.read_struct(<u128 as aztec::protocol::traits::Deserialize>::deserialize);
207+
let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
208+
let arg1: u128 = <u128 as Deserialize>::stream_deserialize(&mut reader);
212209
_increase_public_balance(arg0, arg1);
213210
aztec::oracle::avm::avm_return([].as_vector());
214211
};
@@ -219,8 +216,7 @@ pub contract FeeJuice {
219216
);
220217
let mut reader: aztec::protocol::utils::reader::Reader<1> =
221218
aztec::protocol::utils::reader::Reader::<1>::new(input_calldata);
222-
let arg0: u128 =
223-
reader.read_struct(<u128 as aztec::protocol::traits::Deserialize>::deserialize);
219+
let arg0: u128 = <u128 as Deserialize>::stream_deserialize(&mut reader);
224220
check_balance(arg0);
225221
aztec::oracle::avm::avm_return([].as_vector());
226222
};
@@ -231,9 +227,7 @@ pub contract FeeJuice {
231227
);
232228
let mut reader: aztec::protocol::utils::reader::Reader<1> =
233229
aztec::protocol::utils::reader::Reader::<1>::new(input_calldata);
234-
let arg0: AztecAddress = reader.read_struct(
235-
<AztecAddress as aztec::protocol::traits::Deserialize>::deserialize,
236-
);
230+
let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
237231
let return_value: [Field; 1] =
238232
<u128 as aztec::protocol::traits::Serialize>::serialize(balance_of_public(arg0));
239233
aztec::oracle::avm::avm_return(return_value.as_vector());

0 commit comments

Comments
 (0)