Add epoch 7,8

scripts/votes/7.py

@@ -0,0 +1,43 @@
+# epoch 1 vote calculations
+
+from ape import accounts, Contract
+import json
+from votes._common import *
+
+CHOICES = 9
+ASSET_NAMES = ['sfrxETH', 'swETH', 'wstETH', 'ETHx', 'cbETH', 'mevETH', 'rETH', 'apxETH']
+PREV_WEIGHTS = [2004, 1541, 1554, 1087, 857, 1881, 819, 257]
+REDISTRIBUTE = UNIT//10
+
+def main():
+    total, votes = read_multiple_choice('votes/7-weight.csv', CHOICES)
+    redistribute(total, votes)
+
+def redistribute(total, votes):
+    assert sum(PREV_WEIGHTS) == 10000
+    results = multiple_choice_result(votes, CHOICES)
+    print('results:')
+    for i, result in enumerate(results):
+        name = ASSET_NAMES[i-1] if i > 0 else 'blank'
+        print(f'{name.rjust(7)}: {result/total*100:.2f}%')
+
+    redistribute = REDISTRIBUTE * (UNIT - results[0] * UNIT // total) // UNIT
+    print(f'\nredistribute: {redistribute/UNIT*100:.2f}%\n')
+
+    weights = []
+    for i in range(1, CHOICES):
+        w = PREV_WEIGHTS[i-1] * (UNIT - redistribute) // 10000
+        w += results[i] * redistribute // (total - results[0])
+        # print(w * 10000 / UNIT)
+        weights.append(round(w * 10000 / UNIT))
+
+    # fix rounding manually
+    weights[4] += 1
+
+    assert sum(weights) == 10000
+
+    print('new weights:')
+    for i, w in enumerate(weights):
+        delta = w - PREV_WEIGHTS[i]
+        sign = '+' if delta > 0 else ''
+        print(f'{ASSET_NAMES[i].rjust(7)}: {w/100:.2f}% ({sign}{delta/100:.2f}%)')

scripts/votes/8.py

@@ -0,0 +1,43 @@
+# epoch 1 vote calculations
+
+from ape import accounts, Contract
+import json
+from votes._common import *
+
+CHOICES = 9
+ASSET_NAMES = ['sfrxETH', 'swETH', 'wstETH', 'ETHx', 'cbETH', 'mevETH', 'rETH', 'apxETH']
+PREV_WEIGHTS = [1808, 1400, 1420, 999, 772, 2406, 801, 394]
+REDISTRIBUTE = UNIT//10
+
+def main():
+    total, votes = read_multiple_choice('votes/8-weight.csv', CHOICES)
+    redistribute(total, votes)
+
+def redistribute(total, votes):
+    assert sum(PREV_WEIGHTS) == 10000
+    results = multiple_choice_result(votes, CHOICES)
+    print('results:')
+    for i, result in enumerate(results):
+        name = ASSET_NAMES[i-1] if i > 0 else 'blank'
+        print(f'{name.rjust(7)}: {result/total*100:.2f}%')
+
+    redistribute = REDISTRIBUTE * (UNIT - results[0] * UNIT // total) // UNIT
+    print(f'\nredistribute: {redistribute/UNIT*100:.2f}%\n')
+
+    weights = []
+    for i in range(1, CHOICES):
+        w = PREV_WEIGHTS[i-1] * (UNIT - redistribute) // 10000
+        w += results[i] * redistribute // (total - results[0])
+        # print(w * 10000 / UNIT)
+        weights.append(round(w * 10000 / UNIT))
+
+    # fix rounding manually
+    weights[6] += 1
+    # print(sum(weights))
+    assert sum(weights) == 10000
+
+    print('new weights:')
+    for i, w in enumerate(weights):
+        delta = w - PREV_WEIGHTS[i]
+        sign = '+' if delta > 0 else ''
+        print(f'{ASSET_NAMES[i].rjust(7)}: {w/100:.2f}% ({sign}{delta/100:.2f}%)')

votes/7-weight.csv

@@ -0,0 +1,35 @@
+address,choice.1,choice.2,choice.3,choice.4,choice.5,choice.6,choice.7,choice.8,choice.9,voting_power,timestamp,author_ipfs_hash,reason
+0x53C40473DcdFd927C4201cCFE24E314a7D7C3584,,,,,,,1,,,0.61609830764247,1710437238,bafkreibzpbk37kp2bzjf6yqz3jlw2xz4hyv6qbfve2pkrtimx5hyz4sahm,""
+0x9d560c8963e8758C1dBf9BeD87D0ff17764b1cA4,,,,,,,,,1,22.359611654689413,1710517105,bafkreihuyliqhkl5kotdpqgz2tyavehekrwcq72yrflirivjskye3fsxmm,""
+0x7AAEE144a14Ec3ba0E468C9Dcf4a89Fdb62C5AA6,,1,,,,,,,,2.352247144703998,1710550799,bafkreie4gpxz4bxnr6idgyzyjh4v3tpzuxirpcz4vkjb5sanvjonxmxi6y,""
+0x7115b222b2CcdE533A27A75D3E8629832E6DC1e3,,,,,,,,1,,18.404884255721985,1710561816,bafkreidvvnmzsijlx63lyil56hlqi7hqkjldrq3wqi77gobu6hsvsoeoyu,""
+0x80E6c4918ce508c08F7e4298f64464044cF79Db7,,100,,,,,,,,0.6013907341953617,1710566846,bafkreifyax7ufj4fjpc34ms2kvyr6au62ox4danqbmkztuun5gtofg3ocy,""
+0xD619F816156EFfABF9dDab313cff6b46cad3Fbdd,,,,,,,,3,1,0.06792678005517529,1710572656,bafkreidyzum2c7csqfdbfl33eeroyxfkbvmr322pjh2um35eomwizysxhq,""
+0x20216577f78eE7D6d5b2b962C744a950efc77437,,,,,,,,,1,13.510643586784848,1710599446,bafkreifd7shcnunufxj3uuhhhbpclpctt4l3whmppr6g2kgsenqydn4bgq,""
+0xEa04a9Fe2CEf51B504e7da8cf1b859454AE27030,1,,,,,,,,,3.010438736300313,1710607872,bafkreie7mzw7obe4uyl35gitppiewnw2lozrtei5h4cnkdls6dmwpwtnxq,""
+0x12478d1a60a910C9CbFFb90648766a2bDD5918f5,,,1,,,,,1,,39.20411907839996,1710726402,bafkreib3o7lib53huyol3fdocduatikmxtd4t7aheovmhvrril4gn4muze,""
+0x3Af637465aEa69F009004283095B1569E764ECd9,,,,,,,1,,,2.993547306547659,1710744853,bafkreibysittwifm37fsw5vvsm7c2f67kqljpolakcmbzntga2qjpn5c24,""
+0x906AfE716e75fBB69B22cAD01Ab19b43de32308b,,,,,,,,1,,2.5732692588015222,1710747788,bafkreicdk3q7gk6zs3xapsrv3clltye3b7rqlw53gdizqx772dgn6idagq,""
+0x3295e39F9Ea9Db98929B52f076acb7D1535A23Cb,,,,,,,,1,,3.920411907839996,1710780474,bafkreiapaw4bpo5vpwsmaa6kndo6tfi6g6ahqofoun5gpkgvq5zhzptl7e,""
+0xa8CC9BCf39E981e5629731A18e87A7FCaf4D72B3,,1,1,,,,,,,11.761235723519988,1710817125,bafkreiccnkqrleretuujvgbs6ruld3mmwueca2mz4y2atzzwjp566ellgi,""
+0xaE79f0562C2128cC12d0ac068aC288856Fe0e1AB,,,,,,,100,,,0.7421214275067564,1710845376,bafkreievsoroljvx4znmp3meff37j22eil6fciz4gcffbldbc7ewepw3fm,""
+0xbe478151e2070B9D468De42EBF34275A9F35bF32,,,,,,,1,,,114.76907852138751,1710845466,bafkreibxxzuryuq5hrkvmwfgdegbgwxfoyhzn7nfdsh2vjsmfwnmd2bkfy,""
+0xc989Df5B623fa84E57e99eC9006283510Ea8C2eC,,,,,,,100,,,47.87775345080384,1710845668,bafkreie2yoptb26ufig5sbpi7o7nc5hqpu4uj5i6dqmj6l735rysxrsnvy,""
+0x7343D89A30C8768730B511B756bf1281c9250CDd,,,,,,,100,,,7.137460194004632,1710845905,bafkreiaqxcsvvzxhqfnyxwgtveqhiwqohbegntek7zlt236si7dqcv457y,""
+0x1176F971277B12595AAB599d15EA80AFBb9CD711,,,,,,,100,,,7.666012224091081,1710845938,bafkreif7euxafwquqi6zf3gy4vaxj5z45assyliwugo5wdv3fhk6cfvdfe,""
+0x8C68a0FC20F27532Fe4BF7a41b98746d96bc8B60,,,,,,,100,,,11.849477004057974,1710845981,bafkreidb4guykngohlc3o42mdt5rkbrn6ow4molvwozufs5ntcb6akxuka,""
+0xE37f3343b3f2b784589B677cfD6C9a166aAC2A19,,,,,,,100,,,58.89755336679999,1710846031,bafkreifox53pyvodbd6pvkgomf6grogb7jf34rdidy3z73efz6dgti4z3m,""
+0x6D5a7597896A703Fe8c85775B23395a48f971305,,,,,,,494,,,493.51944351197994,1710917269,bafkreicdfzr6xoyc6k2hmgqgkdvi5szblazaxhr2zdxhpzhe2gpvv6o5pq,""
+0x02cA76E87779412a77Ee77C3600D72F68b9ea68C,,,,,,,206,,,205.83237717596654,1710926391,bafkreie2hbc4nal3iohyn7h7kiaqm2clxgzk7dsl7isq5szdywjqgrks5y,""
+0x020cA66C30beC2c4Fe3861a94E4DB4A498A35872,,,,,,,1,,,68.76257496168535,1710927996,bafkreifue4v6ulkmrwhlpxbjgfyfcf6uiijx66ynfml3tqqkbuqsihpvty,""
+0x20EADfcaf91BD98674FF8fc341D148E1731576A4,,,,1,1,,,2,,164.55106462012446,1710928467,bafkreibmcw3f5doibbk2j6kxtabxcx357z7uicqlusoy72ndedbi64ejwa,""
+0xaED5C1a09EdD534AA78151dCb7EE3D388Eb58EE6,,,,,,,100,,,17.82153736079053,1710929392,bafkreiekmwg7vchd2nwu75ozvhi5b5unaldqejj65wsc373jsffcy6bcdi,""
+0xC95f235896F5a82486Ab645596fC29b76e52900c,,,,,,,100,,,65.59705140729359,1710929432,bafkreigmvnonmdvyfcojnzp4cxbjlubfiwelzzxyvftx2weqm2h4spbw4a,""
+0x42b126099beDdCE8f5CcC06b4b39E8343e8F4260,,,,,,,100,,,184.37016321319203,1710929474,bafkreiaqn2v4despdfzgjvi5r6gha3bbmxuvrijuuw3p7jvkdluidj2moq,""
+0x3C9F71Ae57FEA4a2E38C9d413705Ed1FDcD9e3Da,,,,,,,100,,,68.00154833990503,1710931600,bafkreihhgerdmn5rz5emjez26v7s2bp2eagx4drmkmrrzslpfwblju3df4,""
+0x1e37ab3f6395567A12a05534EE0E88A409C1a3dC,,,,,,,100,,,1.5521018248063867,1710932939,bafkreiadvravt5t4rpbmc37qmvplcsa3jci3q7bbo2q3cbebwqtqjap3re,""
+0xD452d16cebD4242d66a23F2f6F9a784A1A2c42d7,,,,,,,100,,,4.756422977555918,1710932991,bafkreigiekjct427dteoaha4e4qa4plt4c7xgu6qekjsku7f3yhsgj42o4,""
+0x888B9201b7247D0f8ab9a1473b894bDFe3df6a6b,,,,,,,100,,,8.928714367423346,1710933030,bafkreihe2qai2qph4jiwkdyg5qdth2jsp3wnq3wq43bp6g3dbvekfcw6s4,""
+0x9Ee63A90B8407FF8E974A24B5F3e9E504346708E,,,,,,,100,,,2.438234780203801,1710933066,bafkreifl5yogtlztc6ljke3a5eg5daod364uka6yic2z2m3pbiprwgq2xm,""
+0x029F1c62662CbBfe79CE55B285FeE4E2db081a06,,,,,,,1,,,37.56486822361463,1710951174,bafkreihumdbcyxncfftcxzd7muwhw6mdx32tkcxtnnj5cnsdshp4whasbq,""
+0x4d0bddEc656ED7C3b33AB581b6f14c9ab5C205d4,,,,,,,,,1,286.1900692723197,1710960081,bafkreign4gvr5gwi6sl6tvxwwcevtrualgaya3swy7jegvfphjhekydfoq,""

votes/8-weight.csv

@@ -0,0 +1,31 @@
+address,choice.1,choice.2,choice.3,choice.4,choice.5,choice.6,choice.7,choice.8,choice.9,voting_power,timestamp,author_ipfs_hash,reason
+0xbbc2EAa0852173CA8Fb193175f67Db8Aa8700a91,,,,,,,,1,1,5.760184897541664,1712880797,bafkreig6tqoic2kr4aqby7shcobe65c54qv4g4z2vzwdg5cpsr2ra2zmye,""
+0x53C40473DcdFd927C4201cCFE24E314a7D7C3584,,,,,,,1,,,0.6889508187127431,1712932724,bafkreigdsmzzmf33iubdivgfwufwp4bh7eahusxzrtocvocbqnjgqkojgi,""
+0x20216577f78eE7D6d5b2b962C744a950efc77437,,1,1,,,,,,,17.72126511842232,1712976707,bafkreiecjzj6vvmwu67heoxt7djskjbjgaac2p7une5wzbpne6vtpo5hza,""
+0xF5d9CD9bC51a0A59598a5Bcd8eB6440002BE3e64,,2,2,,,,,3,,0.3118816263852785,1713062482,bafkreidsjguilllzkcwkvi26fo4g5qo3zpcmbqxw7sal7tvmkigh3eqibu,""
+0x7115b222b2CcdE533A27A75D3E8629832E6DC1e3,,,,,,,,1,,19.198493721492085,1713087168,bafkreibyidl7cxquubgnd7fitd5xiolmzhkzwt25esjig5cn3vpq6qalry,""
+0x992dac69827A200BA112A0303Fe8F79F03c37D9d,,,,,,,1,,,150.4863235760081,1713125225,bafkreigrgchonh5n7qp3e44qbdxrcxtgd52jhp73gih55irkpsarvzexcy,""
+0x4570d5b4177Cf209944e8E3fB1f2A77021ffD5C5,,,,,,,1,,,35.92641240866621,1713125279,bafkreifgzmyi2cbe3znr6cxasbq6gd7ngv3l2m2qgufe3ls2dragz22mmq,""
+0x80E6c4918ce508c08F7e4298f64464044cF79Db7,,33,,66,,,,,,0.6639095014093563,1713240294,bafkreiawposrnljg3awprllpcjasjv6m2yj6bdhvbdmyai4jzewc2nyytu,""
+0x20EADfcaf91BD98674FF8fc341D148E1731576A4,,,,2,,,,2,,175.97785853222567,1713255885,bafkreidbhlucteemylpn3eicnsfebcel5nuhcv6vqyybcr3dxyyrier6x4,""
+0x029F1c62662CbBfe79CE55B285FeE4E2db081a06,,,,,,,,1,,39.29553067100472,1713283974,bafkreih57mf5cadvbsjsaa5y5eyobcl6m5ra7idbioa3apvlnwggjpmrnu,""
+0x4d0bddEc656ED7C3b33AB581b6f14c9ab5C205d4,,,,,,,,,1,293.4041758630701,1713334409,bafkreidimeoy3tuyn76zugeaxmqmjftdmcbf67cpwwqmr3mx5ngqwbzjvi,""
+0x6D5a7597896A703Fe8c85775B23395a48f971305,,,,,,,661,,,661.3092381488641,1713336700,bafkreifcyfcp2pyrhddsioz4a73yzlrjrzlggu4ojokbo52k3eljxorwme,""
+0x02cA76E87779412a77Ee77C3600D72F68b9ea68C,,,,,,,218,,,217.51121908261572,1713336830,bafkreia46spiy7vacdpxqqck6wxndmzrebre4rw36mgwctzxo2iuqvk5zm,""
+0x8C68a0FC20F27532Fe4BF7a41b98746d96bc8B60,,,,,,,100,,,14.004163863080466,1713338350,bafkreigqokilao4ojaycwt4teskcpoaqzbnamowpii47yzzfom2gbupjue,""
+0xaE79f0562C2128cC12d0ac068aC288856Fe0e1AB,,,,,,,100,,,0.8217272403892669,1713338417,bafkreidckpwojn535hycvlqogjfwkqut7rxakcuinlnzwyuollz5hbvoha,""
+0x3C9F71Ae57FEA4a2E38C9d413705Ed1FDcD9e3Da,,,,,,,100,,,70.97219165957863,1713338622,bafkreihb6kijvtbmbgjgmwbpisgwkzk5bcghnx6ad3awi5nkh3d6aibapq,""
+0x1e37ab3f6395567A12a05534EE0E88A409C1a3dC,,,,,,,100,,,1.9347937505953658,1713338676,bafkreicbt6g4dtstjx362fzj5qatluccnz5e2wog6orhl2n3geys7v4j3e,""
+0x1361be487cb4Bcc54b199C1423666D82F9C6A1c3,,,,,,,100,,,4.109727826661767,1713338718,bafkreidygjwnf4vako6ru5otq4sawix6k4nsd6pouixmji77s2mm3gt4uy,""
+0xD452d16cebD4242d66a23F2f6F9a784A1A2c42d7,,,,,,,100,,,5.9293540580407145,1713338824,bafkreihukenaizmusy5onaqki35usa2wznmbmlt2wrmzwnfbhgpg46tsu4,""
+0x888B9201b7247D0f8ab9a1473b894bDFe3df6a6b,,,,,,,100,,,9.44787126232519,1713338866,bafkreidxttuuw3wt5nwfhwlicnburozn7rernfufzutujbm3rqokouhe7m,""
+0x9Ee63A90B8407FF8E974A24B5F3e9E504346708E,,,,,,,100,,,3.03938051511382,1713338905,bafkreicf7aj7xy2gpxzhpzwk25g3ugmpsbrwqorfyshzopqg2g6ktvqnja,""
+0xc989Df5B623fa84E57e99eC9006283510Ea8C2eC,,,,,,,100,,,50.59449721772272,1713339108,bafkreiev4bjzml4hdu472snnu5kmhpw3dlbwyfy2f5qrgasftucxk7qje4,""
+0x7343D89A30C8768730B511B756bf1281c9250CDd,,,,,,,100,,,7.488759636855701,1713339151,bafkreif66cmk5xr5erfu64bmoh5j2rsbvm5oku5wvuq73lyawrimu3nqgq,""
+0x8633E9199E4d7380403fd9D1091a69858c3B0212,,,,,,,100,,,2.9970038057441686,1713339227,bafkreig4qnevdjvij3tjpdd4rve4ilcq7qto5pw3uzkwbmtzgxc2nc26pm,""
+0xE37f3343b3f2b784589B677cfD6C9a166aAC2A19,,,,,,,100,,,72.36654794648469,1713339311,bafkreia2qylrrlyuxqm4yvyldhqr6tve6fszoxrvw5p7ll4eywwnzsml3m,""
+0xaED5C1a09EdD534AA78151dCb7EE3D388Eb58EE6,,,,,,,100,,,26.10869068257177,1713339360,bafkreicyduals2qgeknquri3eatxrkveq7s262tdithkiqic5mx5dhldlm,""
+0xC95f235896F5a82486Ab645596fC29b76e52900c,,,,,,,1,,,87.00090993156687,1713339424,bafkreiapuveamzek4rd7pz4gu7c4xkyrtuj3pbbepgjxk7j2axadpgla5i,""
+0x42b126099beDdCE8f5CcC06b4b39E8343e8F4260,,,,,,,100,,,201.10602477344148,1713339474,bafkreigxvktslizp6gcz2svrdpr3vm64rayogqrujwum2zrg544xis6qdm,""
+0x7AAEE144a14Ec3ba0E468C9Dcf4a89Fdb62C5AA6,,,,,,,1,,,2.4115411714772885,1713340486,bafkreibxoreqsgxyzqeg2v6jypnvudj733fuato7ndek5mal4uouvekubi,""
+0x020cA66C30beC2c4Fe3861a94E4DB4A498A35872,,,,,,,1,,,72.73685097375827,1713340905,bafkreifejxxup2ntgy2t6dxeyhhrpyyc3ron54uzmj2nklzlxebssl2ooa,""