From 41fa18ed4581d911120520003af7a06a7dfa8ab9 Mon Sep 17 00:00:00 2001 From: dexturr Date: Tue, 14 Mar 2023 12:10:12 +0000 Subject: [PATCH 1/3] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 566 +++++++++++++++++-- 1 file changed, 512 insertions(+), 54 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 9a305662d..a92065a8d 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -3,9 +3,9 @@ "tranche_id": 54, "tranche_start": "2023-04-06T00:00:00.000Z", "tranche_end": "2023-05-06T00:00:00.000Z", - "total_added": "1017", + "total_added": "1050", "total_removed": "0", - "locked_amount": "1017", + "locked_amount": "1050", "deposits": [ { "amount": "111", @@ -21,6 +21,11 @@ "amount": "858", "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", "tx": "0x1951bb7b36cbc8033a63f49dcd778dcd5d554d772321481070c6274b04432f45" + }, + { + "amount": "33", + "user": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1", + "tx": "0x591046ca7581e17fc9b6a99bca457d7abe411c8ef8445259a0954128b71b93fa" } ], "withdrawals": [], @@ -69,6 +74,21 @@ "total_tokens": "858", "withdrawn_tokens": "0", "remaining_tokens": "858" + }, + { + "address": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1", + "deposits": [ + { + "amount": "33", + "user": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1", + "tranche_id": 54, + "tx": "0x591046ca7581e17fc9b6a99bca457d7abe411c8ef8445259a0954128b71b93fa" + } + ], + "withdrawals": [], + "total_tokens": "33", + "withdrawn_tokens": "0", + "remaining_tokens": "33" } ] }, @@ -177,7 +197,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "22.78816420236", - "locked_amount": "10344.2042644862615388", + "locked_amount": "10229.9446714456392499", "deposits": [ { "amount": "30", @@ -2870,7 +2890,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "63098.8078918222376806917", + "locked_amount": "63039.1561083784903416105", "deposits": [ { "amount": "86666.297", @@ -2936,7 +2956,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "1081.650958994709", + "locked_amount": "1078.200040700040825", "deposits": [ { "amount": "2500", @@ -3057,7 +3077,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "16239.25718347423575", + "locked_amount": "16215.3633252818025", "deposits": [ { "amount": "12500", @@ -3323,8 +3343,8 @@ "tranche_start": "2023-02-01T00:00:00.000Z", "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", - "total_removed": "3917.838301575", - "locked_amount": "28952.5255141190925", + "total_removed": "3992.79801615", + "locked_amount": "28900.47575199508875", "deposits": [ { "amount": "7500", @@ -3343,6 +3363,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x52d96a1f9ab2704f3d71359bb538fc410d6536c58a4be8a4188ff2fa96640900" }, + { + "amount": "74.959714575", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xac63fdcb9359decdf7b0866d4b9e227a411c3cb3a5d7a5191928687b7a974e61" + }, { "amount": "151.8473757", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -3437,6 +3462,12 @@ "tranche_id": 34, "tx": "0x52d96a1f9ab2704f3d71359bb538fc410d6536c58a4be8a4188ff2fa96640900" }, + { + "amount": "74.959714575", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 34, + "tx": "0xac63fdcb9359decdf7b0866d4b9e227a411c3cb3a5d7a5191928687b7a974e61" + }, { "amount": "151.8473757", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -3523,8 +3554,8 @@ } ], "total_tokens": "7500", - "withdrawn_tokens": "1642.725118875", - "remaining_tokens": "5857.274881125" + "withdrawn_tokens": "1717.68483345", + "remaining_tokens": "5782.31516655" }, { "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600", @@ -3556,7 +3587,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "63041.238169017378291735", + "locked_amount": "62981.64081032036146416", "deposits": [ { "amount": "129999.45", @@ -3622,7 +3653,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "29626.811732623032584", + "locked_amount": "29583.72460679858138", "deposits": [ { "amount": "10000", @@ -3815,7 +3846,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2558.139586504312", + "locked_amount": "2554.6981227803145", "deposits": [ { "amount": "5000", @@ -4026,7 +4057,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "5059.78370974873541472972", + "locked_amount": "5001.324252612036335169", "deposits": [ { "amount": "97499.58", @@ -4059,7 +4090,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "6915.850796010897201399987636", + "locked_amount": "6835.94681070926191948628655", "deposits": [ { "amount": "135173.4239508", @@ -4105,7 +4136,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "2128.5636289003244271826", + "locked_amount": "2103.9707448237409406114", "deposits": [ { "amount": "32499.86", @@ -4138,7 +4169,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "692.8268061145151353672", + "locked_amount": "684.8220609912854297203", "deposits": [ { "amount": "10833.29", @@ -4171,7 +4202,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "2589.9413413285340939682", + "locked_amount": "2560.0178162303665144245", "deposits": [ { "amount": "6500", @@ -4322,8 +4353,8 @@ "tranche_start": "2022-11-01T00:00:00.000Z", "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", - "total_removed": "5454.874059975", - "locked_amount": "5935.0512200736645", + "total_removed": "5529.83377455", + "locked_amount": "5903.82136279926225", "deposits": [ { "amount": "7500", @@ -4342,6 +4373,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0xa2379016c651c71c744be188b92a2196b7f6d02ba458c84b9fe455b8ce246309" }, + { + "amount": "74.959714575", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xd1aa978e4d382f278ee56108094b266b37a71c9778283ba007f443d28153b115" + }, { "amount": "151.858885875", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -4491,6 +4527,12 @@ "tranche_id": 33, "tx": "0xa2379016c651c71c744be188b92a2196b7f6d02ba458c84b9fe455b8ce246309" }, + { + "amount": "74.959714575", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 33, + "tx": "0xd1aa978e4d382f278ee56108094b266b37a71c9778283ba007f443d28153b115" + }, { "amount": "151.858885875", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -4649,8 +4691,8 @@ } ], "total_tokens": "7500", - "withdrawn_tokens": "5454.874059975", - "remaining_tokens": "2045.125940025" + "withdrawn_tokens": "5529.83377455", + "remaining_tokens": "1970.16622545" }, { "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1", @@ -4675,7 +4717,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "423830.1834571677259461984", + "locked_amount": "422494.9448277827874971314", "deposits": [ { "amount": "1852091.69", @@ -10106,7 +10148,7 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "56003.000000000000000003", + "total_added": "56798.000000000000000003", "total_removed": "44482.21518131551", "locked_amount": "0", "deposits": [ @@ -10210,6 +10252,176 @@ "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", "tx": "0x16b4461d9c727f3238bb846506b8758441a866afa5abb85f3777cd28ef4f5230" }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x081d462d5c9139c671c3c424d5be1c249c1ea6840bd592a0987af4911a9ef7e9" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xa0bc8e5e31b36c34ed18e8daf8718482376c5963bd18d130ffd29a1756f654a2" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x9957c4800b8f6a6866cb8d4bec223fe878facb5192f15f1247ab89abfd778333" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xe3e65e4d8b1ce80295cecfe4e7819bf0dd21c13e9b9f34d1fd38f834f92f4919" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xaf9f518599789527e6519cb117ab3af68c50c3ffd18ae60af226ab96bb4fca5f" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xcd8bd04442610276f60667258780a586edd93572be1cbb18a2dd34de794a9ae0" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x7993fb7e736e64bf8c12f40487b498df343e19ed7684cb0f69f9be44a8650184" + }, + { + "amount": "70", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x4ac16195b9a0b3c804b650071638e2ce851db635e788dca75eb5f69a3a527b12" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x91edcbcef77dae2fb385d6837cb79f80c99755fc1cb25775b9cac8e2ce1b8318" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xb1c188d030677376789d7979bc501a17849fd196da0e7dfe16b18b012284f623" + }, + { + "amount": "25", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xdf54aa115d8ea311c01312caf4c1e2981cfe77263fc60a6c7eaf14fc32d1a3b0" + }, + { + "amount": "50", + "user": "0x58e87362C786fa1A19A7bD9Ee0b8b46926a26856", + "tx": "0x83960e15b10bf6235e62c440bb51a3704959364e8574f8027f05d62b8e9f66fe" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x6812c4a9fc1a26f13b575a6dc48dbe1e043a85c2cf7336b84cd5d24b4f83a07b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x8eae5f76f72be9b68196652709d3c03d4ea5a50caed9b53eda1e913dc56cb2f2" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xb7ae28569d82c75eb9e5053452daeee4d80e848429e3095708e36e872b0f37d5" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xe91af6b4d57f8132e2c2875f0cad7cc1b981f16d4df2dd34489435df47cfdf16" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x390ce02db88341263900a3c840d20c8960d4f46b47237aff96c4f06ae153fa4a" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x6fb308e2f09e8354af9cf53fd97b1c17826ad659a56750abf4b978bcc16936c1" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xc5bc5f2dd1d98451c441f76fda13ffe0cbcb22e56de971169b3f69ac9096e942" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x81a7d7a1018c8570342c77ea475b5dd84ec77cad3d2c4188f5a67677a616616b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x0295e0eedfd3160886dbda08390eded6c6ea384886cf2e6d8259ef3c9172316d" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xf6dfbfc55830cfa94474824c29867e7ceeeea4e701306c3b5754df1882616f9c" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x3e7086d0e3229a1e81b8f4098f5b16110d5a0b082ff976b839739ad3bb406d44" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xe7634fc1d270bdc841395a3e6d27ed622f44c52e27c4cc2590e9bc69cbd8530a" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x2309e9122765b8b6b468dad980d2068ded84ba4e1a51788cdba9f596a9abf430" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x268ca8df0d2a17b8ae310b32344c51c0f899bd78f920385b5afbcc14a16a9df0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x2e329721bd1ed2873172287f23c4a346e5f294c37e99059ece839ecf72bae393" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x1b16eb5988c246f0bf1e8491093a4ae600d66151d2fb1861fc188a4c5c63f3e0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xacab25ab73ec343b211988e08131ab32dd8742b00043b78be3eb6e5bf0a25a86" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xe1ca43b366158934f53a571fb6aef3221ffec6d591a9d2119ab189661aa1e985" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x1432dafb1c3dd721b4cc1a61dae19ed81b510ecd76a44d4b28771a2df1aa0b7b" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x9835ddc3739235216d41cb2b865f441dbb9d78d880655b82f8428939695ae6c0" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xeac30fab594bc2345bb47df30b00570db86457b7845ad527482a524fc9635eac" + }, + { + "amount": "30", + "user": "0xDaaf3C8f3D6aCCdEf64B814e4267d861cf546391", + "tx": "0x7c43b57ebbf743de03da9c68dc16d1982258a594d15c07f3d7f58c5aae90e3ea" + }, { "amount": "15", "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", @@ -22885,6 +23097,198 @@ "tranche_id": 11, "tx": "0x16b4461d9c727f3238bb846506b8758441a866afa5abb85f3777cd28ef4f5230" }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x081d462d5c9139c671c3c424d5be1c249c1ea6840bd592a0987af4911a9ef7e9" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xa0bc8e5e31b36c34ed18e8daf8718482376c5963bd18d130ffd29a1756f654a2" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x9957c4800b8f6a6866cb8d4bec223fe878facb5192f15f1247ab89abfd778333" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xe3e65e4d8b1ce80295cecfe4e7819bf0dd21c13e9b9f34d1fd38f834f92f4919" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xaf9f518599789527e6519cb117ab3af68c50c3ffd18ae60af226ab96bb4fca5f" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xcd8bd04442610276f60667258780a586edd93572be1cbb18a2dd34de794a9ae0" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x7993fb7e736e64bf8c12f40487b498df343e19ed7684cb0f69f9be44a8650184" + }, + { + "amount": "70", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x4ac16195b9a0b3c804b650071638e2ce851db635e788dca75eb5f69a3a527b12" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x91edcbcef77dae2fb385d6837cb79f80c99755fc1cb25775b9cac8e2ce1b8318" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xb1c188d030677376789d7979bc501a17849fd196da0e7dfe16b18b012284f623" + }, + { + "amount": "25", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xdf54aa115d8ea311c01312caf4c1e2981cfe77263fc60a6c7eaf14fc32d1a3b0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x6812c4a9fc1a26f13b575a6dc48dbe1e043a85c2cf7336b84cd5d24b4f83a07b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x8eae5f76f72be9b68196652709d3c03d4ea5a50caed9b53eda1e913dc56cb2f2" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xb7ae28569d82c75eb9e5053452daeee4d80e848429e3095708e36e872b0f37d5" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xe91af6b4d57f8132e2c2875f0cad7cc1b981f16d4df2dd34489435df47cfdf16" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x390ce02db88341263900a3c840d20c8960d4f46b47237aff96c4f06ae153fa4a" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x6fb308e2f09e8354af9cf53fd97b1c17826ad659a56750abf4b978bcc16936c1" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xc5bc5f2dd1d98451c441f76fda13ffe0cbcb22e56de971169b3f69ac9096e942" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x81a7d7a1018c8570342c77ea475b5dd84ec77cad3d2c4188f5a67677a616616b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x0295e0eedfd3160886dbda08390eded6c6ea384886cf2e6d8259ef3c9172316d" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xf6dfbfc55830cfa94474824c29867e7ceeeea4e701306c3b5754df1882616f9c" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x3e7086d0e3229a1e81b8f4098f5b16110d5a0b082ff976b839739ad3bb406d44" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xe7634fc1d270bdc841395a3e6d27ed622f44c52e27c4cc2590e9bc69cbd8530a" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x2309e9122765b8b6b468dad980d2068ded84ba4e1a51788cdba9f596a9abf430" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x268ca8df0d2a17b8ae310b32344c51c0f899bd78f920385b5afbcc14a16a9df0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x2e329721bd1ed2873172287f23c4a346e5f294c37e99059ece839ecf72bae393" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x1b16eb5988c246f0bf1e8491093a4ae600d66151d2fb1861fc188a4c5c63f3e0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xacab25ab73ec343b211988e08131ab32dd8742b00043b78be3eb6e5bf0a25a86" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xe1ca43b366158934f53a571fb6aef3221ffec6d591a9d2119ab189661aa1e985" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x1432dafb1c3dd721b4cc1a61dae19ed81b510ecd76a44d4b28771a2df1aa0b7b" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x9835ddc3739235216d41cb2b865f441dbb9d78d880655b82f8428939695ae6c0" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xeac30fab594bc2345bb47df30b00570db86457b7845ad527482a524fc9635eac" + }, { "amount": "20", "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", @@ -23049,9 +23453,9 @@ } ], "withdrawals": [], - "total_tokens": "1210", + "total_tokens": "1925", "withdrawn_tokens": "0", - "remaining_tokens": "1210" + "remaining_tokens": "1925" }, { "address": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", @@ -23171,6 +23575,42 @@ "withdrawn_tokens": "239", "remaining_tokens": "0" }, + { + "address": "0x58e87362C786fa1A19A7bD9Ee0b8b46926a26856", + "deposits": [ + { + "amount": "50", + "user": "0x58e87362C786fa1A19A7bD9Ee0b8b46926a26856", + "tranche_id": 11, + "tx": "0x83960e15b10bf6235e62c440bb51a3704959364e8574f8027f05d62b8e9f66fe" + }, + { + "amount": "20", + "user": "0x58e87362C786fa1A19A7bD9Ee0b8b46926a26856", + "tranche_id": 11, + "tx": "0x1b17c69323ab2a97f693f820d9ad108e30f5ea39406fe7cb9f56d54ec13e76f8" + } + ], + "withdrawals": [], + "total_tokens": "70", + "withdrawn_tokens": "0", + "remaining_tokens": "70" + }, + { + "address": "0xDaaf3C8f3D6aCCdEf64B814e4267d861cf546391", + "deposits": [ + { + "amount": "30", + "user": "0xDaaf3C8f3D6aCCdEf64B814e4267d861cf546391", + "tranche_id": 11, + "tx": "0x7c43b57ebbf743de03da9c68dc16d1982258a594d15c07f3d7f58c5aae90e3ea" + } + ], + "withdrawals": [], + "total_tokens": "30", + "withdrawn_tokens": "0", + "remaining_tokens": "30" + }, { "address": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", "deposits": [ @@ -27661,21 +28101,6 @@ "withdrawn_tokens": "39", "remaining_tokens": "0" }, - { - "address": "0x58e87362C786fa1A19A7bD9Ee0b8b46926a26856", - "deposits": [ - { - "amount": "20", - "user": "0x58e87362C786fa1A19A7bD9Ee0b8b46926a26856", - "tranche_id": 11, - "tx": "0x1b17c69323ab2a97f693f820d9ad108e30f5ea39406fe7cb9f56d54ec13e76f8" - } - ], - "withdrawals": [], - "total_tokens": "20", - "withdrawn_tokens": "0", - "remaining_tokens": "20" - }, { "address": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", "deposits": [ @@ -37745,7 +38170,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "675780.754705802613353193526", + "locked_amount": "673728.95781315364925259848", "deposits": [ { "amount": "1998.95815", @@ -39126,8 +39551,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "802077.86972775802842952", - "locked_amount": "7695962.7525560818016928647242119629467423", + "total_removed": "803126.94523812819680452", + "locked_amount": "7688687.2125127014185007375133475697864288", "deposits": [ { "amount": "16249.93", @@ -39656,6 +40081,16 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x3ba2633848985b36b6efea3cf273e61cebac69a47391e40278b45d0310ce1034" }, + { + "amount": "454.286376370168375", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xae9ab503ba7d8eb0f63ca4f55df3173e5427cd305cad58ce9d2a004a913cf647" + }, + { + "amount": "594.789134", + "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", + "tx": "0x62c8dc821d27225e5cb0ba5394332499fe6496cec058b22b9d0cf9e4c0fb86bd" + }, { "amount": "827.191309560501875", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -41587,6 +42022,12 @@ "tranche_id": 2, "tx": "0x3ba2633848985b36b6efea3cf273e61cebac69a47391e40278b45d0310ce1034" }, + { + "amount": "454.286376370168375", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0xae9ab503ba7d8eb0f63ca4f55df3173e5427cd305cad58ce9d2a004a913cf647" + }, { "amount": "827.191309560501875", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -42903,8 +43344,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "133555.774419543081375", - "remaining_tokens": "126443.113080456918625" + "withdrawn_tokens": "134010.06079591324975", + "remaining_tokens": "125988.82670408675025" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -43618,6 +44059,12 @@ "tranche_id": 2, "tx": "0x395df06126723394b02bb2ed3068baba30302632375d8a93e07107a35287cedd" }, + { + "amount": "594.789134", + "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", + "tranche_id": 2, + "tx": "0x62c8dc821d27225e5cb0ba5394332499fe6496cec058b22b9d0cf9e4c0fb86bd" + }, { "amount": "2345.954988", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -43848,8 +44295,8 @@ } ], "total_tokens": "200000", - "withdrawn_tokens": "102498.525782", - "remaining_tokens": "97501.474218" + "withdrawn_tokens": "103093.314916", + "remaining_tokens": "96906.685084" }, { "address": "0x1b956E6c00E238194B331eddEFF72Cb5f28A8d01", @@ -45231,8 +45678,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "5735243.926636882158318256", - "locked_amount": "1383418.447683332822286136523652822", + "total_removed": "5735873.982235800798313006", + "locked_amount": "1376701.715570043445104453407840739", "deposits": [ { "amount": "129284.449", @@ -45456,6 +45903,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0x58f0d9434f7a7b15ea976adba6ba9b843aacb72164e1c0ad522a4229cb4021dc" }, + { + "amount": "630.05559891863999475", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xbcd7fcce1e926517ccef1e1262d7c50fa6895dd339de4856dd3185854ecd025d" + }, { "amount": "1147.2913244855584015", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -48554,6 +49006,12 @@ "tranche_id": 3, "tx": "0x58f0d9434f7a7b15ea976adba6ba9b843aacb72164e1c0ad522a4229cb4021dc" }, + { + "amount": "630.05559891863999475", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xbcd7fcce1e926517ccef1e1262d7c50fa6895dd339de4856dd3185854ecd025d" + }, { "amount": "1147.2913244855584015", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -51172,8 +51630,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "324589.52720081706972075", - "remaining_tokens": "34533.94237418293027925" + "withdrawn_tokens": "325219.5827997357097155", + "remaining_tokens": "33903.8867752642902845" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -52565,7 +53023,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3362269.76579626473241024", - "locked_amount": "229693.5919846168338849190758594575", + "locked_amount": "227039.77050419898661023179041578", "deposits": [ { "amount": "552496.6455", @@ -54671,7 +55129,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "36243.9702435650685", - "locked_amount": "107081.323510615075578492419381028", + "locked_amount": "106756.20456440379208495091730084", "deposits": [ { "amount": "3000", From 613cce3683bb148e811f95afa8b80f986447e4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20G=C5=82ownia?= Date: Tue, 14 Mar 2023 13:53:51 +0100 Subject: [PATCH 2/3] feat(orders): use default filters in orders list (#3143) --- .../src/integration/trading-orders.cy.ts | 21 ++++++++++++------- .../order-list-manager/order-list-manager.tsx | 14 ++++++++++--- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/apps/trading-e2e/src/integration/trading-orders.cy.ts b/apps/trading-e2e/src/integration/trading-orders.cy.ts index 294e63ee5..af5ef4e11 100644 --- a/apps/trading-e2e/src/integration/trading-orders.cy.ts +++ b/apps/trading-e2e/src/integration/trading-orders.cy.ts @@ -30,9 +30,6 @@ describe('orders list', { tags: '@smoke' }, () => { cy.setVegaWallet(); cy.visit('/#/markets/market-0'); cy.getByTestId('Orders').click(); - cy.wait('@Orders').then(() => { - expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice; - }); cy.wait('@Markets'); }); @@ -135,14 +132,19 @@ describe('subscribe orders', { tags: '@smoke' }, () => { cy.setVegaWallet(); cy.visit('/#/markets/market-0'); cy.getByTestId('Orders').click(); - cy.wait('@Orders').then(() => { - expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice; + cy.getByTestId('tab-orders').within(() => { + cy.get('[col-id="status"][role="columnheader"]') + .focus() + .find('.ag-header-cell-menu-button') + .click(); + cy.get('.ag-filter-apply-panel-button').click(); }); }); const orderId = '1234567890'; // 7002-SORD-053 // 7002-SORD-040 // 7003-MORD-001 + it('must see an active order', () => { // 7002-SORD-041 updateOrder({ @@ -151,6 +153,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => { }); cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Active'); }); + it('must see an expired order', () => { // 7002-SORD-042 updateOrder({ @@ -353,8 +356,12 @@ describe('amend and cancel order', { tags: '@smoke' }, () => { cy.setVegaWallet(); cy.visit('/#/markets/market-0'); cy.getByTestId('Orders').click(); - cy.wait('@Orders').then(() => { - expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice; + cy.getByTestId('tab-orders').within(() => { + cy.get('[col-id="status"][role="columnheader"]') + .focus() + .find('.ag-header-cell-menu-button') + .click(); + cy.get('.ag-filter-apply-panel-button').click(); }); cy.mockVegaWalletTransaction(); }); diff --git a/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx index 0404d9aaf..385588dd8 100644 --- a/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx +++ b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx @@ -16,6 +16,7 @@ import { useOrderListData } from './use-order-list-data'; import { useHasActiveOrder } from '../../order-hooks/use-has-active-order'; import type { Filter, Sort } from './use-order-list-data'; import { useBottomPlaceholder } from '@vegaprotocol/react-helpers'; +import { OrderStatus } from '@vegaprotocol/types'; import { normalizeOrderAmendment, useVegaTransactionStore, @@ -53,6 +54,12 @@ const CancelAllOrdersButton = ({ ) : null; }; +const initialFilter: Filter = { + status: { + value: [OrderStatus.STATUS_ACTIVE, OrderStatus.STATUS_PARKED], + }, +}; + export const OrderListManager = ({ partyId, marketId, @@ -62,7 +69,7 @@ export const OrderListManager = ({ const gridRef = useRef(null); const scrolledToTop = useRef(true); const [sort, setSort] = useState(); - const [filter, setFilter] = useState(); + const [filter, setFilter] = useState(initialFilter); const [editOrder, setEditOrder] = useState(null); const create = useVegaTransactionStore((state) => state.create); const hasActiveOrder = useHasActiveOrder(marketId); @@ -160,10 +167,11 @@ export const OrderListManager = ({ ); const onGridReady = useCallback( - (event: GridReadyEvent) => { - event.api.setDatasource({ + ({ api }: GridReadyEvent) => { + api.setDatasource({ getRows, }); + api.setFilterModel(initialFilter); }, [getRows] ); From 101ae00a57dd9130f292de3b27917864516ef8b5 Mon Sep 17 00:00:00 2001 From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:39:47 -0400 Subject: [PATCH 3/3] fix(trading): hide transfer button in view as mode (#3189) --- .../vega-wallet-connect-button.tsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx index 342c55c86..54ad5c36e 100644 --- a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx +++ b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx @@ -145,7 +145,8 @@ export const VegaWalletConnectButton = () => { (store) => store.openVegaWalletDialog ); const openTransferDialog = useTransferDialog((store) => store.open); - const { pubKey, pubKeys, selectPubKey, disconnect } = useVegaWallet(); + const { pubKey, pubKeys, selectPubKey, disconnect, isReadOnly } = + useVegaWallet(); const isConnected = pubKey !== null; const activeKey = useMemo(() => { @@ -186,12 +187,14 @@ export const VegaWalletConnectButton = () => { ))} - openTransferDialog(true)} - > - {t('Transfer')} - + {!isReadOnly && ( + openTransferDialog(true)} + > + {t('Transfer')} + + )} {t('Disconnect')}