chore: space contract parity

starknet/src/authenticators/eth_sig.cairo

@@ -88,9 +88,9 @@ mod EthSigAuthenticator {
             ISpaceDispatcher { contract_address: target }
                 .propose(
                     UserAddress::Ethereum(author),
+                    metadata_uri,
                     execution_strategy,
                     user_proposal_validation_params,
-                    metadata_uri
                 );
         }
 
@@ -126,7 +126,7 @@ mod EthSigAuthenticator {
                     proposal_id,
                     choice,
                     user_voting_strategies,
-                    metadata_uri
+                    metadata_uri,
                 );
         }
 

starknet/src/authenticators/eth_tx.cairo

@@ -61,19 +61,19 @@ mod EthTxAuthenticator {
             target.serialize(ref payload);
             PROPOSE_SELECTOR.serialize(ref payload);
             author.serialize(ref payload);
+            metadata_uri.serialize(ref payload);
             execution_strategy.serialize(ref payload);
             user_proposal_validation_params.serialize(ref payload);
-            metadata_uri.serialize(ref payload);
             let payload_hash = poseidon::poseidon_hash_span(payload.span());
 
             consume_commit(ref self, payload_hash, author);
 
             ISpaceDispatcher { contract_address: target }
                 .propose(
                     UserAddress::Ethereum(author),
+                    metadata_uri,
                     execution_strategy,
                     user_proposal_validation_params,
-                    metadata_uri
                 );
         }
 
@@ -104,7 +104,7 @@ mod EthTxAuthenticator {
                     proposal_id,
                     choice,
                     user_voting_strategies,
-                    metadata_uri
+                    metadata_uri,
                 );
         }
 

starknet/src/authenticators/stark_sig.cairo

@@ -84,9 +84,9 @@ mod StarkSigAuthenticator {
             ISpaceDispatcher { contract_address: target }
                 .propose(
                     UserAddress::Starknet(author),
+                    metadata_uri,
                     execution_strategy,
                     user_proposal_validation_params,
-                    metadata_uri
                 );
         }
 
@@ -121,7 +121,7 @@ mod StarkSigAuthenticator {
                     proposal_id,
                     choice,
                     user_voting_strategies,
-                    metadata_uri
+                    metadata_uri,
                 );
         }
 

starknet/src/authenticators/stark_tx.cairo

@@ -57,9 +57,9 @@ mod StarkTxAuthenticator {
             ISpaceDispatcher { contract_address: space }
                 .propose(
                     UserAddress::Starknet(author),
+                    metadata_uri,
                     execution_strategy,
                     user_proposal_validation_params,
-                    metadata_uri
                 );
         }
 
@@ -80,7 +80,7 @@ mod StarkTxAuthenticator {
                     proposal_id,
                     choice,
                     user_voting_strategies,
-                    metadata_uri
+                    metadata_uri,
                 );
         }
 

starknet/src/factory/factory.cairo

@@ -1,4 +1,4 @@
-use starknet::{ContractAddress, ClassHash};
+use starknet::{ContractAddress, ClassHash, SyscallResult};
 
 #[starknet::interface]
 trait IFactory<TContractState> {
@@ -7,7 +7,7 @@ trait IFactory<TContractState> {
         class_hash: ClassHash,
         contract_address_salt: felt252,
         initialize_calldata: Span<felt252>
-    ) -> ContractAddress;
+    ) -> SyscallResult<ContractAddress>;
 }
 
 
@@ -16,7 +16,7 @@ mod Factory {
     use super::IFactory;
     use starknet::{
         ContractAddress, ClassHash, contract_address_const,
-        syscalls::{deploy_syscall, call_contract_syscall}
+        syscalls::{deploy_syscall, call_contract_syscall}, SyscallResult
     };
     use sx::utils::constants::INITIALIZE_SELECTOR;
 
@@ -42,18 +42,17 @@ mod Factory {
             class_hash: ClassHash,
             contract_address_salt: felt252,
             initialize_calldata: Span<felt252>
-        ) -> ContractAddress {
+        ) -> SyscallResult<ContractAddress> {
             let (space_address, _) = deploy_syscall(
                 class_hash, contract_address_salt, array![].span(), false
-            )
-                .unwrap();
+            )?;
 
             // Call initializer. 
-            call_contract_syscall(space_address, INITIALIZE_SELECTOR, initialize_calldata).unwrap();
+            call_contract_syscall(space_address, INITIALIZE_SELECTOR, initialize_calldata)?;
 
             self.emit(Event::SpaceDeployed(SpaceDeployed { class_hash, space_address }));
 
-            space_address
+            Result::Ok(space_address)
         }
     }
 }