Merge branch 'development' into oracle_v1pool

DistributedCollective · Jul 13, 2021 · b5bd57f · b5bd57f
2 parents 9ee08dc + 7cfa71d
commit b5bd57f
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 6 deletions.
diff --git a/scripts/contractInteraction/mainnet_contracts.json b/scripts/contractInteraction/mainnet_contracts.json
@@ -2,8 +2,8 @@
     "iDOC" : "0xd8D25f03EBbA94E15Df2eD4d6D38276B595593c1",
     "iRBTC" : "0xa9DcDC63eaBb8a2b6f39D7fF9429d88340044a7A",
     "iXUSD" : "0x8F77ecf69711a4b346f23109c40416BE3dC7f129",
-    "LoanTokenLogicStandard" : "0x52235977526bd661F6fD518dfd2fC2F335f14424",
-    "LoanTokenLogicWrbtc" : "0x0e3816f348cb2Aeeef1976acffd8e078D4A9878a",
+    "LoanTokenLogicStandard" : "0xFc833691B9bcC9c33ec7b80B8bEc1Adb0cCDb0F6",
+    "LoanTokenLogicWrbtc" : "0xa8167F38E4188171a8b7cDfafAC88234a1c1881D",
     "sovrynProtocol" : "0x5A0D867e0D70Fcc6Ade25C3F1B89d618b5B4Eaa7",
     "DoC" : "0xe700691da7b9851f2f35f8b8182c69c53ccad9db",
     "WRBTC" : "0x542fda317318ebf1d3deaf76e0b632741a7e677d",

diff --git a/scripts/contractInteraction/testnet_contracts.json b/scripts/contractInteraction/testnet_contracts.json
@@ -50,14 +50,24 @@
 
     "TokenSender": "0x4D1903BaAd894Fc6Ff70483d8518Db78F163F9ff",
 
-    "WRBTCtoSOVConverter": "0x38729759415b27F70D5ca91CE357c45214B95Cf4",
-    "WRBTCtoesETHConverter": "0xBA25e656f4fb9389c1B07d23688867E88882E010",
+    "WRBTCtoSOVConverter": "0x36B3b4C34906f6C6B5148b8d228cF6cD90837297",
+    "WRBTCtoXUSDConverter": "0x346f086079d250E97Ad64C60CCaCbd64A5E50B79",
+    "WRBTCtoETHsConverter": "0xa84f851b62aCc3af633ce9fB497893Bb2571e810",
+    "WRBTCtoesETHConverter": "0x633a3c595a7EE0cB8254B8CAb598Bb9aBC66E96D",
+    "WRBTCtoMOCConverter": "0x432CF15Df918Db95ECFfD3e849539364D432E392",
+    "WRBTCtoBNBConverter": "0xE1b2151943C1C8ddc92Df15b4Bb0D4bEE7b867a3",
     "WRBTCtoETHxConverter": "0x21475506d808DaAf757092a5675cfa3804AB7239",
-    "WRBTCtoETHsConverter": "0xC8717501Bb0c6640069fcD8BF0DD13904F861abE",
-    "WRBTCtoXUSDConverter": "0xd795296C1D3622950bb8bE26DB5Aacd0eF128f52",
 
     "RBTCWrapperProxy": "0x6b1a4735b1E25ccE9406B2d5D7417cE53d1cf90e",
     "RBTCWrapperProxyWithoutLM": "0x106f117Af68586A994234E208c29DE0f1A764C60",
+
+
+    "WRBTCtoSOVOracle": "0x28A05da0939853F7Bc9D5A17C9550D2769eE93D3",
+    "WRBTCtoXUSDOracle": "0x0D303c47473ac60153C12F97E9270E4562BE90e8",
+    "WRBTCtoETHsOracle": "0xC57d22c3599651Dd94336Ed7B6973680009A7AF5",
+    "WRBTCtoesETHOracle": "0xD1D3939f8f487EeC3394A072E17e9252C8f52894",
+    "WRBTCtoMOCOracle": "0xdeD64B9B77655C2e215a3C8CeA3b48FbB857d0c5",
+    "WRBTCtoBNBOracle": "0x37c53Ea6E9121d6373a8d011b9e6A405F1998740",
 
     "SovrynSwapFormula":"0x7FF1C363b5600834bce7c514B01109eF1c103507",
 

diff --git a/scripts/staking/check_stakes.py b/scripts/staking/check_stakes.py
@@ -0,0 +1,41 @@
+from brownie import *
+
+import calendar
+import time
+import json
+
+def main():
+    thisNetwork = network.show_active()
+
+    DAY = 24 * 60 * 60
+    TWO_WEEKS = 2 * 7 * DAY
+
+    # == Load config =======================================================================================================================
+    if thisNetwork == "development":
+        acct = accounts[0]
+        configFile =  open('./scripts/contractInteraction/testnet_contracts.json')
+    elif thisNetwork == "testnet":
+        acct = accounts.load("rskdeployer")
+        configFile =  open('./scripts/contractInteraction/testnet_contracts.json')
+    elif thisNetwork == "rsk-mainnet":
+        acct = accounts.load("rskdeployer")
+        configFile =  open('./scripts/contractInteraction/mainnet_contracts.json')
+    else:
+        raise Exception("network not supported")
+
+    # load deployed contracts addresses
+    contracts = json.load(configFile)
+
+    staking = Contract.from_abi("Staking", address=contracts['Staking'], abi=Staking.abi, owner=acct)
+
+    ts = calendar.timegm(time.gmtime())
+    lockedTS = staking.timestampToLockDate(ts)
+
+    totalAmount = 0
+    for i in range(1, 79):
+        lockedTS += TWO_WEEKS
+        amount = staking.getCurrentStakedUntil(lockedTS)
+        totalAmount += amount
+        print(amount / 10**18)
+
+    print("totalAmount: ", totalAmount / 10**18)
diff --git a/scripts/staking/check_user_stakes.py b/scripts/staking/check_user_stakes.py
@@ -0,0 +1,51 @@
+from brownie import *
+
+import calendar
+import time
+import json
+import csv
+import math
+
+def main():
+    thisNetwork = network.show_active()
+
+    # == Load config =======================================================================================================================
+    if thisNetwork == "development":
+        acct = accounts[0]
+        configFile =  open('./scripts/contractInteraction/testnet_contracts.json')
+    elif thisNetwork == "testnet":
+        acct = accounts.load("rskdeployer")
+        configFile =  open('./scripts/contractInteraction/testnet_contracts.json')
+    elif thisNetwork == "rsk-mainnet":
+        acct = accounts.load("rskdeployer")
+        configFile =  open('./scripts/contractInteraction/mainnet_contracts.json')
+    else:
+        raise Exception("network not supported")
+
+    # load deployed contracts addresses
+    contracts = json.load(configFile)
+
+    staking = Contract.from_abi("Staking", address=contracts['Staking'], abi=Staking.abi, owner=acct)
+
+    DAY = 24 * 60 * 60
+    TWO_WEEKS = 2 * 7 * DAY
+    # parse data
+
+    ts = calendar.timegm(time.gmtime())
+    totalLockedAmount = 0
+    with open('./scripts/staking/processed-list.csv', 'r') as file:
+        reader = csv.reader(file)
+        for row in reader:
+            user = row[0]
+
+            stakes = staking.getStakes(user)
+            stakeDates = stakes[0]
+            stakeAmounts = stakes[1]
+
+            userLockedAmount = 0
+            for index, value in enumerate(stakeDates):
+                if (int(value) > ts):
+                    userLockedAmount += stakeAmounts[index]
+
+            totalLockedAmount += userLockedAmount
+            print(user + ", " + str(userLockedAmount) + ", " + str(stakeDates) + ", " + str(stakeAmounts))