Compare commits

..
Author SHA1 Message Date
Dariusz Majcherczyk 17bc4541e9 chore: multi click for toast 2023-01-29 19:51:12 +01:00
Dariusz Majcherczyk 2bd8044a6c chore: reverted proper assertion 2023-01-29 16:03:16 +01:00
Dariusz Majcherczyk b3a82fd6f0 chore: capsule tests refactor and increase deposit AC test coverage 2023-01-29 14:09:43 +01:00
mattrussell36 f22fb56afd chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-29 12:06:12 +00:00
mattrussell36 f2627e6ebf chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-29 06:07:03 +00:00
mattrussell36 24e6a13d93 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-29 00:13:02 +00:00
mattrussell36 b56050ad1c chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-28 18:07:37 +00:00
mattrussell36 cff83ed062 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-28 12:06:05 +00:00
mattrussell36 8ecce874b0 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-28 06:08:30 +00:00
5 changed files with 342 additions and 119 deletions
+274 -73
View File
@@ -5,7 +5,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "86666.297",
"total_removed": "0",
"locked_amount": "73842.5871117838699228653",
"locked_amount": "73487.251446645509463922",
"deposits": [
{
"amount": "86666.297",
@@ -71,7 +71,7 @@
"tranche_end": "2023-06-01T00:00:00.000Z",
"total_added": "2500",
"total_removed": "0",
"locked_amount": "1703.18986568986575",
"locked_amount": "1682.6333244301995",
"deposits": [
{
"amount": "2500",
@@ -450,7 +450,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "129999.45",
"total_removed": "0",
"locked_amount": "73775.215042274932477725",
"locked_amount": "73420.20357622098315111",
"deposits": [
{
"amount": "129999.45",
@@ -516,7 +516,7 @@
"tranche_end": "2023-09-03T00:00:00.000Z",
"total_added": "62600",
"total_removed": "0",
"locked_amount": "37387.15920852359522",
"locked_amount": "37130.49642947742434",
"deposits": [
{
"amount": "10000",
@@ -709,7 +709,7 @@
"tranche_end": "2023-09-17T00:00:00.000Z",
"total_added": "5000",
"total_removed": "0",
"locked_amount": "3177.9756468797565",
"locked_amount": "3157.4754249112125",
"deposits": [
{
"amount": "5000",
@@ -920,7 +920,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "97499.58",
"total_removed": "0",
"locked_amount": "15588.8151072394589870328",
"locked_amount": "15240.5819298544871083824",
"deposits": [
{
"amount": "97499.58",
@@ -953,7 +953,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "135173.4239508",
"total_removed": "98230.390980249184455396",
"locked_amount": "21307.21895494269883610961768",
"locked_amount": "20831.244321407448710024671284",
"deposits": [
{
"amount": "135173.4239508",
@@ -999,7 +999,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "32499.86",
"total_removed": "0",
"locked_amount": "6557.9453111780461671324",
"locked_amount": "6411.4496271174975967098",
"deposits": [
{
"amount": "32499.86",
@@ -1032,7 +1032,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "10833.29",
"total_removed": "0",
"locked_amount": "2134.5475619934638285412",
"locked_amount": "2086.8646383922243299952",
"deposits": [
{
"amount": "10833.29",
@@ -1065,7 +1065,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "22749.93",
"total_removed": "0",
"locked_amount": "7979.4155293193716715025",
"locked_amount": "7801.1661111092940288519",
"deposits": [
{
"amount": "6500",
@@ -1203,8 +1203,8 @@
"tranche_start": "2022-11-01T00:00:00.000Z",
"tranche_end": "2023-05-01T00:00:00.000Z",
"total_added": "22500",
"total_removed": "3539.640404325",
"locked_amount": "11559.8066298342525",
"total_removed": "3707.308452225",
"locked_amount": "11373.775610036832",
"deposits": [
{
"amount": "7500",
@@ -1218,6 +1218,11 @@
}
],
"withdrawals": [
{
"amount": "167.6680479",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tx": "0x3bd3579f34ddc1eee597ba9b3fbbf18b6c268d085cd299e964b7239b2434fcf3"
},
{
"amount": "305.3119245",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -1281,6 +1286,12 @@
}
],
"withdrawals": [
{
"amount": "167.6680479",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tranche_id": 33,
"tx": "0x3bd3579f34ddc1eee597ba9b3fbbf18b6c268d085cd299e964b7239b2434fcf3"
},
{
"amount": "305.3119245",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -1343,8 +1354,8 @@
}
],
"total_tokens": "7500",
"withdrawn_tokens": "3539.640404325",
"remaining_tokens": "3960.359595675"
"withdrawn_tokens": "3707.308452225",
"remaining_tokens": "3792.691547775"
},
{
"address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -1369,7 +1380,7 @@
"tranche_end": "2023-06-02T00:00:00.000Z",
"total_added": "1939928.38",
"total_removed": "928642.9598472029154",
"locked_amount": "664317.6963511111024892072",
"locked_amount": "656363.903872495430316328",
"deposits": [
{
"amount": "1852091.69",
@@ -1721,7 +1732,7 @@
"tranche_end": "2023-02-01T00:00:00.000Z",
"total_added": "42500",
"total_removed": "24434.0787288",
"locked_amount": "922.11654589372055",
"locked_amount": "576.45383579911392",
"deposits": [
{
"amount": "12500",
@@ -6711,10 +6722,65 @@
"tranche_id": 11,
"tranche_start": "2021-09-03T00:00:00.000Z",
"tranche_end": "2022-09-03T00:00:00.000Z",
"total_added": "53684.000000000000000003",
"total_removed": "42606.21518131551",
"total_added": "53995.000000000000000003",
"total_removed": "42939.21518131551",
"locked_amount": "0",
"deposits": [
{
"amount": "45",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0xa6c36806aba504d0a30c574f6ab4dc2d76aad26d8759c778feb6bf27729cddcf"
},
{
"amount": "46",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x0f0f261dd8e05919d3c6c1d4358434e2c9c1b9087347702d2b8a4b1aeecd7e4b"
},
{
"amount": "50",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0xe66d0dc85202757228ed7c7ea7138710b00755f69d604e6a7199c2759370aef8"
},
{
"amount": "30",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x470591c033f228afd59d498fcf42ecba8b83d389042d5c43e5af277e8deed9fe"
},
{
"amount": "30",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x86543ba39726b072d1b338fc9bf4852b5707ccfdf9abaf6ce21b85d76591b3cd"
},
{
"amount": "15",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x0f98bf0636a4f08d09d40b227beb78d7aaf57d6c856dd44ea0c6c29cc965c6c2"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0xca73109b8c348b6df6723c5a67616d2406784d56718731264e97a49cf4d314fb"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x1a3c1319ece46cec553198ce7fb164670a5322a97afbcf432a44d524ace7267d"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0xb2617627421f96ca8e732982a756dd98ff8889871f64def89f2971ead24c8fe7"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x8b2831993c44c6baa40677a9ac5055f244f15ed005cddf3419226c86280ff93a"
},
{
"amount": "15",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0x6957b2bd0f9f04f7cc124c11638be50ff5e2a26412e0be0c16f7aac1f1b73bc6"
},
{
"amount": "20",
"user": "0xB12Cdb63E38f9a6ff2C0F68aBC3CA9beFCb7148c",
@@ -16647,6 +16713,21 @@
}
],
"withdrawals": [
{
"amount": "311",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tx": "0xa94f27a51d17008d4f8c62a11f65db9dc3f94eb430b2842b0cb8403c29951658"
},
{
"amount": "10",
"user": "0xa2920abaA03b696C7B90486600D578b455E11609",
"tx": "0xc454f6f2572533714b74636b4243ba8fd5456a6f67ef8b93051588b156ab2093"
},
{
"amount": "12",
"user": "0xa10aD7E7712617fc4ABe0811D8a30fD96cE48F9f",
"tx": "0x7ffe3e795b50a8449052143a739d53aec81c2f53c7981f31496b8c121bd4ec81"
},
{
"amount": "200",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
@@ -17609,6 +17690,112 @@
}
],
"users": [
{
"address": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"deposits": [
{
"amount": "45",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xa6c36806aba504d0a30c574f6ab4dc2d76aad26d8759c778feb6bf27729cddcf"
},
{
"amount": "46",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x0f0f261dd8e05919d3c6c1d4358434e2c9c1b9087347702d2b8a4b1aeecd7e4b"
},
{
"amount": "50",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xe66d0dc85202757228ed7c7ea7138710b00755f69d604e6a7199c2759370aef8"
},
{
"amount": "30",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x470591c033f228afd59d498fcf42ecba8b83d389042d5c43e5af277e8deed9fe"
},
{
"amount": "30",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x86543ba39726b072d1b338fc9bf4852b5707ccfdf9abaf6ce21b85d76591b3cd"
},
{
"amount": "15",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x0f98bf0636a4f08d09d40b227beb78d7aaf57d6c856dd44ea0c6c29cc965c6c2"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xca73109b8c348b6df6723c5a67616d2406784d56718731264e97a49cf4d314fb"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x1a3c1319ece46cec553198ce7fb164670a5322a97afbcf432a44d524ace7267d"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xb2617627421f96ca8e732982a756dd98ff8889871f64def89f2971ead24c8fe7"
},
{
"amount": "20",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x8b2831993c44c6baa40677a9ac5055f244f15ed005cddf3419226c86280ff93a"
},
{
"amount": "15",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x6957b2bd0f9f04f7cc124c11638be50ff5e2a26412e0be0c16f7aac1f1b73bc6"
},
{
"amount": "100",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x4b249ec22c90d0f4d1d472c407e8c27b1a87db2c5d822d600636f9b17406588a"
},
{
"amount": "60",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x6a8d2bd962a14937de4beb99bff97cf55fd823de00b96c49e5e4e97b5b68f40f"
},
{
"amount": "40",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xea7d189a9ad2d7ee3a93dd352201d19b1128ccf46246b1ec346c8ee1b9f7ea62"
}
],
"withdrawals": [
{
"amount": "311",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xa94f27a51d17008d4f8c62a11f65db9dc3f94eb430b2842b0cb8403c29951658"
},
{
"amount": "200",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xf7ad77b4bb44e24178d182db393ace12f22021706d6583d438b285621eaf8b01"
}
],
"total_tokens": "511",
"withdrawn_tokens": "511",
"remaining_tokens": "0"
},
{
"address": "0xB12Cdb63E38f9a6ff2C0F68aBC3CA9beFCb7148c",
"deposits": [
@@ -18953,40 +19140,6 @@
"withdrawn_tokens": "0",
"remaining_tokens": "905"
},
{
"address": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"deposits": [
{
"amount": "100",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x4b249ec22c90d0f4d1d472c407e8c27b1a87db2c5d822d600636f9b17406588a"
},
{
"amount": "60",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0x6a8d2bd962a14937de4beb99bff97cf55fd823de00b96c49e5e4e97b5b68f40f"
},
{
"amount": "40",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xea7d189a9ad2d7ee3a93dd352201d19b1128ccf46246b1ec346c8ee1b9f7ea62"
}
],
"withdrawals": [
{
"amount": "200",
"user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
"tranche_id": 11,
"tx": "0xf7ad77b4bb44e24178d182db393ace12f22021706d6583d438b285621eaf8b01"
}
],
"total_tokens": "200",
"withdrawn_tokens": "200",
"remaining_tokens": "0"
},
{
"address": "0x6ebf587df7C5C5eb49BB570c240563a98E1b8f4f",
"deposits": [
@@ -30881,10 +31034,17 @@
"tx": "0xee0be2716f9467edff80ca7225263c95e69db8d7f020655ab3621b0966d0a311"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "12",
"user": "0xa10aD7E7712617fc4ABe0811D8a30fD96cE48F9f",
"tranche_id": 11,
"tx": "0x7ffe3e795b50a8449052143a739d53aec81c2f53c7981f31496b8c121bd4ec81"
}
],
"total_tokens": "12",
"withdrawn_tokens": "0",
"remaining_tokens": "12"
"withdrawn_tokens": "12",
"remaining_tokens": "0"
},
{
"address": "0x804dEbc8807aEe993a727B37d81D7A379DA59fE6",
@@ -31310,10 +31470,17 @@
"tx": "0xaa605daf521cdcdbbc1d6942a69e1efc86eac89d5804e05f088bce2fabe3d52a"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "10",
"user": "0xa2920abaA03b696C7B90486600D578b455E11609",
"tranche_id": 11,
"tx": "0xc454f6f2572533714b74636b4243ba8fd5456a6f67ef8b93051588b156ab2093"
}
],
"total_tokens": "10",
"withdrawn_tokens": "0",
"remaining_tokens": "10"
"withdrawn_tokens": "10",
"remaining_tokens": "0"
},
{
"address": "0xA2B5F0114E7935EFcBd7c038d789Bfa71f2Bfe5D",
@@ -33128,7 +33295,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "3732368.4671",
"total_removed": "442882.3484327902809",
"locked_amount": "1045326.238638006681438682145",
"locked_amount": "1033104.123341510407167357286",
"deposits": [
{
"amount": "1998.95815",
@@ -34419,8 +34586,8 @@
"tranche_start": "2022-06-05T00:00:00.000Z",
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "15870102.715470999700000001",
"total_removed": "548215.72659525097016952",
"locked_amount": "9006347.3114917987915309320511637840294675",
"total_removed": "549182.48543502092691952",
"locked_amount": "8963008.4753852283836950014010192461651798",
"deposits": [
{
"amount": "16249.93",
@@ -34929,6 +35096,11 @@
"user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
"tx": "0x7882fc86536accee89368b825b374eb365ee5f051cb89fb3710c7e2d24b0d29d"
},
{
"amount": "966.75883976995675",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tx": "0x6c49f9f742a84f7889b90e6f978f3fb1f642ea447f737f348b3fac91716b9717"
},
{
"amount": "858.360074993579125",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -36512,6 +36684,12 @@
}
],
"withdrawals": [
{
"amount": "966.75883976995675",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tranche_id": 2,
"tx": "0x6c49f9f742a84f7889b90e6f978f3fb1f642ea447f737f348b3fac91716b9717"
},
{
"amount": "858.360074993579125",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -37600,8 +37778,8 @@
}
],
"total_tokens": "259998.8875",
"withdrawn_tokens": "112175.254589489570875",
"remaining_tokens": "147823.632910510429125"
"withdrawn_tokens": "113142.013429259527625",
"remaining_tokens": "146856.874070740472375"
},
{
"address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -39754,8 +39932,8 @@
"tranche_start": "2021-11-05T00:00:00.000Z",
"tranche_end": "2023-05-05T00:00:00.000Z",
"total_added": "14597706.0446472999",
"total_removed": "3708107.46955489707527943",
"locked_amount": "2593157.105608381636374622900271523",
"total_removed": "3709441.39326687814680893",
"locked_amount": "2553146.968835877717601199418901287",
"deposits": [
{
"amount": "129284.449",
@@ -39964,6 +40142,11 @@
}
],
"withdrawals": [
{
"amount": "1333.9237119810715295",
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
"tx": "0xc8aae35d9d474b83dd5524de9db59f994fd77040397c00a1a4cf30a5c9315826"
},
{
"amount": "8950.14985089483210984",
"user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -42765,6 +42948,12 @@
}
],
"withdrawals": [
{
"amount": "1333.9237119810715295",
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
"tranche_id": 3,
"tx": "0xc8aae35d9d474b83dd5524de9db59f994fd77040397c00a1a4cf30a5c9315826"
},
{
"amount": "1192.05386354121365675",
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -45155,8 +45344,8 @@
}
],
"total_tokens": "359123.469575",
"withdrawn_tokens": "294949.4170736759185085",
"remaining_tokens": "64174.0525013240814915"
"withdrawn_tokens": "296283.340785656990038",
"remaining_tokens": "62840.128789343009962"
},
{
"address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -46467,7 +46656,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "5778205.3912159303",
"total_removed": "2622261.560853924298939789",
"locked_amount": "707668.652169292606505178553015827",
"locked_amount": "691860.405151183386025619771012724",
"deposits": [
{
"amount": "552496.6455",
@@ -48362,7 +48551,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "472355.6199999996",
"total_removed": "31616.1712341930685",
"locked_amount": "165637.91785171665550452967326228",
"locked_amount": "163701.253818397273052118746829",
"deposits": [
{
"amount": "3000",
@@ -76847,7 +77036,7 @@
"tranche_start": "2021-12-05T00:00:00.000Z",
"tranche_end": "2022-06-05T00:00:00.000Z",
"total_added": "171288.42",
"total_removed": "64196.1049690697989",
"total_removed": "64226.1049690697989",
"locked_amount": "0",
"deposits": [
{
@@ -81072,6 +81261,11 @@
}
],
"withdrawals": [
{
"amount": "30",
"user": "0x4A13d4dC5e06ACdA81C011D55a7DaAc332bC5Dbf",
"tx": "0x72e95b2e51cae897d2c09ca7294c630fb3b969aea950a53e10158570faee89c7"
},
{
"amount": "250",
"user": "0xbd09687340A09BeB0B5EE0D3C2bCa8d78eBF6E63",
@@ -97279,10 +97473,17 @@
"tx": "0xb59405747c8088945a412703637a7b422f3639439ec2ee15e180c0a2a0d71ee4"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "30",
"user": "0x4A13d4dC5e06ACdA81C011D55a7DaAc332bC5Dbf",
"tranche_id": 6,
"tx": "0x72e95b2e51cae897d2c09ca7294c630fb3b969aea950a53e10158570faee89c7"
}
],
"total_tokens": "30",
"withdrawn_tokens": "0",
"remaining_tokens": "30"
"withdrawn_tokens": "30",
"remaining_tokens": "0"
},
{
"address": "0x02e3d96c448d38790151930A39c36273904C1b0B",
+66 -41
View File
@@ -21,15 +21,21 @@ const orderUpdatedAt = 'updatedAt';
const assetSelectField = 'select[name="asset"]';
const amountField = 'input[name="amount"]';
const txTimeout = Cypress.env('txTimeout');
const btcName = 'BTC (local)';
const sepoliaUrl = Cypress.env('ETHERSCAN_URL');
const btcName =
'BTC (local)5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c - tBTC';
const btcSymbol = 'tBTC';
const usdcSymbol = 'fUSDC';
const toastContent = 'toast-content';
const ordersTab = 'Orders';
const depositsTab = 'Deposits';
const toastCloseBtn = 'toast-close';
const price = '390';
const size = '0.0005';
const newPrice = '200';
// TODO: ensure this test runs only if capsule is running via workflow
// Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
describe('capsule', { tags: '@slow' }, () => {
before(() => {
cy.createMarket();
@@ -50,8 +56,8 @@ describe('capsule', { tags: '@slow' }, () => {
marketId: market.id,
type: Schema.OrderType.TYPE_LIMIT,
side: Schema.Side.SIDE_BUY,
size: '0.0005',
price: '390',
size: size,
price: price,
timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
};
const rawPrice = removeDecimal(order.price, market.decimalPlaces);
@@ -64,7 +70,8 @@ describe('capsule', { tags: '@slow' }, () => {
cy.getByTestId(toastContent).should(
'contain.text',
`ConfirmedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+0.0005 @ 390.00 ${usdcSymbol}`
`ConfirmedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+${order.size} @ ${order.price}.00 ${usdcSymbol}`,
{ matchCase: false }
);
cy.getByTestId(toastCloseBtn).click();
// orderbook cells are keyed by price level
@@ -75,7 +82,7 @@ describe('capsule', { tags: '@slow' }, () => {
.should('contain.text', rawSize);
cy.getByTestId(ordersTab).click();
cy.getByTestId('edit').should('contain.text', 'Edit');
cy.getByTestId('edit', txTimeout).should('contain.text', 'Edit');
cy.getByTestId('tab-orders').within(() => {
cy.get('.ag-center-cols-container')
.children()
@@ -113,35 +120,41 @@ describe('capsule', { tags: '@slow' }, () => {
checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderCreatedAt);
});
});
//edit order
});
it('can edit order', function () {
cy.getByTestId(ordersTab).click();
cy.getByTestId('edit').first().should('be.visible').click();
cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
cy.get('#limitPrice').focus().clear().type('200');
cy.get('#limitPrice').focus().clear().type(newPrice);
cy.getByTestId('edit-order').find('[type="submit"]').click();
cy.getByTestId(toastContent).should(
'contain.text',
`ConfirmedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+0.0005 @ 200.00 ${usdcSymbol}+0.0005 @ 200.00 ${usdcSymbol}`
`ConfirmedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+${size} @ ${price}.00 ${usdcSymbol}+${size} @ ${newPrice}.00 ${usdcSymbol}`,
{ matchCase: false }
);
cy.getByTestId(ordersTab).click();
cy.getByTestId(toastCloseBtn).click();
cy.getByTestId(toastCloseBtn).click({ multiple: true });
cy.get('.ag-center-cols-container')
.children()
.first()
.within(() => {
cy.get(`[col-id='${orderPrice}']`).then(($price) => {
expect(parseFloat($price.text())).to.equal(parseFloat('200'));
expect(parseFloat($price.text())).to.equal(parseFloat(newPrice));
});
checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
});
//cancel order
});
it('can cancel order', function () {
cy.getByTestId(ordersTab).click();
cy.getByTestId('cancel').first().click();
cy.getByTestId(toastContent).should(
'contain.text',
`ConfirmedYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+0.0005 @ 200.00 ${usdcSymbol}`
`ConfirmedYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+${size} @ ${newPrice}.00 ${usdcSymbol}`,
{ matchCase: false }
);
cy.getByTestId(toastCloseBtn).click();
cy.getByTestId(toastCloseBtn).click({ multiple: true });
cy.getByTestId('tab-orders')
.get('.ag-center-cols-container')
@@ -151,7 +164,10 @@ describe('capsule', { tags: '@slow' }, () => {
.should('contain.text', OrderStatusMapping.STATUS_CANCELLED);
});
it('can deposit and withdrawal', function () {
it('can deposit', function () {
cy.visit('/#/portfolio');
cy.get('main[data-testid="/portfolio"]').should('exist');
// 1001-DEPO-001
// 1001-DEPO-002
// 1001-DEPO-003
@@ -160,27 +176,12 @@ describe('capsule', { tags: '@slow' }, () => {
// 1001-DEPO-007
// 1001-DEPO-008
// 1001-DEPO-009
// 1002-WITH-001
// 1002-WITH-006
// 1002-WITH-009
// 002-WITH-011
// 1002-WITH-024
// 1002-WITH-012
// 1002-WITH-013
// 1002-WITH-014
// 1002-WITH-015
// 1002-WITH-016
// 1002-WITH-019
cy.visit('/#/portfolio');
cy.get('main[data-testid="/portfolio"]').should('exist');
cy.highlight('creating deposit');
// 1001-DEPO-010
cy.getByTestId(depositsTab).click();
cy.getByTestId('deposit-button').click();
connectEthereumWallet('Unknown');
cy.get(assetSelectField, txTimeout).select(btcName);
cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
cy.getByTestId('deposit-approve-submit').click();
cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
cy.get('[data-testid="Return to deposit"]').click();
@@ -188,7 +189,8 @@ describe('capsule', { tags: '@slow' }, () => {
cy.getByTestId('deposit-submit').click();
cy.getByTestId(toastContent, txTimeout).should(
'contain.text',
`Transaction completedYour transaction has been completedView on EtherscanDeposit 1.00 ${btcSymbol}`
`Transaction confirmedYour transaction has been confirmed.View on EtherscanDeposit 1.00 ${btcSymbol}`,
{ matchCase: false }
);
cy.getByTestId(toastCloseBtn).click();
cy.getByTestId('Collateral').click();
@@ -196,8 +198,6 @@ describe('capsule', { tags: '@slow' }, () => {
cy.highlight('deposit verification');
cy.getByTestId('asset', txTimeout).should('contain.text', btcSymbol);
// need to reload page to see deposit history complete
cy.reload();
cy.getByTestId(depositsTab).click();
cy.get('.ag-cell-value', txTimeout).should('contain.text', btcSymbol);
cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
@@ -214,15 +214,29 @@ describe('capsule', { tags: '@slow' }, () => {
cy.get('[col-id="txHash"]')
.find('a')
.should('have.attr', 'href')
.and('contain', 'https://sepolia.etherscan.io/tx');
.and('contain', `${sepoliaUrl}/tx/0x`);
});
});
cy.highlight('creating withdrawals');
it('can withdrawal', function () {
// 1002-WITH-001
// 1002-WITH-006
// 1002-WITH-009
// 1002-WITH-011
// 1002-WITH-024
// 1002-WITH-012
// 1002-WITH-013
// 1002-WITH-014
// 1002-WITH-015
// 1002-WITH-016
// 1002-WITH-019
cy.getByTestId('Withdrawals').click();
cy.getByTestId('withdraw-dialog-button').click();
connectEthereumWallet('Unknown');
cy.get(assetSelectField).select(btcName);
cy.get(assetSelectField, txTimeout).select(
'BTC (local)5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c - tBTC',
{ force: true }
);
cy.get(amountField).clear().type('1');
cy.getByTestId('submit-withdrawal').click();
cy.getByTestId(toastContent, txTimeout).should(
@@ -243,7 +257,7 @@ describe('capsule', { tags: '@slow' }, () => {
cy.getByTestId('toast-complete-withdrawal').click();
cy.getByTestId(toastContent, txTimeout).should(
'contain.text',
'Transaction completed'
'Transaction confirmed'
);
cy.getByTestId('complete-withdrawal', txTimeout).should('not.exist');
@@ -258,17 +272,28 @@ describe('capsule', { tags: '@slow' }, () => {
cy.get('[col-id="details.receiverAddress"]')
.find('a')
.should('have.attr', 'href')
.and('contain', 'https://sepolia.etherscan.io/address/');
.and('contain', `${sepoliaUrl}/address/`);
cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
cy.get('[col-id="status"]').should('have.text', 'Completed');
cy.get('[col-id="txHash"]')
.find('a')
.should('have.attr', 'href')
.and('contain', 'https://sepolia.etherscan.io/tx/0x');
.and('contain', `${sepoliaUrl}/tx/0x`);
});
});
it('deposit - if approved amount is less than deposit: must see that an approval is needed and be prompted to approve more', function () {
// 1001-DEPO-006
cy.getByTestId(depositsTab).click();
cy.getByTestId('deposit-button').click();
cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
cy.get(amountField).clear().type('20000000');
cy.getByTestId('deposit-approve-submit').should('be.visible');
});
});
function checkIfDataAndTimeOfCreationAndUpdateIsEqual(date: string) {
cy.get(`[col-id='${date}'] .ag-cell-wrapper`)
.children('span')
@@ -56,6 +56,7 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
});
it('insufficient funds', () => {
// 1001-DEPO-005
// Deposit amount is valid, but less than approved. This will always be the case because our
// CI wallet wont have approved any assets
cy.get(amountField)
@@ -454,8 +454,4 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
);
});
});
it.skip('tbd for 7003-MORD', () => {
// NOT COVERED: must see the reference, offset and direction for each part pegged order - waiting for clarification
// NOT COVERED: must see the reference, offset and direction for each part liquidity order order - waiting for clarification
});
});
@@ -48,7 +48,7 @@ function createNewMarketProposal(): ProposalSubmissionBody {
signers: [
{
pubKey: {
key: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
},
},
],