Merge remote-tracking branch 'origin/123-refactor-replace-orders_used…

…-for-orders_pending' into 123-refactor-replace-orders_used-for-orders_pending # Conflicts: # contracts/cairo/src/escrow.cairo
yetanotherco · Feb 5, 2024 · 0878366 · 0878366
2 parents 99bb544 + b31dba9
commit 0878366
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/contracts/cairo/src/escrow.cairo b/contracts/cairo/src/escrow.cairo
@@ -13,7 +13,7 @@ trait IEscrow<ContractState> {
 
     fn set_order(ref self: ContractState, order: Order) -> u256;
 
-    fn get_order_used(self: @ContractState, order_id: u256) -> bool;
+    fn get_order_pending(self: @ContractState, order_id: u256) -> bool;
 
     fn get_order_fee(self: @ContractState, order_id: u256) -> u256;
 
@@ -104,7 +104,7 @@ mod Escrow {
     struct Storage {
         current_order_id: u256,
         orders: LegacyMap::<u256, Order>,
-        orders_used: LegacyMap::<u256, bool>,
+        orders_pending: LegacyMap::<u256, bool>,
         orders_senders: LegacyMap::<u256, ContractAddress>,
         orders_timestamps: LegacyMap::<u256, u64>,
         eth_transfer_contract: EthAddress, // our transfer contract in L1
@@ -162,7 +162,7 @@ mod Escrow {
 
             let mut order_id = self.current_order_id.read();
             self.orders.write(order_id, order);
-            self.orders_used.write(order_id, false);
+            self.orders_pending.write(order_id, true);
             self.orders_senders.write(order_id, get_caller_address());
             self.orders_timestamps.write(order_id, get_block_timestamp());
 
@@ -182,8 +182,8 @@ mod Escrow {
             order_id
         }
 
-        fn get_order_used(self: @ContractState, order_id: u256) -> bool {
-            self.orders_used.read(order_id)
+        fn get_order_pending(self: @ContractState, order_id: u256) -> bool {
+            self.orders_pending.read(order_id)
         }
 
         fn get_order_fee(self: @ContractState, order_id: u256) -> u256 {
@@ -243,13 +243,13 @@ mod Escrow {
         self.pausable.assert_not_paused();
         let eth_transfer_contract_felt: felt252 = self.eth_transfer_contract.read().into();
         assert(from_address == eth_transfer_contract_felt, 'Only YAB_TRANSFER_CONTRACT');
-        assert(!self.orders_used.read(order_id), 'Order already withdrawn');
+        assert(self.orders_pending.read(order_id), 'Order withdrawn or nonexistent');
 
         let order = self.orders.read(order_id);
         assert(order.recipient_address == recipient_address, 'recipient_address not match L1');
         assert(order.amount == amount, 'amount not match L1');
 
-        self.orders_used.write(order_id, true);
+        self.orders_pending.write(order_id, false);
         let payment_amount = order.amount + order.fee;
 
         IERC20Dispatcher { contract_address: self.native_token_eth_starknet.read() }