From 4062c493cbaa71ba7b8a8916daed8527a5c5061c Mon Sep 17 00:00:00 2001 From: daro-maj <119658839+daro-maj@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:16:13 +0100 Subject: [PATCH 01/19] chore: cover 7003-MORD-007-7003 and MORD-008-MORD e2e tests (#2471) --- .../src/integration/trading-orders.cy.ts | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/apps/trading-e2e/src/integration/trading-orders.cy.ts b/apps/trading-e2e/src/integration/trading-orders.cy.ts index 0599e115d..d03fc43ee 100644 --- a/apps/trading-e2e/src/integration/trading-orders.cy.ts +++ b/apps/trading-e2e/src/integration/trading-orders.cy.ts @@ -223,6 +223,52 @@ describe('subscribe orders', { tags: '@smoke' }, () => { }); cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Parked'); }); + + it('for Active order when is part of a liquidity or peg shape, must not see an option to amend the individual order ', () => { + // 7003-MORD-008 + updateOrder({ + id: orderId, + status: Schema.OrderStatus.STATUS_ACTIVE, + peggedOrder: {}, + liquidityProvisionId: '6536', + }); + cy.get(`[row-id=${orderId}]`) + .find(`[data-testid="cancel"]`) + .should('not.exist'); + cy.get(`[row-id=${orderId}]`) + .find(`[data-testid="edit"]`) + .should('not.exist'); + }); + + it('for Active order when is part of a liquidity, must not see an option to amend the individual order ', () => { + // 7003-MORD-008 + updateOrder({ + id: orderId, + status: Schema.OrderStatus.STATUS_ACTIVE, + liquidityProvisionId: '6536', + }); + cy.get(`[row-id=${orderId}]`) + .find(`[data-testid="cancel"]`) + .should('not.exist'); + cy.get(`[row-id=${orderId}]`) + .find(`[data-testid="edit"]`) + .should('not.exist'); + }); + + it('for Active order when is part of a peg shape, must not see an option to amend the individual order ', () => { + // 7003-MORD-008 + updateOrder({ + id: orderId, + status: Schema.OrderStatus.STATUS_ACTIVE, + peggedOrder: {}, + }); + cy.get(`[row-id=${orderId}]`) + .find(`[data-testid="cancel"]`) + .should('not.exist'); + cy.get(`[row-id=${orderId}]`) + .find(`[data-testid="edit"]`) + .should('not.exist'); + }); }); describe('amend and cancel order', { tags: '@smoke' }, () => { @@ -248,6 +294,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => { updateOrder({ id: orderId, status: Schema.OrderStatus.STATUS_ACTIVE, + peggedOrder: null, + liquidityProvisionId: null, }); cy.get(`[row-id=${orderId}]`) .find('[data-testid="edit"]') @@ -274,6 +322,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => { updateOrder({ id: orderId, status: Schema.OrderStatus.STATUS_ACTIVE, + peggedOrder: null, + liquidityProvisionId: null, }); cy.get(`[row-id=${orderId}]`) .find(`[data-testid="cancel"]`) @@ -288,9 +338,14 @@ describe('amend and cancel order', { tags: '@smoke' }, () => { }); }); it('must be able to cancel all orders on a market', () => { + // 7003-MORD-009 + // 7003-MORD-010 + // 7003-MORD-011 updateOrder({ id: orderId, status: Schema.OrderStatus.STATUS_ACTIVE, + peggedOrder: null, + liquidityProvisionId: null, }); cy.get(`[data-testid="cancelAll"]`) .should('have.text', 'Cancel all') From d65ef297a924a8a7e454e3ea667c17b6ac34cd69 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Fri, 23 Dec 2022 18:08:21 +0000 Subject: [PATCH 02/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index a90332ce3..20f673b97 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "82197.14332850199619251", + "locked_amount": "82137.87819501471022326", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36530.92183536276314", + "locked_amount": "36494.91945712835692", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3664.301908929477", + "locked_amount": "3660.87962962963", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23849.9422179213040896852", + "locked_amount": "23791.8086427671701434516", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32598.75349114788455213696028", + "locked_amount": "32519.294930255229016400015736", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "10033.258824607458562468", + "locked_amount": "10008.80303345325855477", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3265.7283869706566541744", + "locked_amount": "3257.768264263344195897", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12208.022097758508156912", + "locked_amount": "12178.265381217277622343", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15973.015941528543", + "locked_amount": "15941.96017495395975", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "853005.319889025269684887", + "locked_amount": "851677.524541413033704058", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "9122.264524204912225", + "locked_amount": "9064.560059380030875", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1335273.421962689707530227104", + "locked_amount": "1333233.15732936539026267269", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "506806.74351511222783952", - "locked_amount": "10034481.4071726185207856284228107618572587", + "locked_amount": "10027246.7597803619028202452725724654068668", "deposits": [ { "amount": "16249.93", @@ -37919,7 +37919,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3487265.64008411344306753", - "locked_amount": "3542323.93804273703335817968877454", + "locked_amount": "3535644.957763863638341688793416505", "deposits": [ { "amount": "129284.449", @@ -44179,7 +44179,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1082690.208177314167466422765104855", + "locked_amount": "1080051.30267499473389082597541582", "deposits": [ { "amount": "552496.6455", @@ -45975,7 +45975,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "21197.8027491183963", - "locked_amount": "211581.70645827225611927070928464", + "locked_amount": "211258.414864472157205596969355668", "deposits": [ { "amount": "3000", From 15bb7b94ada8a4d1a995c3eb54ed68f0f78edbac Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 24 Dec 2022 00:09:36 +0000 Subject: [PATCH 03/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 49 ++++++++++++-------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 20f673b97..1409bf0ec 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "82137.87819501471022326", + "locked_amount": "82078.36869753015830874", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36494.91945712835692", + "locked_amount": "36458.76863267377132", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3660.87962962963", + "locked_amount": "3657.443239472349", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23791.8086427671701434516", + "locked_amount": "23733.435369295284494676", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32519.294930255229016400015736", + "locked_amount": "32439.50874314439862501372188", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "10008.80303345325855477", + "locked_amount": "9984.246405356144941552", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3257.768264263344195897", + "locked_amount": "3249.775320109613115106", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12178.265381217277622343", + "locked_amount": "12148.385970778796683224", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15941.96017495395975", + "locked_amount": "15910.776358195212", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "851677.524541413033704058", + "locked_amount": "850344.25438324081258994", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "9064.560059380030875", + "locked_amount": "9006.61766555958205", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1333233.15732936539026267269", + "locked_amount": "1331184.38529162113163562608", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "506806.74351511222783952", - "locked_amount": "10027246.7597803619028202452725724654068668", + "locked_amount": "10019981.9456782568403400218971067781048932", "deposits": [ { "amount": "16249.93", @@ -37919,7 +37919,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3487265.64008411344306753", - "locked_amount": "3535644.957763863638341688793416505", + "locked_amount": "3528938.127771077728010500203505248", "deposits": [ { "amount": "129284.449", @@ -44179,7 +44179,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1080051.30267499473389082597541582", + "locked_amount": "1077401.393582275024904916935359876", "deposits": [ { "amount": "552496.6455", @@ -45974,8 +45974,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "21197.8027491183963", - "locked_amount": "211258.414864472157205596969355668", + "total_removed": "21238.7169043703963", + "locked_amount": "210933.775223811346032894781938096", "deposits": [ { "amount": "3000", @@ -52619,6 +52619,11 @@ "user": "0xe28dBf57Ad23cc0c32b6769556CD3c64873b4330", "tx": "0x93e29c518d96a60702a9ec71087ef37e4b4125dae3a4087c2ec61a7612fa03cd" }, + { + "amount": "40.914155252", + "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", + "tx": "0xa6cc04f7c5af79b204cbe1dc0161b604ea0cc92a884934718b079a9610b5a1d5" + }, { "amount": "199.140778792", "user": "0x2827B97046558f044ab07c3De0159632f8956472", @@ -70029,6 +70034,12 @@ } ], "withdrawals": [ + { + "amount": "40.914155252", + "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", + "tranche_id": 5, + "tx": "0xa6cc04f7c5af79b204cbe1dc0161b604ea0cc92a884934718b079a9610b5a1d5" + }, { "amount": "180.29405124", "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", @@ -70037,8 +70048,8 @@ } ], "total_tokens": "400", - "withdrawn_tokens": "180.29405124", - "remaining_tokens": "219.70594876" + "withdrawn_tokens": "221.208206492", + "remaining_tokens": "178.791793508" }, { "address": "0x3738bec36216eA2F11B954891C65AAd1Bc852156", From 01420c56ff214e076e9365b8f5bc5d2fafd17043 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 24 Dec 2022 06:08:31 +0000 Subject: [PATCH 04/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 1409bf0ec..5d78d8ad1 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "82078.36869753015830874", + "locked_amount": "82019.238101524475893785", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36458.76863267377132", + "locked_amount": "36422.84798325723434", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3657.443239472349", + "locked_amount": "3654.0287290715375", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23733.435369295284494676", + "locked_amount": "23675.433762877885462503", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32439.50874314439862501372188", + "locked_amount": "32360.230560731427883610961768", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9984.246405356144941552", + "locked_amount": "9959.8461311705161602042", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3249.775320109613115106", + "locked_amount": "3241.833267636846079522", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12148.385970778796683224", + "locked_amount": "12118.6968048102079683", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15910.776358195212", + "locked_amount": "15879.7910911602195", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "850344.25438324081258994", + "locked_amount": "849019.473257172737821028", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "9006.61766555958205", + "locked_amount": "8949.0441953502407", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1331184.38529162113163562608", + "locked_amount": "1329148.65794065387257839432", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "506806.74351511222783952", - "locked_amount": "10019981.9456782568403400218971067781048932", + "locked_amount": "10012763.3871979155839579018206164954420113", "deposits": [ { "amount": "16249.93", @@ -37919,7 +37919,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3487265.64008411344306753", - "locked_amount": "3528938.127771077728010500203505248", + "locked_amount": "3522274.000672957197636783953430468", "deposits": [ { "amount": "129284.449", @@ -44179,7 +44179,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1077401.393582275024904916935359876", + "locked_amount": "1074768.35666150287099005490395157", "deposits": [ { "amount": "552496.6455", @@ -45975,7 +45975,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "21238.7169043703963", - "locked_amount": "210933.775223811346032894781938096", + "locked_amount": "210611.202588336936706255214003064", "deposits": [ { "amount": "3000", From 13ffe8a8d0850a5bdbf28ee765de3f328e974c98 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 24 Dec 2022 12:08:48 +0000 Subject: [PATCH 05/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 5d78d8ad1..047864988 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "82019.238101524475893785", + "locked_amount": "81959.88236116179932685", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36422.84798325723434", + "locked_amount": "36386.79056316590082", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3654.0287290715375", + "locked_amount": "3650.601217656012", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23675.433762877885462503", + "locked_amount": "23617.21131081941434764", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32360.230560731427883610961768", + "locked_amount": "32280.65052045451331621916792", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9959.8461311705161602042", + "locked_amount": "9935.3529510374837628158", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3241.833267636846079522", + "locked_amount": "3233.8609751797389734733", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12118.6968048102079683", + "locked_amount": "12088.894595026176773055", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15879.7910911602195", + "locked_amount": "15848.687845303866", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "849019.473257172737821028", + "locked_amount": "847689.647923622456804709", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8949.0441953502407", + "locked_amount": "8891.251509661835525", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1329148.65794065387257839432", + "locked_amount": "1327105.17939899310979585017", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "506806.74351511222783952", - "locked_amount": "10012763.3871979155839579018206164954420113", + "locked_amount": "10005517.343493049871022300005823400892133", "deposits": [ { "amount": "16249.93", @@ -37919,7 +37919,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3487265.64008411344306753", - "locked_amount": "3522274.000672957197636783953430468", + "locked_amount": "3515584.499391051113488946988825165", "deposits": [ { "amount": "129284.449", @@ -44179,7 +44179,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1074768.35666150287099005490395157", + "locked_amount": "1072125.294247254708995075839786512", "deposits": [ { "amount": "552496.6455", @@ -45975,7 +45975,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "21238.7169043703963", - "locked_amount": "210611.202588336936706255214003064", + "locked_amount": "210287.40173238948752169332724504", "deposits": [ { "amount": "3000", From b0aa1b8a3e4eafb884e9c912e3407fcf0db632ec Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sat, 24 Dec 2022 18:08:19 +0000 Subject: [PATCH 06/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 98 ++++++++++++++------ 1 file changed, 71 insertions(+), 27 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 047864988..5c889765b 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81959.88236116179932685", + "locked_amount": "81900.658412617865629305", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36386.79056316590082", + "locked_amount": "36350.81320395737734", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3650.601217656012", + "locked_amount": "3647.181316590563", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23617.21131081941434764", + "locked_amount": "23559.118134258149144016", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32280.65052045451331621916792", + "locked_amount": "32201.247177463809801887643564", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9935.3529510374837628158", + "locked_amount": "9910.9141548736600754404", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3233.8609751797389734733", + "locked_amount": "3225.906384176878667213", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12088.894595026176773055", + "locked_amount": "12059.158557231675879696", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15848.687845303866", + "locked_amount": "15817.65366022099425", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "847689.647923622456804709", + "locked_amount": "846362.775296891106296185", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8891.251509661835525", + "locked_amount": "8833.58714522946995", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1327105.17939899310979585017", + "locked_amount": "1325066.14361297413238186276", "deposits": [ { "amount": "1998.95815", @@ -33204,8 +33204,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "506806.74351511222783952", - "locked_amount": "10005517.343493049871022300005823400892133", + "total_removed": "508780.99323915010017952", + "locked_amount": "9998287.0535144366000664827179501990091917", "deposits": [ { "amount": "16249.93", @@ -33754,6 +33754,16 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x857534def76185e44db301ed76b6b1c58b2b861a92a2a426c66215dd1af481ed" }, + { + "amount": "1387.11719949836634", + "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D", + "tx": "0x06a5b5862308d83bda5de42c3ce7f692d528d61da7d77e7698488ece926e8e53" + }, + { + "amount": "587.132524539506", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xa05b3825dec0543aa934b601d345f80d8db2a64f1a2d04e4d7c1d1b42f940f46" + }, { "amount": "930.302108", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -35036,6 +35046,12 @@ "tranche_id": 2, "tx": "0x857534def76185e44db301ed76b6b1c58b2b861a92a2a426c66215dd1af481ed" }, + { + "amount": "587.132524539506", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0xa05b3825dec0543aa934b601d345f80d8db2a64f1a2d04e4d7c1d1b42f940f46" + }, { "amount": "2074.139541638025125", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -35926,8 +35942,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "95601.643430125375125", - "remaining_tokens": "164397.244069874624875" + "withdrawn_tokens": "96188.775954664881125", + "remaining_tokens": "163810.111545335118875" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -36154,6 +36170,12 @@ "tranche_id": 2, "tx": "0xe63c2fb53455781596d91101708c24e53610a10d74b12132fbd3f7300fbae5f3" }, + { + "amount": "1387.11719949836634", + "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D", + "tranche_id": 2, + "tx": "0x06a5b5862308d83bda5de42c3ce7f692d528d61da7d77e7698488ece926e8e53" + }, { "amount": "1055.19046635722995", "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D", @@ -36294,8 +36316,8 @@ } ], "total_tokens": "150551.801", - "withdrawn_tokens": "54272.36427887047024", - "remaining_tokens": "96279.43672112952976" + "withdrawn_tokens": "55659.48147836883658", + "remaining_tokens": "94892.31952163116342" }, { "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148", @@ -37918,8 +37940,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "3487265.64008411344306753", - "locked_amount": "3515584.499391051113488946988825165", + "total_removed": "3488079.86156385250404553", + "locked_amount": "3508909.541848632261004035772518903", "deposits": [ { "amount": "129284.449", @@ -38158,6 +38180,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0x9e2334407036669be5b1bccc4544949dd5b64a986498f4118b378f4c750d860f" }, + { + "amount": "814.221479739060978", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0x35a541fdaee8b0d8408783be8c28fc334c79b20e3cb61d0ef8f58ff35cd38862" + }, { "amount": "9158.56255453299474378", "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", @@ -40754,6 +40781,12 @@ "tranche_id": 3, "tx": "0x9e2334407036669be5b1bccc4544949dd5b64a986498f4118b378f4c750d860f" }, + { + "amount": "814.221479739060978", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0x35a541fdaee8b0d8408783be8c28fc334c79b20e3cb61d0ef8f58ff35cd38862" + }, { "amount": "2874.6686339993457875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -42934,8 +42967,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "271972.71356822515138125", - "remaining_tokens": "87150.75600677484861875" + "withdrawn_tokens": "272786.93504796421235925", + "remaining_tokens": "86336.53452703578764075" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -44179,7 +44212,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1072125.294247254708995075839786512", + "locked_amount": "1069487.978152437794874342139326925", "deposits": [ { "amount": "552496.6455", @@ -45974,8 +46007,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "21238.7169043703963", - "locked_amount": "210287.40173238948752169332724504", + "total_removed": "21246.2952909743963", + "locked_amount": "209964.30485646926296958209639776", "deposits": [ { "amount": "3000", @@ -52624,6 +52657,11 @@ "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", "tx": "0xa6cc04f7c5af79b204cbe1dc0161b604ea0cc92a884934718b079a9610b5a1d5" }, + { + "amount": "7.578386604", + "user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A", + "tx": "0x3888d5619b67bce67e15fa391be79c46e9916cd3a9fcc2e375714d871d76ae8b" + }, { "amount": "199.140778792", "user": "0x2827B97046558f044ab07c3De0159632f8956472", @@ -65612,6 +65650,12 @@ "tranche_id": 5, "tx": "0x42cab1fe6b6604bb12a8d76335aec458d600328f039a78baba10a4bb750ebf67" }, + { + "amount": "7.578386604", + "user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A", + "tranche_id": 5, + "tx": "0x3888d5619b67bce67e15fa391be79c46e9916cd3a9fcc2e375714d871d76ae8b" + }, { "amount": "26.6608828", "user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A", @@ -65668,8 +65712,8 @@ } ], "total_tokens": "400", - "withdrawn_tokens": "214.495116692", - "remaining_tokens": "185.504883308" + "withdrawn_tokens": "222.073503296", + "remaining_tokens": "177.926496704" }, { "address": "0x5c90765F50629570738fEe7b7FA82ae118f81Ed1", From 7ab20d07f9d87f4782c30f9bd6a30fbaa0de97ec Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 25 Dec 2022 00:10:37 +0000 Subject: [PATCH 07/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 52 ++++++++++++-------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 5c889765b..a7e05e294 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81900.658412617865629305", + "locked_amount": "81840.9704470454452041", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36350.81320395737734", + "locked_amount": "36314.55396372399634", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3647.181316590563", + "locked_amount": "3643.734620750888", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23559.118134258149144016", + "locked_amount": "23500.5698002171230357822", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32201.247177463809801887643564", + "locked_amount": "32121.221712777898591641099324", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9910.9141548736600754404", + "locked_amount": "9886.2838818182438741802", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3225.906384176878667213", + "locked_amount": "3217.889469303854097129", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12059.158557231675879696", + "locked_amount": "12029.189538890707411977", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15817.65366022099425", + "locked_amount": "15786.37632366482625", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "846362.775296891106296185", + "locked_amount": "845025.5066815683944016012", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8833.58714522946995", + "locked_amount": "8775.470983041464525", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1325066.14361297413238186276", + "locked_amount": "1323011.32186542016421824191", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "508780.99323915010017952", - "locked_amount": "9998287.0535144366000664827179501990091917", + "locked_amount": "9991000.787529776135131637030387189990538", "deposits": [ { "amount": "16249.93", @@ -37941,7 +37941,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3488079.86156385250404553", - "locked_amount": "3508909.541848632261004035772518903", + "locked_amount": "3502182.907614841168696583488481982", "deposits": [ { "amount": "129284.449", @@ -44212,7 +44212,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1069487.978152437794874342139326925", + "locked_amount": "1066830.244284321809310876608495514", "deposits": [ { "amount": "552496.6455", @@ -46007,8 +46007,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "21246.2952909743963", - "locked_amount": "209964.30485646926296958209639776", + "total_removed": "21301.8805998273963", + "locked_amount": "209638.706604707455196083079655", "deposits": [ { "amount": "3000", @@ -52662,6 +52662,11 @@ "user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A", "tx": "0x3888d5619b67bce67e15fa391be79c46e9916cd3a9fcc2e375714d871d76ae8b" }, + { + "amount": "55.585308853", + "user": "0xe46BFCBF19E96e2AdD939b5bC6E541feE6631a11", + "tx": "0xc1b142befd0ff0b541a6a6333cd5baa7b1145fa1a854b01601b35adddada71ce" + }, { "amount": "199.140778792", "user": "0x2827B97046558f044ab07c3De0159632f8956472", @@ -54483,10 +54488,17 @@ "tx": "0xee02e72ef8e0755982704385da512cc12c8ff0ea7b58056fa3d5a5932394e9ca" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "55.585308853", + "user": "0xe46BFCBF19E96e2AdD939b5bC6E541feE6631a11", + "tranche_id": 5, + "tx": "0xc1b142befd0ff0b541a6a6333cd5baa7b1145fa1a854b01601b35adddada71ce" + } + ], "total_tokens": "100", - "withdrawn_tokens": "0", - "remaining_tokens": "100" + "withdrawn_tokens": "55.585308853", + "remaining_tokens": "44.414691147" }, { "address": "0x4e5D990688190A9d0245912e1Cc0C2cC9E5aBf62", From 9d66eeae51df4a662801c03534944694ecca52b7 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 25 Dec 2022 06:06:12 +0000 Subject: [PATCH 08/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index a7e05e294..3c3d0cd9a 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81840.9704470454452041", + "locked_amount": "81782.394474943601114655", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36314.55396372399634", + "locked_amount": "36278.97023718924418", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3643.734620750888", + "locked_amount": "3640.3521372399795", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23500.5698002171230357822", + "locked_amount": "23443.1122281838367017854", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32121.221712777898591641099324", + "locked_amount": "32042.687131444397281276687416", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9886.2838818182438741802", + "locked_amount": "9862.1124735030393464104", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3217.889469303854097129", + "locked_amount": "3210.0219104510486814625", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "12029.189538890707411977", + "locked_amount": "11999.778846711386932089", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15786.37632366482625", + "locked_amount": "15755.681687384898", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "845025.5066815683944016012", + "locked_amount": "843713.151530029823050658", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8775.470983041464525", + "locked_amount": "8718.437531451287275", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1323011.32186542016421824191", + "locked_amount": "1320994.594384324005512471287", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "508780.99323915010017952", - "locked_amount": "9991000.787529776135131637030387189990538", + "locked_amount": "9983849.6013680911676987640181415125628549", "deposits": [ { "amount": "16249.93", @@ -37941,7 +37941,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3488079.86156385250404553", - "locked_amount": "3502182.907614841168696583488481982", + "locked_amount": "3495580.978211127319001479733061117", "deposits": [ { "amount": "129284.449", @@ -44212,7 +44212,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1066830.244284321809310876608495514", + "locked_amount": "1064221.782048778033078667803528085", "deposits": [ { "amount": "552496.6455", @@ -46008,7 +46008,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "21301.8805998273963", - "locked_amount": "209638.706604707455196083079655", + "locked_amount": "209319.144607222031320837644444456", "deposits": [ { "amount": "3000", From 48cccc26784490d1f699c95ddede2b586f89799b Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 25 Dec 2022 12:07:02 +0000 Subject: [PATCH 09/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 49 ++++++++++++-------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 3c3d0cd9a..c5b96dba1 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81782.394474943601114655", + "locked_amount": "81722.950873368433634775", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36278.97023718924418", + "locked_amount": "36242.85944317605308", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3640.3521372399795", + "locked_amount": "3636.919552257737", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23443.1122281838367017854", + "locked_amount": "23384.803592460550596144", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "32042.687131444397281276687416", + "locked_amount": "31962.98929297666633361645052", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9862.1124735030393464104", + "locked_amount": "9837.583037390536100673", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3210.0219104510486814625", + "locked_amount": "3202.0378170244413255644", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11999.778846711386932089", + "locked_amount": "11969.93252226766886892", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15755.681687384898", + "locked_amount": "15724.53240101289", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "843713.151530029823050658", + "locked_amount": "842381.357725267018692228", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8718.437531451287275", + "locked_amount": "8660.55929825885825", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1320994.594384324005512471287", + "locked_amount": "1318948.18551447436995341468", "deposits": [ { "amount": "1998.95815", @@ -33204,8 +33204,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "508780.99323915010017952", - "locked_amount": "9983849.6013680911676987640181415125628549", + "total_removed": "510265.02608515010017952", + "locked_amount": "9976593.1669076098796341938205778932752095", "deposits": [ { "amount": "16249.93", @@ -33764,6 +33764,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0xa05b3825dec0543aa934b601d345f80d8db2a64f1a2d04e4d7c1d1b42f940f46" }, + { + "amount": "1484.032846", + "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", + "tx": "0xaa6324943437bf4c7cfd5e768371d0f23b2e9e4a93e3f0be5a790607524b3a77" + }, { "amount": "930.302108", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -36531,6 +36536,12 @@ "tranche_id": 2, "tx": "0xb87629e5ecd14a79820cfc8eb8804e15c5385d5f425ff732a61bf32d0c57b803" }, + { + "amount": "1484.032846", + "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", + "tranche_id": 2, + "tx": "0xaa6324943437bf4c7cfd5e768371d0f23b2e9e4a93e3f0be5a790607524b3a77" + }, { "amount": "930.302108", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -36635,8 +36646,8 @@ } ], "total_tokens": "200000", - "withdrawn_tokens": "72759.880204", - "remaining_tokens": "127240.119796" + "withdrawn_tokens": "74243.91305", + "remaining_tokens": "125756.08695" }, { "address": "0x1b956E6c00E238194B331eddEFF72Cb5f28A8d01", @@ -37941,7 +37952,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3488079.86156385250404553", - "locked_amount": "3495580.978211127319001479733061117", + "locked_amount": "3488881.884249983255005936693066203", "deposits": [ { "amount": "129284.449", @@ -44212,7 +44223,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1064221.782048778033078667803528085", + "locked_amount": "1061574.9295089477356903729324709", "deposits": [ { "amount": "552496.6455", @@ -46008,7 +46019,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "21301.8805998273963", - "locked_amount": "209319.144607222031320837644444456", + "locked_amount": "208994.879424022527534457959107052", "deposits": [ { "amount": "3000", From c8fc91a3bdcfc008d4a5cc454d5331d7de0fa078 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Sun, 25 Dec 2022 18:07:33 +0000 Subject: [PATCH 10/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 66 +++++++++++++------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index c5b96dba1..980f8c2c5 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81722.950873368433634775", + "locked_amount": "81663.559439388178165725", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36242.85944317605308", + "locked_amount": "36206.780339928971", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3636.919552257737", + "locked_amount": "3633.489979705733", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23384.803592460550596144", + "locked_amount": "23326.546128288247294407", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31962.98929297666633361645052", + "locked_amount": "31883.36139718474317216434784", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9837.583037390536100673", + "locked_amount": "9813.075128265841365684", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3202.0378170244413255644", + "locked_amount": "3194.0607304234749799926", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11969.93252226766886892", + "locked_amount": "11940.112390903140167955", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15724.53240101289", + "locked_amount": "15693.41045119705425", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "842381.357725267018692228", + "locked_amount": "841050.732700286507604686", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8660.55929825885825", + "locked_amount": "8602.7318588969381", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1318948.18551447436995341468", + "locked_amount": "1316903.47812550841661204221", "deposits": [ { "amount": "1998.95815", @@ -33204,8 +33204,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "510265.02608515010017952", - "locked_amount": "9976593.1669076098796341938205778932752095", + "total_removed": "510715.16102028372292952", + "locked_amount": "9969342.7657890992326787545963197341578805", "deposits": [ { "amount": "16249.93", @@ -33769,6 +33769,11 @@ "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", "tx": "0xaa6324943437bf4c7cfd5e768371d0f23b2e9e4a93e3f0be5a790607524b3a77" }, + { + "amount": "450.13493513362275", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xfbf58834bd7889b8a3d473ec21f4c583708b672e274f4d047b175c7b72dde478" + }, { "amount": "930.302108", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -35057,6 +35062,12 @@ "tranche_id": 2, "tx": "0xa05b3825dec0543aa934b601d345f80d8db2a64f1a2d04e4d7c1d1b42f940f46" }, + { + "amount": "450.13493513362275", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0xfbf58834bd7889b8a3d473ec21f4c583708b672e274f4d047b175c7b72dde478" + }, { "amount": "2074.139541638025125", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -35947,8 +35958,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "96188.775954664881125", - "remaining_tokens": "163810.111545335118875" + "withdrawn_tokens": "96638.910889798503875", + "remaining_tokens": "163359.976610201496125" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -37951,8 +37962,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "3488079.86156385250404553", - "locked_amount": "3488881.884249983255005936693066203", + "total_removed": "3488704.61873769943249253", + "locked_amount": "3482188.360231622774303580495882126", "deposits": [ { "amount": "129284.449", @@ -38196,6 +38207,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0x35a541fdaee8b0d8408783be8c28fc334c79b20e3cb61d0ef8f58ff35cd38862" }, + { + "amount": "624.757173846928447", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xa1dca04a068ba23bab9e2c53554a9357b9bedb1f4c2b63aef77b92ce46ae2ee6" + }, { "amount": "9158.56255453299474378", "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", @@ -40798,6 +40814,12 @@ "tranche_id": 3, "tx": "0x35a541fdaee8b0d8408783be8c28fc334c79b20e3cb61d0ef8f58ff35cd38862" }, + { + "amount": "624.757173846928447", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xa1dca04a068ba23bab9e2c53554a9357b9bedb1f4c2b63aef77b92ce46ae2ee6" + }, { "amount": "2874.6686339993457875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -42978,8 +43000,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "272786.93504796421235925", - "remaining_tokens": "86336.53452703578764075" + "withdrawn_tokens": "273411.69222181114080625", + "remaining_tokens": "85711.77735318885919375" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -44223,7 +44245,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1061574.9295089477356903729324709", + "locked_amount": "1058930.27768719659198409948180197", "deposits": [ { "amount": "552496.6455", @@ -46019,7 +46041,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "21301.8805998273963", - "locked_amount": "208994.879424022527534457959107052", + "locked_amount": "208670.88385019517564699636326736", "deposits": [ { "amount": "3000", From 496fdee10e9c0c71cc6bffa658dd49b16c6e16dc Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 26 Dec 2022 00:12:57 +0000 Subject: [PATCH 11/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 52 ++++++++++++-------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 980f8c2c5..e1a06328b 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81663.559439388178165725", + "locked_amount": "81603.36352618105805625", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36206.780339928971", + "locked_amount": "36170.21253170979054", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3633.489979705733", + "locked_amount": "3630.013952308473", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23326.546128288247294407", + "locked_amount": "23267.4995449350284112792", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31883.36139718474317216434784", + "locked_amount": "31802.65491170823094494519678", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9813.075128265841365684", + "locked_amount": "9788.2352503290951138736", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3194.0607304234749799926", + "locked_amount": "3185.975591195534071168", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11940.112390903140167955", + "locked_amount": "11909.8883346858652419", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15693.41045119705425", + "locked_amount": "15661.8669429097605", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "841050.732700286507604686", + "locked_amount": "839702.083860766065956926", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8602.7318588969381", + "locked_amount": "8544.12112520129025", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1316903.47812550841661204221", + "locked_amount": "1314830.97988210392346860847", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "510715.16102028372292952", - "locked_amount": "9969342.7657890992326787545963197341578805", + "locked_amount": "9961993.820085095093448792442105215592052", "deposits": [ { "amount": "16249.93", @@ -37963,7 +37963,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3488704.61873769943249253", - "locked_amount": "3482188.360231622774303580495882126", + "locked_amount": "3475403.86048114619866836741853827", "deposits": [ { "amount": "129284.449", @@ -44245,7 +44245,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1058930.27768719659198409948180197", + "locked_amount": "1056249.680803470606633171471856479", "deposits": [ { "amount": "552496.6455", @@ -46040,8 +46040,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "21301.8805998273963", - "locked_amount": "208670.88385019517564699636326736", + "total_removed": "27113.8260843153963", + "locked_amount": "208342.484656622750079586438964976", "deposits": [ { "amount": "3000", @@ -52700,6 +52700,11 @@ "user": "0xe46BFCBF19E96e2AdD939b5bC6E541feE6631a11", "tx": "0xc1b142befd0ff0b541a6a6333cd5baa7b1145fa1a854b01601b35adddada71ce" }, + { + "amount": "5811.945484488", + "user": "0xfB48DBD9eaEA23D7ABCFB80fF87d001567956c0e", + "tx": "0xe1d9888ad5ee915e9c81f18ac12e6e0ee54f006f0a75ad3ab4fabd8e9c5ac549" + }, { "amount": "199.140778792", "user": "0x2827B97046558f044ab07c3De0159632f8956472", @@ -53753,10 +53758,17 @@ "tx": "0xb59405747c8088945a412703637a7b422f3639439ec2ee15e180c0a2a0d71ee4" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "5811.945484488", + "user": "0xfB48DBD9eaEA23D7ABCFB80fF87d001567956c0e", + "tranche_id": 5, + "tx": "0xe1d9888ad5ee915e9c81f18ac12e6e0ee54f006f0a75ad3ab4fabd8e9c5ac549" + } + ], "total_tokens": "10400", - "withdrawn_tokens": "0", - "remaining_tokens": "10400" + "withdrawn_tokens": "5811.945484488", + "remaining_tokens": "4588.054515512" }, { "address": "0x727f82E843617c79c5E5aa7368B92f2C790D8257", From bcc1c8a474cdd6589a8c83989d51e0762edd3073 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 26 Dec 2022 06:06:54 +0000 Subject: [PATCH 12/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index e1a06328b..eb54b4ee5 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81603.36352618105805625", + "locked_amount": "81545.05388337958639038", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36170.21253170979054", + "locked_amount": "36134.79059487570188", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3630.013952308473", + "locked_amount": "3626.646848046677", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23267.4995449350284112792", + "locked_amount": "23210.3032171357082524728", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31802.65491170823094494519678", + "locked_amount": "31724.477406140611964632843716", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9788.2352503290951138736", + "locked_amount": "9764.173742951668897474", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3185.975591195534071168", + "locked_amount": "3178.1438040315226113097", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11909.8883346858652419", + "locked_amount": "11880.61136506871460855", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15661.8669429097605", + "locked_amount": "15631.31186694290925", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "839702.083860766065956926", + "locked_amount": "838395.69563759066392283", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8544.12112520129025", + "locked_amount": "8487.346989482688775", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1314830.97988210392346860847", + "locked_amount": "1312823.61054587005110091517", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "510715.16102028372292952", - "locked_amount": "9961993.820085095093448792442105215592052", + "locked_amount": "9954875.8173042375430442389533397791011084", "deposits": [ { "amount": "16249.93", @@ -37963,7 +37963,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3488704.61873769943249253", - "locked_amount": "3475403.86048114619866836741853827", + "locked_amount": "3468832.56576273599903778276994755", "deposits": [ { "amount": "129284.449", @@ -44245,7 +44245,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1056249.680803470606633171471856479", + "locked_amount": "1053653.322517367693838229090237889", "deposits": [ { "amount": "552496.6455", @@ -46041,7 +46041,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "27113.8260843153963", - "locked_amount": "208342.484656622750079586438964976", + "locked_amount": "208024.405510684095518603695991904", "deposits": [ { "amount": "3000", From 418ea41e22a4cc5ba308f099cb7e72bc6f8d2803 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 26 Dec 2022 12:07:29 +0000 Subject: [PATCH 13/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 67 +++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index eb54b4ee5..95fd8c07e 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81545.05388337958639038", + "locked_amount": "81485.654212410657867", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36134.79059487570188", + "locked_amount": "36098.70648782343694", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3626.646848046677", + "locked_amount": "3623.2167998477925", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23210.3032171357082524728", + "locked_amount": "23152.0376732448286672248", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31724.477406140611964632843716", + "locked_amount": "31644.838466768287855372588836", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9764.173742951668897474", + "locked_amount": "9739.662434828899938416", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3178.1438040315226113097", + "locked_amount": "3170.165611089664622006", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11880.61136506871460855", + "locked_amount": "11850.787097954844529329", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2056.3876419", - "locked_amount": "15631.31186694290925", + "locked_amount": "15600.1856008287285", "deposits": [ { "amount": "7500", @@ -1184,7 +1184,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "838395.69563759066392283", + "locked_amount": "837064.886068434266730084", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1536,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8487.346989482688775", + "locked_amount": "8429.51153004227125", "deposits": [ { "amount": "12500", @@ -31979,7 +31979,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1312823.61054587005110091517", + "locked_amount": "1310778.61957675686093422746", "deposits": [ { "amount": "1998.95815", @@ -33205,7 +33205,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "510715.16102028372292952", - "locked_amount": "9954875.8173042375430442389533397791011084", + "locked_amount": "9947624.41062873178923727790019737662206", "deposits": [ { "amount": "16249.93", @@ -37963,7 +37963,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3488704.61873769943249253", - "locked_amount": "3468832.56576273599903778276994755", + "locked_amount": "3462138.113420579203304121667702827", "deposits": [ { "amount": "129284.449", @@ -44245,7 +44245,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1053653.322517367693838229090237889", + "locked_amount": "1051008.30390926989932383525982576", "deposits": [ { "amount": "552496.6455", @@ -46040,8 +46040,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "27113.8260843153963", - "locked_amount": "208024.405510684095518603695991904", + "total_removed": "27238.3679206278963", + "locked_amount": "207700.3650019613771087287519026", "deposits": [ { "amount": "3000", @@ -52705,6 +52705,16 @@ "user": "0xfB48DBD9eaEA23D7ABCFB80fF87d001567956c0e", "tx": "0xe1d9888ad5ee915e9c81f18ac12e6e0ee54f006f0a75ad3ab4fabd8e9c5ac549" }, + { + "amount": "96.547945204", + "user": "0xf016E520e70f12A366a34B24B621F83140f8Be68", + "tx": "0x459e4dbb06dac1e3171d15a8974dd7035e7f735c0247b45b66c4bdf427984af2" + }, + { + "amount": "27.9938911085", + "user": "0xeE2C02Cd75dcEacD16614feB126a1cD2637646d0", + "tx": "0x81181699f4cae02ba8761ccf126f88141644a318f8f5bfd67f3d4a4f870b59e9" + }, { "amount": "199.140778792", "user": "0x2827B97046558f044ab07c3De0159632f8956472", @@ -67685,6 +67695,12 @@ } ], "withdrawals": [ + { + "amount": "96.547945204", + "user": "0xf016E520e70f12A366a34B24B621F83140f8Be68", + "tranche_id": 5, + "tx": "0x459e4dbb06dac1e3171d15a8974dd7035e7f735c0247b45b66c4bdf427984af2" + }, { "amount": "127.394812276", "user": "0xf016E520e70f12A366a34B24B621F83140f8Be68", @@ -67693,8 +67709,8 @@ } ], "total_tokens": "400", - "withdrawn_tokens": "127.394812276", - "remaining_tokens": "272.605187724" + "withdrawn_tokens": "223.94275748", + "remaining_tokens": "176.05724252" }, { "address": "0x1d999A280c97D468866b80292c707c47f23D7B18", @@ -69992,10 +70008,17 @@ "tx": "0x3a0390dffa4280c286016566b29c62e4cec36c6504f7ac3d1de80d22b2903008" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "27.9938911085", + "user": "0xeE2C02Cd75dcEacD16614feB126a1cD2637646d0", + "tranche_id": 5, + "tx": "0x81181699f4cae02ba8761ccf126f88141644a318f8f5bfd67f3d4a4f870b59e9" + } + ], "total_tokens": "50", - "withdrawn_tokens": "0", - "remaining_tokens": "50" + "withdrawn_tokens": "27.9938911085", + "remaining_tokens": "22.0061088915" }, { "address": "0x4B2FE2305A9F8AdCa0038B375dADCcad274C09Ca", From f3cd2db1cef04b43d73269dcb29da1b713b72b62 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 26 Dec 2022 18:08:27 +0000 Subject: [PATCH 14/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 83 ++++++++++++++------ 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 95fd8c07e..70c8f85ef 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81485.654212410657867", + "locked_amount": "81426.18589986947122413", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36098.70648782343694", + "locked_amount": "36062.5806823947183", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3623.2167998477925", + "locked_amount": "3619.782787924911", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23152.0376732448286672248", + "locked_amount": "23093.7047983658137110504", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31644.838466768287855372588836", + "locked_amount": "31565.107497559391912846601564", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9739.662434828899938416", + "locked_amount": "9715.122801722165570508", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3170.165611089664622006", + "locked_amount": "3162.178198640386884894", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11850.787097954844529329", + "locked_amount": "11820.928366263088681434", "deposits": [ { "amount": "6500", @@ -1084,8 +1084,8 @@ "tranche_start": "2022-11-01T00:00:00.000Z", "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", - "total_removed": "2056.3876419", - "locked_amount": "15600.1856008287285", + "total_removed": "2310.007577475", + "locked_amount": "15569.02336556169225", "deposits": [ { "amount": "7500", @@ -1109,6 +1109,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x1d4aa474e9a6de0e86702e16f621eb46d117a5d072049ade2860ca8301d6cf02" }, + { + "amount": "253.619935575", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xcc41ce33de4f693230c5ca45acba37c826147157c0ab86e7cbaf235652c9cfad" + }, { "amount": "442.132826925", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -1144,6 +1149,12 @@ "tranche_id": 33, "tx": "0x1d4aa474e9a6de0e86702e16f621eb46d117a5d072049ade2860ca8301d6cf02" }, + { + "amount": "253.619935575", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 33, + "tx": "0xcc41ce33de4f693230c5ca45acba37c826147157c0ab86e7cbaf235652c9cfad" + }, { "amount": "442.132826925", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -1158,8 +1169,8 @@ } ], "total_tokens": "7500", - "withdrawn_tokens": "2056.3876419", - "remaining_tokens": "5443.6123581" + "withdrawn_tokens": "2310.007577475", + "remaining_tokens": "5189.992422525" }, { "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1", @@ -1184,7 +1195,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "837064.886068434266730084", + "locked_amount": "835732.5386311427564947168", "deposits": [ { "amount": "1852091.69", @@ -1536,7 +1547,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8429.51153004227125", + "locked_amount": "8371.609236614329275", "deposits": [ { "amount": "12500", @@ -31979,7 +31990,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1310778.61957675686093422746", + "locked_amount": "1308731.26543974915967060376", "deposits": [ { "amount": "1998.95815", @@ -33204,8 +33215,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "510715.16102028372292952", - "locked_amount": "9947624.41062873178923727790019737662206", + "total_removed": "511218.93522350218767952", + "locked_amount": "9940364.6243116022610146636691529061286834", "deposits": [ { "amount": "16249.93", @@ -33774,6 +33785,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0xfbf58834bd7889b8a3d473ec21f4c583708b672e274f4d047b175c7b72dde478" }, + { + "amount": "503.77420321846475", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x1e3efba0c9a6b7f9653f0fb5f9b24ae9c13ec801d00cf7f9333689f7432914c0" + }, { "amount": "930.302108", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -35068,6 +35084,12 @@ "tranche_id": 2, "tx": "0xfbf58834bd7889b8a3d473ec21f4c583708b672e274f4d047b175c7b72dde478" }, + { + "amount": "503.77420321846475", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x1e3efba0c9a6b7f9653f0fb5f9b24ae9c13ec801d00cf7f9333689f7432914c0" + }, { "amount": "2074.139541638025125", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -35958,8 +35980,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "96638.910889798503875", - "remaining_tokens": "163359.976610201496125" + "withdrawn_tokens": "97142.685093016968625", + "remaining_tokens": "162856.202406983031375" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -37962,8 +37984,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "3488704.61873769943249253", - "locked_amount": "3462138.113420579203304121667702827", + "total_removed": "3489401.90950082536320653", + "locked_amount": "3455435.615605513322507301207354558", "deposits": [ { "amount": "129284.449", @@ -38212,6 +38234,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xa1dca04a068ba23bab9e2c53554a9357b9bedb1f4c2b63aef77b92ce46ae2ee6" }, + { + "amount": "697.290763125930714", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0x617ff95943d9685aaf9763e3fb4ca1f81e8dd04fd013d1a64b59e52b78b25b81" + }, { "amount": "9158.56255453299474378", "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", @@ -40820,6 +40847,12 @@ "tranche_id": 3, "tx": "0xa1dca04a068ba23bab9e2c53554a9357b9bedb1f4c2b63aef77b92ce46ae2ee6" }, + { + "amount": "697.290763125930714", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0x617ff95943d9685aaf9763e3fb4ca1f81e8dd04fd013d1a64b59e52b78b25b81" + }, { "amount": "2874.6686339993457875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -43000,8 +43033,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "273411.69222181114080625", - "remaining_tokens": "85711.77735318885919375" + "withdrawn_tokens": "274108.98298493707152025", + "remaining_tokens": "85014.48659006292847975" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -44245,7 +44278,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1051008.30390926989932383525982576", + "locked_amount": "1048360.10648616851045106305493731", "deposits": [ { "amount": "552496.6455", @@ -46041,7 +46074,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "27238.3679206278963", - "locked_amount": "207700.3650019613771087287519026", + "locked_amount": "207375.93505747890052861638964992", "deposits": [ { "amount": "3000", From bd129f122998612458f4af009ab399c2bb8554fe Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Tue, 27 Dec 2022 00:12:33 +0000 Subject: [PATCH 15/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 70c8f85ef..0919852dc 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81426.18589986947122413", + "locked_amount": "81366.20689403068521225", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36062.5806823947183", + "locked_amount": "36026.14464104515678", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3619.782787924911", + "locked_amount": "3616.3192858954845", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23093.7047983658137110504", + "locked_amount": "23034.8709809350925770932", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31565.107497559391912846601564", + "locked_amount": "31484.691826366438784619206136", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9715.122801722165570508", + "locked_amount": "9690.372430734744810686", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3162.178198640386884894", + "locked_amount": "3154.1221930558962444615", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11820.928366263088681434", + "locked_amount": "11790.813218111910307458", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2310.007577475", - "locked_amount": "15569.02336556169225", + "locked_amount": "15537.59351979742125", "deposits": [ { "amount": "7500", @@ -1195,7 +1195,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "835732.5386311427564947168", + "locked_amount": "834388.749454928324600619", "deposits": [ { "amount": "1852091.69", @@ -1547,7 +1547,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8371.609236614329275", + "locked_amount": "8313.209698319244475", "deposits": [ { "amount": "12500", @@ -31990,7 +31990,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1308731.26543974915967060376", + "locked_amount": "1306666.329333606915418941833", "deposits": [ { "amount": "1998.95815", @@ -33216,7 +33216,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "511218.93522350218767952", - "locked_amount": "9940364.6243116022610146636691529061286834", + "locked_amount": "9933042.493460791978100411518285047208705", "deposits": [ { "amount": "16249.93", @@ -37985,7 +37985,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3489401.90950082536320653", - "locked_amount": "3455435.615605513322507301207354558", + "locked_amount": "3448676.18059755681364342039403001", "deposits": [ { "amount": "129284.449", @@ -44278,7 +44278,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1048360.10648616851045106305493731", + "locked_amount": "1045689.41283380244361170877101401", "deposits": [ { "amount": "552496.6455", @@ -46074,7 +46074,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "27238.3679206278963", - "locked_amount": "207375.93505747890052861638964992", + "locked_amount": "207048.74910608111127077586808728", "deposits": [ { "amount": "3000", From d2ae780996776b0fc525e50dcbcce9bce112d1df Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Tue, 27 Dec 2022 06:08:39 +0000 Subject: [PATCH 16/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 0919852dc..19bb4c44b 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81366.20689403068521225", + "locked_amount": "81307.540315053463525065", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "36026.14464104515678", + "locked_amount": "35990.50587265347206", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3616.3192858954845", + "locked_amount": "3612.931570268899", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "23034.8709809350925770932", + "locked_amount": "22977.3245319974778494292", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31484.691826366438784619206136", + "locked_amount": "31406.03576564866087005483132", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9690.372430734744810686", + "locked_amount": "9666.16363344070691823", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3154.1221930558962444615", + "locked_amount": "3146.242464453294772696", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11790.813218111910307458", + "locked_amount": "11761.357032689791441887", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2310.007577475", - "locked_amount": "15537.59351979742125", + "locked_amount": "15506.85140423572725", "deposits": [ { "amount": "7500", @@ -1195,7 +1195,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "834388.749454928324600619", + "locked_amount": "833074.364317451785811321", "deposits": [ { "amount": "1852091.69", @@ -1547,7 +1547,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8313.209698319244475", + "locked_amount": "8256.088025865538725", "deposits": [ { "amount": "12500", @@ -31990,7 +31990,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1306666.329333606915418941833", + "locked_amount": "1304646.5769976062751817308", "deposits": [ { "amount": "1998.95815", @@ -33216,7 +33216,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "511218.93522350218767952", - "locked_amount": "9933042.493460791978100411518285047208705", + "locked_amount": "9925880.5813578269289248200293407539226817", "deposits": [ { "amount": "16249.93", @@ -37985,7 +37985,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3489401.90950082536320653", - "locked_amount": "3448676.18059755681364342039403001", + "locked_amount": "3442064.349073341394799607916857306", "deposits": [ { "amount": "129284.449", @@ -44278,7 +44278,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1045689.41283380244361170877101401", + "locked_amount": "1043077.038210560557981748676738499", "deposits": [ { "amount": "552496.6455", @@ -46074,7 +46074,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "27238.3679206278963", - "locked_amount": "207048.74910608111127077586808728", + "locked_amount": "206728.70780304521507469111821412", "deposits": [ { "amount": "3000", From 2cb88624f3afd7d3d7eb541f02a5eb75abd628ed Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Tue, 27 Dec 2022 12:07:23 +0000 Subject: [PATCH 17/19] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 49 ++++++++++++-------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 19bb4c44b..a2a4dd17c 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -351,7 +351,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "81307.540315053463525065", + "locked_amount": "81248.44266700247332743", "deposits": [ { "amount": "129999.45", @@ -417,7 +417,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "35990.50587265347206", + "locked_amount": "35954.60523845763496", "deposits": [ { "amount": "2600", @@ -590,7 +590,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3612.931570268899", + "locked_amount": "3609.518962455606", "deposits": [ { "amount": "5000", @@ -801,7 +801,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "22977.3245319974778494292", + "locked_amount": "22919.355244454384926296", "deposits": [ { "amount": "97499.58", @@ -834,7 +834,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "31406.03576564866087005483132", + "locked_amount": "31326.801757557241202249339196", "deposits": [ { "amount": "135173.4239508", @@ -880,7 +880,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "9666.16363344070691823", + "locked_amount": "9641.77695524737925814", "deposits": [ { "amount": "32499.86", @@ -913,7 +913,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "3146.242464453294772696", + "locked_amount": "3138.304837344090628721", "deposits": [ { "amount": "10833.29", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "11761.357032689791441887", + "locked_amount": "11731.684409718586439931", "deposits": [ { "amount": "6500", @@ -1085,7 +1085,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2310.007577475", - "locked_amount": "15506.85140423572725", + "locked_amount": "15475.883402394108", "deposits": [ { "amount": "7500", @@ -1195,7 +1195,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "833074.364317451785811321", + "locked_amount": "831750.321368088516416672", "deposits": [ { "amount": "1852091.69", @@ -1547,7 +1547,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "22452.0135114", - "locked_amount": "8256.088025865538725", + "locked_amount": "8198.5466359702077", "deposits": [ { "amount": "12500", @@ -31990,7 +31990,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "428705.3729302523069", - "locked_amount": "1304646.5769976062751817308", + "locked_amount": "1302611.983967228485957345394", "deposits": [ { "amount": "1998.95815", @@ -33216,7 +33216,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "511218.93522350218767952", - "locked_amount": "9925880.5813578269289248200293407539226817", + "locked_amount": "9918666.0451054660999487872683874447066774", "deposits": [ { "amount": "16249.93", @@ -37985,7 +37985,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "3489401.90950082536320653", - "locked_amount": "3442064.349073341394799607916857306", + "locked_amount": "3435403.935270409773977622448850085", "deposits": [ { "amount": "129284.449", @@ -44278,7 +44278,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "2479228.813551817124120168", - "locked_amount": "1043077.038210560557981748676738499", + "locked_amount": "1040445.46843517541177374554941811", "deposits": [ { "amount": "552496.6455", @@ -46074,7 +46074,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "27238.3679206278963", - "locked_amount": "206728.70780304521507469111821412", + "locked_amount": "206406.314907152309626154543277504", "deposits": [ { "amount": "3000", @@ -74117,7 +74117,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "60531.9043909997989", + "total_removed": "60641.2093106172989", "locked_amount": "0", "deposits": [ { @@ -78367,6 +78367,11 @@ "user": "0xe611723f968ED5735B3742ae721b4A2A6edB6758", "tx": "0x940ac7457a2b8a9072a31ad871c5e4c0a343f302e0d9f76de99df369abe297fc" }, + { + "amount": "109.3049196175", + "user": "0x667B436A05523B8D80483b030f559f034753DD74", + "tx": "0x48d6761a237f75fa95ff67082e4f0b5538586a58a7a677943f1c4260f3abb860" + }, { "amount": "250", "user": "0x3E1CECDc3d15Cb03e91a60470C4453f4fBFc75F9", @@ -87079,6 +87084,12 @@ } ], "withdrawals": [ + { + "amount": "109.3049196175", + "user": "0x667B436A05523B8D80483b030f559f034753DD74", + "tranche_id": 6, + "tx": "0x48d6761a237f75fa95ff67082e4f0b5538586a58a7a677943f1c4260f3abb860" + }, { "amount": "140.6950803825", "user": "0x667B436A05523B8D80483b030f559f034753DD74", @@ -87087,8 +87098,8 @@ } ], "total_tokens": "250", - "withdrawn_tokens": "140.6950803825", - "remaining_tokens": "109.3049196175" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0x036946f917076119Dc6a221F8ad587938CBf14d3", From 28fe7458ca20e52d31bf28446a61f45664b1bc9a Mon Sep 17 00:00:00 2001 From: daro-maj <119658839+daro-maj@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:10:08 +0100 Subject: [PATCH 18/19] chore: cover 7003-MORD e2e tests order list - fields (#2477) * chore: cover 7003-MORD e2e tests order list - fields * chore: formating fix --- .../src/integration/trading-orders.cy.ts | 86 ++++++++++++++++--- 1 file changed, 76 insertions(+), 10 deletions(-) diff --git a/apps/trading-e2e/src/integration/trading-orders.cy.ts b/apps/trading-e2e/src/integration/trading-orders.cy.ts index d03fc43ee..94d872201 100644 --- a/apps/trading-e2e/src/integration/trading-orders.cy.ts +++ b/apps/trading-e2e/src/integration/trading-orders.cy.ts @@ -96,7 +96,7 @@ describe('orders list', { tags: '@smoke' }, () => { }); it('orders are sorted by most recent order', () => { - //7003-MORD-002 + // 7003-MORD-002 const expectedOrderList = ['BTCUSD.MF21', 'BTCUSD.MF21']; cy.getByTestId('tab-orders') @@ -133,9 +133,9 @@ describe('subscribe orders', { tags: '@smoke' }, () => { }); }); const orderId = '1234567890'; - //7002-SORD-053 - //7002-SORD-040 - //7003-MORD-001 + // 7002-SORD-053 + // 7002-SORD-040 + // 7003-MORD-001 it('must see an active order', () => { // 7002-SORD-041 updateOrder({ @@ -224,6 +224,70 @@ describe('subscribe orders', { tags: '@smoke' }, () => { cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Parked'); }); + it('must see the size of the order and direction/side -', () => { + // 7003-MORD-003 + // 7003-MORD-004 + updateOrder({ + id: orderId, + size: '15', + side: Schema.Side.SIDE_SELL, + status: Schema.OrderStatus.STATUS_ACTIVE, + }); + cy.get(`[row-id=${orderId}]`) + .find('[col-id="size"]') + .should('have.text', '-15'); + }); + + it('must see the size of the order and direction/side +', () => { + // 7003-MORD-003 + // 7003-MORD-004 + updateOrder({ + id: orderId, + size: '5', + side: Schema.Side.SIDE_BUY, + status: Schema.OrderStatus.STATUS_ACTIVE, + }); + cy.get(`[row-id=${orderId}]`) + .find('[col-id="size"]') + .should('have.text', '+5'); + }); + + it('for limit typy must see the Limit price that was set on the order', () => { + // 7003-MORD-005 + updateOrder({ + id: orderId, + status: Schema.OrderStatus.STATUS_ACTIVE, + }); + cy.get(`[row-id=${orderId}]`) + .find('[col-id="price"]') + .should('have.text', '200.00'); + }); + + it('for market typy must not see a price for active or parked orders', () => { + // 7003-MORD-005 + updateOrder({ + id: orderId, + type: Schema.OrderType.TYPE_MARKET, + status: Schema.OrderStatus.STATUS_PARKED, + }); + cy.get(`[row-id=${orderId}]`) + .find('[col-id="price"]') + .should('have.text', '200.00'); + }); + + it('must see the time in force applied to the order', () => { + // 7003-MORD-006 + updateOrder({ + id: orderId, + type: Schema.OrderType.TYPE_MARKET, + status: Schema.OrderStatus.STATUS_ACTIVE, + timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC, + }); + cy.get(`[row-id=${orderId}]`) + .find(`[col-id='${orderTimeInForce}']`) + .should('have.text', "Good 'til Cancelled (GTC)"); + }); + it('for Active order when is part of a liquidity or peg shape, must not see an option to amend the individual order ', () => { // 7003-MORD-008 updateOrder({ @@ -288,9 +352,10 @@ describe('amend and cancel order', { tags: '@smoke' }, () => { const orderId = '1234567890'; it('must be able to amend the price of an order', () => { - //7003-MORD-012 - //7003-MORD-014 - //7003-MORD-015 + // 7003-MORD-007 + // 7003-MORD-012 + // 7003-MORD-014 + // 7003-MORD-015 updateOrder({ id: orderId, status: Schema.OrderStatus.STATUS_ACTIVE, @@ -316,9 +381,10 @@ describe('amend and cancel order', { tags: '@smoke' }, () => { }); }); it('must be able to cancel an individual order', () => { - //7003-MORD-009 - //7003-MORD-010 - //7003-MORD-011 + // 7003-MORD-007 + // 7003-MORD-009 + // 7003-MORD-010 + // 7003-MORD-011 updateOrder({ id: orderId, status: Schema.OrderStatus.STATUS_ACTIVE, From 22179252853e64d0df6ea901d30d197e67aca039 Mon Sep 17 00:00:00 2001 From: botond <105208209+notbot00@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:28:54 +0100 Subject: [PATCH 19/19] fix: env ssl to subscription (#2440) * fix: rename ssl environment check to subscription * fix: format --- .../components/node-switcher/node-stats.tsx | 18 ++++++++++-------- .../node-switcher/node-switcher.spec.tsx | 18 ++++++++++-------- .../components/node-switcher/node-switcher.tsx | 2 +- .../src/hooks/use-environment.spec.tsx | 4 ++-- libs/environment/src/hooks/use-nodes.spec.tsx | 14 +++++++------- libs/environment/src/hooks/use-nodes.tsx | 8 ++++---- libs/environment/src/types.ts | 4 ++-- libs/environment/src/utils/validate-node.tsx | 14 +++++++------- 8 files changed, 43 insertions(+), 39 deletions(-) diff --git a/libs/environment/src/components/node-switcher/node-stats.tsx b/libs/environment/src/components/node-switcher/node-stats.tsx index 9d1acab38..9bfbc9576 100644 --- a/libs/environment/src/components/node-switcher/node-stats.tsx +++ b/libs/environment/src/components/node-switcher/node-stats.tsx @@ -40,11 +40,13 @@ const getBlockDisplayValue = ( return '-'; }; -const getSslDisplayValue = (ssl?: NodeData['ssl']) => { - if (ssl?.value) { +const getSubscriptionDisplayValue = ( + subscription?: NodeData['subscription'] +) => { + if (subscription?.value) { return t('Yes'); } - if (ssl?.hasError) { + if (subscription?.hasError) { return t('No'); } return '-'; @@ -81,12 +83,12 @@ const NodeStatsContent = ({ {getBlockDisplayValue(data.block, setBlock)} - {getSslDisplayValue(data.ssl)} + {getSubscriptionDisplayValue(data.subscription)} ); diff --git a/libs/environment/src/components/node-switcher/node-switcher.spec.tsx b/libs/environment/src/components/node-switcher/node-switcher.spec.tsx index 4643fe8a2..a09e09894 100644 --- a/libs/environment/src/components/node-switcher/node-switcher.spec.tsx +++ b/libs/environment/src/components/node-switcher/node-switcher.spec.tsx @@ -10,7 +10,7 @@ import { getErrorByType } from '../../utils/validate-node'; import type { Configuration, NodeData } from '../../types'; import { Networks, ErrorType, CUSTOM_NODE_KEY } from '../../types'; -type NodeDataProp = 'responseTime' | 'block' | 'chain' | 'ssl'; +type NodeDataProp = 'responseTime' | 'block' | 'chain' | 'subscription'; jest.mock('../../hooks/use-environment'); jest.mock('../../hooks/use-nodes'); @@ -99,7 +99,7 @@ const getValidNodeState = (env: Networks, url: string) => ({ hasError: false, value: 123, }, - ssl: { + subscription: { isLoading: false, hasError: false, value: true, @@ -203,8 +203,8 @@ describe('Node switcher', () => { ${'block'} | ${STATES.HAS_ERROR} ${'chain'} | ${STATES.LOADING} ${'chain'} | ${STATES.HAS_ERROR} - ${'ssl'} | ${STATES.LOADING} - ${'ssl'} | ${STATES.HAS_ERROR} + ${'subscription'} | ${STATES.LOADING} + ${'subscription'} | ${STATES.HAS_ERROR} `( 'disables selecting a node when the $dataProp $state', ({ dataProp, state }: { dataProp: NodeDataProp; state: STATES }) => { @@ -409,8 +409,8 @@ describe('Node switcher', () => { ${'block'} | ${STATES.HAS_ERROR} ${'chain'} | ${STATES.LOADING} ${'chain'} | ${STATES.HAS_ERROR} - ${'ssl'} | ${STATES.LOADING} - ${'ssl'} | ${STATES.HAS_ERROR} + ${'subscription'} | ${STATES.LOADING} + ${'subscription'} | ${STATES.HAS_ERROR} `( 'disables selecting a custom node when the $dataProp $state', ({ dataProp, state }: { dataProp: NodeDataProp; state: STATES }) => { @@ -494,7 +494,9 @@ describe('Node switcher', () => { if (state === STATES.HAS_ERROR) { const expectedErrorType = - dataProp === 'ssl' ? ErrorType.SSL_ERROR : ErrorType.CONNECTION_ERROR; + dataProp === 'subscription' + ? ErrorType.SUBSCRIPTION_ERROR + : ErrorType.CONNECTION_ERROR; const error = getErrorByType( expectedErrorType, Networks.TESTNET, @@ -547,7 +549,7 @@ describe('Node switcher', () => { it.each` description | errorType ${'the node has an invalid url'} | ${ErrorType.INVALID_URL} - ${'the node has an ssl issue'} | ${ErrorType.SSL_ERROR} + ${'the node has a subscription issue'} | ${ErrorType.SUBSCRIPTION_ERROR} ${'the node cannot be reached'} | ${ErrorType.CONNECTION_ERROR} ${'none of the config nodes can be connected to'} | ${ErrorType.CONNECTION_ERROR_ALL} ${'the config cannot be loaded'} | ${ErrorType.CONFIG_LOAD_ERROR} diff --git a/libs/environment/src/components/node-switcher/node-switcher.tsx b/libs/environment/src/components/node-switcher/node-switcher.tsx index 53361318e..b97223df7 100644 --- a/libs/environment/src/components/node-switcher/node-switcher.tsx +++ b/libs/environment/src/components/node-switcher/node-switcher.tsx @@ -97,7 +97,7 @@ export const NodeSwitcher = ({
{t('Response time')} {t('Block')} - {t('SSL')} + {t('Subscription')}
{ }); }); - it('has a network error when the selected node has not ssl available', async () => { + it('has a network error when the selected node has not subscription available', async () => { act(async () => { // @ts-ignore allow adding a mock return value to mocked module createClient.mockImplementation(() => { @@ -517,7 +517,7 @@ describe('node selection', () => { await waitFor(() => { expect(result.current).toEqual({ ...mockEnvironmentState, - networkError: ErrorType.SSL_ERROR, + networkError: ErrorType.SUBSCRIPTION_ERROR, setNodeSwitcherOpen: result.current.setNodeSwitcherOpen, }); }); diff --git a/libs/environment/src/hooks/use-nodes.spec.tsx b/libs/environment/src/hooks/use-nodes.spec.tsx index 674f825f6..67057aa99 100644 --- a/libs/environment/src/hooks/use-nodes.spec.tsx +++ b/libs/environment/src/hooks/use-nodes.spec.tsx @@ -24,7 +24,7 @@ const initialState = { hasError: false, value: undefined, }, - ssl: { + subscription: { isLoading: false, hasError: false, value: undefined, @@ -84,8 +84,8 @@ describe('useNodes hook', () => { ...initialState.chain, isLoading: true, }, - ssl: { - ...initialState.ssl, + subscription: { + ...initialState.subscription, isLoading: true, }, }); @@ -122,7 +122,7 @@ describe('useNodes hook', () => { const { result } = renderHook(() => useNodes({ hosts: [node] })); await waitFor(() => { - expect(result.current.state[node].ssl).toEqual({ + expect(result.current.state[node].subscription).toEqual({ isLoading: false, hasError: false, value: true, @@ -182,7 +182,7 @@ describe('useNodes hook', () => { const { result } = renderHook(() => useNodes({ hosts: [node] })); await waitFor(() => { - expect(result.current.state[node].ssl).toEqual({ + expect(result.current.state[node].subscription).toEqual({ isLoading: false, hasError: true, value: undefined, @@ -273,7 +273,7 @@ describe('useNodes hook', () => { expect(result.current.state[node].block.hasError).toBe(true); expect(result.current.state[node].chain.hasError).toBe(true); expect(result.current.state[node].responseTime.hasError).toBe(true); - expect(result.current.state[node].ssl.hasError).toBe(true); + expect(result.current.state[node].subscription.hasError).toBe(true); }); }); @@ -331,7 +331,7 @@ describe('useNodes hook', () => { }); await waitFor(() => { - expect(result.current.state[node].ssl).toEqual({ + expect(result.current.state[node].subscription).toEqual({ isLoading: false, hasError: true, value: undefined, diff --git a/libs/environment/src/hooks/use-nodes.tsx b/libs/environment/src/hooks/use-nodes.tsx index 8960aaaa8..eda1a801a 100644 --- a/libs/environment/src/hooks/use-nodes.tsx +++ b/libs/environment/src/hooks/use-nodes.tsx @@ -61,7 +61,7 @@ const getNodeData = (url?: string): NodeData => ({ initialized: false, responseTime: withData(), block: withData(), - ssl: withData(), + subscription: withData(), chain: withData(), }); @@ -141,18 +141,18 @@ const reducer = (state: Record, action: Action) => { state[action.node] = getNodeData(action.payload?.url); } state[action.node].url = action.payload?.url ?? ''; - state[action.node].ssl.isLoading = true; + state[action.node].subscription.isLoading = true; state[action.node].initialized = true; }); case ACTIONS.CHECK_SUBSCRIPTION_SUCCESS: return produce(state, (state) => { if (!state[action.node]) return; - state[action.node].ssl = withData(true); + state[action.node].subscription = withData(true); }); case ACTIONS.CHECK_SUBSCRIPTION_FAILURE: return produce(state, (state) => { if (!state[action.node]) return; - state[action.node].ssl = withError(); + state[action.node].subscription = withError(); }); case ACTIONS.ADD_NODE: return produce(state, (state) => { diff --git a/libs/environment/src/types.ts b/libs/environment/src/types.ts index bfcec4129..0713e8941 100644 --- a/libs/environment/src/types.ts +++ b/libs/environment/src/types.ts @@ -10,7 +10,7 @@ export const CUSTOM_NODE_KEY = 'custom'; export enum ErrorType { INVALID_URL, - SSL_ERROR, + SUBSCRIPTION_ERROR, CONNECTION_ERROR, CONNECTION_ERROR_ALL, CONFIG_LOAD_ERROR, @@ -37,7 +37,7 @@ type NodeCheck = { export type NodeData = { url: string; initialized: boolean; - ssl: NodeCheck; + subscription: NodeCheck; block: NodeCheck; responseTime: NodeCheck; chain: NodeCheck; diff --git a/libs/environment/src/utils/validate-node.tsx b/libs/environment/src/utils/validate-node.tsx index 09f9a43d8..6d96c7cfb 100644 --- a/libs/environment/src/utils/validate-node.tsx +++ b/libs/environment/src/utils/validate-node.tsx @@ -8,7 +8,7 @@ export const getIsNodeLoading = (node?: NodeData): boolean => { node.chain.isLoading || node.responseTime.isLoading || node.block.isLoading || - node.ssl.isLoading + node.subscription.isLoading ); }; @@ -29,7 +29,7 @@ export const getIsNodeDisabled = (env: Networks, data?: NodeData) => { data.chain.hasError || data.responseTime.hasError || data.block.hasError || - data.ssl.hasError) + data.subscription.hasError) ); }; @@ -57,12 +57,12 @@ export const getErrorByType = ( headline: t('Error: invalid url'), message: t(url ? `${url} is not a valid url.` : ''), }; - case ErrorType.SSL_ERROR: + case ErrorType.SUBSCRIPTION_ERROR: return { - headline: t(`Error: the node you are reading from does not have SSL`), + headline: t(`Error: the node you are reading from does not emit data`), message: t( url - ? `${url} does not have SSL. SSL is required to subscribe to data.` + ? `${url} is required to have subscriptions working to enable data updates on the page.` : '' ), }; @@ -112,8 +112,8 @@ export const getErrorType = (env: Networks, data?: NodeData) => { return ErrorType.CONNECTION_ERROR; } - if (data.ssl.hasError) { - return ErrorType.SSL_ERROR; + if (data.subscription.hasError) { + return ErrorType.SUBSCRIPTION_ERROR; } }