@@ -48,9 +48,12 @@ pub contract CyclicDeployer {
4848 use aztec:: {
4949 macros:: functions ::{external , initialization_utils:: compute_initialization_hash , internal },
5050 protocol ::{
51- abis::function_selector::FunctionSelector , address::AztecAddress ,
52- contract_class_id::ContractClassId , contract_instance::ContractInstance ,
53- public_keys::PublicKeys , traits ::{Deserialize , FromField , Serialize , ToField },
51+ abis::function_selector::FunctionSelector ,
52+ address::AztecAddress ,
53+ contract_class_id::ContractClassId ,
54+ contract_instance::ContractInstance ,
55+ public_keys::PublicKeys ,
56+ traits ::{Deserialize , FromField , Serialize , ToField },
5457 },
5558 publish_contract_instance:: publish_contract_instance_for_public_execution ,
5659 };
@@ -145,15 +148,25 @@ pub contract CyclicDeployer {
145148 #[internal("private")]
146149 fn _deploy_contract (salt : Field , spec : ContractSpec ) -> AztecAddress {
147150 // 1. Derive the contract address on-chain, with this instance as the deployer.
148- let address =
149- _derive_instance (spec .init_selector , spec .init_args_hash , spec .class_id , salt , self .address );
151+ let address = _derive_instance (
152+ spec .init_selector ,
153+ spec .init_args_hash ,
154+ spec .class_id ,
155+ salt ,
156+ self .address ,
157+ );
150158
151159 // 2. Publish the instance (reverts on a duplicate or already-published address).
152160 publish_contract_instance_for_public_execution (context , address );
153161
154162 // 3. Run the public constructor by dispatching its precomputed calldata hash. `hide_msg_sender` is
155163 // false so the constructor sees this contract as `msg_sender`, satisfying the deployer check.
156- context .call_public_function_with_calldata_hash (address , spec .init_calldata_hash , false , false );
164+ context .call_public_function_with_calldata_hash (
165+ address ,
166+ spec .init_calldata_hash ,
167+ false ,
168+ false ,
169+ );
157170
158171 address
159172 }
@@ -167,7 +180,12 @@ pub contract CyclicDeployer {
167180 #[internal("private")]
168181 fn _run_action (address : AztecAddress , action : Action ) {
169182 if action .calldata_hash != 0 {
170- context .call_public_function_with_calldata_hash (address , action .calldata_hash , false , false );
183+ context .call_public_function_with_calldata_hash (
184+ address ,
185+ action .calldata_hash ,
186+ false ,
187+ false ,
188+ );
171189 }
172190 }
173191
0 commit comments