Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

validate signature v2 #60

Merged
merged 2 commits into from
Mar 8, 2024
Merged

validate signature v2 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18cd1f3
validate signature v2
Mar 5, 2024
8c60fe4
update domain hash
Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 58 additions & 10 deletions src/marketplace/marketplace.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use flex::marketplace::utils::order_types::{MakerOrder, TakerOrder};
trait IMarketPlace<TState> {
fn initializer(
ref self: TState,
hash: felt252,
domain_name: felt252,
domain_ver: felt252,
recipient: ContractAddress,
currency: ContractAddress,
execution: ContractAddress,
Expand Down Expand Up @@ -39,7 +40,7 @@ trait IMarketPlace<TState> {
maker_bid: MakerOrder,
maker_bid_signature: Array<felt252>
);
fn update_hash_domain(ref self: TState, hash: felt252);
fn update_hash_domain(ref self: TState, domain_name: felt252, domain_ver: felt252,);
fn update_protocol_fee_recipient(ref self: TState, recipient: ContractAddress);
fn update_currency_manager(ref self: TState, manager: ContractAddress);
fn update_execution_manager(ref self: TState, manager: ContractAddress);
Expand All @@ -59,6 +60,9 @@ trait IMarketPlace<TState> {
) -> bool;
}

const STARKNET_DOMAIN_TYPE_HASH: felt252 =
selector!("StarkNetDomain(name:felt,version:felt,chainId:felt)");

#[starknet::interface]
trait IExecutionStrategy<TState> {
fn protocolFee(self: @TState) -> u128;
Expand All @@ -80,14 +84,18 @@ trait IAuctionStrategy<TState> {

#[starknet::contract]
mod MarketPlace {
use flex::marketplace::marketplace::IMarketPlace;
use super::{
IExecutionStrategyDispatcher, IExecutionStrategyDispatcherTrait, IAuctionStrategyDispatcher,
IAuctionStrategyDispatcherTrait
IAuctionStrategyDispatcherTrait, STARKNET_DOMAIN_TYPE_HASH
};
use starknet::{
ContractAddress, ClassHash, contract_address_const, get_block_timestamp, get_caller_address
ContractAddress, ClassHash, contract_address_const, get_block_timestamp, get_caller_address,
get_tx_info
};

use pedersen::PedersenTrait;
use hash::{HashStateTrait, HashStateExTrait};
use flex::{DebugContractAddress, DisplayContractAddress};
use flex::marketplace::{
currency_manager::{ICurrencyManagerDispatcher, ICurrencyManagerDispatcherTrait},
Expand Down Expand Up @@ -263,10 +271,18 @@ mod MarketPlace {
timestamp: u64,
}

#[derive(Drop, Copy, Serde, Hash)]
struct StarknetDomain {
name: felt252,
version: felt252,
chain_id: felt252,
}

#[constructor]
fn constructor(
ref self: ContractState,
hash: felt252,
domain_name: felt252,
domain_ver: felt252,
recipient: ContractAddress,
currency: ContractAddress,
execution: ContractAddress,
Expand All @@ -275,14 +291,26 @@ mod MarketPlace {
owner: ContractAddress,
proxy_admin: ContractAddress
) {
self.initializer(hash, recipient, currency, execution, fee_manager, checker, owner, proxy_admin);
self
.initializer(
domain_name,
domain_ver,
recipient,
currency,
execution,
fee_manager,
checker,
owner,
proxy_admin
);
}

#[external(v0)]
impl MarketPlaceImpl of super::IMarketPlace<ContractState> {
fn initializer(
ref self: ContractState,
hash: felt252,
domain_name: felt252,
domain_ver: felt252,
recipient: ContractAddress,
currency: ContractAddress,
execution: ContractAddress,
Expand All @@ -292,7 +320,10 @@ mod MarketPlace {
proxy_admin: ContractAddress
) {
self.ownable.initializer(owner);
self.hash_domain.write(hash);
let domain = StarknetDomain {
name: domain_name, version: domain_ver, chain_id: get_tx_info().unbox().chain_id
};
self.hash_domain.write(domain.hash_struct());
self.protocol_fee_recipient.write(recipient);
self.currency_manager.write(ICurrencyManagerDispatcher { contract_address: currency });
self
Expand Down Expand Up @@ -565,8 +596,12 @@ mod MarketPlace {
self.reentrancyguard.end();
}

fn update_hash_domain(ref self: ContractState, hash: felt252) {
fn update_hash_domain(ref self: ContractState, domain_name: felt252, domain_ver: felt252,) {
self.ownable.assert_only_owner();
let domain = StarknetDomain {
name: domain_name, version: domain_ver, chain_id: get_tx_info().unbox().chain_id
};
let hash = domain.hash_struct();
self.hash_domain.write(hash);
self.emit(NewHashDomain { hash, timestamp: get_block_timestamp() });
}
Expand Down Expand Up @@ -747,7 +782,7 @@ mod MarketPlace {
self
.signature_checker
.read()
.verify_maker_order_signature(self.get_hash_domain(), *order, order_signature);
.verify_maker_order_signature_v2(self.get_hash_domain(), *order, order_signature);
let currency_whitelisted = self
.currency_manager
.read()
Expand All @@ -766,4 +801,17 @@ mod MarketPlace {
);
}
}

trait IStructHash<T> {
fn hash_struct(self: @T) -> felt252;
}
impl StructHashStarknetDomain of IStructHash<StarknetDomain> {
fn hash_struct(self: @StarknetDomain) -> felt252 {
let mut state = PedersenTrait::new(0);
state = state.update_with(STARKNET_DOMAIN_TYPE_HASH);
state = state.update_with(*self);
state = state.update_with(4);
state.finalize()
}
}
}
100 changes: 95 additions & 5 deletions src/marketplace/signature_checker2.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,38 @@ const STARKNET_MESSAGE: felt252 = 110930206544689809660069706067448260453;
const HASH_MESSAGE_SELECTOR: felt252 =
563771258078353655219004671487831885088158240957819730493696170021701903504;

const STARKNET_MAKER_ORDER_TYPE_HASH: felt252 =
selector!(
"MakerOrder(isOrderAsk:u8,signer:felt,collection:felt,price:u128,tokenId:u256,amount:u128,strategy:felt,currency:felt,nonce:u128,startTime:u64,endTime:u64,minPercentageToAsk:u128,params:felt)u256(low:felt,high:felt)"
);

const U256_TYPE_HASH: felt252 = selector!("u256(low:felt,high:felt)");

#[starknet::interface]
trait ISignatureChecker2<TState> {
fn compute_maker_order_hash(self: @TState, hash_domain: felt252, order: MakerOrder) -> felt252;
fn verify_maker_order_signature(
self: @TState, hash_domain: felt252, order: MakerOrder, order_signature: Array<felt252>
);
fn compute_message_hash(self: @TState, domain_hash: felt252, order: MakerOrder) -> felt252;
fn verify_maker_order_signature_v2(
self: @TState, domain_hash: felt252, order: MakerOrder, order_signature: Array<felt252>
);
}

#[starknet::contract]
mod SignatureChecker2 {
use openzeppelin::account::interface::AccountABIDispatcherTrait;
use core::option::OptionTrait;
use core::traits::Into;
use core::traits::TryInto;
use core::box::BoxTrait;
use flex::marketplace::signature_checker2::ISignatureChecker2;
use starknet::ContractAddress;
use starknet::{ContractAddress, get_tx_info, contract_address_to_felt252};
use poseidon::poseidon_hash_span;

use pedersen::PedersenTrait;
use hash::{HashStateTrait, HashStateExTrait};
use openzeppelin::account::AccountABIDispatcher;
use openzeppelin::account::interface::{ISRC6CamelOnlyDispatcher, ISRC6CamelOnlyDispatcherTrait};

use flex::marketplace::utils::order_types::MakerOrder;
Expand All @@ -29,12 +47,29 @@ mod SignatureChecker2 {
struct Storage {}

#[constructor]
fn constructor(
ref self: ContractState
) {}
fn constructor(ref self: ContractState) {}

#[derive(Drop, Copy, Serde, Hash)]
struct StarknetDomain {
name: felt252,
version: felt252,
chain_id: felt252,
}

#[external(v0)]
impl SignatureChecker2Impl of super::ISignatureChecker2<ContractState> {
fn compute_message_hash(
self: @ContractState, domain_hash: felt252, order: MakerOrder
) -> felt252 {
let mut state = PedersenTrait::new(0);
state = state.update_with('StarkNet Message');
state = state.update_with(domain_hash);
state = state.update_with(order.signer);
state = state.update_with(order.hash_struct());
state = state.update_with(4);
state.finalize()
}

fn compute_maker_order_hash(
self: @ContractState, hash_domain: felt252, order: MakerOrder
) -> felt252 {
Expand Down Expand Up @@ -75,5 +110,60 @@ mod SignatureChecker2 {

assert!(result == starknet::VALIDATED, "SignatureChecker: Invalid signature");
}

fn verify_maker_order_signature_v2(
self: @ContractState,
domain_hash: felt252,
order: MakerOrder,
order_signature: Array<felt252>
) {
let hash = self.compute_message_hash(domain_hash, order);
let account: AccountABIDispatcher = AccountABIDispatcher {
contract_address: order.signer
};
let result = account.is_valid_signature(hash, order_signature);

assert!(result == starknet::VALIDATED, "SignatureChecker: Invalid signature");
}
}

trait IStructHash<T> {
fn hash_struct(self: @T) -> felt252;
}

impl StructHashMarkerOrder of IStructHash<MakerOrder> {
fn hash_struct(self: @MakerOrder) -> felt252 {
let mut state = PedersenTrait::new(0);
state = state.update_with(super::STARKNET_MAKER_ORDER_TYPE_HASH);
let mut is_order_ask_u8: u8 = 1;
if !(*self.is_order_ask) {
is_order_ask_u8 = 0;
}
state = state.update_with(is_order_ask_u8);
state = state.update_with(contract_address_to_felt252(*self.signer));
state = state.update_with(contract_address_to_felt252(*self.collection));
state = state.update_with(*self.price);
state = state.update_with(self.token_id.hash_struct());
state = state.update_with(*self.amount);
state = state.update_with(contract_address_to_felt252(*self.strategy));
state = state.update_with(contract_address_to_felt252(*self.currency));
state = state.update_with(*self.nonce);
state = state.update_with(*self.start_time);
state = state.update_with(*self.end_time);
state = state.update_with(*self.min_percentage_to_ask);
state = state.update_with(*self.params);
state = state.update_with(14);
state.finalize()
}
}

impl StructHashU256 of IStructHash<u256> {
fn hash_struct(self: @u256) -> felt252 {
let mut state = PedersenTrait::new(0);
state = state.update_with(super::U256_TYPE_HASH);
state = state.update_with(*self);
state = state.update_with(3);
state.finalize()
}
}
}
Loading