Merge pull request #291 from DistributedCollective/script-refactoring

Script refactoring
DistributedCollective · Jun 29, 2021 · 2db5c51 · 2db5c51
2 parents ed6cf52 + 98afbe4
commit 2db5c51
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/scripts/contractInteraction/amm.py b/scripts/contractInteraction/amm.py
@@ -22,17 +22,20 @@ def swapTokens(amount, minReturn, swapNetworkAddress, sourceTokenAddress, destTo
     print("path", path)
     expectedReturn = swapNetwork.getReturnByPath(path, amount)
     print("expected return ", expectedReturn)
-
-    tx = swapNetwork.convertByPath(
-        path,
-        amount,
-        minReturn,
-        "0x0000000000000000000000000000000000000000",
-        "0x0000000000000000000000000000000000000000",
-        0
-    )
-    tx.info()
-
+
+    if(expectedReturn[0] > minReturn):
+        tx = swapNetwork.convertByPath(
+            path,
+            amount,
+            minReturn,
+            "0x0000000000000000000000000000000000000000",
+            "0x0000000000000000000000000000000000000000",
+            0
+        )
+        tx.info()
+    else:
+        print('retrun too low')
+
 
 def addLiquidity(converter, reserve, amount):
     abiFile =  open('./scripts/contractInteraction/ABIs/LiquidityPoolV2Converter.json')
@@ -43,6 +46,21 @@ def addLiquidity(converter, reserve, amount):
     tx = converter.addLiquidity(reserve, amount, 1)
     print(tx)
 
+def addLiquidityWithMS(converter, reserve, amount):
+    # approve
+    token = Contract.from_abi("ERC20", address=reserve, abi=ERC20.abi, owner=conf.acct)
+    data = token.approve.encode_input(converter, amount)
+    print(data)
+    sendWithMultisig(conf.contracts['multisig'], token.address, data, conf.acct)
+
+    #add liquidity
+    abiFile =  open('./scripts/contractInteraction/ABIs/LiquidityPoolV2Converter.json')
+    abi = json.load(abiFile)
+    converter = Contract.from_abi("LiquidityPoolV2Converter", address=converter, abi=abi, owner=conf.acct)
+    data = converter.addLiquidity.encode_input(reserve, amount, 1)
+    print(data)
+    sendWithMultisig(conf.contracts['multisig'], converter.address, data, conf.acct)
+
 def readBalanceFromAMM():
 
     tokenContract = Contract.from_abi("Token", address=conf.contracts['USDT'], abi=TestToken.abi, owner=conf.acct)

diff --git a/scripts/contractInteraction/loan_tokens.py b/scripts/contractInteraction/loan_tokens.py
@@ -19,7 +19,7 @@ def lendToPoolWithMS(loanTokenAddress, tokenAddress, amount):
     if(token.allowance(conf.contracts['multisig'], loanToken.address) < amount):
         data = token.approve.encode_input(loanToken.address, amount)
         sendWithMultisig(conf.contracts['multisig'], token.address, data, conf.acct)
-    data = loanToken.mint.encode_input(conf.acct, amount)
+    data = loanToken.mint.encode_input(conf.contracts['multisig'], amount)
     sendWithMultisig(conf.contracts['multisig'], loanToken.address, data, conf.acct)
 
 def removeFromPool(loanTokenAddress, amount):