From a1515e980c75ca4f2a37e5ab1ab79d0220a055bd Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Fri, 1 Jul 2022 18:04:28 +0000 Subject: [PATCH 01/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 132 +++++++++++++----- apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 101 insertions(+), 37 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index a521fa343..81b7a75bb 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123771.490322542830121935", + "locked_amount": "123652.94083592799939009", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64630.503793473215764854", + "locked_amount": "64514.21779048826240256", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "88338.74069468335043789037108", + "locked_amount": "88179.79780454381915063008248", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27188.936836812527603638", + "locked_amount": "27140.01732350862052375", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8849.73510518450376725", + "locked_amount": "8833.812278307801706974", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "15009.77977807970925", + "locked_amount": "14948.671025815218", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1784450.526715937253657224", + "locked_amount": "1781794.505417635002809684", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14174.3154725799324512925372029368", + "locked_amount": "14096.2587620904936880451685496979", "deposits": [ { "amount": "2833.333333", @@ -3239,8 +3239,8 @@ "tranche_id": 10, "tranche_start": "2021-07-15T23:37:11.000Z", "tranche_end": "2021-07-15T23:37:11.000Z", - "total_added": "3710968.150000000000000001", - "total_removed": "3702778.640000000000000001", + "total_added": "3777968.150000000000000001", + "total_removed": "3769778.640000000000000001", "locked_amount": "0", "deposits": [ { @@ -3258,6 +3258,11 @@ "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", "tx": "0x66d007fc762ef9b7d2c0b57434295d06dfbafb9aeb5884cedc650f5f0c98d68f" }, + { + "amount": "67000", + "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", + "tx": "0x83e5d244c5a64cd83651a00617537028952644542974d051a3f7b521e2cf3597" + }, { "amount": "40000", "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", @@ -3690,6 +3695,11 @@ "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", "tx": "0x25c796bbfae4d91dca908b1ea7c50f6ea26b38d5350862b154a7963802bc3497" }, + { + "amount": "67000", + "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", + "tx": "0xc1f88f4a54c58fe57044170cccc159ae116dc6fef9e15f14887526710bf31b49" + }, { "amount": "40000", "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", @@ -4068,6 +4078,12 @@ "tranche_id": 10, "tx": "0x66d007fc762ef9b7d2c0b57434295d06dfbafb9aeb5884cedc650f5f0c98d68f" }, + { + "amount": "67000", + "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", + "tranche_id": 10, + "tx": "0x83e5d244c5a64cd83651a00617537028952644542974d051a3f7b521e2cf3597" + }, { "amount": "40000", "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", @@ -4160,6 +4176,12 @@ "tranche_id": 10, "tx": "0x25c796bbfae4d91dca908b1ea7c50f6ea26b38d5350862b154a7963802bc3497" }, + { + "amount": "67000", + "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", + "tranche_id": 10, + "tx": "0xc1f88f4a54c58fe57044170cccc159ae116dc6fef9e15f14887526710bf31b49" + }, { "amount": "40000", "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f", @@ -4227,8 +4249,8 @@ "tx": "0xac16a4ce688d40a482a59914d68c3a676592f8804ee8f0781b66a4ba5ccfbdfc" } ], - "total_tokens": "564651", - "withdrawn_tokens": "564651", + "total_tokens": "631651", + "withdrawn_tokens": "631651", "remaining_tokens": "0" }, { @@ -5226,9 +5248,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19457.000000000000000003", + "total_added": "19479.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3398.13272038305485656052394501522070024", + "locked_amount": "3375.30562871004610653051983761415525121", "deposits": [ { "amount": "75", @@ -5265,6 +5287,21 @@ "user": "0xB2BddeEb907797F9be51E3f9f75824f83cD71B67", "tx": "0x09792a45790c762f046f34979cbbe7687661ce7643da9ba6bc9c128710191b46" }, + { + "amount": "10", + "user": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", + "tx": "0x94f937a35cad50e22f4484288d5aa7afc9a725ea08b2be0610da02f037a3b42b" + }, + { + "amount": "10", + "user": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", + "tx": "0xf0ea80ce8cb2489b9e5ee52d7a2641a1ee3b35c7136e3f4164097f8b95e56c7a" + }, + { + "amount": "2", + "user": "0xe755dC26fB680E1A3f977d74421adBE720C5Ccbe", + "tx": "0xd00a311d6d2dd1ef04ce275e86407b257cd91806c0ad5300e00b377689ebba5e" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8689,6 +8726,48 @@ "withdrawn_tokens": "0", "remaining_tokens": "2" }, + { + "address": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", + "deposits": [ + { + "amount": "10", + "user": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", + "tranche_id": 11, + "tx": "0x94f937a35cad50e22f4484288d5aa7afc9a725ea08b2be0610da02f037a3b42b" + }, + { + "amount": "10", + "user": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", + "tranche_id": 11, + "tx": "0xf0ea80ce8cb2489b9e5ee52d7a2641a1ee3b35c7136e3f4164097f8b95e56c7a" + }, + { + "amount": "2", + "user": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", + "tranche_id": 11, + "tx": "0x49f0ba8366b426e48703e022e91679a2c7d4b56d35a92dc2c0a4746e0a4641ec" + } + ], + "withdrawals": [], + "total_tokens": "22", + "withdrawn_tokens": "0", + "remaining_tokens": "22" + }, + { + "address": "0xe755dC26fB680E1A3f977d74421adBE720C5Ccbe", + "deposits": [ + { + "amount": "2", + "user": "0xe755dC26fB680E1A3f977d74421adBE720C5Ccbe", + "tranche_id": 11, + "tx": "0xd00a311d6d2dd1ef04ce275e86407b257cd91806c0ad5300e00b377689ebba5e" + } + ], + "withdrawals": [], + "total_tokens": "2", + "withdrawn_tokens": "0", + "remaining_tokens": "2" + }, { "address": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", "deposits": [ @@ -10783,21 +10862,6 @@ "withdrawn_tokens": "526.9148541318", "remaining_tokens": "533.0851458682" }, - { - "address": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", - "deposits": [ - { - "amount": "2", - "user": "0x2e44fCe3FDd9ea80eF3E6242121a76D08DCb31d2", - "tranche_id": 11, - "tx": "0x49f0ba8366b426e48703e022e91679a2c7d4b56d35a92dc2c0a4746e0a4641ec" - } - ], - "withdrawals": [], - "total_tokens": "2", - "withdrawn_tokens": "0", - "remaining_tokens": "2" - }, { "address": "0x2BaB5247D173131F8243ae348464B093E50D0726", "deposits": [ @@ -14143,7 +14207,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2766580.5046049960554378523", + "locked_amount": "2762499.1245979052625425817", "deposits": [ { "amount": "1998.95815", @@ -14856,7 +14920,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9334.9335972441156", - "locked_amount": "15032447.2480229303798974414774589251797783", + "locked_amount": "15018049.0299908649869471031432296321938362", "deposits": [ { "amount": "16249.93", @@ -17007,7 +17071,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2159399.571956092952408927", - "locked_amount": "8227829.74049486209436849383466922", + "locked_amount": "8214468.99496572665119571822171721", "deposits": [ { "amount": "129284.449", @@ -21198,7 +21262,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2933961.88842931001107719366680201", + "locked_amount": "2928682.9770656322893606632792211", "deposits": [ { "amount": "552496.6455", @@ -22354,7 +22418,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "75.634316334", - "locked_amount": "438380.49540303746176025562354132", + "locked_amount": "437733.77741075118798344909893452", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index f60b21a07..2cc4065fd 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.63611745306951", + "locked_amount": "40.49918822932521", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "309.75924657534241", + "locked_amount": "308.253025114155275", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 82f032d4a..19e2bab6d 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "284.4153082191780310002815993150684931", + "locked_amount": "283.03232305936075250028023002283105025", "deposits": [ { "amount": "1000", From 46bdf17f1ade79e7d9b1963adf0b4e6476e0eba5 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 2 Jul 2022 00:09:30 +0000 Subject: [PATCH 02/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 62 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 81b7a75bb..6433f21b2 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123652.94083592799939009", + "locked_amount": "123592.80258164157766098", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64514.21779048826240256", + "locked_amount": "64455.227765165073604026", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "88179.79780454381915063008248", + "locked_amount": "88099.1686241300256953424288", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27140.01732350862052375", + "locked_amount": "27115.201238558400015396", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8833.812278307801706974", + "locked_amount": "8825.734883466094395971", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14948.671025815218", + "locked_amount": "14917.67153532608625", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1781794.505417635002809684", + "locked_amount": "1780447.148387347703826732", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14096.2587620904936880451685496979", + "locked_amount": "14056.6618440588950259799382632108", "deposits": [ { "amount": "2833.333333", @@ -5250,7 +5250,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19479.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3375.30562871004610653051983761415525121", + "locked_amount": "3361.7766923515991193005177539954337901", "deposits": [ { "amount": "75", @@ -14207,7 +14207,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2762499.1245979052625425817", + "locked_amount": "2760428.70594224804367076871", "deposits": [ { "amount": "1998.95815", @@ -14919,8 +14919,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", - "total_removed": "9334.9335972441156", - "locked_amount": "15018049.0299908649869471031432296321938362", + "total_removed": "9537.99183463793955", + "locked_amount": "15010745.0447775256673940707909329682806164", "deposits": [ { "amount": "16249.93", @@ -15469,6 +15469,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0xa8bd86154d3a5c4db84fa8f2f26199b14625b9977690fc175d349a668f2e26b8" }, + { + "amount": "203.05823739382395", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x5df689a85b28b4b8189e7ab8bba19ed4b0ff71e6d399af5b9096271cd56b1ef8" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15621,6 +15626,12 @@ "tranche_id": 2, "tx": "0xa8bd86154d3a5c4db84fa8f2f26199b14625b9977690fc175d349a668f2e26b8" }, + { + "amount": "203.05823739382395", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x5df689a85b28b4b8189e7ab8bba19ed4b0ff71e6d399af5b9096271cd56b1ef8" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15665,8 +15676,8 @@ } ], "total_tokens": "194999.1675", - "withdrawn_tokens": "9334.9335972441156", - "remaining_tokens": "185664.2339027558844" + "withdrawn_tokens": "9537.99183463793955", + "remaining_tokens": "185461.17566536206045" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -17070,8 +17081,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "2159399.571956092952408927", - "locked_amount": "8214468.99496572665119571822171721", + "total_removed": "2159777.137895419323307927", + "locked_amount": "8207691.30292309429307130177097206", "deposits": [ { "amount": "129284.449", @@ -17360,6 +17371,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xab622bab50344a6084b801420f43550a461b7d47402f9db0323258d02489ee9b" }, + { + "amount": "377.565939326370899", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xce2bb0d889d5efdd4c34dcd1972c0520db2c683fcc6012d169fa4fd94f982146" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -19008,6 +19024,12 @@ "tranche_id": 3, "tx": "0xab622bab50344a6084b801420f43550a461b7d47402f9db0323258d02489ee9b" }, + { + "amount": "377.565939326370899", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xce2bb0d889d5efdd4c34dcd1972c0520db2c683fcc6012d169fa4fd94f982146" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -20246,8 +20268,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "156693.3672870004635365", - "remaining_tokens": "202430.1022879995364635" + "withdrawn_tokens": "157070.9332263268344355", + "remaining_tokens": "202052.5363486731655645" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -21262,7 +21284,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2928682.9770656322893606632792211", + "locked_amount": "2926005.0699484477358119890788672", "deposits": [ { "amount": "552496.6455", @@ -22418,7 +22440,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "75.634316334", - "locked_amount": "437733.77741075118798344909893452", + "locked_amount": "437405.70773974471745061692846268", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 2cc4065fd..df9c43f75 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.49918822932521", + "locked_amount": "40.42974695585997", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "308.253025114155275", + "locked_amount": "307.48917110603747", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 19e2bab6d..88de427f0 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "283.03232305936075250028023002283105025", + "locked_amount": "282.3309661973616770002795356100963977", "deposits": [ { "amount": "1000", From d843c61570a9fa91737991d1ca45f77a58bce263 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 2 Jul 2022 06:04:28 +0000 Subject: [PATCH 03/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 94 ++++++++++++++++--- apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 82 insertions(+), 18 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 6433f21b2..f04fe30ed 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123592.80258164157766098", + "locked_amount": "123534.32545340379722355", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64455.227765165073604026", + "locked_amount": "64397.867149754708522136", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "88099.1686241300256953424288", + "locked_amount": "88020.76656576116138495894676", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27115.201238558400015396", + "locked_amount": "27091.07061822010340138", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8825.734883466094395971", + "locked_amount": "8817.880600703976030138", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14917.67153532608625", + "locked_amount": "14887.52830615942125", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1780447.148387347703826732", + "locked_amount": "1779137.007765923335206456", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14056.6618440588950259799382632108", + "locked_amount": "14018.158663661824795521921503671", "deposits": [ { "amount": "2833.333333", @@ -5248,9 +5248,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19479.000000000000000003", + "total_added": "19539.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3361.7766923515991193005177539954337901", + "locked_amount": "3358.93600799086849272051572792998477944", "deposits": [ { "amount": "75", @@ -5302,6 +5302,31 @@ "user": "0xe755dC26fB680E1A3f977d74421adBE720C5Ccbe", "tx": "0xd00a311d6d2dd1ef04ce275e86407b257cd91806c0ad5300e00b377689ebba5e" }, + { + "amount": "25", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tx": "0x41b05e4dab4204b5ef837fb9d4c40884681abc70f3c02c2e51755876212dd714" + }, + { + "amount": "10", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tx": "0x9c2dbd306c1a4784fd2bb73304fb1e8b34ebe0e11ea0834d64c9c47174405866" + }, + { + "amount": "5", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tx": "0x4d3223da4c0f6d7f017aa0e178f847ac243a257f981afe6da172d7229025cd88" + }, + { + "amount": "10", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tx": "0x3d09422191a20d1a1b7ea1d92426766fbfad22768ca6ef158418ab6c17ae1820" + }, + { + "amount": "10", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tx": "0x1bcb767534313d3561ccd943339d0eeb653e0c613a1044cdfb3b570f16cb0487" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8768,6 +8793,45 @@ "withdrawn_tokens": "0", "remaining_tokens": "2" }, + { + "address": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "deposits": [ + { + "amount": "25", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tranche_id": 11, + "tx": "0x41b05e4dab4204b5ef837fb9d4c40884681abc70f3c02c2e51755876212dd714" + }, + { + "amount": "10", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tranche_id": 11, + "tx": "0x9c2dbd306c1a4784fd2bb73304fb1e8b34ebe0e11ea0834d64c9c47174405866" + }, + { + "amount": "5", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tranche_id": 11, + "tx": "0x4d3223da4c0f6d7f017aa0e178f847ac243a257f981afe6da172d7229025cd88" + }, + { + "amount": "10", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tranche_id": 11, + "tx": "0x3d09422191a20d1a1b7ea1d92426766fbfad22768ca6ef158418ab6c17ae1820" + }, + { + "amount": "10", + "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", + "tranche_id": 11, + "tx": "0x1bcb767534313d3561ccd943339d0eeb653e0c613a1044cdfb3b570f16cb0487" + } + ], + "withdrawals": [], + "total_tokens": "60", + "withdrawn_tokens": "0", + "remaining_tokens": "60" + }, { "address": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", "deposits": [ @@ -14207,7 +14271,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2760428.70594224804367076871", + "locked_amount": "2758415.47594963582857109576", "deposits": [ { "amount": "1998.95815", @@ -14920,7 +14984,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9537.99183463793955", - "locked_amount": "15010745.0447775256673940707909329682806164", + "locked_amount": "15003642.808687780515255576725026362314139", "deposits": [ { "amount": "16249.93", @@ -17082,7 +17146,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2159777.137895419323307927", - "locked_amount": "8207691.30292309429307130177097206", + "locked_amount": "8201100.82284621368087360193757608", "deposits": [ { "amount": "129284.449", @@ -21284,7 +21348,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2926005.0699484477358119890788672", + "locked_amount": "2923401.13141117985884576813755272", "deposits": [ { "amount": "552496.6455", @@ -22440,7 +22504,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "75.634316334", - "locked_amount": "437405.70773974471745061692846268", + "locked_amount": "437086.6999393020103686729883308", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index df9c43f75..336e206c2 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.42974695585997", + "locked_amount": "40.362201927955355", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "307.48917110603747", + "locked_amount": "306.746175799086727", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 88de427f0..950b82d47 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "282.3309661973616770002795356100963977", + "locked_amount": "281.64876141552508570027886015981735157", "deposits": [ { "amount": "1000", From a50c28713ae38be098719a667837938e19bb7991 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 2 Jul 2022 12:04:54 +0000 Subject: [PATCH 04/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 87 ++++++++++++++----- apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index f04fe30ed..ed36354c7 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123534.32545340379722355", + "locked_amount": "123474.94774773798817842", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64397.867149754708522136", + "locked_amount": "64339.62315178003560957", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "88020.76656576116138495894676", + "locked_amount": "87941.15707593654610183564092", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27091.07061822010340138", + "locked_amount": "27066.568374092203373154", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8817.880600703976030138", + "locked_amount": "8809.905358004494349125", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14887.52830615942125", + "locked_amount": "14856.9208559782605", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1779137.007765923335206456", + "locked_amount": "1777806.690314569947603714", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14018.158663661824795521921503671", + "locked_amount": "13979.0625147620699110713437916606", "deposits": [ { "amount": "2833.333333", @@ -5248,9 +5248,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19539.000000000000000003", - "total_removed": "5056.88782409978", - "locked_amount": "3358.93600799086849272051572792998477944", + "total_added": "19551.000000000000000003", + "total_removed": "5115.42263510978", + "locked_amount": "3347.59170490867598805051367066210045665", "deposits": [ { "amount": "75", @@ -5327,6 +5327,11 @@ "user": "0xad7e213fb8354609574B6ab5871B18244c347a46", "tx": "0x1bcb767534313d3561ccd943339d0eeb653e0c613a1044cdfb3b570f16cb0487" }, + { + "amount": "12", + "user": "0x8420818ee975a76C47A21e135c14C57A681d8254", + "tx": "0x9c8ba32a35eb20c1fd5dea83beb9584bbc946a1c26c162eb120d4503ecca1098" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8354,6 +8359,11 @@ "user": "0xc5467213593778E528f0eB8117cc7AFBC5b7491b", "tx": "0xfbca378f6263977884e6eebc653c8d68f39b6c8eb6ce2f6668767ed63bfcc55b" }, + { + "amount": "58.53481101", + "user": "0x65623CE02BEFCc862D069e463A88D784dA35332F", + "tx": "0x27589128002933008eef3a3daf1ba761c2b34cc7c1b42d73520e59ad70337f2f" + }, { "amount": "8.25227042", "user": "0xc5467213593778E528f0eB8117cc7AFBC5b7491b", @@ -8832,6 +8842,21 @@ "withdrawn_tokens": "0", "remaining_tokens": "60" }, + { + "address": "0x8420818ee975a76C47A21e135c14C57A681d8254", + "deposits": [ + { + "amount": "12", + "user": "0x8420818ee975a76C47A21e135c14C57A681d8254", + "tranche_id": 11, + "tx": "0x9c8ba32a35eb20c1fd5dea83beb9584bbc946a1c26c162eb120d4503ecca1098" + } + ], + "withdrawals": [], + "total_tokens": "12", + "withdrawn_tokens": "0", + "remaining_tokens": "12" + }, { "address": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", "deposits": [ @@ -14057,6 +14082,12 @@ } ], "withdrawals": [ + { + "amount": "58.53481101", + "user": "0x65623CE02BEFCc862D069e463A88D784dA35332F", + "tranche_id": 11, + "tx": "0x27589128002933008eef3a3daf1ba761c2b34cc7c1b42d73520e59ad70337f2f" + }, { "amount": "31.271429478", "user": "0x65623CE02BEFCc862D069e463A88D784dA35332F", @@ -14071,8 +14102,8 @@ } ], "total_tokens": "200", - "withdrawn_tokens": "107.101116184", - "remaining_tokens": "92.898883816" + "withdrawn_tokens": "165.635927194", + "remaining_tokens": "34.364072806" }, { "address": "0x3f626D48C2a6104976A03009cFDB4A48F32fd282", @@ -14271,7 +14302,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2758415.47594963582857109576", + "locked_amount": "2756371.24119424885209647983", "deposits": [ { "amount": "1998.95815", @@ -14984,7 +15015,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9537.99183463793955", - "locked_amount": "15003642.808687780515255576725026362314139", + "locked_amount": "14996431.1945607804095669695175086287996756", "deposits": [ { "amount": "16249.93", @@ -17146,7 +17177,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2159777.137895419323307927", - "locked_amount": "8201100.82284621368087360193757608", + "locked_amount": "8194408.84603418034323106710000208", "deposits": [ { "amount": "129284.449", @@ -21348,7 +21379,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2923401.13141117985884576813755272", + "locked_amount": "2920757.09090000714061032429498099", "deposits": [ { "amount": "552496.6455", @@ -22503,8 +22534,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "75.634316334", - "locked_amount": "437086.6999393020103686729883308", + "total_removed": "90.683707504", + "locked_amount": "436762.77925696689823011737290716", "deposits": [ { "amount": "3000", @@ -29137,6 +29168,11 @@ "amount": "41.461263318", "user": "0x6EfF23b65688CaE71Af19128A7674b7Dd53f7f19", "tx": "0x16a1ae4e6602247b005985fff7824f896a344caa9b6be09f4eacd3df840fa36c" + }, + { + "amount": "15.04939117", + "user": "0xe2311b0A4614BE4E839213aBbF8989127acAd455", + "tx": "0x5ba79123548cfb6b3b9a91fba83adbdbea84ed3f95f8d77464171c6776730eac" } ], "users": [ @@ -35063,10 +35099,17 @@ "tx": "0xc7dd4c2b995cc486fcd8b7892cd79f8fb393ada004dc68cf66ec82d99b35763c" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "15.04939117", + "user": "0xe2311b0A4614BE4E839213aBbF8989127acAd455", + "tranche_id": 5, + "tx": "0x5ba79123548cfb6b3b9a91fba83adbdbea84ed3f95f8d77464171c6776730eac" + } + ], "total_tokens": "200", - "withdrawn_tokens": "0", - "remaining_tokens": "200" + "withdrawn_tokens": "15.04939117", + "remaining_tokens": "184.95060883" }, { "address": "0xE35187d2c191b19d70C008CDB90fC05b46154e98", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 336e206c2..76a4cdc21 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.362201927955355", + "locked_amount": "40.29362633181126", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "306.746175799086727", + "locked_amount": "305.991844241501825", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 950b82d47..1512c79f4 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "281.64876141552508570027886015981735157", + "locked_amount": "280.95614789446985750027817440385591075", "deposits": [ { "amount": "1000", From 806b8605e99aeae2162cbe82eece565e8f547128 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 2 Jul 2022 18:05:21 +0000 Subject: [PATCH 05/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 82 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index ed36354c7..cf42a7e04 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123474.94774773798817842", + "locked_amount": "123415.567296409292448495", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64339.62315178003560957", + "locked_amount": "64281.376460565835644174", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87941.15707593654610183564092", + "locked_amount": "87861.54390491846383610961768", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27066.568374092203373154", + "locked_amount": "27042.064996964944728574", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8809.905358004494349125", + "locked_amount": "8801.929746524714045207", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14856.9208559782605", + "locked_amount": "14826.3119904891285", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1777806.690314569947603714", + "locked_amount": "1776476.311348491135304012", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13979.0625147620699110713437916606", + "locked_amount": "13939.9645580315160048453822455076", "deposits": [ { "amount": "2833.333333", @@ -5250,7 +5250,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19551.000000000000000003", "total_removed": "5115.42263510978", - "locked_amount": "3347.59170490867598805051367066210045665", + "locked_amount": "3334.1838701484025377005116132990867581", "deposits": [ { "amount": "75", @@ -14302,7 +14302,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2756371.24119424885209647983", + "locked_amount": "2754326.91191214600560114325", "deposits": [ { "amount": "1998.95815", @@ -15014,8 +15014,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", - "total_removed": "9537.99183463793955", - "locked_amount": "14996431.1945607804095669695175086287996756", + "total_removed": "9847.4472493957209", + "locked_amount": "14989219.2469641549694390272160628041646391", "deposits": [ { "amount": "16249.93", @@ -15569,6 +15569,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x5df689a85b28b4b8189e7ab8bba19ed4b0ff71e6d399af5b9096271cd56b1ef8" }, + { + "amount": "309.45541475778135", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x5ef2932425e8419e9387e18af563f265214f8d6bc2e04092748bdd78d3ba5a39" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15727,6 +15732,12 @@ "tranche_id": 2, "tx": "0x5df689a85b28b4b8189e7ab8bba19ed4b0ff71e6d399af5b9096271cd56b1ef8" }, + { + "amount": "309.45541475778135", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x5ef2932425e8419e9387e18af563f265214f8d6bc2e04092748bdd78d3ba5a39" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15771,8 +15782,8 @@ } ], "total_tokens": "194999.1675", - "withdrawn_tokens": "9537.99183463793955", - "remaining_tokens": "185461.17566536206045" + "withdrawn_tokens": "9847.4472493957209", + "remaining_tokens": "185151.7202506042791" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -17176,8 +17187,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "2159777.137895419323307927", - "locked_amount": "8194408.84603418034323106710000208", + "total_removed": "2160347.510107733344730427", + "locked_amount": "8187716.55978088078870044157955187", "deposits": [ { "amount": "129284.449", @@ -17471,6 +17482,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xce2bb0d889d5efdd4c34dcd1972c0520db2c683fcc6012d169fa4fd94f982146" }, + { + "amount": "570.3722123140214225", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xb615df4e7234ecec4811186115b7979a297d7527a15303751942ede44aadc045" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -19125,6 +19141,12 @@ "tranche_id": 3, "tx": "0xce2bb0d889d5efdd4c34dcd1972c0520db2c683fcc6012d169fa4fd94f982146" }, + { + "amount": "570.3722123140214225", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xb615df4e7234ecec4811186115b7979a297d7527a15303751942ede44aadc045" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -20363,8 +20385,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "157070.9332263268344355", - "remaining_tokens": "202052.5363486731655645" + "withdrawn_tokens": "157641.305438640855858", + "remaining_tokens": "201482.164136359144142" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -21379,7 +21401,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2920757.09090000714061032429498099", + "locked_amount": "2918112.92812671873728071453078982", "deposits": [ { "amount": "552496.6455", @@ -22535,7 +22557,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "90.683707504", - "locked_amount": "436762.77925696689823011737290716", + "locked_amount": "436438.84359633332586053444140032", "deposits": [ { "amount": "3000", @@ -48237,7 +48259,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "32535.6624708206377", + "total_removed": "32785.6624708206377", "locked_amount": "0", "deposits": [ { @@ -52557,6 +52579,11 @@ "user": "0x2fCBC94236FeF3e5173a7ec27a25925cd2304540", "tx": "0xf44b015cc0a7f3c369d48e8c9b71985ad5280c709fd7d541c4d3194dac79482d" }, + { + "amount": "250", + "user": "0xfac0752f644599A63295A9c76903Bb533B945d1C", + "tx": "0x0e8f9c91c9e80efe3e632cfbab44ed30db2c431c231a6ed8e1ab60eaef93e0fd" + }, { "amount": "183.6335597275", "user": "0x690Fc36d52eD3f198F0eBDea1557333a1766f786", @@ -61396,10 +61423,17 @@ "tx": "0x06dfa508f6d82e3ebfc0ff5f3deeab5e36f69c3258e2264b29d3bad4d075c808" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "250", + "user": "0xfac0752f644599A63295A9c76903Bb533B945d1C", + "tranche_id": 6, + "tx": "0x0e8f9c91c9e80efe3e632cfbab44ed30db2c431c231a6ed8e1ab60eaef93e0fd" + } + ], "total_tokens": "250", - "withdrawn_tokens": "0", - "remaining_tokens": "250" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0x3B7aD4171ea02a8C95847511A8EDCf099eEec462", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 76a4cdc21..6d4dd78ba 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.29362633181126", + "locked_amount": "40.22505707762557", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "305.991844241501825", + "locked_amount": "305.23758244545907", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 1512c79f4..0484bbe59 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "280.95614789446985750027817440385591075", + "locked_amount": "280.2635984271942370002774887113140537", "deposits": [ { "amount": "1000", From a585c39dcfcb6822b78ac7c6d3c4a6fe8cb2870c Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 3 Jul 2022 00:10:16 +0000 Subject: [PATCH 06/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 50 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index cf42a7e04..ae15441ab 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123415.567296409292448495", + "locked_amount": "123355.45100742600319758", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64281.376460565835644174", + "locked_amount": "64222.407981158843768364", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87861.54390491846383610961768", + "locked_amount": "87780.94417405239272430130812", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27042.064996964944728574", + "locked_amount": "27017.257976009593151052", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8801.929746524714045207", + "locked_amount": "8793.855301925381634167", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14826.3119904891285", + "locked_amount": "14795.323822463769", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1776476.311348491135304012", + "locked_amount": "1775129.44643600723389674", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13939.9645580315160048453822455076", + "locked_amount": "13900.3821026463271828165558688386", "deposits": [ { "amount": "2833.333333", @@ -5248,9 +5248,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19551.000000000000000003", + "total_added": "19556.000000000000000003", "total_removed": "5115.42263510978", - "locked_amount": "3334.1838701484025377005116132990867581", + "locked_amount": "3321.45910400811735472050953044140030436", "deposits": [ { "amount": "75", @@ -5332,6 +5332,11 @@ "user": "0x8420818ee975a76C47A21e135c14C57A681d8254", "tx": "0x9c8ba32a35eb20c1fd5dea83beb9584bbc946a1c26c162eb120d4503ecca1098" }, + { + "amount": "5", + "user": "0x367e9C3Ac0e28C1536d5503de72BfEA24fA4Ed8A", + "tx": "0x982cc9aec7477a4688b952257df4891059fa12c606b1580a10dfb14afda08e4c" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8857,6 +8862,21 @@ "withdrawn_tokens": "0", "remaining_tokens": "12" }, + { + "address": "0x367e9C3Ac0e28C1536d5503de72BfEA24fA4Ed8A", + "deposits": [ + { + "amount": "5", + "user": "0x367e9C3Ac0e28C1536d5503de72BfEA24fA4Ed8A", + "tranche_id": 11, + "tx": "0x982cc9aec7477a4688b952257df4891059fa12c606b1580a10dfb14afda08e4c" + } + ], + "withdrawals": [], + "total_tokens": "5", + "withdrawn_tokens": "0", + "remaining_tokens": "5" + }, { "address": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", "deposits": [ @@ -14302,7 +14322,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2754326.91191214600560114325", + "locked_amount": "2752257.24947021500042140204", "deposits": [ { "amount": "1998.95815", @@ -15015,7 +15035,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9847.4472493957209", - "locked_amount": "14989219.2469641549694390272160628041646391", + "locked_amount": "14981917.9295078230620565952564907792160044", "deposits": [ { "amount": "16249.93", @@ -17188,7 +17208,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2160347.510107733344730427", - "locked_amount": "8187716.55978088078870044157955187", + "locked_amount": "8180941.34326837524613954166235642", "deposits": [ { "amount": "129284.449", @@ -21401,7 +21421,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2918112.92812671873728071453078982", + "locked_amount": "2915435.99910645966448536770339144", "deposits": [ { "amount": "552496.6455", @@ -22557,7 +22577,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "90.683707504", - "locked_amount": "436438.84359633332586053444140032", + "locked_amount": "436110.89375171448994035879959412", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 6d4dd78ba..ca5051d53 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.22505707762557", + "locked_amount": "40.15561897513952", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "305.23758244545907", + "locked_amount": "304.47376331811263", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 0484bbe59..1ccef1779 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "280.2635984271942370002774887113140537", + "locked_amount": "279.5622735920852330002767943302891933", "deposits": [ { "amount": "1000", From c470740a41d0d1ad7532ec0ec911d7771ee421db Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 3 Jul 2022 06:04:24 +0000 Subject: [PATCH 07/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 60 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index ae15441ab..cb9dbd828 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123355.45100742600319758", + "locked_amount": "123297.111162332725999185", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64222.407981158843768364", + "locked_amount": "64165.182027724743578352", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87780.94417405239272430130812", + "locked_amount": "87702.7261753566612665753748", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27017.257976009593151052", + "locked_amount": "26993.18400563922410475", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8793.855301925381634167", + "locked_amount": "8786.019458178104497277", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14795.323822463769", + "locked_amount": "14765.251358695653", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1775129.44643600723389674", + "locked_amount": "1773822.381550852354188922", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13900.3821026463271828165558688386", + "locked_amount": "13861.969313789303071127730296486", "deposits": [ { "amount": "2833.333333", @@ -5249,8 +5249,8 @@ "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19556.000000000000000003", - "total_removed": "5115.42263510978", - "locked_amount": "3321.45910400811735472050953044140030436", + "total_removed": "5173.44789563774", + "locked_amount": "3308.28286453576790092050750913242009121", "deposits": [ { "amount": "75", @@ -8369,6 +8369,16 @@ "user": "0x65623CE02BEFCc862D069e463A88D784dA35332F", "tx": "0x27589128002933008eef3a3daf1ba761c2b34cc7c1b42d73520e59ad70337f2f" }, + { + "amount": "3.765163624", + "user": "0xc5467213593778E528f0eB8117cc7AFBC5b7491b", + "tx": "0x9784ca6792b784e281c92b80c42cc8ce999fa02a22d59b936206090d5e4bd659" + }, + { + "amount": "54.26009690396", + "user": "0xa0479A52EEe756B49cbdB3Fd07F8292E4Bd61c39", + "tx": "0x4059b8d653fa343f3ca514351626a950896b05c7f2e3ac2668bff0111202100c" + }, { "amount": "8.25227042", "user": "0xc5467213593778E528f0eB8117cc7AFBC5b7491b", @@ -13875,6 +13885,12 @@ } ], "withdrawals": [ + { + "amount": "54.26009690396", + "user": "0xa0479A52EEe756B49cbdB3Fd07F8292E4Bd61c39", + "tranche_id": 11, + "tx": "0x4059b8d653fa343f3ca514351626a950896b05c7f2e3ac2668bff0111202100c" + }, { "amount": "76.60815740756", "user": "0xa0479A52EEe756B49cbdB3Fd07F8292E4Bd61c39", @@ -13931,8 +13947,8 @@ } ], "total_tokens": "412", - "withdrawn_tokens": "287.93673515724", - "remaining_tokens": "124.06326484276" + "withdrawn_tokens": "342.1968320612", + "remaining_tokens": "69.8031679388" }, { "address": "0x70dE1021E0dC0876CE3Df2889ADbf1aeD381Fc69", @@ -14240,6 +14256,12 @@ "tranche_id": 11, "tx": "0xfbca378f6263977884e6eebc653c8d68f39b6c8eb6ce2f6668767ed63bfcc55b" }, + { + "amount": "3.765163624", + "user": "0xc5467213593778E528f0eB8117cc7AFBC5b7491b", + "tranche_id": 11, + "tx": "0x9784ca6792b784e281c92b80c42cc8ce999fa02a22d59b936206090d5e4bd659" + }, { "amount": "8.25227042", "user": "0xc5467213593778E528f0eB8117cc7AFBC5b7491b", @@ -14296,8 +14318,8 @@ } ], "total_tokens": "200", - "withdrawn_tokens": "162.301598172", - "remaining_tokens": "37.698401828" + "withdrawn_tokens": "166.066761796", + "remaining_tokens": "33.933238204" }, { "address": "0x1775cc97E5c05Fde8b571ef75CA52d0A9ff19025", @@ -14322,7 +14344,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2752257.24947021500042140204", + "locked_amount": "2750248.74581339143427875436", "deposits": [ { "amount": "1998.95815", @@ -15035,7 +15057,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9847.4472493957209", - "locked_amount": "14981917.9295078230620565952564907792160044", + "locked_amount": "14974832.3668993651573938409992883392781833", "deposits": [ { "amount": "16249.93", @@ -17208,7 +17230,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2160347.510107733344730427", - "locked_amount": "8180941.34326837524613954166235642", + "locked_amount": "8174366.33525477774270489114290113", "deposits": [ { "amount": "129284.449", @@ -21421,7 +21443,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2915435.99910645966448536770339144", + "locked_amount": "2912838.17367497026402205162711866", "deposits": [ { "amount": "552496.6455", @@ -22577,7 +22599,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "90.683707504", - "locked_amount": "436110.89375171448994035879959412", + "locked_amount": "435792.63486619446376084666362252", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index ca5051d53..09ec971a0 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.15561897513952", + "locked_amount": "40.088242009132424", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "304.47376331811263", + "locked_amount": "303.732616692034497", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 1ccef1779..0612d432b 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "279.5622735920852330002767943302891933", + "locked_amount": "278.88176623541349270027612056062912227", "deposits": [ { "amount": "1000", From 3b04963cf47ec86d36fb12a322d31bae37c369ff Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 3 Jul 2022 12:05:25 +0000 Subject: [PATCH 08/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 28 +++++++++---------- apps/static/src/assets/stagnet1-tranches.json | 4 +-- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index cb9dbd828..98f08d968 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123297.111162332725999185", + "locked_amount": "123237.63735846575298678", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64165.182027724743578352", + "locked_amount": "64106.843766366682316484", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87702.7261753566612665753748", + "locked_amount": "87622.98784376085028312330584", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "26993.18400563922410475", + "locked_amount": "26968.64210653377575412", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8786.019458178104497277", + "locked_amount": "8778.031308168232764342", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14765.251358695653", + "locked_amount": "14734.5943727355075", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1773822.381550852354188922", + "locked_amount": "1772489.911084110266149608", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13861.969313789303071127730296486", + "locked_amount": "13822.809890811516634538718749445", "deposits": [ { "amount": "2833.333333", @@ -5250,7 +5250,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19556.000000000000000003", "total_removed": "5173.44789563774", - "locked_amount": "3308.28286453576790092050750913242009121", + "locked_amount": "3294.85051686960848744050544853500761022", "deposits": [ { "amount": "75", @@ -14344,7 +14344,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2750248.74581339143427875436", + "locked_amount": "2748201.20262295236621053607", "deposits": [ { "amount": "1998.95815", @@ -15057,7 +15057,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9847.4472493957209", - "locked_amount": "14974832.3668993651573938409992883392781833", + "locked_amount": "14967609.0813354625574754400332877165436604", "deposits": [ { "amount": "16249.93", @@ -17230,7 +17230,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2160347.510107733344730427", - "locked_amount": "8174366.33525477774270489114290113", + "locked_amount": "8167663.52799844725076764491087964", "deposits": [ { "amount": "129284.449", @@ -21443,7 +21443,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2912838.17367497026402205162711866", + "locked_amount": "2910189.85398975203441403525742471", "deposits": [ { "amount": "552496.6455", @@ -22599,7 +22599,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "90.683707504", - "locked_amount": "435792.63486619446376084666362252", + "locked_amount": "435468.18994341347971414498528668", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 09ec971a0..7e081503f 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.088242009132424", + "locked_amount": "40.019564941653984", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "303.732616692034497", + "locked_amount": "302.977168949771657", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 0612d432b..0bbfbb88e 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "278.88176623541349270027612056062912227", + "locked_amount": "278.18812785388124870027543378995433787", "deposits": [ { "amount": "1000", From db06f0bc9945bd2bcc4ce44983c1c55fcf74330b Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 3 Jul 2022 18:04:24 +0000 Subject: [PATCH 09/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 82 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 98f08d968..17b238d54 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123237.63735846575298678", + "locked_amount": "123178.50127113431020218", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64106.843766366682316484", + "locked_amount": "64048.836773470224303672", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87622.98784376085028312330584", + "locked_amount": "87543.70229896095098345206896", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "26968.64210653377575412", + "locked_amount": "26944.239566349427465074", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8778.031308168232764342", + "locked_amount": "8770.088518134872816264", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14734.5943727355075", + "locked_amount": "14704.1114696557965", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1772489.911084110266149608", + "locked_amount": "1771165.006928591341986776", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13822.809890811516634538718749445", + "locked_amount": "13783.8728310222401413219175420824", "deposits": [ { "amount": "2833.333333", @@ -5248,9 +5248,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19556.000000000000000003", + "total_added": "19636.000000000000000003", "total_removed": "5173.44789563774", - "locked_amount": "3294.85051686960848744050544853500761022", + "locked_amount": "3294.91843391679465072050339963850837156", "deposits": [ { "amount": "75", @@ -5337,6 +5337,11 @@ "user": "0x367e9C3Ac0e28C1536d5503de72BfEA24fA4Ed8A", "tx": "0x982cc9aec7477a4688b952257df4891059fa12c606b1580a10dfb14afda08e4c" }, + { + "amount": "80", + "user": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", + "tx": "0x5377a6794c88d7c17b57eb2185dcb7e5b477c6642bb24a732a1ba7169184c02a" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8700,6 +8705,12 @@ "tranche_id": 11, "tx": "0x72adba1aa2d918148f1a95eb6a447da22fa06217cadafa94d56f12fd22a389be" }, + { + "amount": "80", + "user": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", + "tranche_id": 11, + "tx": "0x5377a6794c88d7c17b57eb2185dcb7e5b477c6642bb24a732a1ba7169184c02a" + }, { "amount": "250", "user": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", @@ -8757,9 +8768,9 @@ "tx": "0x113a57018552a2003c49b030ef1cb9ffaee99747c81485647d195d08d676ed78" } ], - "total_tokens": "1590", + "total_tokens": "1670", "withdrawn_tokens": "940.30940496195", - "remaining_tokens": "649.69059503805" + "remaining_tokens": "729.69059503805" }, { "address": "0xB2BddeEb907797F9be51E3f9f75824f83cD71B67", @@ -14344,7 +14355,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2748201.20262295236621053607", + "locked_amount": "2746165.28621855411358555643", "deposits": [ { "amount": "1998.95815", @@ -15057,7 +15068,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9847.4472493957209", - "locked_amount": "14967609.0813354625574754400332877165436604", + "locked_amount": "14960426.8125355329334662913160412216396324", "deposits": [ { "amount": "16249.93", @@ -17230,7 +17241,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2160347.510107733344730427", - "locked_amount": "8167663.52799844725076764491087964", + "locked_amount": "8160998.78201779574638835175978243", "deposits": [ { "amount": "129284.449", @@ -21443,7 +21454,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2910189.85398975203441403525742471", + "locked_amount": "2907556.57254474920369548832868916", "deposits": [ { "amount": "552496.6455", @@ -22598,8 +22609,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "90.683707504", - "locked_amount": "435468.18994341347971414498528668", + "total_removed": "106.36782724", + "locked_amount": "435145.5873513422066081251851852", "deposits": [ { "amount": "3000", @@ -29237,6 +29248,11 @@ "amount": "15.04939117", "user": "0xe2311b0A4614BE4E839213aBbF8989127acAd455", "tx": "0x5ba79123548cfb6b3b9a91fba83adbdbea84ed3f95f8d77464171c6776730eac" + }, + { + "amount": "15.684119736", + "user": "0x09996E1a67c371400bD5f52DF841f77B1741eB9d", + "tx": "0x7065fa7c06fea3e88435b0db4d7b68f515491ae128580bcd99e2a0ed18c522c3" } ], "users": [ @@ -42769,10 +42785,17 @@ "tx": "0xb1425d9b0d5f10c5b06236d6f9d61ebddd21c4027e0f41deb5ec227a1753c715" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "15.684119736", + "user": "0x09996E1a67c371400bD5f52DF841f77B1741eB9d", + "tranche_id": 5, + "tx": "0x7065fa7c06fea3e88435b0db4d7b68f515491ae128580bcd99e2a0ed18c522c3" + } + ], "total_tokens": "200", - "withdrawn_tokens": "0", - "remaining_tokens": "200" + "withdrawn_tokens": "15.684119736", + "remaining_tokens": "184.315880264" }, { "address": "0xb2495ea94f7f329Ca3d91342e0c7422d97ac5a9F", @@ -48301,7 +48324,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "32785.6624708206377", + "total_removed": "32818.6050837656377", "locked_amount": "0", "deposits": [ { @@ -52626,6 +52649,11 @@ "user": "0xfac0752f644599A63295A9c76903Bb533B945d1C", "tx": "0x0e8f9c91c9e80efe3e632cfbab44ed30db2c431c231a6ed8e1ab60eaef93e0fd" }, + { + "amount": "32.942612945", + "user": "0x95041B9A88d99a4AB15bfC6d6BAf165e7268449D", + "tx": "0x3ac3b44b3d467e96a45adad2973a41c8b0245b1eea75574ac2819605189dc816" + }, { "amount": "183.6335597275", "user": "0x690Fc36d52eD3f198F0eBDea1557333a1766f786", @@ -63780,6 +63808,12 @@ } ], "withdrawals": [ + { + "amount": "32.942612945", + "user": "0x95041B9A88d99a4AB15bfC6d6BAf165e7268449D", + "tranche_id": 6, + "tx": "0x3ac3b44b3d467e96a45adad2973a41c8b0245b1eea75574ac2819605189dc816" + }, { "amount": "217.057387055", "user": "0x95041B9A88d99a4AB15bfC6d6BAf165e7268449D", @@ -63788,8 +63822,8 @@ } ], "total_tokens": "250", - "withdrawn_tokens": "217.057387055", - "remaining_tokens": "32.942612945" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0xA6e8835b796630fD46F57e89Dcdf601dc86E6cfE", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 7e081503f..2aca08509 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "40.019564941653984", + "locked_amount": "39.951255707762556", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "302.977168949771657", + "locked_amount": "302.22576737696596", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 0bbfbb88e..b8b907166 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "278.18812785388124870027543378995433787", + "locked_amount": "277.4982045915778360002747506976154236", "deposits": [ { "amount": "1000", From fba905a8115cfb5ed0133d29d0a93b63914ee4d4 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 4 Jul 2022 00:09:41 +0000 Subject: [PATCH 10/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 28 +++++++++---------- apps/static/src/assets/stagnet1-tranches.json | 4 +-- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 17b238d54..ead7561ce 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123178.50127113431020218", + "locked_amount": "123118.32457756742288616", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "64048.836773470224303672", + "locked_amount": "63989.80904279369576535", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87543.70229896095098345206896", + "locked_amount": "87463.02158183868735843834708", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "26944.239566349427465074", + "locked_amount": "26919.407619408186327764", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8770.088518134872816264", + "locked_amount": "8762.005960369008617829", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14704.1114696557965", + "locked_amount": "14673.092164855074", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1771165.006928591341986776", + "locked_amount": "1769816.788692148679224898", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13783.8728310222401413219175420824", + "locked_amount": "13744.2506033594338535679803609194", "deposits": [ { "amount": "2833.333333", @@ -5250,7 +5250,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19636.000000000000000003", "total_removed": "5173.44789563774", - "locked_amount": "3294.91843391679465072050339963850837156", + "locked_amount": "3281.27173769660025372050131468797564681", "deposits": [ { "amount": "75", @@ -14355,7 +14355,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2746165.28621855411358555643", + "locked_amount": "2744093.54418887546089734776", "deposits": [ { "amount": "1998.95815", @@ -15068,7 +15068,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9847.4472493957209", - "locked_amount": "14960426.8125355329334662913160412216396324", + "locked_amount": "14953118.1587474326162213414603514020383888", "deposits": [ { "amount": "16249.93", @@ -17241,7 +17241,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2160347.510107733344730427", - "locked_amount": "8160998.78201779574638835175978243", + "locked_amount": "8154216.75779744365068368807242029", "deposits": [ { "amount": "129284.449", @@ -21454,7 +21454,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2907556.57254474920369548832868916", + "locked_amount": "2904876.95375794737011064771203522", "deposits": [ { "amount": "552496.6455", @@ -22610,7 +22610,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "106.36782724", - "locked_amount": "435145.5873513422066081251851852", + "locked_amount": "434817.30798415743454759658954844", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 2aca08509..046df87b0 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "39.951255707762556", + "locked_amount": "39.881757356671743", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "302.22576737696596", + "locked_amount": "301.461285514967006", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index b8b907166..563292812 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "277.4982045915778360002747506976154236", + "locked_amount": "276.79627124556061460027405571410451546", "deposits": [ { "amount": "1000", From 5eefd0c1a5ba094c6c3fa754d01e72f80d801777 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 4 Jul 2022 06:04:51 +0000 Subject: [PATCH 11/24] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 108 ++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 74 insertions(+), 40 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index ead7561ce..55ad180c9 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "123118.32457756742288616", + "locked_amount": "123059.811755712063546615", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "63989.80904279369576535", + "locked_amount": "63932.41341526947899667", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "87463.02158183868735843834708", + "locked_amount": "87384.57166795480634358911916", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "26919.407619408186327764", + "locked_amount": "26895.262270078230951132", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8762.005960369008617829", + "locked_amount": "8754.14688346303090414", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "14673.092164855074", + "locked_amount": "14642.9305366847805", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1769816.788692148679224898", + "locked_amount": "1768505.84837929398353698", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "13744.2506033594338535679803609194", + "locked_amount": "13705.72392116195562836330720418", "deposits": [ { "amount": "2833.333333", @@ -5248,9 +5248,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19636.000000000000000003", + "total_added": "19686.000000000000000003", "total_removed": "5173.44789563774", - "locked_amount": "3281.27173769660025372050131468797564681", + "locked_amount": "3276.32382591324267552049928738584474896", "deposits": [ { "amount": "75", @@ -5342,6 +5342,11 @@ "user": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", "tx": "0x5377a6794c88d7c17b57eb2185dcb7e5b477c6642bb24a732a1ba7169184c02a" }, + { + "amount": "50", + "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", + "tx": "0xc5c9a3b67c4bcb95735e5d36cdf303573a989ed2eafe23ef7edb37bc04ecc357" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8898,6 +8903,27 @@ "withdrawn_tokens": "0", "remaining_tokens": "5" }, + { + "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", + "deposits": [ + { + "amount": "50", + "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", + "tranche_id": 11, + "tx": "0xc5c9a3b67c4bcb95735e5d36cdf303573a989ed2eafe23ef7edb37bc04ecc357" + }, + { + "amount": "5", + "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", + "tranche_id": 11, + "tx": "0x1dbbc8c55e6b64081b2336251d1ab30886e0446a885ee7b2fa981897e94a0f6c" + } + ], + "withdrawals": [], + "total_tokens": "55", + "withdrawn_tokens": "0", + "remaining_tokens": "55" + }, { "address": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", "deposits": [ @@ -10253,21 +10279,6 @@ "withdrawn_tokens": "0", "remaining_tokens": "5540" }, - { - "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", - "deposits": [ - { - "amount": "5", - "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", - "tranche_id": 11, - "tx": "0x1dbbc8c55e6b64081b2336251d1ab30886e0446a885ee7b2fa981897e94a0f6c" - } - ], - "withdrawals": [], - "total_tokens": "5", - "withdrawn_tokens": "0", - "remaining_tokens": "5" - }, { "address": "0xC5681832099869B7e612bfA8575f1c0ddD25633C", "deposits": [ @@ -14355,7 +14366,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2744093.54418887546089734776", + "locked_amount": "2742079.0853489584284756932", "deposits": [ { "amount": "1998.95815", @@ -15068,7 +15079,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "9847.4472493957209", - "locked_amount": "14953118.1587474326162213414603514020383888", + "locked_amount": "14946011.5875525518008302649849797315044607", "deposits": [ { "amount": "16249.93", @@ -17240,8 +17251,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "2160347.510107733344730427", - "locked_amount": "8154216.75779744365068368807242029", + "total_removed": "2161230.565414943152410427", + "locked_amount": "8147622.25498410659825262275582355", "deposits": [ { "amount": "129284.449", @@ -17540,6 +17551,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xb615df4e7234ecec4811186115b7979a297d7527a15303751942ede44aadc045" }, + { + "amount": "883.05530720980768", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xdb5360b2665d411079b3ed596f5d5744c4960cc20d871f5b175090e8d4f94a0d" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -19200,6 +19216,12 @@ "tranche_id": 3, "tx": "0xb615df4e7234ecec4811186115b7979a297d7527a15303751942ede44aadc045" }, + { + "amount": "883.05530720980768", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xdb5360b2665d411079b3ed596f5d5744c4960cc20d871f5b175090e8d4f94a0d" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -20438,8 +20460,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "157641.305438640855858", - "remaining_tokens": "201482.164136359144142" + "withdrawn_tokens": "158524.360745850663538", + "remaining_tokens": "200599.108829149336462" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -21454,7 +21476,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1417003.438054406291892727", - "locked_amount": "2904876.95375794737011064771203522", + "locked_amount": "2902271.42581317732038188715444711", "deposits": [ { "amount": "552496.6455", @@ -22610,7 +22632,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "106.36782724", - "locked_amount": "434817.30798415743454759658954844", + "locked_amount": "434498.10546583488616898354033484", "deposits": [ { "amount": "3000", @@ -48324,7 +48346,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "32818.6050837656377", + "total_removed": "32898.5750837656377", "locked_amount": "0", "deposits": [ { @@ -52654,6 +52676,11 @@ "user": "0x95041B9A88d99a4AB15bfC6d6BAf165e7268449D", "tx": "0x3ac3b44b3d467e96a45adad2973a41c8b0245b1eea75574ac2819605189dc816" }, + { + "amount": "79.97", + "user": "0x0DCC2304f67eE437bd2f7bdA841450cBd1d267E8", + "tx": "0xb25a441fc8300c5b9915372df109fb1331cae89b831473444370e676adbd4139" + }, { "amount": "183.6335597275", "user": "0x690Fc36d52eD3f198F0eBDea1557333a1766f786", @@ -57605,10 +57632,17 @@ "tx": "0x5f6fbdcd43bd83bf0d7a4beb3a2c7d4aa493ef5e4c0c6eeb6a4eb6a0ae4df05e" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "79.97", + "user": "0x0DCC2304f67eE437bd2f7bdA841450cBd1d267E8", + "tranche_id": 6, + "tx": "0xb25a441fc8300c5b9915372df109fb1331cae89b831473444370e676adbd4139" + } + ], "total_tokens": "79.97", - "withdrawn_tokens": "0", - "remaining_tokens": "79.97" + "withdrawn_tokens": "79.97", + "remaining_tokens": "0" }, { "address": "0x8a075634d235b31710D7835e3B243A2Ad3a8590E", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 046df87b0..53c9c53c9 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "39.881757356671743", + "locked_amount": "39.81418378995434", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "301.461285514967006", + "locked_amount": "300.71797628107554", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 563292812..706b5a657 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "276.79627124556061460027405571410451546", + "locked_amount": "276.1137782217148140002733799784373414", "deposits": [ { "amount": "1000", From 5be0a1a85dfbe7454fba56e8005fb00575401315 Mon Sep 17 00:00:00 2001 From: macqbat Date: Mon, 4 Jul 2022 08:26:59 +0200 Subject: [PATCH 12/24] feat: [console-lite] - top nav-bar - first commit (#677) * feat: [console-lite] - top nav-bar - first commit * feat: [console-lite] - top nav-bar - fixes and improvements * feat: [console-lite] - top nav-bar - add some netlify conf, change header for always black * feat: [console-lite] - top nav-bar - add some netlify conf, change header for always black * feat: [console-lite] - top nav-bar - add home link on logo * feat: [console-lite] - top nav-bar - add job for copying netlify conf file * feat: [console-lite] - top nav-bar - add job for copying netlify conf file * feat: [console-lite] - top nav-bar - add a couple of int tests * feat: [console-lite] - top nav-bar - fix a typo * feat: [console-lite] - top nav-bar - remove anims due its inconsist with design concept, css fixes * feat: [console-lite] - top nav-bar - make v-logo a component, add darken green color * feat: [console-lite] - top nav-bar - move v-logo to existing dir Co-authored-by: maciek --- .../src/integration/header.test.ts | 30 ++++++++++++ apps/simple-trading-app/netlify.toml | 4 ++ apps/simple-trading-app/project.json | 9 ++++ apps/simple-trading-app/src/app/app.tsx | 34 +++---------- .../app/components/drawer/drawer-wrapper.tsx | 2 +- .../src/app/components/drawer/drawer.tsx | 13 +++-- .../src/app/components/header/comet.tsx | 48 +++++++++++++++++++ .../src/app/components/header/header.tsx | 41 ++++++++++++++++ .../src/app/components/header/index.tsx | 1 + .../src/app/components/header/logo.tsx | 18 +++++++ .../src/app/components/header/video.tsx | 22 +++++++++ .../app/components/icons/liquidity-icon.tsx | 4 +- .../src/app/components/icons/market-icon.tsx | 4 +- .../app/components/icons/portfolio-icon.tsx | 4 +- .../src/app/components/icons/trade-icon.tsx | 8 ++-- .../simple-market-list/constants.ts | 1 + .../simple-market-percent-change.spec.tsx | 9 ++-- .../simple-market-percent-change.tsx | 16 +++---- libs/tailwindcss-config/src/theme-lite.js | 5 ++ .../theme-switcher/theme-switcher.tsx | 8 +++- .../components/vega-logo/vega-logo.spec.tsx | 7 ++- .../vega-logo/vega-logo.stories.tsx | 4 +- .../src/components/vega-logo/vega-logo.tsx | 21 ++++++++ 23 files changed, 251 insertions(+), 62 deletions(-) create mode 100644 apps/simple-trading-app-e2e/src/integration/header.test.ts create mode 100644 apps/simple-trading-app/netlify.toml create mode 100644 apps/simple-trading-app/src/app/components/header/comet.tsx create mode 100644 apps/simple-trading-app/src/app/components/header/header.tsx create mode 100644 apps/simple-trading-app/src/app/components/header/index.tsx create mode 100644 apps/simple-trading-app/src/app/components/header/logo.tsx create mode 100644 apps/simple-trading-app/src/app/components/header/video.tsx diff --git a/apps/simple-trading-app-e2e/src/integration/header.test.ts b/apps/simple-trading-app-e2e/src/integration/header.test.ts new file mode 100644 index 000000000..65243eaab --- /dev/null +++ b/apps/simple-trading-app-e2e/src/integration/header.test.ts @@ -0,0 +1,30 @@ +describe('console lite header', () => { + beforeEach(() => { + window.localStorage.setItem('theme', 'dark'); + cy.visit('/'); + }); + + it('logo should linked home', () => { + cy.get('span').contains('Markets').click(); + cy.location('pathname').should('eq', '/markets'); + cy.getByTestId('header').find('a').click(); + cy.location('pathname').should('eq', '/'); + }); + + it('theme switcher should switch theme', () => { + cy.get('#root').children().eq(0).as('Container'); + cy.get('@Container').should('have.css', 'background-color', 'rgb(8, 8, 8)'); + cy.getByTestId('theme-switcher').click(); + cy.get('@Container').should( + 'have.css', + 'background-color', + 'rgb(255, 255, 255)' + ); + }); + + it('wallet connector should open a dialog', () => { + cy.get('[role="dialog"]').should('not.exist'); + cy.getByTestId('connect-vega-wallet').click(); + cy.get('[role="dialog"]').should('be.visible'); + }); +}); diff --git a/apps/simple-trading-app/netlify.toml b/apps/simple-trading-app/netlify.toml new file mode 100644 index 000000000..b87b8d3dd --- /dev/null +++ b/apps/simple-trading-app/netlify.toml @@ -0,0 +1,4 @@ +[[redirects]] + from = "/*" + to = "/index.html" + status = 200 diff --git a/apps/simple-trading-app/project.json b/apps/simple-trading-app/project.json index 3905d0432..d65b5d432 100644 --- a/apps/simple-trading-app/project.json +++ b/apps/simple-trading-app/project.json @@ -68,6 +68,15 @@ "jestConfig": "apps/simple-trading-app/jest.config.js", "passWithNoTests": true } + }, + "build-netlify": { + "builder": "@nrwl/workspace:run-commands", + "options": { + "commands": [ + "cp apps/simple-trading-app/netlify.toml netlify.toml", + "nx build simple-trading-app" + ] + } } }, "tags": [] diff --git a/apps/simple-trading-app/src/app/app.tsx b/apps/simple-trading-app/src/app/app.tsx index a4a53f682..daf1e5358 100644 --- a/apps/simple-trading-app/src/app/app.tsx +++ b/apps/simple-trading-app/src/app/app.tsx @@ -8,13 +8,11 @@ import { VegaManageDialog, VegaWalletProvider, } from '@vegaprotocol/wallet'; -import { VegaWalletConnectButton } from './components/vega-wallet-connect-button'; -import { ThemeSwitcher } from '@vegaprotocol/ui-toolkit'; import { Connectors } from './lib/vega-connectors'; import '../styles.scss'; import { AppLoader } from './components/app-loader'; +import Header from './components/header'; import { Main } from './components/main'; -import { DrawerToggle, DRAWER_TOGGLE_VARIANTS } from './components/drawer'; import { useLocation } from 'react-router-dom'; function App() { @@ -39,32 +37,12 @@ function App() { -
-
-
- - setVegaWallet((x) => ({ ...x, connect: open })) - } - setManageDialog={(open) => - setVegaWallet((x) => ({ ...x, manage: open })) - } - /> - -
- -
- +
+
- { - const classes = classNames('flex dark:bg-black md:flex-row', className); + const classes = classNames('flex dark:bg-lite-black md:flex-row', className); return
{children}
; }; diff --git a/apps/simple-trading-app/src/app/components/drawer/drawer.tsx b/apps/simple-trading-app/src/app/components/drawer/drawer.tsx index 128259e32..ef7fb9015 100644 --- a/apps/simple-trading-app/src/app/components/drawer/drawer.tsx +++ b/apps/simple-trading-app/src/app/components/drawer/drawer.tsx @@ -34,11 +34,14 @@ export const NavigationDrawer = ({ const translateClose = rtl ? 'translate-x-full' : '-translate-x-full'; - const innerStyles = classNames('w-3/4 md:w-full bg-white dark:bg-black', { - 'translate-x-0 transition-transform md:transform-none': isMenuOpen, - [`${translateClose} md:transform-none`]: !isMenuOpen, - [innerClasses]: innerClasses, - }); + const innerStyles = classNames( + 'w-3/4 md:w-full bg-white dark:bg-lite-black', + { + 'translate-x-0 transition-transform md:transform-none': isMenuOpen, + [`${translateClose} md:transform-none`]: !isMenuOpen, + [innerClasses]: innerClasses, + } + ); return (