started the process, updated addresses

DistributedCollective · Jun 9, 2022 · 742b99a · 742b99a
1 parent e0fa21a
commit 742b99a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/scripts/contractInteraction/contract_interaction.py b/scripts/contractInteraction/contract_interaction.py
@@ -37,8 +37,8 @@ def main():
     #withdrawRBTCFromWatcher(40e18, conf.contracts['FastBTC'])
     #bal = getBalance(conf.contracts['SOV'], conf.contracts['Watcher'])
     #withdrawTokensFromWatcher(conf.contracts['DoC'], 170000e18, conf.contracts['multisig'])
-
-    #sendTokensFromMultisig(conf.contracts['SOV'], '0xEd09C97b91e8fC6d34FDe6503f64A01a6b8684c6', 77065e18)
+    #print(conf.acct)
+    #sendTokensFromMultisig(conf.contracts['SOV'], conf.acct, 2336448e18)
     #sendFromMultisig('0xD9ECB390a6a32ae651D5C614974c5570c50A5D89', 30e18)
 
     #sendMYNTFromMultisigToFeeSharingProxy(36632.144056847e18)
@@ -58,11 +58,11 @@ def main():
 
     #redeemFromAggregatorWithMS(conf.contracts['XUSDAggregatorProxy'], conf.contracts['USDT'], 100000e18)
     #sendTokensFromMultisig(conf.contracts['USDT'], conf.contracts['Watcher'], 100000e18)
-
+    '''
     vestingAddress = "0x9768eF9F59b030E98f12B2B4C859E5eCbC016633"
     fourYearVesting = Contract.from_abi("FourYearVestingLogic", address=vestingAddress, abi=FourYearVestingLogic.abi, owner=conf.acct)
 
-    '''
+    
     stakingAddress = conf.contracts['Staking']
     staking = Contract.from_abi("Staking", address=stakingAddress, abi=Staking.abi, owner=conf.acct)
     stakes = staking.getStakes(vestingAddress)
@@ -108,8 +108,9 @@ def main():
 
     #upgradeVesting()
 
+    #addVestingAdmin(conf.acct)
     #isVestingAdmin(conf.acct)
 
-    #readAllVestingContractsForAddress(conf.acct)
+    readAllVestingContractsForAddress('0x945F5A36998abfC3450d9108f8C1D34Aa18fa48E')
 
 
diff --git a/scripts/contractInteraction/mainnet_contracts.json b/scripts/contractInteraction/mainnet_contracts.json
@@ -91,7 +91,7 @@
     "FeeSharingProxy": "0x115cAF168c51eD15ec535727F64684D33B7b08D1",
     "FeeSharingLogic": "0x8289AF920cA3d63245740a20116e13aAe0F978e3",
     "VestingRegistryProxy": "0xe24ABdB7DcaB57F3cbe4cBDDd850D52F143eE920",
-    "VestingRegistryLogic": "0x536416A9fbAc10A3EA0D7f7396d0eE8FaE8146D0",
+    "VestingRegistryLogic": "0xc47E977d30fa553412897d0B1f97247F635c09b2",
     "VestingCreator": "0xa003D9F781a498D90f489328612E74Af1027417f",
     "TimelockOwner": "0x967c84b731679E36A344002b8E3CE50620A7F69f",
     "GovernorOwner": "0x6496DF39D000478a7A7352C01E0E713835051CcD",
@@ -100,6 +100,8 @@
     "GovernorAdmin": "0xfF25f66b7D7F385503D70574AE0170b6B1622dAd",
     "GovernorVaultAdmin": "0x51C754330c6cD04B810014E769Dab0343E31409E",
     "VestingLogic": "0x24fbA2281202C3aaE95A3440C08C0050448508A6",
+    "FourYearVestingLogic": "0xfA0888E2Cd5b045496A63E230910B9EC16EFA073",
+    "FourYearVestingFactory": "0xD5564a16f356dD45e445beC725F54496700b5C5A",
     "VestingRegistry": "0x80B036ae59B3e38B573837c01BB1DB95515b7E6B",
     "AdoptionFund": "0x0f31cfd6aAb4d378668Ad74DeFa89d3f4DB26633",
     "DevelopmentFund": "0x617866cC4a089c3653ddC31a618b078291839AeB",

diff --git a/scripts/fouryearvesting/addfouryearvestingstoregistry.csv b/scripts/fouryearvesting/addfouryearvestingstoregistry.csv
@@ -1,6 +1,3 @@
 tokenOwner,vestingAddress
-0x511893483DCc1A9A98f153ec8298b63BE010A99f,0x6A86A77851d9D5E4D4E1b9Ad26aC3D010A5A9cF9
-0x8517ecCe55F6d11e4a60eDDbB7F4090dd2aC19E7,0x9768eF9F59b030E98f12B2B4C859E5eCbC016633
-0xC6138eC6c65e3280e720d4E6da0FD91A061351c4,0x1DbE53CB4a8895b32641ceAFB7d5e894F1D6c82E
-0x9E0816a71B53ca67201a5088df960fE90910DE55,0xB0A9a94f41A0113AF99Ce6adcf5376A924BA9544
-0xD0Af98AEb84Ca58C0EfB2B5dBd80297bE02259Dc,0xB875aC55c8513A74629225CBF03b924F4b33D68D
+0x616cc7A216dBB411f0632e6b65CE2B1A9D9a05F3,0x8bA06b52B0b9d86381329E73499d9138F4d34569
+0x9E0816a71B53ca67201a5088df960fE90910DE55,0x71d6240d87ec6c8dac09852dEad7e7192E138C9C
diff --git a/scripts/fouryearvesting/create_four_year_vestings.py b/scripts/fouryearvesting/create_four_year_vestings.py
@@ -85,7 +85,7 @@ def main():
             print(stakes)
 
     #  == Transfer ownership to multisig =============================================================================================
-    fourYearVestingFactory.transferOwnership(multisig)
+    #fourYearVestingFactory.transferOwnership(multisig)
 
     print("SOV Balance After:")
     print(SOVtoken.balanceOf(acct) / 10**18)

diff --git a/scripts/fouryearvesting/fouryearvestinglist.csv b/scripts/fouryearvesting/fouryearvestinglist.csv
@@ -1,3 +1,5 @@
-0xC6138eC6c65e3280e720d4E6da0FD91A061351c4,117.00,26611200
-0x9E0816a71B53ca67201a5088df960fE90910DE55,156.00,29030400
-0xD0Af98AEb84Ca58C0EfB2B5dBd80297bE02259Dc,195.00,31449600
+0x616cc7A216dBB411f0632e6b65CE2B1A9D9a05F3,0.20,31449600
+0x9E0816a71B53ca67201a5088df960fE90910DE55,0.02,31449600
+
+
+