From c5b22f5bfb1c8c3c3619ab63785b0192ff73f6a0 Mon Sep 17 00:00:00 2001 From: dexturr Date: Sat, 1 Apr 2023 00:14:47 +0000 Subject: [PATCH 01/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 62 ++++++++++++-------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 668bed319..87ca23394 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "2384.8071072281962495", + "locked_amount": "2269.36838635005916848", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58943.4260728205234523893", + "locked_amount": "58883.158699240810008431", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "841.2577584452585", + "locked_amount": "837.771227614977625", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14574.79556662640875", + "locked_amount": "14550.65513033413925", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25326.70541743400625", + "locked_amount": "25274.11851596071125", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58889.6476130753215522965", + "locked_amount": "58829.435225890864434123", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "54144.7663", + "locked_amount": "54143.24926577926176255214", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26625.33467782851442", + "locked_amount": "26581.80290461694402", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2318.4049974632165", + "locked_amount": "2314.928018772197", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "987.46011252320075420058", + "locked_amount": "928.39736973282949904994", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "1349.6874959427382120583231388", + "locked_amount": "1268.9589233054512590810817896", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "415.4074168144787082168", + "locked_amount": "390.5607408815804332838", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "135.2110831549561525247", + "locked_amount": "127.12373124523448039287", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "505.4492276832454581195", + "locked_amount": "475.2168999672786755805", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3759.55916206261545", + "locked_amount": "3728.00702117863845", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "330816.5968674758056088834", + "locked_amount": "329467.5789396030679700528", "deposits": [ { "amount": "1852091.69", @@ -39021,7 +39021,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "532851.256008774290412798337", + "locked_amount": "530778.19060507543558978813", "deposits": [ { "amount": "1998.95815", @@ -40403,7 +40403,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "813651.96014483668060452", - "locked_amount": "7189143.92712736043441309136733409486645037", + "locked_amount": "7181792.97030936608148008555535108957718307", "deposits": [ { "amount": "16249.93", @@ -46673,7 +46673,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5796006.190908996961970156", - "locked_amount": "915526.544116288479207984933532503", + "locked_amount": "908740.187718217667762497134864366", "deposits": [ { "amount": "129284.449", @@ -54171,7 +54171,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "44826.6710986056946985124448000769", + "locked_amount": "42145.3406421858356890099449910882", "deposits": [ { "amount": "552496.6455", @@ -56298,8 +56298,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "39906.7861606897949", - "locked_amount": "84433.32742222470651024894266868", + "total_removed": "40071.0963522157949", + "locked_amount": "84104.83835886153845089992186708", "deposits": [ { "amount": "3000", @@ -62963,6 +62963,11 @@ "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b", "tx": "0x93540a3930099c8b54157bb83ae50c8ced993009ae2091888f85704e6f13869c" }, + { + "amount": "164.310191526", + "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D", + "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca" + }, { "amount": "154.812094114", "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7", @@ -82938,10 +82943,17 @@ "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "164.310191526", + "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D", + "tranche_id": 5, + "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca" + } + ], "total_tokens": "200", - "withdrawn_tokens": "0", - "remaining_tokens": "200" + "withdrawn_tokens": "164.310191526", + "remaining_tokens": "35.689808474" }, { "address": "0x40c9DF6b867cA219c0Ab4C2E390E8B919Be52e7e", From 84bae12defa3c69fa945f749c476e5e92f43d84f Mon Sep 17 00:00:00 2001 From: dexturr Date: Sat, 1 Apr 2023 06:06:47 +0000 Subject: [PATCH 02/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 87ca23394..42076d31c 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "2269.36838635005916848", + "locked_amount": "2158.1934759557937647", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58883.158699240810008431", + "locked_amount": "58825.1173435634895507923", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "837.771227614977625", + "locked_amount": "834.41347425722425", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14550.65513033413925", + "locked_amount": "14527.4063380636085", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25274.11851596071125", + "locked_amount": "25223.47394874156", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58829.435225890864434123", + "locked_amount": "58771.446825647558687475", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "54143.24926577926176255214", + "locked_amount": "54107.0870053481775482804", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26581.80290461694402", + "locked_amount": "26539.87900811770556", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2314.928018772197", + "locked_amount": "2311.579464738711", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "928.39736973282949904994", + "locked_amount": "871.51615095797250222378", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "1268.9589233054512590810817896", + "locked_amount": "1191.2121173729676147103831068", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "390.5607408815804332838", + "locked_amount": "366.63179442910576533048", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "127.12373124523448039287", + "locked_amount": "119.33509137595369541906", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "475.2168999672786755805", + "locked_amount": "446.1012245746083237021", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3728.00702117863845", + "locked_amount": "3697.620280847145", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "329467.5789396030679700528", + "locked_amount": "328168.3879392986890156386", "deposits": [ { "amount": "1852091.69", @@ -39021,7 +39021,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "530778.19060507543558978813", + "locked_amount": "528781.880894587419806802277", "deposits": [ { "amount": "1998.95815", @@ -40403,7 +40403,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "813651.96014483668060452", - "locked_amount": "7181792.97030936608148008555535108957718307", + "locked_amount": "7174714.1842513086523263355746013151932955", "deposits": [ { "amount": "16249.93", @@ -46673,7 +46673,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5796006.190908996961970156", - "locked_amount": "908740.187718217667762497134864366", + "locked_amount": "902205.0976278960882716926774081185", "deposits": [ { "amount": "129284.449", @@ -54171,7 +54171,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "42145.3406421858356890099449910882", + "locked_amount": "39563.28702360353170158746762085492", "deposits": [ { "amount": "552496.6455", @@ -56299,7 +56299,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40071.0963522157949", - "locked_amount": "84104.83835886153845089992186708", + "locked_amount": "83788.511673841899574221960629112", "deposits": [ { "amount": "3000", From 5ef8c11e6ef4171906e5101b0bfb4c65ca5ad01c Mon Sep 17 00:00:00 2001 From: dexturr Date: Sat, 1 Apr 2023 12:07:28 +0000 Subject: [PATCH 03/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 42076d31c..a96836c90 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "2158.1934759557937647", + "locked_amount": "2044.27077658303485912", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58825.1173435634895507923", + "locked_amount": "58765.6414430157288131204", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "834.41347425722425", + "locked_amount": "830.972730972731", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14527.4063380636085", + "locked_amount": "14503.58293075684475", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25223.47394874156", + "locked_amount": "25171.57765500307125", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58771.446825647558687475", + "locked_amount": "58712.025189375510685845", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "54107.0870053481775482804", + "locked_amount": "54070.03096177575676374931", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26539.87900811770556", + "locked_amount": "26496.9189244038568", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2311.579464738711", + "locked_amount": "2308.148148148148", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "871.51615095797250222378", + "locked_amount": "813.22906115088965677908", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "1191.2121173729676147103831068", + "locked_amount": "1111.5437284529391400361695632", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "366.63179442910576533048", + "locked_amount": "342.11142231146768044132", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "119.33509137595369541906", + "locked_amount": "111.3539481917216294824", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "446.1012245746083237021", + "locked_amount": "416.26592879581120401648", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3697.620280847145", + "locked_amount": "3666.4825046040522", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "328168.3879392986890156386", + "locked_amount": "326837.086252338855448645", "deposits": [ { "amount": "1852091.69", @@ -39021,7 +39021,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "528781.880894587419806802277", + "locked_amount": "526736.133711747642711196077", "deposits": [ { "amount": "1998.95815", @@ -40403,7 +40403,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "813651.96014483668060452", - "locked_amount": "7174714.1842513086523263355746013151932955", + "locked_amount": "7167460.0960904836715888306758342437496621", "deposits": [ { "amount": "16249.93", @@ -46673,7 +46673,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5796006.190908996961970156", - "locked_amount": "902205.0976278960882716926774081185", + "locked_amount": "895508.1697556120244456276575473986", "deposits": [ { "amount": "129284.449", @@ -54171,7 +54171,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "39563.28702360353170158746762085492", + "locked_amount": "36917.2903185818546854774745795269", "deposits": [ { "amount": "552496.6455", @@ -56299,7 +56299,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40071.0963522157949", - "locked_amount": "83788.511673841899574221960629112", + "locked_amount": "83464.35133873155599880288787416", "deposits": [ { "amount": "3000", From 5e765f3172abd30505f1ade1664acdaaca7b26fc Mon Sep 17 00:00:00 2001 From: dexturr Date: Sat, 1 Apr 2023 18:07:57 +0000 Subject: [PATCH 04/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index a96836c90..977d1f61b 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "2044.27077658303485912", + "locked_amount": "1930.4217727001191829", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58765.6414430157288131204", + "locked_amount": "58706.2040168514686653251", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "830.972730972731", + "locked_amount": "827.5342134717134", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14503.58293075684475", + "locked_amount": "14479.77493458132", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25171.57765500307125", + "locked_amount": "25119.7149324739125", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58712.025189375510685845", + "locked_amount": "58652.641992383923071147", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "54070.03096177575676374931", + "locked_amount": "54032.99888939869154257846", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26496.9189244038568", + "locked_amount": "26453.986631151701816", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2308.148148148148", + "locked_amount": "2304.7190512430238", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "813.22906115088965677908", + "locked_amount": "754.97967669716273605266", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "1111.5437284529391400361695632", + "locked_amount": "1031.9268762413897565340049724", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "342.11142231146768044132", + "locked_amount": "317.60691218485064700634", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "111.3539481917216294824", + "locked_amount": "103.37796793164456598528", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "416.26592879581120401648", + "locked_amount": "386.44993318062847679334", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3666.4825046040522", + "locked_amount": "3635.364871086557175", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "326837.086252338855448645", + "locked_amount": "325506.645771534715448402", "deposits": [ { "amount": "1852091.69", @@ -39021,7 +39021,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "526736.133711747642711196077", + "locked_amount": "524691.709902929299431985557", "deposits": [ { "amount": "1998.95815", @@ -40403,7 +40403,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "813651.96014483668060452", - "locked_amount": "7167460.0960904836715888306758342437496621", + "locked_amount": "7160210.70052896749668080466162033999405246", "deposits": [ { "amount": "16249.93", @@ -46673,7 +46673,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5796006.190908996961970156", - "locked_amount": "895508.1697556120244456276575473986", + "locked_amount": "888815.574061047946360812633307767", "deposits": [ { "amount": "129284.449", @@ -54171,7 +54171,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "36917.2903185818546854774745795269", + "locked_amount": "34273.00528317793094055543842293045", "deposits": [ { "amount": "552496.6455", @@ -56299,7 +56299,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40071.0963522157949", - "locked_amount": "83464.35133873155599880288787416", + "locked_amount": "83140.4006997995470159736402841", "deposits": [ { "amount": "3000", From d4b237a6ba241fc65d2bf546a14cbb7fba32d644 Mon Sep 17 00:00:00 2001 From: dexturr Date: Sun, 2 Apr 2023 00:17:15 +0000 Subject: [PATCH 05/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 102 +++++++++++++------ 1 file changed, 73 insertions(+), 29 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 977d1f61b..7a44b71aa 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "1930.4217727001191829", + "locked_amount": "1813.77760416666690165", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58706.2040168514686653251", + "locked_amount": "58645.30731228452404874", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "827.5342134717134", + "locked_amount": "824.01127518315025", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14479.77493458132", + "locked_amount": "14455.382416213767", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25119.7149324739125", + "locked_amount": "25066.57890193369875", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58652.641992383923071147", + "locked_amount": "58591.800848397584438433", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "54032.99888939869154257846", + "locked_amount": "53995.05762382612718879719", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26453.986631151701816", + "locked_amount": "26410.00028538812874", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2304.7190512430238", + "locked_amount": "2301.205764840183", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "754.97967669716273605266", + "locked_amount": "695.3001820554918411285", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "1031.9268762413897565340049724", + "locked_amount": "950.3553103011485259279606012", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "317.60691218485064700634", + "locked_amount": "292.50077939884706943048", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "103.37796793164456598528", + "locked_amount": "95.20616533394608947708", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "386.44993318062847679334", + "locked_amount": "355.90190993128360852956", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3635.364871086557175", + "locked_amount": "3603.48325276243185", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "325506.645771534715448402", + "locked_amount": "324143.5409715468805414536", "deposits": [ { "amount": "1852091.69", @@ -39021,7 +39021,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "524691.709902929299431985557", + "locked_amount": "522597.092408033167766506265", "deposits": [ { "amount": "1998.95815", @@ -40403,7 +40403,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "813651.96014483668060452", - "locked_amount": "7160210.70052896749668080466162033999405246", + "locked_amount": "7152783.32137936374975334411021448521411194", "deposits": [ { "amount": "16249.93", @@ -46672,8 +46672,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "5796006.190908996961970156", - "locked_amount": "888815.574061047946360812633307767", + "total_removed": "5801354.376551976517702256", + "locked_amount": "881958.665054397487918429442573943", "deposits": [ { "amount": "129284.449", @@ -46922,6 +46922,16 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xf7c393e9346520e22750d3065cb66f49e315599b24406aed2b9570b5a25babe0" }, + { + "amount": "5343.35381683275644592", + "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", + "tx": "0x5a00c2a54f777e2d2ac0f487c6978d4c0edd8a2b146636e45ba94c6988a330f8" + }, + { + "amount": "4.83182614679928618", + "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", + "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496" + }, { "amount": "755.482067130393772", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -53009,6 +53019,18 @@ "tranche_id": 3, "tx": "0x55259c6fbd43ea2b1e081dc4964c6785ed4d03bb0cafc49de2f07685b056f487" }, + { + "amount": "5343.35381683275644592", + "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", + "tranche_id": 3, + "tx": "0x5a00c2a54f777e2d2ac0f487c6978d4c0edd8a2b146636e45ba94c6988a330f8" + }, + { + "amount": "4.83182614679928618", + "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", + "tranche_id": 3, + "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496" + }, { "amount": "80421.5336580481619385", "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", @@ -53341,8 +53363,8 @@ } ], "total_tokens": "1266324.603486", - "withdrawn_tokens": "1183921.35061421307696042", - "remaining_tokens": "82403.25287178692303958" + "withdrawn_tokens": "1189269.53625719263269252", + "remaining_tokens": "77055.06722880736730748" }, { "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296", @@ -54171,7 +54193,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "34273.00528317793094055543842293045", + "locked_amount": "31563.799064410111440072377240963", "deposits": [ { "amount": "552496.6455", @@ -56298,8 +56320,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "40071.0963522157949", - "locked_amount": "83140.4006997995470159736402841", + "total_removed": "40152.1324861581949", + "locked_amount": "82808.496584389198721746752511416", "deposits": [ { "amount": "3000", @@ -62968,6 +62990,16 @@ "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D", "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca" }, + { + "amount": "58.7761643844", + "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B", + "tx": "0xda5812fda239af9581d2d60c8f4b959e0a8cc5466e5422c5b8fa9df72435d3bc" + }, + { + "amount": "22.259969558", + "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585", + "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9" + }, { "amount": "154.812094114", "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7", @@ -82214,6 +82246,12 @@ } ], "withdrawals": [ + { + "amount": "58.7761643844", + "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B", + "tranche_id": 5, + "tx": "0xda5812fda239af9581d2d60c8f4b959e0a8cc5466e5422c5b8fa9df72435d3bc" + }, { "amount": "20.679657534", "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B", @@ -82228,8 +82266,8 @@ } ], "total_tokens": "180", - "withdrawn_tokens": "89.6315011398", - "remaining_tokens": "90.3684988602" + "withdrawn_tokens": "148.4076655242", + "remaining_tokens": "31.5923344758" }, { "address": "0x68927b7A4A360f5B615e104BA2cA2E264a563A33", @@ -84510,6 +84548,12 @@ } ], "withdrawals": [ + { + "amount": "22.259969558", + "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585", + "tranche_id": 5, + "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9" + }, { "amount": "17.060806698", "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585", @@ -84542,8 +84586,8 @@ } ], "total_tokens": "200", - "withdrawn_tokens": "142.641089548", - "remaining_tokens": "57.358910452" + "withdrawn_tokens": "164.901059106", + "remaining_tokens": "35.098940894" }, { "address": "0xBef628af8547cE5264835F32487055a7e3dF393D", From 3a6c0554ccedfcdcf427e056d5e165f779b94218 Mon Sep 17 00:00:00 2001 From: dexturr Date: Sun, 2 Apr 2023 06:06:55 +0000 Subject: [PATCH 06/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 7a44b71aa..ad1ef4714 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "1813.77760416666690165", + "locked_amount": "1703.34491263440912821", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58645.30731228452404874", + "locked_amount": "58587.6534486124347702022", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "824.01127518315025", + "locked_amount": "820.6759386446885", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14455.382416213767", + "locked_amount": "14432.28883605072375", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25066.57890193369875", + "locked_amount": "25016.272444751385", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58591.800848397584438433", + "locked_amount": "58534.199586621813445713", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "53995.05762382612718879719", + "locked_amount": "53959.13678757690326494457", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26410.00028538812874", + "locked_amount": "26368.3562785388135", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2301.205764840183", + "locked_amount": "2297.8795662100455", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "695.3001820554918411285", + "locked_amount": "638.79871005369754941678", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "950.3553103011485259279606012", + "locked_amount": "873.1275526469143275414719214", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "292.50077939884706943048", + "locked_amount": "268.7315858559226499543", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "95.20616533394608947708", + "locked_amount": "87.46952348651967178079", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "355.90190993128360852956", + "locked_amount": "326.98061475785375233095", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3603.48325276243185", + "locked_amount": "3573.299378453039325", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "324143.5409715468805414536", + "locked_amount": "322853.0235475229220231254", "deposits": [ { "amount": "1852091.69", @@ -39021,7 +39021,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "522597.092408033167766506265", + "locked_amount": "520614.01643775381694740722", "deposits": [ { "amount": "1998.95815", @@ -40403,7 +40403,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "813651.96014483668060452", - "locked_amount": "7152783.32137936374975334411021448521411194", + "locked_amount": "7145751.46131440025083238769926627671046234", "deposits": [ { "amount": "16249.93", @@ -46673,7 +46673,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5801354.376551976517702256", - "locked_amount": "881958.665054397487918429442573943", + "locked_amount": "875466.896741273795149808913943092", "deposits": [ { "amount": "129284.449", @@ -54193,7 +54193,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "31563.799064410111440072377240963", + "locked_amount": "28998.8621420066495058711182478514", "deposits": [ { "amount": "552496.6455", @@ -56321,7 +56321,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40152.1324861581949", - "locked_amount": "82808.496584389198721746752511416", + "locked_amount": "82494.266861152901047410842922372", "deposits": [ { "amount": "3000", From 5e13173efb1b1009620de0e41236a381efaf7cb2 Mon Sep 17 00:00:00 2001 From: dexturr Date: Sun, 2 Apr 2023 12:09:35 +0000 Subject: [PATCH 07/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 98 ++++++++++++++------ 1 file changed, 70 insertions(+), 28 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index ad1ef4714..89bb88896 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "1703.34491263440912821", + "locked_amount": "1588.80106556152892488", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58587.6534486124347702022", + "locked_amount": "58527.853263975204965322", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "820.6759386446885", + "locked_amount": "817.216435185185175", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14432.28883605072375", + "locked_amount": "14408.33553492351025", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "25016.272444751385", + "locked_amount": "24964.09319367709875", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58534.199586621813445713", + "locked_amount": "58474.45396212870244011", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "53959.13678757690326494457", + "locked_amount": "53921.8787010721457301823", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26368.3562785388135", + "locked_amount": "26325.16196093353182", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2297.8795662100455", + "locked_amount": "2294.4295408422122", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "638.79871005369754941678", + "locked_amount": "580.19381798262595165554", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "873.1275526469143275414719214", + "locked_amount": "793.0247828982925909422913002", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "268.7315858559226499543", + "locked_amount": "244.07751981397846274736", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "87.46952348651967178079", + "locked_amount": "79.44486422726076721147", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "326.98061475785375233095", + "locked_amount": "296.9826461714659481613", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3573.299378453039325", + "locked_amount": "3541.99182780847185", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "322853.0235475229220231254", + "locked_amount": "321514.4631229667764744766", "deposits": [ { "amount": "1852091.69", @@ -10796,7 +10796,7 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "57188.000000000000000003", + "total_added": "57213.000000000000000003", "total_removed": "48157.21518131551", "locked_amount": "0", "deposits": [ @@ -10815,6 +10815,11 @@ "user": "0xE9F41a0090fcc7eaf626037003AAD44B17098E7C", "tx": "0x971e9bcaace01278dc20ecd83d5de588d15be22c1797f4934cfd2ffb357a95ef" }, + { + "amount": "25", + "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D", + "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96" + }, { "amount": "150", "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", @@ -22603,6 +22608,21 @@ "withdrawn_tokens": "0", "remaining_tokens": "472" }, + { + "address": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D", + "deposits": [ + { + "amount": "25", + "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D", + "tranche_id": 11, + "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96" + } + ], + "withdrawals": [], + "total_tokens": "25", + "withdrawn_tokens": "0", + "remaining_tokens": "25" + }, { "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", "deposits": [ @@ -39021,7 +39041,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "520614.01643775381694740722", + "locked_amount": "518557.115102452873101642988", "deposits": [ { "amount": "1998.95815", @@ -40402,8 +40422,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "813651.96014483668060452", - "locked_amount": "7145751.46131440025083238769926627671046234", + "total_removed": "814470.78267520605435452", + "locked_amount": "7138457.8212451104835293020438454550391998", "deposits": [ { "amount": "16249.93", @@ -40932,6 +40952,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x83497ea22d041f3b818b20cc112250ea3e38dc24b89a0bc5fee7198d6399a9cc" }, + { + "amount": "818.82253036937375", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x58bac20de3636c17156dcb64322cc7612c48f553d941bc039c796ef4167eeeb5" + }, { "amount": "545.4204142199725", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -42950,6 +42975,12 @@ "tranche_id": 2, "tx": "0x83497ea22d041f3b818b20cc112250ea3e38dc24b89a0bc5fee7198d6399a9cc" }, + { + "amount": "818.82253036937375", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x58bac20de3636c17156dcb64322cc7612c48f553d941bc039c796ef4167eeeb5" + }, { "amount": "545.4204142199725", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -44326,8 +44357,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "142195.97974307557425", - "remaining_tokens": "117802.90775692442575" + "withdrawn_tokens": "143014.802273444948", + "remaining_tokens": "116984.085226555052" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -46672,8 +46703,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "5801354.376551976517702256", - "locked_amount": "875466.896741273795149808913943092", + "total_removed": "5802489.518043560526965506", + "locked_amount": "868733.4547996372591242522529342734", "deposits": [ { "amount": "129284.449", @@ -46932,6 +46963,11 @@ "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496" }, + { + "amount": "1135.14149158400926325", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xae9047ab72d73da1001c570a12dddc5e82fd523454c1b377928e008da9bdfa85" + }, { "amount": "755.482067130393772", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -50092,6 +50128,12 @@ "tranche_id": 3, "tx": "0xf7c393e9346520e22750d3065cb66f49e315599b24406aed2b9570b5a25babe0" }, + { + "amount": "1135.14149158400926325", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xae9047ab72d73da1001c570a12dddc5e82fd523454c1b377928e008da9bdfa85" + }, { "amount": "755.482067130393772", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -52770,8 +52812,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "336567.43498450983251575", - "remaining_tokens": "22556.03459049016748425" + "withdrawn_tokens": "337702.576476093841779", + "remaining_tokens": "21420.893098906158221" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -54193,7 +54235,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "28998.8621420066495058711182478514", + "locked_amount": "26338.4385073484058567808339468165", "deposits": [ { "amount": "552496.6455", @@ -56321,7 +56363,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40152.1324861581949", - "locked_amount": "82494.266861152901047410842922372", + "locked_amount": "82168.339086825133515777872349072", "deposits": [ { "amount": "3000", From 00579fcb1fbae61861b9eaab8e8dde50fca04aca Mon Sep 17 00:00:00 2001 From: dexturr Date: Sun, 2 Apr 2023 18:06:45 +0000 Subject: [PATCH 08/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 89bb88896..878b5e585 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "1588.80106556152892488", + "locked_amount": "1475.99432646356010982", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58527.853263975204965322", + "locked_amount": "58468.9599755204209697283", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "817.216435185185175", + "locked_amount": "813.8093966218965", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14408.33553492351025", + "locked_amount": "14384.74549617552475", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "24964.09319367709875", + "locked_amount": "24912.70526396562", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58474.45396212870244011", + "locked_amount": "58415.6144063893921118025", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "53921.8787010721457301823", + "locked_amount": "53885.18564988662439387521", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26325.16196093353182", + "locked_amount": "26282.62270421106062", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2294.4295408422122", + "locked_amount": "2291.0318366311515", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "580.19381798262595165554", + "locked_amount": "522.477694954921321208628", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "793.0247828982925909422913002", + "locked_amount": "714.1368069923518046723627304", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "244.07751981397846274736", + "locked_amount": "219.79734356035391496276", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "79.44486422726076721147", + "locked_amount": "71.54190246595885947974", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "296.9826461714659481613", + "locked_amount": "267.43961001308832249066", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3541.99182780847185", + "locked_amount": "3511.159069981583925", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "321514.4631229667764744766", + "locked_amount": "320196.2025577904023057948", "deposits": [ { "amount": "1852091.69", @@ -39041,7 +39041,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "518557.115102452873101642988", + "locked_amount": "516531.4075833578334933083", "deposits": [ { "amount": "1998.95815", @@ -40423,7 +40423,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "814470.78267520605435452", - "locked_amount": "7138457.8212451104835293020438454550391998", + "locked_amount": "7131274.79244525374500770256318194615706945", "deposits": [ { "amount": "16249.93", @@ -46704,7 +46704,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5802489.518043560526965506", - "locked_amount": "868733.4547996372591242522529342734", + "locked_amount": "862102.128475681911743667817790322", "deposits": [ { "amount": "129284.449", @@ -54235,7 +54235,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "26338.4385073484058567808339468165", + "locked_amount": "23718.3613708256456113660009346938", "deposits": [ { "amount": "552496.6455", @@ -56363,7 +56363,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40152.1324861581949", - "locked_amount": "82168.339086825133515777872349072", + "locked_amount": "81847.354150986762356154209233872", "deposits": [ { "amount": "3000", From c8c0bf2cc0a7e9073d2c7dcbed2a2cf25c926b69 Mon Sep 17 00:00:00 2001 From: dexturr Date: Mon, 3 Apr 2023 00:16:15 +0000 Subject: [PATCH 09/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 878b5e585..c84fe8038 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "1475.99432646356010982", + "locked_amount": "1359.29751829450376958", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58468.9599755204209697283", + "locked_amount": "58408.0357892509808841626", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "813.8093966218965", + "locked_amount": "810.2848684879935", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14384.74549617552475", + "locked_amount": "14360.34196985708425", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "24912.70526396562", + "locked_amount": "24859.5452539901775", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58415.6144063893921118025", + "locked_amount": "58354.745805774156731265", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "53885.18564988662439387521", + "locked_amount": "53847.22726203166320912234", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26282.62270421106062", + "locked_amount": "26238.616508117707438", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2291.0318366311515", + "locked_amount": "2287.516964738711", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "522.477694954921321208628", + "locked_amount": "462.77126791799621941416", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "714.1368069923518046723627304", + "locked_amount": "632.5284291174911677262780076", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "219.79734356035391496276", + "locked_amount": "194.67988078076183385698", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "71.54190246595885947974", + "locked_amount": "63.36641206529184468411", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "267.43961001308832249066", + "locked_amount": "236.87780093259069375252", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3511.159069981583925", + "locked_amount": "3479.263063996316175", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "320196.2025577904023057948", + "locked_amount": "318832.4826105484756235168", "deposits": [ { "amount": "1852091.69", @@ -39041,7 +39041,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "516531.4075833578334933083", + "locked_amount": "514435.84482130419597853198", "deposits": [ { "amount": "1998.95815", @@ -40423,7 +40423,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "814470.78267520605435452", - "locked_amount": "7131274.79244525374500770256318194615706945", + "locked_amount": "7123844.0614390012818191165141652491713977", "deposits": [ { "amount": "16249.93", @@ -46704,7 +46704,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5802489.518043560526965506", - "locked_amount": "862102.128475681911743667817790322", + "locked_amount": "855242.12505637337177807029953837", "deposits": [ { "amount": "129284.449", @@ -54235,7 +54235,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "23718.3613708256456113660009346938", + "locked_amount": "21007.93253090200946798875120985005", "deposits": [ { "amount": "552496.6455", @@ -56363,7 +56363,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40152.1324861581949", - "locked_amount": "81847.354150986762356154209233872", + "locked_amount": "81515.300252591901499221960629112", "deposits": [ { "amount": "3000", From eb58dcd35020de35e52246f9f5abe41f428148eb Mon Sep 17 00:00:00 2001 From: dexturr Date: Mon, 3 Apr 2023 06:09:59 +0000 Subject: [PATCH 10/12] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index c84fe8038..1ca6d5ab0 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -561,7 +561,7 @@ "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", "total_removed": "165.10784124668", - "locked_amount": "1359.29751829450376958", + "locked_amount": "1247.56462776284332054", "deposits": [ { "amount": "30", @@ -3349,7 +3349,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "58408.0357892509808841626", + "locked_amount": "58349.7031275271807221145", "deposits": [ { "amount": "86666.297", @@ -3415,7 +3415,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "810.2848684879935", + "locked_amount": "806.91026276963785", "deposits": [ { "amount": "2500", @@ -3536,7 +3536,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "14360.34196985708425", + "locked_amount": "14336.97649330716525", "deposits": [ { "amount": "12500", @@ -3803,7 +3803,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "11668.32172695", - "locked_amount": "24859.5452539901775", + "locked_amount": "24808.64650475752125", "deposits": [ { "amount": "7500", @@ -4112,7 +4112,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "58354.745805774156731265", + "locked_amount": "58296.4663652644736979915", "deposits": [ { "amount": "129999.45", @@ -4145,7 +4145,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "53847.22726203166320912234", + "locked_amount": "53810.8835054071292707386", "deposits": [ { "amount": "54144.7663", @@ -4178,7 +4178,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "26238.616508117707438", + "locked_amount": "26196.482198122780824", "deposits": [ { "amount": "10000", @@ -4371,7 +4371,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2287.516964738711", + "locked_amount": "2284.15160451547415", "deposits": [ { "amount": "5000", @@ -4582,7 +4582,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "462.77126791799621941416", + "locked_amount": "405.60456575344483061187", "deposits": [ { "amount": "97499.58", @@ -4615,7 +4615,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "133818.54965292963650862", - "locked_amount": "632.5284291174911677262780076", + "locked_amount": "554.3914166779487086967342868", "deposits": [ { "amount": "135173.4239508", @@ -4672,7 +4672,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "194.67988078076183385698", + "locked_amount": "170.63083639627856110929", "deposits": [ { "amount": "32499.86", @@ -4705,7 +4705,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "63.36641206529184468411", + "locked_amount": "55.53868148454478352929", "deposits": [ { "amount": "10833.29", @@ -4738,7 +4738,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "236.87780093259069375252", + "locked_amount": "207.61599572971184611278", "deposits": [ { "amount": "6500", @@ -4890,7 +4890,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "6244.98110415", - "locked_amount": "3479.263063996316175", + "locked_amount": "3448.723814456722875", "deposits": [ { "amount": "7500", @@ -5308,7 +5308,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "318832.4826105484756235168", + "locked_amount": "317526.7710493525900617104", "deposits": [ { "amount": "1852091.69", @@ -39041,7 +39041,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "514435.84482130419597853198", + "locked_amount": "512429.420752227829460135708", "deposits": [ { "amount": "1998.95815", @@ -40423,7 +40423,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "814470.78267520605435452", - "locked_amount": "7123844.0614390012818191165141652491713977", + "locked_amount": "7116729.41051479466949006868895061288618547", "deposits": [ { "amount": "16249.93", @@ -46704,7 +46704,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "5802489.518043560526965506", - "locked_amount": "855242.12505637337177807029953837", + "locked_amount": "848673.9247506211806821697552292785", "deposits": [ { "amount": "129284.449", @@ -54235,7 +54235,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "3381706.364737906998719578", - "locked_amount": "21007.93253090200946798875120985005", + "locked_amount": "18412.7968659549219832486449580318", "deposits": [ { "amount": "552496.6455", @@ -56363,7 +56363,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "40152.1324861581949", - "locked_amount": "81515.300252591901499221960629112", + "locked_amount": "81197.370889637811460062778488072", "deposits": [ { "amount": "3000", From 17ad0cc975111d1a6ca4d2267f63e5696c129cbc Mon Sep 17 00:00:00 2001 From: Joe Tsang <30622993+jtsang586@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:16:42 +0100 Subject: [PATCH 11/12] test(governance): add e2e tests for banner and footer links (#3340) --- apps/governance-e2e/.env | 2 + .../src/integration/view/home.cy.ts | 328 ++++++++++-------- apps/governance/.env.capsule | 2 +- 3 files changed, 189 insertions(+), 143 deletions(-) diff --git a/apps/governance-e2e/.env b/apps/governance-e2e/.env index 7463399fc..de1f22211 100644 --- a/apps/governance-e2e/.env +++ b/apps/governance-e2e/.env @@ -13,6 +13,8 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/ NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz +NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json +NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions #Test configuration variables CYPRESS_FAIRGROUND=false diff --git a/apps/governance-e2e/src/integration/view/home.cy.ts b/apps/governance-e2e/src/integration/view/home.cy.ts index 0cce3da85..248a765b4 100644 --- a/apps/governance-e2e/src/integration/view/home.cy.ts +++ b/apps/governance-e2e/src/integration/view/home.cy.ts @@ -6,159 +6,203 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () { cy.get('nav', { timeout: 10000 }).should('be.visible'); }); - describe('with wallets disconnected', function () { - describe('Links and buttons', function () { - it('should have link for proposal page', function () { - cy.getByTestId('home-proposals').within(() => { - cy.get('[href="/proposals"]') - .should('exist') - .and('have.text', 'Browse, vote, and propose'); - }); - }); - it('should show open or enacted proposals with proposal summary', function () { - cy.get('body').then(($body) => { - if (!$body.find('[data-testid="proposals-list-item"]').length) { - cy.createMarket(); - cy.reload(); - waitForSpinner(); - } - }); - cy.getByTestId('proposals-list-item') - .should('have.length.at.least', 1) - .first() - .within(() => { - cy.getByTestId('proposal-title') - .invoke('text') - .should('not.be.empty'); - cy.getByTestId('proposal-type') - .invoke('text') - .should('not.be.empty'); - cy.getByTestId('proposal-description') - .invoke('text') - .should('not.be.empty'); - cy.getByTestId('proposal-details') - .invoke('text') - .should('not.be.empty'); - cy.getByTestId('proposal-status') - .invoke('text') - .should('not.be.empty'); - cy.getByTestId('vote-details') - .invoke('text') - .should('not.be.empty'); - cy.getByTestId('view-proposal-btn').should('be.visible'); - }); - }); - it('should have external link for governance', function () { - cy.getByTestId('home-proposals').within(() => { - cy.getByTestId('external-link') - .should('have.attr', 'href') - .and('contain', 'https://vega.xyz/governance'); - }); - }); - it('should have link for validator page', function () { - cy.getByTestId('home-validators').within(() => { - cy.get('[href="/validators"]') - .first() - .should('exist') - .and('have.text', 'Browse, and stake'); - }); - }); - it('should have external link for validators', function () { - cy.getByTestId('home-validators').within(() => { - cy.getByTestId('external-link') - .should('have.attr', 'href') - .and( - 'contain', - 'https://community.vega.xyz/c/mainnet-validator-candidates' - ); - }); - }); - it('should have information on active nodes', function () { - cy.getByTestId('node-information') - .first() - .should('contain.text', '2') - .and('contain.text', 'active nodes'); - }); - it('should have information on consensus nodes', function () { - cy.getByTestId('node-information') - .last() - .should('contain.text', '2') - .and('contain.text', 'consensus nodes'); - }); - it('should contain link to specific validators', function () { - cy.getByTestId('validators') - .should('have.length', '2') - .each(($validator) => { - cy.wrap($validator).find('a').should('have.attr', 'href'); - }); - }); - it('should have link for rewards page', function () { - cy.getByTestId('home-rewards').within(() => { - cy.get('[href="/rewards"]') - .first() - .should('exist') - .and('have.text', 'See rewards'); - }); - }); - it('should have link for withdrawal page', function () { - cy.getByTestId('home-vega-token').within(() => { - cy.get('[href="/token/withdraw"]') - .first() - .should('exist') - .and('have.text', 'Manage tokens'); - }); + describe('Links and buttons', function () { + it('should have link for proposal page', function () { + cy.getByTestId('home-proposals').within(() => { + cy.get('[href="/proposals"]') + .should('exist') + .and('have.text', 'Browse, vote, and propose'); }); }); - describe('Mobile view - navigation bar', function () { - before('Change to mobile resolution', function () { - cy.viewport('iphone-xr'); - }); - - it('should have burger button', () => { - cy.getByTestId('button-menu-drawer').should('be.visible').click(); - cy.getByTestId('menu-drawer').should('be.visible'); - }); - - it('should have link for proposal page', function () { - cy.getByTestId('menu-drawer').within(() => { - cy.get('[href="/proposals"]') - .should('exist') - .and('have.text', 'Proposals'); + it('should display announcement banner', function () { + cy.getByTestId('app-announcement') + .should('be.visible') + .within(() => { + cy.getByTestId('external-link').should('exist'); }); + cy.getByTestId('app-announcement-close').should('be.visible').click(); + cy.getByTestId('app-announcement').should('not.exist'); + }); + + it('should show open or enacted proposals with proposal summary', function () { + cy.get('body').then(($body) => { + if (!$body.find('[data-testid="proposals-list-item"]').length) { + cy.createMarket(); + cy.reload(); + waitForSpinner(); + } }); - it('should have link for validator page', function () { - cy.getByTestId('menu-drawer').within(() => { - cy.get('[href="/validators"]') + cy.getByTestId('proposals-list-item') + .should('have.length.at.least', 1) + .first() + .within(() => { + cy.getByTestId('proposal-title') + .invoke('text') + .should('not.be.empty'); + cy.getByTestId('proposal-type').invoke('text').should('not.be.empty'); + cy.getByTestId('proposal-description') + .invoke('text') + .should('not.be.empty'); + cy.getByTestId('proposal-details') + .invoke('text') + .should('not.be.empty'); + cy.getByTestId('proposal-status') + .invoke('text') + .should('not.be.empty'); + cy.getByTestId('vote-details').invoke('text').should('not.be.empty'); + cy.getByTestId('view-proposal-btn').should('be.visible'); + }); + }); + + it('should have external link for governance', function () { + cy.getByTestId('home-proposals').within(() => { + cy.getByTestId('external-link') + .should('have.attr', 'href') + .and('contain', 'https://vega.xyz/governance'); + }); + }); + + it('should have link for validator page', function () { + cy.getByTestId('home-validators').within(() => { + cy.get('[href="/validators"]') + .first() + .should('exist') + .and('have.text', 'Browse, and stake'); + }); + }); + + it('should have external link for validators', function () { + cy.getByTestId('home-validators').within(() => { + cy.getByTestId('external-link') + .should('have.attr', 'href') + .and( + 'contain', + 'https://community.vega.xyz/c/mainnet-validator-candidates' + ); + }); + }); + + it('should have information on active nodes', function () { + cy.getByTestId('node-information') + .first() + .should('contain.text', '2') + .and('contain.text', 'active nodes'); + }); + + it('should have information on consensus nodes', function () { + cy.getByTestId('node-information') + .last() + .should('contain.text', '2') + .and('contain.text', 'consensus nodes'); + }); + + it('should contain link to specific validators', function () { + cy.getByTestId('validators') + .should('have.length', '2') + .each(($validator) => { + cy.wrap($validator).find('a').should('have.attr', 'href'); + }); + }); + + it('should have link for rewards page', function () { + cy.getByTestId('home-rewards').within(() => { + cy.get('[href="/rewards"]') + .first() + .should('exist') + .and('have.text', 'See rewards'); + }); + }); + + it('should have link for withdrawal page', function () { + cy.getByTestId('home-vega-token').within(() => { + cy.get('[href="/token/withdraw"]') + .first() + .should('exist') + .and('have.text', 'Manage tokens'); + }); + }); + + it('should display network data', function () { + cy.getByTestId('git-network-data') + .should('contain.text', 'Reading network data from') + .within(() => { + cy.get('span') .first() - .should('exist') - .and('have.text', 'Validators'); + .should('have.text', 'http://localhost:3028/query'); + cy.getByTestId('link').should('exist'); }); - }); + }); - it('should have link for rewards page', function () { - cy.getByTestId('menu-drawer').within(() => { - cy.get('[href="/rewards"]') - .first() - .should('exist') - .and('have.text', 'Rewards'); + it('should display eth data', function () { + cy.getByTestId('git-eth-data') + .should('contain.text', 'Reading Ethereum data from') + .within(() => { + cy.get('span').should('have.text', 'http://localhost:8545'); }); - }); - it('should have link for withdrawal page', function () { - cy.getByTestId('menu-drawer').within(() => { - cy.get('[href="/token/withdraw"]') - .first() - .should('exist') - .and('have.text', 'Withdraw'); - }); - }); + }); - after(function () { - cy.viewport( - Cypress.config('viewportWidth'), - Cypress.config('viewportHeight') - ); + it('should contain link for known issues on Github', function () { + cy.getByTestId('git-info').within(() => { + cy.contains('Known issues and feedback on') + .find('[data-testid="link"]') + .should( + 'have.attr', + 'href', + 'https://github.com/vegaprotocol/feedback/discussions' + ); }); }); }); + + describe('Mobile view - navigation bar', function () { + before('Change to mobile resolution', function () { + cy.viewport('iphone-xr'); + }); + + it('should have burger button', () => { + cy.getByTestId('button-menu-drawer').should('be.visible').click(); + cy.getByTestId('menu-drawer').should('be.visible'); + }); + + it('should have link for proposal page', function () { + cy.getByTestId('menu-drawer').within(() => { + cy.get('[href="/proposals"]') + .should('exist') + .and('have.text', 'Proposals'); + }); + }); + it('should have link for validator page', function () { + cy.getByTestId('menu-drawer').within(() => { + cy.get('[href="/validators"]') + .first() + .should('exist') + .and('have.text', 'Validators'); + }); + }); + + it('should have link for rewards page', function () { + cy.getByTestId('menu-drawer').within(() => { + cy.get('[href="/rewards"]') + .first() + .should('exist') + .and('have.text', 'Rewards'); + }); + }); + it('should have link for withdrawal page', function () { + cy.getByTestId('menu-drawer').within(() => { + cy.get('[href="/token/withdraw"]') + .first() + .should('exist') + .and('have.text', 'Withdraw'); + }); + }); + + after(function () { + cy.viewport( + Cypress.config('viewportWidth'), + Cypress.config('viewportHeight') + ); + }); + }); }); diff --git a/apps/governance/.env.capsule b/apps/governance/.env.capsule index 37f49fcd2..eeb84ea5b 100644 --- a/apps/governance/.env.capsule +++ b/apps/governance/.env.capsule @@ -5,6 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_FAIRGROUND=false NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions +NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json NX_VEGA_CONFIG_URL='' NX_VEGA_URL=http://localhost:3028/query @@ -16,7 +17,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet NX_DELEGATIONS_PAGINATION=50 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz -NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json #Test configuration variables CYPRESS_FAIRGROUND=false From 7c82144f37160b8cbf73d4e9cf01a1228935d6a8 Mon Sep 17 00:00:00 2001 From: Maciek Date: Mon, 3 Apr 2023 10:20:20 +0200 Subject: [PATCH 12/12] chore(trading): add metaKey detection - clean up some unit tests (#3337) --- libs/fills/src/lib/fills-table.spec.tsx | 35 +----- .../components/order-list/order-list.spec.tsx | 9 +- .../src/lib/positions-table.spec.tsx | 113 ++++++------------ 3 files changed, 46 insertions(+), 111 deletions(-) diff --git a/libs/fills/src/lib/fills-table.spec.tsx b/libs/fills/src/lib/fills-table.spec.tsx index c68567ea4..f1ee45630 100644 --- a/libs/fills/src/lib/fills-table.spec.tsx +++ b/libs/fills/src/lib/fills-table.spec.tsx @@ -7,7 +7,6 @@ import type { Trade } from './fills-data-provider'; import { FillsTable, getFeesBreakdown } from './fills-table'; import { generateFill } from './test-helpers'; -import { MemoryRouter } from 'react-router-dom'; describe('FillsTable', () => { let defaultFill: PartialDeep; @@ -37,11 +36,7 @@ describe('FillsTable', () => { it('correct columns are rendered', async () => { await act(async () => { - render( - - - - ); + render(); }); const headers = screen.getAllByRole('columnheader'); @@ -72,11 +67,7 @@ describe('FillsTable', () => { liquidityFee: '2', }, }); - render( - - - - ); + render(); const cells = screen.getAllByRole('gridcell'); const expectedValues = [ buyerFill.market?.tradableInstrument.instrument.name || '', @@ -109,11 +100,7 @@ describe('FillsTable', () => { liquidityFee: '1', }, }); - render( - - - - ); + render(); const cells = screen.getAllByRole('gridcell'); const expectedValues = [ @@ -142,9 +129,7 @@ describe('FillsTable', () => { aggressor: Schema.Side.SIDE_SELL, }); const { rerender } = render( - - - + ); expect( screen @@ -158,11 +143,7 @@ describe('FillsTable', () => { }, aggressor: Schema.Side.SIDE_BUY, }); - rerender( - - - - ); + rerender(); expect( screen @@ -179,11 +160,7 @@ describe('FillsTable', () => { }, aggressor: Schema.Side.SIDE_SELL, }); - render( - - - - ); + render(); const feeCell = screen .getAllByRole('gridcell') diff --git a/libs/orders/src/lib/components/order-list/order-list.spec.tsx b/libs/orders/src/lib/components/order-list/order-list.spec.tsx index 3d4f56538..20f66106e 100644 --- a/libs/orders/src/lib/components/order-list/order-list.spec.tsx +++ b/libs/orders/src/lib/components/order-list/order-list.spec.tsx @@ -13,7 +13,6 @@ import { limitOrder, marketOrder, } from '../mocks/generate-orders'; -import { MemoryRouter } from 'react-router-dom'; // Mock theme switcher to get around inconsistent mocking of zustand // stores @@ -37,11 +36,9 @@ const generateJsx = ( ) => { return ( - - - - - + + + ); }; diff --git a/libs/positions/src/lib/positions-table.spec.tsx b/libs/positions/src/lib/positions-table.spec.tsx index dc71063c7..e5fa8cddb 100644 --- a/libs/positions/src/lib/positions-table.spec.tsx +++ b/libs/positions/src/lib/positions-table.spec.tsx @@ -6,7 +6,6 @@ import type { Position } from './positions-data-providers'; import * as Schema from '@vegaprotocol/types'; import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types'; import type { ICellRendererParams } from 'ag-grid-community'; -import { MemoryRouter } from 'react-router-dom'; const singleRow: Position = { marketName: 'ETH/BTC (31 july 2022)', @@ -38,9 +37,7 @@ const singleRowData = [singleRow]; it('should render successfully', async () => { await act(async () => { const { baseElement } = render( - - - + ); expect(baseElement).toBeTruthy(); }); @@ -48,11 +45,7 @@ it('should render successfully', async () => { it('render correct columns', async () => { await act(async () => { - render( - - - - ); + render(); }); const headers = screen.getAllByRole('columnheader'); @@ -76,11 +69,7 @@ it('render correct columns', async () => { it('renders market name', async () => { await act(async () => { - render( - - - - ); + render(); }); expect(screen.getByText('ETH/BTC (31 july 2022)')).toBeTruthy(); }); @@ -91,11 +80,7 @@ it('Does not fail if the market name does not match the split pattern', async () Object.assign({}, singleRow, { marketName: breakingMarketName }), ]; await act(async () => { - render( - - - - ); + render(); }); expect(screen.getByText(breakingMarketName)).toBeTruthy(); @@ -105,9 +90,7 @@ it('add color and sign to amount, displays positive notional value', async () => let result: RenderResult; await act(async () => { result = render( - - - + ); }); let cells = screen.getAllByRole('gridcell'); @@ -118,12 +101,10 @@ it('add color and sign to amount, displays positive notional value', async () => expect(cells[1].textContent).toEqual('1,230.0'); await act(async () => { result.rerender( - - - + ); }); cells = screen.getAllByRole('gridcell'); @@ -137,9 +118,7 @@ it('displays mark price', async () => { let result: RenderResult; await act(async () => { result = render( - - - + ); }); @@ -148,18 +127,16 @@ it('displays mark price', async () => { await act(async () => { result.rerender( - - - + ); }); @@ -169,11 +146,7 @@ it('displays mark price', async () => { it('displays leverage', async () => { await act(async () => { - render( - - - - ); + render(); }); const cells = screen.getAllByRole('gridcell'); expect(cells[6].textContent).toEqual('1.1'); @@ -181,11 +154,7 @@ it('displays leverage', async () => { it('displays allocated margin', async () => { await act(async () => { - render( - - - - ); + render(); }); const cells = screen.getAllByRole('gridcell'); const cell = cells[7]; @@ -194,11 +163,7 @@ it('displays allocated margin', async () => { it('displays realised and unrealised PNL', async () => { await act(async () => { - render( - - - - ); + render(); }); const cells = screen.getAllByRole('gridcell'); expect(cells[9].textContent).toEqual('4.56'); @@ -207,15 +172,13 @@ it('displays realised and unrealised PNL', async () => { it('displays close button', async () => { await act(async () => { render( - - { - return; - }} - isReadOnly={false} - /> - + { + return; + }} + isReadOnly={false} + /> ); }); const cells = screen.getAllByRole('gridcell'); @@ -225,15 +188,13 @@ it('displays close button', async () => { it('do not display close button if openVolume is zero', async () => { await act(async () => { render( - - { - return; - }} - isReadOnly={false} - /> - + { + return; + }} + isReadOnly={false} + /> ); }); const cells = screen.getAllByRole('gridcell');