adjusted scripts for arb testnet

DistributedCollective · Jun 10, 2021 · 411c156 · 411c156
1 parent af24b96
commit 411c156
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 12 deletions.
diff --git a/scripts/contractInteraction/arbitrum_testnet_contracts.json b/scripts/contractInteraction/arbitrum_testnet_contracts.json
@@ -1,3 +1,55 @@
 {
-    "WRBTC" : "0x0F3E903d1aefbF9151c82C7EE9301A37C5158d58"
+    "sovrynProtocol": "0x3219C5dDefa71FA700CE32CBC9cFac8BB115A32A",
+    "PriceFeedsMoC": "0x9cd5F8fF48E18f401073727feA6FCC8a8c392b48",
+    "PriceFeeds": "0x73773666F1B2cc4eAeFD034bF56B7CA10718eF89",
+    "ProtocolSettings": "0xE3F15A57e3DEb080ce3575b45C694BC601F3387E",
+    "SwapsImplSovrynSwap": "0x5e3f06Ef152Fa96797860B67EBD31644CC17280A",
+    "LoanSettings": "0x944EEDfD4B8Fc7CBFec655Dfbe71e1EC60201267",
+    "LoanOpenings": "0x30753B54a3DB9Cf6181454a17e20daA0DEBDD01c",
+    "LoanMaintenance": "0xc9De05aB27edbF12e20df98e79589941E7fac24B",
+    "LoanClosingsBase": "0xFd25A56db4A4E037E296734e5E9cd631e987cfB5",
+    "LoanClosingsWith": "0xe19E43086e9d697C1cE3561c47987570c365fcAD",
+    "SwapsExternal": "0x9e31156E035e5ebCF014e5662765A6EE3FAe795d",
+
+    "iSUSD": "0x8F77ecf69711a4b346f23109c40416BE3dC7f129",
+    "iRBTC": "0xD019CE9487dB3eB54B45cb675a804ca73598be6e",
+
+    "Staking": "0x4283DE93D21a91D38A39E295E0991F23E0c62941",
+    "StakingLogic": "0xf33385F54Ee6881dA59948bb19906C138A9f52ea",
+    "FeeSharingProxy": "0x7e51Db19ee260B54c8Ba9a2cFcfB85cf3bCc171e",
+    "VestingLogic": "0xE866E64Ab8f7354316aBd0846d361393fAe0E05E",
+    "VestingFactory": "0x332324a5432Fd9Af0268001332C134B24369b915",
+    "VestingRegistry3": "0x374EE48C4A167E328084b14D0a4B21dB721A7366",
+    "LockedSOV": "0xD49F7F17987ff03B1B0D331ad308AE3fADe2CDCb",
+    "LiquidityMiningLogic": "0x6D3eD52503369A31A17C3644aBAc53370aFee05d",
+    "LiquidityMiningProxy": "0x932F876517129c4bbE12563dAD53112592688012",
+    "LiquidityMiningConfigToken": "0x17eF6bfb1b62D0c87Bf8d4fDcBdca90551f87253",
+
+    "WRBTC" : "0x0F3E903d1aefbF9151c82C7EE9301A37C5158d58",
+    "SUSD" : "0x9913A2Bb5D95742DdfC642DF107532afAaB444B6",
+    "SOV" : "0x49a6c70D85fC3F1bFecb2a4C1019471804533fdE",
+
+    "(WR)BTC/SUSD1": "0x97F10B4951Ce49579269f862A82d773A6261B0F8",
+    "(WR)BTC/SUSD2": "0xca9C9aC9C8003680D7dCcc1A5275790B04437AD5",
+
+    "ConverterSUSD": "0x0eF94f9c1C6Bc09Bb8deF90752e9F19376F73366",
+
+    "RBTCWrapperProxy": "0xEA5c74eEAb0Ccea6452D0B43fe030f30b0dcfD16",
+    "swapNetwork": "0x01c1943fc90693e0738849E90C03D562D5BbC60C",
+    "ContractRegistry": "0x49b11f6D038Bb77D51682680B0298f3AB16F74B5",
+    "ConverterFactory": "0x85512286e586ab4A891ed4527584d572DfA3f2B6",
+    "SovrynSwapFormula": "0x316d56a3648CE18fA2368873EeEd0f43f2A0c2Cb",
+    "ConverterUpgrader": "0x5AB05D0bD45c1Ff62866F15c3D0B2b8aa337Cc2B",
+    "ConversionPathFinder": "0x8FABc858aF52c3921Bb24928ee26Ab6A26aCBD9e",
+    "ConverterRegistry": "0xc44345B387B7D27d07C67DfAEA6Ecc93550b62Cf",
+    "ConverterRegistryData": "0xf52D45c20641C34E96DbDEA5040A066cb232F9e4",
+    "LiquidTokenConverterFactory": "0xd2aA41Fc7A006423dbA193e87e9D602FBDeB5BAd",
+    "LiquidityPoolV1ConverterFactory": "0x980E73986e16426FC4cFF218669bE6fd4ccD3E80",
+    "LiquidityPoolV2ConverterFactory": "0x0643524DB2FC85ee9b8b361E058b0EdbB358048e",
+    "LiquidityPoolV2ConverterAnchorFactory": "0x4Fe3924c007040a2C8Ea8753432dA062B82f5869",
+    "LiquidityPoolV2ConverterCustomFactory": "0x0Cdac2e3167d6E4137f2e0Cdd8797fF6d80D0760",
+    "OracleWhitelist": "0x7df83447300De0c7C33Aa6b05A95EDb0c5654732",
+    "MoCMedianizerMock": "0x2bA68A1B23e2BEf037a3EBe3bE629d54131Af422",
+    "MocBTCToUSDOracle": "0xA098eb3F3eaeA8BEe705213eDa5953868C4cFF19",
+    "MocBTCToBTCOracle": "0x939B3089447D4A98d59549200bEFA911d4697C51"
 }
diff --git a/scripts/contractInteraction/contract_interaction.py b/scripts/contractInteraction/contract_interaction.py
@@ -18,8 +18,8 @@ def main():
 
 
 
-    #transferTokensFromWallet(contracts['SOV'], contracts['LiquidityMiningProxy'], 40000e18)
-    #sendTokensFromMultisig(contracts['SOV'], contracts['LiquidityMiningProxy'], 40000e18)
+    #transferTokensFromWallet(contracts['WRBTC'], '0x9Cf4CC7185E957C63f0BA6a4D793F594c702AD66', 0.001e18)
+    #sendTokensFromMultisig(contracts['XUSD'], '0x9Cf4CC7185E957C63f0BA6a4D793F594c702AD66', 40e18)
     #setWrapperOnLM()
     #addAdmin(contracts['LockedSOV'], contracts['VestingRegistry3'])
     #setFeesController()
@@ -39,7 +39,7 @@ def main():
     '''
     #0x37A706259F5201C03f6Cb556A960F30F86842d01  -ms aggregator
     #deployMultisig(['0xfe9d5402dc3c86cbaBE80231Cd48d98ba742D3f6','0x4C3d3505d34213751c4b4d621cB6bDe7E664E222',acct], 2)
-    sendFromMultisig('0x2064242b697830535A2d76BE352e82Cf85E0EC2c', 30e18)
+    #sendFromMultisig('0x2064242b697830535A2d76BE352e82Cf85E0EC2c', 30e18)
     #removeLiquidityV1toMultisigUsingWrapper(contracts['RBTCWrapperProxyWithoutLM'], contracts["ConverterETHs"], 90e18, [contracts['WRBTC'], contracts['ETHs']], [8e18,1])
 
     #amount = getBalance('0x09c5FAf7723B13434ABdF1A65AB1b667bc02a902', contracts['multisig'])
@@ -49,15 +49,17 @@ def main():
     #replaceOwnerOnMultisig('0x37A706259F5201C03f6Cb556A960F30F86842d01', '0x4C3d3505d34213751c4b4d621cB6bDe7E664E222', '0xEaBB83a1cEFc5f50C83BC4252C618d3294152A86')
     #upgradeAggregator('0x37A706259F5201C03f6Cb556A960F30F86842d01','0x3E9De61dC23D4BC1b84D174781809e5820cfceb7')
 
-    #addLiquidityV1FromMultisigUsingWrapper(contracts['RBTCWrapperProxyWithoutLM'], contracts['ConverterETHs'], [contracts['WRBTC'], contracts['ETHs']], [25e18,352e18], 248e18)
+    #addLiquidityV1FromMultisigUsingWrapper(contracts['RBTCWrapperProxyWithoutLM'], contracts['ConverterXUSD'], [contracts['WRBTC'], contracts['XUSD']], [28.66e18,1000000e18], 285e18)
     #addLiquidityV1UsingWrapper(contracts['RBTCWrapperProxyWithoutLM'], contracts['ConverterETHs'], [contracts['WRBTC'], contracts['ETHs']], [0.002e18,0.01e18])
     #readWRBTCAddressFromWrapper(contracts['RBTCWrapperProxyWithoutLM'])
 
     #readSwapRate('0x542fDA317318eBF1d3DEAf76E0b632741A7e677d', '0x1D931Bf8656d795E50eF6D639562C5bD8Ac2B78f')
 
     #swapTokens(0.0013e18, 1, contracts['swapNetwork'], contracts['WRBTC'], contracts['ETHs'])
 
-    buyWRBTC(0.1e18)
+    #buyWRBTC(0.001e18)
+    confirmWithMS(190)
+    confirmWithMS(191)
 
 def loadConfig():
     global contracts, acct
@@ -1310,4 +1312,8 @@ def readWRBTCAddressFromWrapper(wrapper):
     abiFile =  open('./scripts/contractInteraction/RBTCWrapperProxy.json')
     abi = json.load(abiFile)
     wrapperProxy = Contract.from_abi("RBTCWrapperProxy", address=wrapper, abi=abi, owner=acct)
-    print(wrapperProxy.wrbtcTokenAddress())
+    print(wrapperProxy.wrbtcTokenAddress())
+
+def confirmWithMS(id):
+    multisig = Contract.from_abi("MultiSig", address=contracts['multisig'], abi=MultiSigWallet.abi, owner=acct)
+    multisig.confirmTransaction(id)
diff --git a/scripts/contractInteraction/mainnet_contracts.json b/scripts/contractInteraction/mainnet_contracts.json
@@ -7,9 +7,11 @@
     "DoC" : "0xe700691da7b9851f2f35f8b8182c69c53ccad9db",
     "WRBTC" : "0x542fda317318ebf1d3deaf76e0b632741a7e677d",
     "ETHs": "0x1D931Bf8656d795E50eF6D639562C5bD8Ac2B78f",
+    "XUSD": "0xb5999795BE0EbB5bAb23144AA5FD6A02D080299F",
     "ConverterDOC" : "0xd715192612F03D20BaE53a5054aF530C9Bb0fA3f",
     "ConverterBPRO" : "0x26463990196B74aD5644865E4d4567E4A411e065",
     "ConverterUSDT" : "0x448c2474b255576554EeD36c24430ccFac131cE3",
+    "ConverterXUSD" : "0x303401D9AB4394AEaE4156F1A21C620eED56E22C",
     "swapNetwork":"0x98aCE08D2b759a265ae326F010496bcD63C15afc",
     "og" : "0x81d25201D044f178883599Be1934FF53FDA98acD",
     "PriceFeeds": "0x437AC62769f386b2d238409B7f0a7596d36506e4",

diff --git a/scripts/deployment/liquidity-mining/deploy-liquidity-mining.py b/scripts/deployment/liquidity-mining/deploy-liquidity-mining.py
@@ -28,19 +28,44 @@ def main():
     elif thisNetwork == "rsk-mainnet":
         acct = accounts.load("rskdeployer")
         configFile =  open('./scripts/contractInteraction/mainnet_contracts.json')
+    elif thisNetwork == "arb-testnet":
+        acct = accounts.load("rskdeployer")
+        configFile =  open('./scripts/contractInteraction/arbitrum_testnet_contracts.json')
     else:
         raise Exception("network not supported")
 
     # load deployed contracts addresses
     contracts = json.load(configFile)
-    multisig = contracts['multisig']
+
+    if thisNetwork == "arb-testnet":
+        multisig = acct
+        SOV = acct.deploy(TestToken, "SOV", "SOV", 18, 100000000e18).address
+        #deploy the staking contracts
+        stakingLogic = acct.deploy(Staking)
+        staking = acct.deploy(StakingProxy, SOV)
+        staking.setImplementation(stakingLogic.address)
+        staking = Contract.from_abi("Staking", address=staking.address, abi=Staking.abi, owner=acct)
+        #deploy fee sharing contract
+        feeSharing = acct.deploy(FeeSharingProxy, contracts['sovrynProtocol'], staking.address)
+        # set fee sharing
+        staking.setFeeSharing(feeSharing.address)
+        vestingLogic = acct.deploy(VestingLogic)
+        vestingFactory = acct.deploy(VestingFactory, vestingLogic.address)
+        vestingRegistry = acct.deploy(VestingRegistry3, vestingFactory.address, SOV, staking.address, feeSharing.address, acct)
+        VestingRegistry = vestingRegistry.address
+        poolToken = contracts['(WR)BTC/SUSD']
+    else:
+        multisig = contracts['multisig']
+        SOV = contracts['SOV']
+        VestingRegistry = contracts['VestingRegistry3']
+        poolToken = contracts['(WR)BTC/SOV']
 
     balanceBefore = acct.balance()
 
     # == LiquidityMining ===================================================================================================================
-    SOVToken = Contract.from_abi("SOV", address = contracts['SOV'], abi=TestToken.abi, owner = acct)
+    SOVToken = Contract.from_abi("SOV", address = SOV, abi=TestToken.abi, owner = acct)
 
-    lockedSOV = acct.deploy(LockedSOV, contracts['SOV'], contracts['VestingRegistry3'], 1, 10, [contracts['multisig']])
+    lockedSOV = acct.deploy(LockedSOV, SOV, VestingRegistry, 1, 10, [multisig])
 
     liquidityMiningLogic = acct.deploy(LiquidityMining)
     liquidityMiningProxy = acct.deploy(LiquidityMiningProxy)
@@ -63,13 +88,13 @@ def main():
     # The % (in Basis Point) which determines how much will be unlocked immediately.
     # 10000 is 100%
     unlockedImmediatelyPercent = 0 # 0%
-    liquidityMining.initialize(contracts['SOV'], rewardTokensPerBlock, startDelayBlocks, numberOfBonusBlocks, wrapper, lockedSOV.address, unlockedImmediatelyPercent)
+    liquidityMining.initialize(SOV, rewardTokensPerBlock, startDelayBlocks, numberOfBonusBlocks, wrapper, lockedSOV.address, unlockedImmediatelyPercent)
 
     # TODO Dummy pool token should be ERC20
     liquidityMiningConfigToken = acct.deploy(LiquidityMiningConfigToken)
 
     # TODO prepare pool tokens list
-    poolTokens = [contracts['(WR)BTC/SOV'], liquidityMiningConfigToken.address]
+    poolTokens = [poolToken, liquidityMiningConfigToken.address]
     # we need to multiply by 1000 to have 100 M
     MAX_ALLOCATION_POINT = 100000 * 1000 # 100 M
     # we don't need 10**18 here, it's just a proportion between tokens