Merge branch 'main' into test_all_liquidity

keep-starknet-strange · Oct 7, 2024 · 3f6b15e · 3f6b15e
2 parents e307d2e + 4d57db4
commit 3f6b15e
Show file tree

Hide file tree

Showing 3 changed files with 354 additions and 37 deletions.
diff --git a/contracts/src/contracts/ramps/revolut/interface.cairo b/contracts/src/contracts/ramps/revolut/interface.cairo
@@ -10,13 +10,13 @@ pub struct Proof {
     pub foo: felt252
 }
 
-#[derive(Drop, Copy, Hash, Serde, starknet::Store)]
+#[derive(Drop, Copy, Hash, Serde, starknet::Store, Debug, PartialEq)]
 pub struct LiquidityKey {
     pub owner: ContractAddress,
     pub offchain_id: OffchainId,
 }
 
-#[derive(Drop, Copy, Serde, starknet::Store)]
+#[derive(Drop, Copy, Serde, starknet::Store, Debug, PartialEq)]
 pub struct LiquidityShareRequest {
     pub requestor: ContractAddress,
     pub liquidity_key: LiquidityKey,

diff --git a/contracts/src/contracts/ramps/revolut/revolut.cairo b/contracts/src/contracts/ramps/revolut/revolut.cairo
@@ -347,7 +347,7 @@ pub mod RevolutRamp {
     //
 
     #[generate_trait]
-    impl InternalImpl of InternalTrait {
+    pub impl InternalImpl of InternalTrait {
         fn _get_available_liquidity(self: @ContractState, liquidity_key: LiquidityKey) -> u256 {
             let mut amount = self.liquidity.read(liquidity_key);
             let current_timestamp = get_block_timestamp();
@@ -362,8 +362,14 @@ pub mod RevolutRamp {
         }
 
         fn _get_next_timestamp_key(self: @ContractState, after: u64) -> u64 {
-            // minus 1 in order to return `after` if it's already a valid key timestamp.
-            after - 1 + LOCK_DURATION_STEP - ((after - 1) % LOCK_DURATION_STEP)
+            if after.is_zero() {
+                0
+            } else {
+                // minus 1 in order to return `after` if it's already a valid key timestamp.
+                let increment_step = (after - 1) / LOCK_DURATION_STEP + 1;
+                // returns a multiple of LOCK_DURATION_STEP
+                LOCK_DURATION_STEP * increment_step
+            }
         }
     }
 }