Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion contracts/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ name = "ark_oz"
version = "0.1.0"
dependencies = [
"openzeppelin",
"snforge_std",
]

[[package]]
Expand Down
3 changes: 3 additions & 0 deletions contracts/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[workspace]

members = ["ark_common", "ark_orderbook", "ark_starknet", "ark_tokens", "solis"]

[workspace.dependencies]
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
4 changes: 3 additions & 1 deletion contracts/ark_common/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ version = "0.1.0"

[dependencies]
starknet = "2.5.4"
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }

[dev-dependencies]
snforge_std.workspace = true

[lib]

Expand Down
4 changes: 3 additions & 1 deletion contracts/ark_orderbook/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ version = "0.1.0"
[dependencies]
ark_common = { path = "../ark_common" }
starknet = "2.5.4"
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }

[dev-dependencies]
snforge_std.workspace = true

[[target.starknet-contract]]
sierra = true
Expand Down
2 changes: 2 additions & 0 deletions contracts/ark_oz/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ version = "0.1.0"
[dependencies]
starknet = "2.5.4"
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.10.0" }

[dev-dependencies]
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }

[lib]
Expand Down
4 changes: 3 additions & 1 deletion contracts/ark_starknet/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ version = "0.1.0"
[dependencies]
starknet = "2.5.4"
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.10.0" }
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
ark_common = { path = "../ark_common" }
ark_tokens = { path = "../ark_tokens" }
ark_oz = { path = "../ark_oz" }

[dev-dependencies]
snforge_std.workspace = true

[[target.starknet-contract]]
sierra = true
casm = true
Expand Down
3 changes: 3 additions & 0 deletions contracts/ark_starknet/src/executor.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ mod executor {
ark_fees: FeesRatio,
// order hash -> OrderInfo
orders: LegacyMap<felt252, OrderInfo>,
fulfilled_orders: LegacyMap<felt252, bool>,
// fallback when collection doesn't implement ERC2981
default_receiver: ContractAddress,
default_fees: FeesRatio,
Expand Down Expand Up @@ -322,10 +323,12 @@ mod executor {
let messaging = IAppchainMessagingDispatcher {
contract_address: self.messaging_address.read()
};
assert!(!self.fulfilled_orders.read(fulfillInfo.order_hash), "Order already fulfilled");

let vinfo = FulfillOrderInfo { fulfillInfo: fulfillInfo.clone() };

_verify_fulfill_order(@self, @vinfo);
self.fulfilled_orders.write(fulfillInfo.order_hash, true);

let mut vinfo_buf = array![];
Serde::serialize(@vinfo, ref vinfo_buf);
Expand Down
40 changes: 40 additions & 0 deletions contracts/ark_starknet/tests/integration/fulfill_order.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -503,3 +503,43 @@ fn test_fulfill_auction_order_fulfiller_same_as_offerer() {
IExecutorDispatcher { contract_address: executor_address }.fulfill_order(fulfill_info);
snf::stop_prank(CheatTarget::One(executor_address));
}

#[test]
#[should_panic(expected: ("Order already fulfilled",))]
fn test_fulfill_offer_order_already_fulfilled_order() {
let (executor_address, erc20_address, nft_address) = setup();
let fulfillerA = contract_address_const::<'fulfillerA'>();
let fulfillerB = contract_address_const::<'fulfillerB'>();
let start_amount = 10_000_000;

let (order_hash, offerer, token_id) = create_listing_order(
executor_address, erc20_address, nft_address, start_amount
);

IFreeMintDispatcher { contract_address: erc20_address }.mint(fulfillerA, start_amount);
IFreeMintDispatcher { contract_address: erc20_address }.mint(fulfillerB, start_amount);

snf::start_prank(CheatTarget::One(nft_address), offerer);
IERC721Dispatcher { contract_address: nft_address }
.set_approval_for_all(executor_address, true);
snf::stop_prank(CheatTarget::One(nft_address));

let fulfill_infoA = create_fulfill_info(order_hash, fulfillerA, nft_address, token_id);
let fulfill_infoB = create_fulfill_info(order_hash, fulfillerB, nft_address, token_id);

snf::start_prank(CheatTarget::One(erc20_address), fulfillerA);
IERC20Dispatcher { contract_address: erc20_address }.approve(executor_address, start_amount);
snf::stop_prank(CheatTarget::One(erc20_address));

snf::start_prank(CheatTarget::One(erc20_address), fulfillerB);
IERC20Dispatcher { contract_address: erc20_address }.approve(executor_address, start_amount);
snf::stop_prank(CheatTarget::One(erc20_address));

snf::start_prank(CheatTarget::One(executor_address), fulfillerA);
IExecutorDispatcher { contract_address: executor_address }.fulfill_order(fulfill_infoA);
snf::stop_prank(CheatTarget::One(executor_address));

snf::start_prank(CheatTarget::One(executor_address), fulfillerB);
IExecutorDispatcher { contract_address: executor_address }.fulfill_order(fulfill_infoB);
snf::stop_prank(CheatTarget::One(executor_address));
}
4 changes: 3 additions & 1 deletion contracts/ark_tokens/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ version = "0.1.0"

[dependencies]
starknet = "2.5.4"
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.10.0" }
ark_oz = { path = "../ark_oz" }

[dev-dependencies]
snforge_std.workspace = true

[lib]

[[target.starknet-contract]]
Expand Down