fix: stark sig auth account interaction

.github/workflows/test.yml

@@ -4,6 +4,7 @@ env:
   STARKNET_SIERRA_COMPILE_PATH: ./cairo/bin/starknet-sierra-compile
   OBJC_DISABLE_INITIALIZE_FORK_SAFETY: YES
   ADDRESS: "0x347be35996a21f6bf0623e75dbce52baba918ad5ae8d83b6f416045ab22961a"
+  PUBLIC_KEY: "0x674efe292c3c1125108916d6128bd6d1db4528db07322a84177551067aa2bef"
   PK: "0xbdd640fb06671ad11c80317fa3b1799d"
 
 on:

starknet/Scarb.toml

@@ -9,6 +9,7 @@ allowed-libfuncs-list.name = "audited"
 sierra = true
 casm = true
 casm-add-pythonic-hints = true
+build-external-contracts = ["openzeppelin::account::account::Account", "openzeppelin::account::interface::AccountABI"]
 
 [dependencies]
 openzeppelin = { git = "https://github.com/ericnordelo/cairo-contracts", branch = "feat/erc20votes-#631" }

starknet/src/authenticators/stark_sig.cairo

@@ -4,6 +4,7 @@ use sx::types::{Strategy, IndexedStrategy, Choice};
 #[starknet::interface]
 trait IStarkSigAuthenticator<TContractState> {
     /// Authenticates a propose transaction using the starknet EIP712-equivalent signature scheme.
+    /// Note: Only SNIP-6 compliant accounts are supported.
     /// 
     /// # Arguments
     ///
@@ -14,7 +15,6 @@ trait IStarkSigAuthenticator<TContractState> {
     /// * `execution_strategy` - The execution strategy of the proposal.
     /// * `user_proposal_validation_params` - The user proposal validation params of the proposal.
     /// * `salt` - The salt, used for replay protection.
-    /// * `account_type` - The account type of the author ('snake' or 'camel').
     fn authenticate_propose(
         ref self: TContractState,
         signature: Array<felt252>,
@@ -23,13 +23,13 @@ trait IStarkSigAuthenticator<TContractState> {
         metadata_uri: Array<felt252>,
         execution_strategy: Strategy,
         user_proposal_validation_params: Array<felt252>,
-        salt: felt252,
-        account_type: felt252
+        salt: felt252
     );
 
 
     /// Authenticates a vote transaction using the starknet EIP712-equivalent signature scheme.
-    /// Salt is not needed because double voting is prevented by the space itself.
+    /// Note: Salt is not needed because double voting is prevented by the space itself.
+    /// Note: Only SNIP-6 compliant accounts are supported.
     ///
     /// # Arguments
     ///
@@ -40,8 +40,6 @@ trait IStarkSigAuthenticator<TContractState> {
     /// * `choice` - The choice of the voter.
     /// * `user_voting_strategies` - The user voting strategies of the voter.
     /// * `metadata_uri` - The URI of the proposal metadata.
-    /// * `account_type` - The account type of the voter ('snake' or 'camel').
-    ///
     fn authenticate_vote(
         ref self: TContractState,
         signature: Array<felt252>,
@@ -50,11 +48,11 @@ trait IStarkSigAuthenticator<TContractState> {
         proposal_id: u256,
         choice: Choice,
         user_voting_strategies: Array<IndexedStrategy>,
-        metadata_uri: Array<felt252>,
-        account_type: felt252
+        metadata_uri: Array<felt252>
     );
 
     /// Authenticates an update proposal transaction using the starknet EIP712-equivalent signature scheme.
+    /// Note: Only SNIP-6 compliant accounts are supported.
     ///
     /// # Arguments
     ///
@@ -65,7 +63,6 @@ trait IStarkSigAuthenticator<TContractState> {
     /// * `execution_strategy` - The execution strategy of the proposal.
     /// * `metadata_uri` - The URI of the proposal metadata.
     /// * `salt` - The salt, used for replay protection.
-    /// * `account_type` - The account type of the author ('snake' or 'camel').
     fn authenticate_update_proposal(
         ref self: TContractState,
         signature: Array<felt252>,
@@ -74,8 +71,7 @@ trait IStarkSigAuthenticator<TContractState> {
         proposal_id: u256,
         execution_strategy: Strategy,
         metadata_uri: Array<felt252>,
-        salt: felt252,
-        account_type: felt252
+        salt: felt252
     );
 }
 
@@ -103,8 +99,7 @@ mod StarkSigAuthenticator {
             metadata_uri: Array<felt252>,
             execution_strategy: Strategy,
             user_proposal_validation_params: Array<felt252>,
-            salt: felt252,
-            account_type: felt252
+            salt: felt252
         ) {
             assert(!self._used_salts.read((author, salt)), 'Salt Already Used');
 
@@ -117,8 +112,7 @@ mod StarkSigAuthenticator {
                 metadata_uri.span(),
                 @execution_strategy,
                 user_proposal_validation_params.span(),
-                salt,
-                account_type
+                salt
             );
 
             self._used_salts.write((author, salt), true);
@@ -139,8 +133,7 @@ mod StarkSigAuthenticator {
             proposal_id: u256,
             choice: Choice,
             user_voting_strategies: Array<IndexedStrategy>,
-            metadata_uri: Array<felt252>,
-            account_type: felt252
+            metadata_uri: Array<felt252>
         ) {
             // No need to check salts here, as double voting is prevented by the space itself.
 
@@ -153,8 +146,7 @@ mod StarkSigAuthenticator {
                 proposal_id,
                 choice,
                 user_voting_strategies.span(),
-                metadata_uri.span(),
-                account_type
+                metadata_uri.span()
             );
 
             ISpaceDispatcher { contract_address: target }
@@ -175,8 +167,7 @@ mod StarkSigAuthenticator {
             proposal_id: u256,
             execution_strategy: Strategy,
             metadata_uri: Array<felt252>,
-            salt: felt252,
-            account_type: felt252
+            salt: felt252
         ) {
             assert(!self._used_salts.read((author, salt)), 'Salt Already Used');
 
@@ -189,8 +180,7 @@ mod StarkSigAuthenticator {
                 proposal_id,
                 @execution_strategy,
                 metadata_uri.span(),
-                salt,
-                account_type
+                salt
             );
 
             self._used_salts.write((author, salt), true);

starknet/src/lib.cairo

@@ -46,12 +46,6 @@ mod factory {
 }
 
 mod interfaces {
-    mod i_account;
-    use i_account::{
-        AccountABI, AccountABIDispatcher, AccountABIDispatcherTrait, AccountCamelABI,
-        AccountCamelABIDispatcher, AccountCamelABIDispatcherTrait
-    };
-
     mod i_execution_strategy;
     use i_execution_strategy::{
         IExecutionStrategy, IExecutionStrategyDispatcher, IExecutionStrategyDispatcherTrait

starknet/src/utils/constants.cairo

@@ -73,5 +73,5 @@ const U256_TYPEHASH: felt252 = 0x1094260a770342332e6a73e9256b901d484a43892531620
 // ------ ERC165 Interface Ids ------
 // For more information, refer to: https://github.com/starknet-io/SNIPs/blob/main/SNIPS/snip-5.md
 
-const ERC165_ACCOUNT_INTERFACE_ID: felt252 = 0xa66bd575; // snake 
-const ERC165_OLD_ACCOUNT_INTERFACE_ID: felt252 = 0x3943f10f; // camel 
+const ERC165_ACCOUNT_INTERFACE_ID: felt252 =
+    0x2ceccef7f994940b3962a6c67e0ba4fcd37df7d131417c604f91e03caecc1cd; // SNIP-6 compliant account ID, functions are snake case

starknet/src/utils/stark_eip712.cairo

@@ -3,15 +3,12 @@
 #[starknet::contract]
 mod StarkEIP712 {
     use starknet::ContractAddress;
+    use openzeppelin::account::interface::{AccountABIDispatcher, AccountABIDispatcherTrait};
     use sx::types::{Strategy, IndexedStrategy, Choice};
     use sx::utils::StructHash;
     use sx::utils::constants::{
         STARKNET_MESSAGE, DOMAIN_TYPEHASH, PROPOSE_TYPEHASH, VOTE_TYPEHASH,
-        UPDATE_PROPOSAL_TYPEHASH, ERC165_ACCOUNT_INTERFACE_ID, ERC165_OLD_ACCOUNT_INTERFACE_ID
-    };
-    use sx::interfaces::{
-        AccountABIDispatcher, AccountABIDispatcherTrait, AccountCamelABIDispatcher,
-        AccountCamelABIDispatcherTrait
+        UPDATE_PROPOSAL_TYPEHASH, ERC165_ACCOUNT_INTERFACE_ID
     };
 
     #[storage]
@@ -34,8 +31,7 @@ mod StarkEIP712 {
             metadata_uri: Span<felt252>,
             execution_strategy: @Strategy,
             user_proposal_validation_params: Span<felt252>,
-            salt: felt252,
-            account_type: felt252,
+            salt: felt252
         ) {
             let digest: felt252 = self
                 .get_propose_digest(
@@ -47,7 +43,7 @@ mod StarkEIP712 {
                     salt
                 );
 
-            InternalImpl::verify_signature(digest, signature, author, account_type);
+            InternalImpl::verify_signature(digest, signature, author);
         }
 
         /// Verifies the signature of the vote calldata.
@@ -59,14 +55,13 @@ mod StarkEIP712 {
             proposal_id: u256,
             choice: Choice,
             user_voting_strategies: Span<IndexedStrategy>,
-            metadata_uri: Span<felt252>,
-            account_type: felt252,
+            metadata_uri: Span<felt252>
         ) {
             let digest: felt252 = self
                 .get_vote_digest(
                     target, voter, proposal_id, choice, user_voting_strategies, metadata_uri
                 );
-            InternalImpl::verify_signature(digest, signature, voter, account_type);
+            InternalImpl::verify_signature(digest, signature, voter);
         }
 
         /// Verifies the signature of the update proposal calldata.
@@ -78,14 +73,13 @@ mod StarkEIP712 {
             proposal_id: u256,
             execution_strategy: @Strategy,
             metadata_uri: Span<felt252>,
-            salt: felt252,
-            account_type: felt252,
+            salt: felt252
         ) {
             let digest: felt252 = self
                 .get_update_proposal_digest(
                     target, author, proposal_id, execution_strategy, metadata_uri, salt
                 );
-            InternalImpl::verify_signature(digest, signature, author, account_type);
+            InternalImpl::verify_signature(digest, signature, author);
         }
 
         /// Returns the digest of the propose calldata.
@@ -177,31 +171,19 @@ mod StarkEIP712 {
         }
 
         /// Verifies the signature of a message by calling the account contract.
-        fn verify_signature(
-            digest: felt252,
-            signature: Array<felt252>,
-            account: ContractAddress,
-            account_type: felt252
-        ) {
-            if account_type == 'snake' {
-                assert(
-                    AccountCamelABIDispatcher { contract_address: account }
-                        .supportsInterface(ERC165_ACCOUNT_INTERFACE_ID) == true,
-                    'Invalid Account'
-                );
-                AccountCamelABIDispatcher { contract_address: account }
-                    .isValidSignature(digest, signature);
-            } else if account_type == 'camel' {
-                assert(
-                    AccountABIDispatcher { contract_address: account }
-                        .supports_interface(ERC165_OLD_ACCOUNT_INTERFACE_ID) == true,
-                    'Invalid Account'
-                );
+        fn verify_signature(digest: felt252, signature: Array<felt252>, account: ContractAddress) {
+            // Only SNIP-6 compliant accounts are supported.
+            assert(
+                AccountABIDispatcher { contract_address: account }
+                    .supports_interface(ERC165_ACCOUNT_INTERFACE_ID) == true,
+                'Invalid Account'
+            );
+
+            assert(
                 AccountABIDispatcher { contract_address: account }
-                    .is_valid_signature(digest, signature);
-            } else {
-                panic_with_felt252('Invalid Account Type');
-            }
+                    .is_valid_signature(digest, signature) == 'VALID',
+                'Invalid Signature'
+            );
         }
     }
 }