Merge pull request #24 from invariant-labs/transfer-tokens-swap

Transfering tokens with swap
invariant-labs · Feb 25, 2024 · ca35b7e · ca35b7e
2 parents de6d2ae + aeae27e
commit ca35b7e
Show file tree

Hide file tree

Showing 14 changed files with 508 additions and 349 deletions.
diff --git a/contracts/collections/ticks.ral b/contracts/collections/ticks.ral
@@ -1,6 +1,6 @@
 Contract Ticks(tickTemplateContractId: ByteVec) {
     enum TicksError {
-        TickAlreadyExist = 1002
+        TickAlreadyExist = 500
     }
 
     @using(preapprovedAssets = true, checkExternalCaller = false)

diff --git a/contracts/invariant.ral b/contracts/invariant.ral
@@ -313,7 +313,7 @@ Contract Invariant(
         return SwapUtils(swapContractId).wrappedQuote(token0, token1, fee, tickSpacing, xToY, amount, byAmountIn, sqrtPriceLimit)
     }
 
-    @using(updateFields = false, checkExternalCaller = false)
+    @using(assetsInContract = true, preapprovedAssets = true, checkExternalCaller = false)
     pub fn swap(
         token0: ByteVec,
         token1: ByteVec,
@@ -324,9 +324,22 @@ Contract Invariant(
         byAmountIn: Bool,
         sqrtPriceLimit: U256
     ) -> (U256, U256, U256, U256, U256) {
+        let caller = callerAddress!()
+        let poolKey = generatePoolKey(token0, token1, fee, tickSpacing)
+
         let (amountIn, amountOut, startingSqrtPrice, targetSqrtPrice, feeAmount) = SwapUtils(swapContractId).wrappedSwap(token0, token1, fee, tickSpacing, xToY, amount, byAmountIn, sqrtPriceLimit)
-        // Emit crossed ticks event
-        // transfer tokens
+
+        let tokenXId = Pools(poolsContractId).getTokenX(poolKey)
+        let tokenYId = Pools(poolsContractId).getTokenY(poolKey)
+
+        if (xToY) {
+            transferTokenToSelf!(caller, tokenXId, amountIn)
+            transferTokenFromSelf!(caller, tokenYId, amountOut)
+        } else {
+            transferTokenFromSelf!(caller, tokenXId, amountOut)
+            transferTokenToSelf!(caller, tokenYId, amountIn)
+        }
+
         return amountIn, amountOut, startingSqrtPrice, targetSqrtPrice, feeAmount
     }
 

diff --git a/contracts/invariant_tx.ral b/contracts/invariant_tx.ral
@@ -30,8 +30,8 @@ TxScript CreatePosition(
     invariant: Invariant,
     token0: ByteVec,
     token1: ByteVec,
-    token0Amount: U256,
-    token1Amount: U256,
+    approvedTokens0: U256,
+    approvedTokens1: U256,
     index: U256,
     fee: U256,
     tickSpacing: U256, 
@@ -41,7 +41,7 @@ TxScript CreatePosition(
     slippageLimitLower: U256,
     slippageLimitUpper: U256
 ) {
-    invariant.createPosition{callerAddress!() -> token0: token0Amount, token1: token1Amount}
+    invariant.createPosition{callerAddress!() -> token0: approvedTokens0, token1: approvedTokens1}
         (index, token0, token1, fee, tickSpacing, lowerTick, upperTick, liquidityDelta, slippageLimitLower, slippageLimitUpper)
 }
 
@@ -54,5 +54,11 @@ TxScript ClaimFee(invariant: Invariant, index: U256) {
 }
 
 TxScript Swap(invariant: Invariant, token0: ByteVec, token1: ByteVec, fee: U256, tickSpacing: U256, xToY: Bool, amount: U256, byAmountIn: Bool, sqrtPriceLimit: U256) {
-    invariant.swap(token0, token1, fee, tickSpacing, xToY, amount, byAmountIn, sqrtPriceLimit)
+    let poolKey = invariant.generatePoolKey(token0, token1, fee, tickSpacing)
+    let (tokenX, tokenY) = invariant.extractTokensFromPoolKey(poolKey)
+    if(xToY) {
+        invariant.swap{callerAddress!() -> tokenX: amount}(token0, token1, fee, tickSpacing, xToY, amount, byAmountIn, sqrtPriceLimit)
+    } else {
+        invariant.swap{callerAddress!() -> tokenY: amount}(token0, token1, fee, tickSpacing, xToY, amount, byAmountIn, sqrtPriceLimit)
+    }
 }
diff --git a/contracts/math/clamm.ral b/contracts/math/clamm.ral
@@ -1,7 +1,7 @@
 Contract CLAMM() extends Log(){ 
     enum CLAMMError {
-        InvalidTickIndex = 100
-        InvalidTickSpacing = 101
+        InvalidTickIndex = 600
+        InvalidTickSpacing = 601
     }
 
     pub fn computeSwapStep(

diff --git a/contracts/math/log.ral b/contracts/math/log.ral
@@ -1,4 +1,8 @@
 Abstract Contract Log() extends Decimal() {
+    enum LogError {
+        SqrtPriceOutOfRange = 7001
+    }
+
     fn getLog2Scale() -> U256 {
         return 32
     }
@@ -106,8 +110,7 @@ Abstract Contract Log() extends Decimal() {
     }
 
     pub fn getTickAtSqrtPrice(sqrtPrice: U256, tickSpacing: U256) -> I256 {
-        // TODO add error enum
-        // assert!(sqrtPrice <= getMaxSqrtPrice() && sqrtPrice >= getMinSqrtPrice(), "sqrt price out of range")
+        assert!(sqrtPrice <= getMaxSqrtPrice() && sqrtPrice >= getMinSqrtPrice(), LogError.SqrtPriceOutOfRange)
         let sqrtPriceX32 = sqrtPriceToX32(sqrtPrice)
 
         let (log2Sign, log2SqrtPrice) = log2IterativeApproximationX32(sqrtPriceX32)

diff --git a/contracts/storage/fee_tier.ral b/contracts/storage/fee_tier.ral
@@ -1,6 +1,6 @@
 Contract FeeTier(admin: Address, fee: U256, tickSpacing: U256, mut isActive: Bool) {
     enum FeeTierError {
-        NotAdmin = 200
+        NotAdmin = 800
     }
 
     pub fn getFee() -> U256 {

diff --git a/contracts/storage/position.ral b/contracts/storage/position.ral
@@ -12,8 +12,8 @@ Contract Position(
     mut posIsActive: Bool
 ) extends Decimal() {
     enum PositionError {
-        InsufficientLiquidity = 700
-        EmptyPositionPokes = 701
+        InsufficientLiquidity = 900
+        EmptyPositionPokes = 901
     }
 
     pub fn getPoolKey() -> ByteVec {

diff --git a/contracts/storage/tick.ral b/contracts/storage/tick.ral
@@ -9,7 +9,7 @@ Contract Tick(
     tickSecondsOutside: U256
 ) extends Decimal() {
     enum TickError {
-        InvalidTickLiquidity = 800
+        InvalidTickLiquidity = 1000
     }
 
     pub fn getSign() -> Bool {

diff --git a/contracts/swap.ral b/contracts/swap.ral
@@ -25,8 +25,6 @@ Contract SwapUtils(
         let currentTimestamp = blockTimeStamp!()
 
         assert!(amount != 0, SwapError.ZeroAmount)
-
-        // let mut ticks = 
 
         let mut currentSqrtPrice = Pools(poolsContractId).getCurrentSqrtPrice(poolKey)
 

diff --git a/contracts/utils.ral b/contracts/utils.ral
@@ -6,11 +6,11 @@ Abstract Contract Utils() {
         assert!(fee <= (10 ** 12), 5001)
 
         for (let mut i = 0; i <= size!(token0); i = i + 1) {
-            if (u256From1Byte!(byteVecSlice!(token0, i, i + 1)) > u256From1Byte!(byteVecSlice!(token1, i, i + 1))) {
+            if (u256From1Byte!(byteVecSlice!(token0, i, i + 1)) < u256From1Byte!(byteVecSlice!(token1, i, i + 1))) {
                 return token0 ++ token1 ++ toByteVec!(fee) ++ toByteVec!(tickSpacing)
             }
 
-            if (u256From1Byte!(byteVecSlice!(token0, i , i + 1)) < u256From1Byte!(byteVecSlice!(token1, i , i + 1))) {
+            if (u256From1Byte!(byteVecSlice!(token0, i , i + 1)) > u256From1Byte!(byteVecSlice!(token1, i , i + 1))) {
                 return token1 ++ token0 ++ toByteVec!(fee) ++ toByteVec!(tickSpacing)
             }
         }