Rex superswap 127 #129

gitChimp88 · 2022-07-13T13:40:10Z

(work in progress)
Port uniswap contracts so we can use solidity 0.8
Create RexSuperSwap contract
Create test for contract

Bring RexSuperSwap contract in to this repo to begin with

Add test for RexSuperSwap to test deployment, Install uniswap sdk - There is an error for incompatible solidity versions between dependency and RexSuperSwap.

Port uniswap contracts that we need to use for super swap, add some more test boilerplate

Test passing for swap functionality, need to test balances and different tokens.

Add check for account balances in test Add call to coingecko api to get minimum amount out of swap Add event to indicate swap just made

fork from latest block number, change swap to be between matic and usd

…ontract

mikeghen · 2022-08-01T13:59:30Z

contracts/superswap/RexSuperSwap.sol

+    // Approve the router to spend token supplied (fromBase).
+    TransferHelper.safeApprove(fromBase, address(swapRouter), amountIn);
+
+    console.log("balance of Maticx before swap - ", _from.balanceOf(address(this)));


This will come out to be 0 because you downgraded MATICx to native MATIC on line 59, to get the balance of the matic you have, do:

console.log("balance of MATIC before swap - ", address(this).balance);

thanks for the tip, now changed

mikeghen · 2022-08-01T14:03:38Z

contracts/superswap/RexSuperSwap.sol

+    // Execute the swap
+    amountOut = swapRouter.exactInput(params);
+
+    console.log("balance of Maticx after swap - ", _from.balanceOf(address(this)));


Again, after the swap, you won't have MATICx, you're going to have native MATIC, check balance with address(this).balance

(actually, not sure how uniswap v3 behaves, it might give you wrapped matic in which case youll check the balance as:

ERC20(_from.getUnderlyingToken()).balanceOf(address(this))

mikeghen · 2022-08-01T14:04:13Z

contracts/superswap/RexSuperSwap.sol

+
+    console.log("balance of Maticx after swap - ", _from.balanceOf(address(this)));
+
+    emit SwapJustMade(amountOut);


I don't think this is needed since Uniswap v3 emits events, remove this event

Now removed

mikeghen · 2022-08-01T14:04:53Z

contracts/superswap/RexSuperSwap.sol

+
+    // Step 1: Get underlying tokens and verify path
+    address fromBase = _from.getUnderlyingToken();
+    address toBase = _to.getUnderlyingToken();


You're missing code here to handle native supertokens, see this code: https://github.com/Ricochet-Exchange/ricochet-protocol/blob/v2/contracts/REXTwoWayMarket.sol#L396

Okay i've now added this check

mikeghen · 2022-08-01T14:06:04Z

contracts/superswap/RexSuperSwap.sol

+    console.log("starting balance of Maticx - ", _from.balanceOf(address(this)));
+
+    // Step 3: Downgrade
+    _from.downgrade(amountIn);


Same here, you're not handling the native supertoken case where the downgrades not needed, swapping RIC to USDCx for example, RIC doens't need to be downgraded, see the code I link to in the comment above

Now handling correctly

mikeghen · 2022-08-01T14:08:01Z

contracts/superswap/RexSuperSwap.sol

+
+    // Step 5: Upgrade and send tokens back
+    TransferHelper.safeApprove(address(toBase), address(_to), amountOut);
+    _to.upgrade(amountOut);


same here with the upgrade, you have to account for native supertokens, like if they're swapping USDCx to RIC, no upgrade required on RIC, see this code snippet: https://github.com/Ricochet-Exchange/ricochet-protocol/blob/v2/contracts/REXTwoWayMarket.sol#L443,

You also need to check here if the _to token is MATICx, if so, you have to use upgradeByETH method, see the code snippet here: https://github.com/Ricochet-Exchange/ricochet-protocol/blob/v2/contracts/REXTwoWayMarket.sol#L434

Great thanks, now handling correctly and added the check for MATICX

mikeghen

see comments, I don't think this is set up right to handle MATICx, which downgrades to native MATIC and needs to be upgraded with upgradeByETH, also this doesn't handle native supertokens, see my comments

Logic added for native tokens downgrade and upgrade, also upgrade of maticx

add approve function for unlimited approvals rather than decimal conversions, has underlying to and from variables to deal with native tokens, add test for native token

Add try catch and emit events on swap errors, run tests from a specific block

contracts/superswap/RexSuperSwap.sol

shreyaspapi · 2022-08-25T15:40:57Z

@gitChimp88 I pushed the local changes I had for Ricochet-Exchange/ricochet-super-swap#2

shreyaspapi

Cool this looks great! Just one lil change + Can you also add a test for RIC -> MaticX

contracts/superswap/RexSuperSwap.sol

gitChimp88 · 2022-08-29T12:16:13Z

Cool this looks great! Just one lil change + Can you also add a test for RIC -> MaticX

I added the test but it fails at the moment because there's no liquidity on uniswap RIC -> Matic

shreyaspapi

Tests looks good to me, we need to test RIC -> MATICx @mikeghen, Also can you remove the unwanted comments in the test file @gitChimp88 .

hardhat.config.ts

mikeghen · 2022-08-30T21:42:19Z

@gitChimp88 I just made some liquidity for RIC-MATIC on uniswap

shreyaspapi · 2022-09-08T09:33:48Z

contracts/superswap/RexSuperSwap.sol

+
+    // Upgrade if it's not a native SuperToken
+    if (_hasUnderlyingTo) {
+      if (address(_to) == superNativeToken) {


@gitChimp88 We don't need this condition, here I wrongly assumed that Super Matic has underlaying token as 0x (native token). As a result the Matic <> Ric test might be failing.

Delete unneccessary if statement and different upgrade method as matic is downgraded to wrapped matic, specified specific block (which has the required liquidity for RIC)

mikeghen · 2022-09-17T19:59:02Z

contracts/superswap/RexSuperSwap.sol

+      emit ErrorOnSwap(reason);
+    } catch (bytes memory returnData) {
+      emit ReturnDataEvent(returnData);
+    }


There's a problem here, if the swap reverts the contract will eat the input tokens and not return them to the user, I would just not use a try catch here at all, if swapRouter.exactInput(params) reverts, revert the whole thing

Withdraw function to convert wmatic to matic so we can upgrade to super token

shreyaspapi · 2022-09-29T13:45:12Z

Closes #127

mikeghen · 2022-09-29T15:35:03Z

@gitChimp88 @shreyaspapi, hows this going? I took a look at the last commit, it looks like a test still needs to done. Lmk how I can help you.

gitChimp88 added 5 commits June 29, 2022 11:34

Create RexSuperSwap.sol

f358d2f

Bring RexSuperSwap contract in to this repo to begin with

Add deployment test for RexSuperSwap

bd76c72

Add test for RexSuperSwap to test deployment, Install uniswap sdk - There is an error for incompatible solidity versions between dependency and RexSuperSwap.

Port uniswap contracts and update them to sol 0.8

a2f76d3

Port uniswap contracts that we need to use for super swap, add some more test boilerplate

Test swap function from REXSuperSwap

28b775b

Test passing for swap functionality, need to test balances and different tokens.

Add check for account balances in test

1ce7456

Add check for account balances in test Add call to coingecko api to get minimum amount out of swap Add event to indicate swap just made

gitChimp88 marked this pull request as draft July 13, 2022 13:40

gitChimp88 added 2 commits July 25, 2022 15:07

Fork from latest block number

b0fb4ac

fork from latest block number, change swap to be between matic and usd

Try different transfer method, add console logs to track balance of c…

39bfeda

…ontract

mikeghen reviewed Aug 1, 2022

View reviewed changes

mikeghen suggested changes Aug 1, 2022

View reviewed changes

gitChimp88 added 3 commits August 4, 2022 15:36

Add logic to handle native tokens

8f88493

Logic added for native tokens downgrade and upgrade, also upgrade of maticx

fix upgrade and tokens are now being transferred

137ba8f

Add approve function to super swap

19873cd

add approve function for unlimited approvals rather than decimal conversions, has underlying to and from variables to deal with native tokens, add test for native token

gitChimp88 marked this pull request as ready for review August 10, 2022 15:16

gitChimp88 requested a review from mikeghen August 10, 2022 15:16

gitChimp88 added 3 commits August 12, 2022 15:34

Add test for swapping ethx to usdcx

ee7bef4

Add try catch to swap function

aa2c736

Add try catch and emit events on swap errors, run tests from a specific block

Test native ric swap and swap from matic - wbtc

54fb2dc

shreyaspapi mentioned this pull request Aug 25, 2022

Adding support for non underlaying tokens and solve the decimal issue Ricochet-Exchange/ricochet-super-swap#2

Open

shreyaspapi requested changes Aug 25, 2022

View reviewed changes

contracts/superswap/RexSuperSwap.sol Outdated Show resolved Hide resolved

shreyaspapi reviewed Aug 25, 2022

View reviewed changes

contracts/superswap/RexSuperSwap.sol Show resolved Hide resolved

Add matic address to the contract constructor

d972d99

gitChimp88 requested review from shreyaspapi and removed request for mikeghen August 26, 2022 14:15

shreyaspapi requested changes Aug 27, 2022

View reviewed changes

contracts/superswap/RexSuperSwap.sol Outdated Show resolved Hide resolved

contracts/superswap/RexSuperSwap.sol Outdated Show resolved Hide resolved

Change variable name and add extra test

30b4989

gitChimp88 requested a review from shreyaspapi August 29, 2022 12:16

shreyaspapi approved these changes Aug 29, 2022

View reviewed changes

hardhat.config.ts Outdated Show resolved Hide resolved

Remove unwanted comments in test file

e18b546

gitChimp88 added 2 commits September 1, 2022 15:27

Test user can swap small amounts and large amounts

0d90cc2

add deploy script for superswap

99ef383

shreyaspapi requested changes Sep 8, 2022

View reviewed changes

Delete unnecessary check for matic token

5ce4958

Delete unneccessary if statement and different upgrade method as matic is downgraded to wrapped matic, specified specific block (which has the required liquidity for RIC)

mikeghen suggested changes Sep 17, 2022

View reviewed changes

Add withdraw function to super swap

d597853

Withdraw function to convert wmatic to matic so we can upgrade to super token

mikeghen closed this Sep 29, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rex superswap 127 #129

Rex superswap 127 #129

gitChimp88 commented Jul 13, 2022 •

edited

Loading

mikeghen Aug 1, 2022

gitChimp88 Aug 4, 2022

mikeghen Aug 1, 2022

gitChimp88 Aug 4, 2022

mikeghen Aug 1, 2022

gitChimp88 Aug 4, 2022

mikeghen Aug 1, 2022

gitChimp88 Aug 4, 2022

mikeghen Aug 1, 2022

gitChimp88 Aug 4, 2022

mikeghen Aug 1, 2022

mikeghen Aug 1, 2022

gitChimp88 Aug 4, 2022

mikeghen left a comment

shreyaspapi commented Aug 25, 2022

shreyaspapi left a comment

gitChimp88 commented Aug 29, 2022

shreyaspapi left a comment

mikeghen commented Aug 30, 2022

shreyaspapi Sep 8, 2022

mikeghen Sep 17, 2022

shreyaspapi commented Sep 29, 2022

mikeghen commented Sep 29, 2022


		console.log("balance of Maticx after swap - ", _from.balanceOf(address(this)));

		emit SwapJustMade(amountOut);

Rex superswap 127 #129

Rex superswap 127 #129

Conversation

gitChimp88 commented Jul 13, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mikeghen left a comment

Choose a reason for hiding this comment

shreyaspapi commented Aug 25, 2022

shreyaspapi left a comment

Choose a reason for hiding this comment

gitChimp88 commented Aug 29, 2022

shreyaspapi left a comment

Choose a reason for hiding this comment

mikeghen commented Aug 30, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shreyaspapi commented Sep 29, 2022

mikeghen commented Sep 29, 2022

gitChimp88 commented Jul 13, 2022 •

edited

Loading