diff --git a/e2e/mocks/localstorage.json b/e2e/mocks/localstorage.json index 83e1af86ec..9c347055f7 100644 --- a/e2e/mocks/localstorage.json +++ b/e2e/mocks/localstorage.json @@ -6,6 +6,6 @@ "0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE", "0x2730d6FdC86C95a74253BefFaA8306B40feDecbb" ], - "tenderlyRpc": "https://virtual.mainnet.eu.rpc.tenderly.co/4c55c851-ae20-4726-a572-21e291d6bd57", - "carbonApi": "https://carbon-multi-endpoint-staging-152368584642.europe-west2.run.app/v1/proxy/d0852fd4-e587-4826-8765-9c80348cec8d/" -} \ No newline at end of file + "tenderlyRpc": "https://virtual.mainnet.eu.rpc.tenderly.co/59b5cba7-408d-4ae7-94ad-a5972a5c3fee", + "carbonApi": "" +} diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png index a421ec0cc3..4ad073a91a 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-animation.png index 0bd72b9aaf..8590f7307a 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-animation.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-summary.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-summary.png index ca658b8758..b1dc59ec43 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-summary.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-results-summary.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-input-price.png index b3d167d1ff..cfa4b4be8f 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-input-price.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png index 8a1e228957..6eabaea86d 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-summary.png b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-summary.png index 6e323e7bb2..9e44b15df4 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-summary.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-summary.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png index 3e362ff78c..dbe38b53d6 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-animation.png index 5f6561e030..04cb0b9a8f 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-animation.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-summary.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-summary.png index 8c77035bdb..bbe3ca31a5 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-summary.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-results-summary.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png index 086f40568d..e3c7c8c0c3 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png index 4e12503a65..9bc9e437a2 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png differ diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-summary.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-summary.png index 601c4dec64..4bff6aa54c 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-summary.png and b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-summary.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png index b602cdc960..d09ac833c4 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png index e5d4e279e1..21cca338b2 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png index 083b19f5ac..4425ba90cc 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png index d71f91eaea..12d5540a7c 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png index bf04c7970e..1177e38916 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png index 55dc5fe383..ff51326392 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png index 9d00b7fb08..fa32980d7f 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png index 95aa790653..fde4b2309d 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png index 197d28daf8..b2f526723c 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png index 83081bef13..609635c6d4 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png index 6203dfa38c..4216ad74c5 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png index 9de7cde42c..d78a646ddc 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png index 66b777bdf8..d94cefa82f 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png index 9c30a2b6b0..868759eb79 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png index 309f68972e..abad9900fe 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png index c43196683d..36628d8b37 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png index abaff28ef2..5e5b1fd763 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png index a59189f274..7a43d20227 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png index 74d2937177..77f67fb5b3 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png index dfb15eb9f4..9b339c9882 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png index 75bb1df996..ea34799107 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png index f24ca96e2f..80da97ef91 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png index 0128a72968..3768995e33 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png index 1f32fa32ab..255fb0e1ba 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png index fd4bcf8b59..62bcdf1ed8 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png index dbd81e4601..77da5bd10d 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png index 3eecab9732..294d0749d5 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png index e3ba50c63e..e3a1ebb86c 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png index bb1df504ba..2411fab838 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png index b203f1a8b2..d310972470 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png and b/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png index 88c2132a85..f353b0c79e 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png index f4b41d33cb..41b9507332 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png index 3d5bb9b1b4..e615535bd4 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png index 2f906a3cfe..ee5381f0c5 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png index a2b312da66..26f5d3d39e 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png index c161f2cc75..21901a0345 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/my-strategy.png index 38ed90bb9f..dd269f300d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png index f6a99af4d1..e5b3fe297a 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png index 226de40e52..5bec29d510 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png index 94c3f10a14..1ed3e532da 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png index b47e0cd96f..2fed040cec 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png index 4db851d451..f85e9953c3 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png index 3f26dc0601..40478b9c6a 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png index cabd8540f6..69f0fa1208 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png index df54d38ce5..43240e6661 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png index 888aad9061..07797303df 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png index ee56c62d8e..95e09d2465 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png index 91eb528d54..6ee6dea0a0 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png index e4f02b3912..92b3a54120 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png index 1d6434d6ef..715d782b77 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png index 0efe82f9ab..cbecd72ee4 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png index 30ded04c13..c61d324b78 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png index 875f01b29e..51026c5f25 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png index 851d328eac..6011580400 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png index 8527ecbcbb..7258c03be1 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png index 01bec680c9..ce65e0f4e2 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png index 44219a8b80..96287ef25e 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png index 434b4b455e..dcf4871d41 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png index e5539b3207..5e88297df9 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png index cb45bfe0be..18955c1bf2 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png index bfa47acbfe..b8521abf5c 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png index 959a9ee850..8f541b0a1d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png index 75723f3e10..fe75250bd8 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png index 5d315e0044..b0d8a09fbe 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png index d12ab6fd62..7fb1116101 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png index 29aabf854d..0d2bb7bb80 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png index b6ecb5b3e0..7b59b6ac4d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png differ diff --git a/e2e/setup.ts b/e2e/setup.ts index 284c105090..1266532893 100644 --- a/e2e/setup.ts +++ b/e2e/setup.ts @@ -1,33 +1,9 @@ import { chromium, firefox, webkit, type FullConfig } from '@playwright/test'; +import { createBackend, waitForBackend } from './utils/api'; const browsers = { chromium, firefox, webkit }; type BrowserName = keyof typeof browsers; -const tenderlyId = 'd0852fd4-e587-4826-8765-9c80348cec8d'; -const apiUrl = `${process.env.BACKEND_TENDERLY_API}/preview/backends`; - -const doesBackendExist = async () => { - const res = await fetch(`${apiUrl}/${tenderlyId}`); - const result = await res.json(); - return result.status === 'ready'; -}; - -const waitForBackend = async () => { - const res = await fetch(apiUrl, { - method: 'POST', - body: JSON.stringify({ tenderlyId }), - }); - if (!res.ok) throw new Error('Could not create backend'); - const max = Date.now() + 10 * 60 * 1000; // in 10min - let ready = false; - while (!ready && max > Date.now()) { - await new Promise((res) => setTimeout(res, 30_000)); // every 30sec - ready = await doesBackendExist(); - } - if (!ready) - throw new Error('Timedout: wait too long for backend to be creating'); -}; - async function globalSetup(config: FullConfig) { const setupProjects = config.projects.map(async (project) => { if (!(project.name in browsers)) return; @@ -35,9 +11,12 @@ async function globalSetup(config: FullConfig) { if (!baseURL) return; // create RPC if do not exist - const backendExist = doesBackendExist(); + console.log('Check if backend exist'); + const backendExist = await waitForBackend(); + console.log({ backendExist }); if (!backendExist) { - await waitForBackend(); + console.log('Create a new backend'); + await createBackend(); } const browser = await browsers[project.name as BrowserName].launch(); diff --git a/e2e/tests/strategy/recurring/pause.ts b/e2e/tests/strategy/recurring/pause.ts index e27f119c61..1a11933301 100644 --- a/e2e/tests/strategy/recurring/pause.ts +++ b/e2e/tests/strategy/recurring/pause.ts @@ -1,6 +1,6 @@ import { expect, test } from '@playwright/test'; import { waitModalOpen } from './../../../utils/modal'; -import { Page } from 'playwright-core'; +import { Page } from '@playwright/test'; import { ManageStrategyDriver } from './../../../utils/strategy/ManageStrategyDriver'; import { CreateStrategyTestCase, @@ -10,7 +10,7 @@ import { TokenApprovalDriver } from '../../../utils/TokenApprovalDriver'; export const pauseStrategy = async ( page: Page, - testCase: CreateStrategyTestCase + testCase: CreateStrategyTestCase, ) => { const manage = new ManageStrategyDriver(page); const tokenApproval = new TokenApprovalDriver(page); diff --git a/e2e/utils/DebugDriver.ts b/e2e/utils/DebugDriver.ts index f02f17b5bc..d6c0ba546d 100644 --- a/e2e/utils/DebugDriver.ts +++ b/e2e/utils/DebugDriver.ts @@ -1,41 +1,10 @@ -import { Page, TestInfo } from '@playwright/test'; +import { Page } from '@playwright/test'; import { waitFor } from './../utils/operators'; -import { - createVirtualNetwork, - deleteVirtualNetwork, - CreateVirtualNetworkBody, -} from './../utils/tenderly'; import { Wallet } from 'ethers'; import { CreateStrategyTestCase, toDebugStrategy } from './strategy'; import { TokenApprovalDriver } from './TokenApprovalDriver'; import mockLocalStorage from '../mocks/localstorage.json' with { type: 'json' }; - -const vNetConfig: CreateVirtualNetworkBody = { - slug: 'e2e-ci', - display_name: 'E2E-CI', - fork_config: { - network_id: 1, - block_number: '18120000', - }, - virtual_network_config: { - chain_config: { - chain_id: 1, - }, - }, - sync_state_config: { - enabled: false, - }, - explorer_page_config: { - enabled: false, - verification_visibility: 'bytecode', - }, -}; - -export const setupVirtualNetwork = async (testInfo: TestInfo) => { - const vNet = await createVirtualNetwork(structuredClone(vNetConfig)); - process.env[`TENDERLY_FORK_ID_TEST_${testInfo.testId}`] = vNet.id; - return vNet; -}; +import { proxyUrl } from './api'; export const setupLocalStorage = async (page: Page) => { // We need to be on a page to set localstorage so we create an empty page @@ -43,6 +12,10 @@ export const setupLocalStorage = async (page: Page) => { return route.fulfill({ status: 200, contentType: 'text/plain', body: '' }); }); await page.goto('empty'); + const mockStorage = { + ...mockLocalStorage, + carbonApi: proxyUrl, + }; return page.evaluate((storage) => { // each value is stringified to match lsservice for (const [key, value] of Object.entries(storage)) { @@ -51,12 +24,7 @@ export const setupLocalStorage = async (page: Page) => { JSON.stringify(value), ); } - }, mockLocalStorage); -}; - -export const removeFork = async (testInfo: TestInfo) => { - const id = process.env[`TENDERLY_FORK_ID_TEST_${testInfo.testId}`]; - if (id) await deleteVirtualNetwork(id); + }, mockStorage); }; interface ImposterConfig { diff --git a/e2e/utils/api.ts b/e2e/utils/api.ts new file mode 100644 index 0000000000..e3f0b76ccb --- /dev/null +++ b/e2e/utils/api.ts @@ -0,0 +1,52 @@ +const tenderlyId = '4a59c786-adf3-4d04-8e6c-e09ac4a029f2'; +const apiUrl = `${process.env.BACKEND_TENDERLY_API}/preview/backends`; +export const proxyUrl = `${process.env.BACKEND_TENDERLY_API}/v1/proxy/${tenderlyId}/`; + +const getBackendStatus = async () => { + const res = await fetch(`${apiUrl}/${tenderlyId}`); + if (!res.ok) return 'errir'; + const result = await res.json(); + return result.status; +}; + +export const doesBackendExist = async () => { + const status = await getBackendStatus(); + return status === 'ready'; +}; + +const waitUntilCreated = async () => { + const max = Date.now() + 10 * 60 * 1000; // in 10min + let ready = false; + while (!ready && max > Date.now()) { + await new Promise((res) => setTimeout(res, 30_000)); // every 30sec + ready = await doesBackendExist(); + } + return ready; +}; + +export const waitForBackend = async () => { + const status = await getBackendStatus(); + if (status === 'creating') { + const ready = await waitUntilCreated(); + if (!ready) throw new Error('Timeout before creation'); + } else { + return status === 'ready'; + } +}; + +export const createBackend = async () => { + const res = await fetch(apiUrl, { + method: 'POST', + body: JSON.stringify({ tenderlyId }), + headers: { + accept: 'application/json', + 'Content-Type': 'application/json', + }, + }); + if (!res.ok) { + const error = await res.json(); + console.error(error); + throw new Error('Could not create backend'); + } + await waitForBackend(); +}; diff --git a/e2e/utils/mock-api.ts b/e2e/utils/mock-api.ts index d8d13e6af6..8f7f135062 100644 --- a/e2e/utils/mock-api.ts +++ b/e2e/utils/mock-api.ts @@ -1,4 +1,4 @@ -import { Page } from 'playwright-core'; +import { Page } from '@playwright/test'; import marketRate from '../mocks/market-rates.json' with { type: 'json' }; import roi from '../mocks/roi.json' with { type: 'json' }; import historyPrices from '../mocks/history-prices.json' with { type: 'json' }; diff --git a/e2e/utils/simulator/SimulationResultDriver.ts b/e2e/utils/simulator/SimulationResultDriver.ts index 6850f4b174..3846338b22 100644 --- a/e2e/utils/simulator/SimulationResultDriver.ts +++ b/e2e/utils/simulator/SimulationResultDriver.ts @@ -1,4 +1,4 @@ -import { Page } from 'playwright-core'; +import { Page } from '@playwright/test'; import { CreateStrategyTestCase, SimulatorChartTypes } from './types'; import { Direction } from '../types'; import { screenshot, waitFor } from '../operators'; @@ -6,7 +6,10 @@ import { screenshotPath } from './utils'; import { MainMenuDriver } from '../MainMenuDriver'; export class SimulationResultDriver { - constructor(private page: Page, private testCase: CreateStrategyTestCase) {} + constructor( + private page: Page, + private testCase: CreateStrategyTestCase, + ) {} waitForChartElement() { return waitFor(this.page, 'chart-tab-animation'); @@ -28,7 +31,7 @@ export class SimulationResultDriver { await mainMenu.hide(); await screenshot( animationChart, - screenshotPath(this.testCase, 'simulator-results-animation') + screenshotPath(this.testCase, 'simulator-results-animation'), ); await mainMenu.show(); } @@ -41,7 +44,7 @@ export class SimulationResultDriver { await mainMenu.hide(); await screenshot( summaryChart, - screenshotPath(this.testCase, 'simulator-results-summary') + screenshotPath(this.testCase, 'simulator-results-summary'), ); await mainMenu.show(); } diff --git a/e2e/utils/strategy/EditStrategyDriver.ts b/e2e/utils/strategy/EditStrategyDriver.ts index 7e1e135187..ab8047e1be 100644 --- a/e2e/utils/strategy/EditStrategyDriver.ts +++ b/e2e/utils/strategy/EditStrategyDriver.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import { Page } from 'playwright-core'; +import { Page } from '@playwright/test'; import { MainMenuDriver } from '../MainMenuDriver'; import { screenshot, shouldTakeScreenshot, waitFor } from '../operators'; import { CreateStrategyTestCase, StrategyType } from './types'; @@ -15,7 +15,10 @@ import { waitTooltipsClose } from '../modal'; type EditType = 'deposit' | 'withdraw' | 'renew' | 'editPrices'; export class EditStrategyDriver { - constructor(private page: Page, private testCase: CreateStrategyTestCase) {} + constructor( + private page: Page, + private testCase: CreateStrategyTestCase, + ) {} async waitForPage(strategyType: StrategyType, editType: EditType) { const options = { timeout: 10_000 }; @@ -34,7 +37,7 @@ export class EditStrategyDriver { async waitForLoading() { const loadings = await this.page.locator('.loading-message').all(); return Promise.all( - loadings.map((loading) => loading.waitFor({ state: 'detached' })) + loadings.map((loading) => loading.waitFor({ state: 'detached' })), ); } @@ -113,7 +116,7 @@ export class EditStrategyDriver { direction: Direction, setting: Setting, order: MinMax, - type: EditType + type: EditType, ) { const form = this.getPriceSection(direction); await form.setting(setting).click(); diff --git a/e2e/utils/strategy/ManageStrategyDriver.ts b/e2e/utils/strategy/ManageStrategyDriver.ts index 95ddcf883d..72227c151a 100644 --- a/e2e/utils/strategy/ManageStrategyDriver.ts +++ b/e2e/utils/strategy/ManageStrategyDriver.ts @@ -4,7 +4,7 @@ import { } from './../../utils/DebugDriver'; import { navigateTo } from './../../utils/operators'; import { MyStrategyDriver } from './../../utils/strategy/MyStrategyDriver'; -import { Page } from 'playwright-core'; +import { Page } from '@playwright/test'; import { CreateStrategyTestCase } from './types'; import { PortfolioDriver } from './PortfolioDriver'; diff --git a/e2e/utils/strategy/MyStrategyDriver.ts b/e2e/utils/strategy/MyStrategyDriver.ts index ec22f3857a..4f174d8d1e 100644 --- a/e2e/utils/strategy/MyStrategyDriver.ts +++ b/e2e/utils/strategy/MyStrategyDriver.ts @@ -1,5 +1,5 @@ import { waitFor } from './../../utils/operators'; -import { Page } from 'playwright-core'; +import { Page } from '@playwright/test'; import { Direction } from '../types'; import { MainMenuDriver } from '../MainMenuDriver'; diff --git a/e2e/utils/tenderly.ts b/e2e/utils/tenderly.ts index c8f350ce03..c01a10670e 100644 --- a/e2e/utils/tenderly.ts +++ b/e2e/utils/tenderly.ts @@ -1,154 +1,154 @@ -import { Page } from '@playwright/test'; +// import { Page } from '@playwright/test'; -const TENDERLY_ACCOUNT = process.env['TENDERLY_ACCOUNT']; -if (!TENDERLY_ACCOUNT) throw new Error('No TENDERLY_ACCOUNT provided in .env'); -const TENDERLY_PROJECT = process.env['TENDERLY_PROJECT']; -if (!TENDERLY_PROJECT) throw new Error('No TENDERLY_PROJECT provided in .env'); -const TENDERLY_ACCESS_KEY = process.env['TENDERLY_ACCESS_KEY']; -if (!TENDERLY_ACCESS_KEY) - throw new Error('No TENDERLY_ACCESS_KEY provided in .env'); +// const TENDERLY_ACCOUNT = process.env['TENDERLY_ACCOUNT']; +// if (!TENDERLY_ACCOUNT) throw new Error('No TENDERLY_ACCOUNT provided in .env'); +// const TENDERLY_PROJECT = process.env['TENDERLY_PROJECT']; +// if (!TENDERLY_PROJECT) throw new Error('No TENDERLY_PROJECT provided in .env'); +// const TENDERLY_ACCESS_KEY = process.env['TENDERLY_ACCESS_KEY']; +// if (!TENDERLY_ACCESS_KEY) +// throw new Error('No TENDERLY_ACCESS_KEY provided in .env'); -const baseUrl = `https://api.tenderly.co/api/v1/account/${TENDERLY_ACCOUNT}/project/${TENDERLY_PROJECT}/vnets`; -const headers = { - 'Content-Type': 'application/json', - 'X-Access-Key': TENDERLY_ACCESS_KEY, -}; +// const baseUrl = `https://api.tenderly.co/api/v1/account/${TENDERLY_ACCOUNT}/project/${TENDERLY_PROJECT}/vnets`; +// const headers = { +// 'Content-Type': 'application/json', +// 'X-Access-Key': TENDERLY_ACCESS_KEY, +// }; -interface ChainConfig { - type: string; // 'ethereum' | ... - chain_id: number; - homestead_block: number; - dao_fork_block: number; - dao_fork_support: boolean; - eip_150_block: number; - eip_150_hash: string; - eip_155_block: number; - eip_158_block: number; - byzantium_block: number; - constantinople_block: number; - petersburg_block: number; - istanbul_block: number; - berlin_block: number; - london_block: number; - shanghai_time: number; - polygon: { - heimdall_url: string; - sprint_length_changelog: string | null; - state_sync: { - do_not_skip: boolean; - event_records_amount_override: number | null; - }; - }; -} +// interface ChainConfig { +// type: string; // 'ethereum' | ... +// chain_id: number; +// homestead_block: number; +// dao_fork_block: number; +// dao_fork_support: boolean; +// eip_150_block: number; +// eip_150_hash: string; +// eip_155_block: number; +// eip_158_block: number; +// byzantium_block: number; +// constantinople_block: number; +// petersburg_block: number; +// istanbul_block: number; +// berlin_block: number; +// london_block: number; +// shanghai_time: number; +// polygon: { +// heimdall_url: string; +// sprint_length_changelog: string | null; +// state_sync: { +// do_not_skip: boolean; +// event_records_amount_override: number | null; +// }; +// }; +// } -interface Fork { - id: string; - project_id: string; - alias: string; - network_id: string; - block_number: number; - transaction_index: number; - chain_config: ChainConfig | null; - fork_config: any | null; - created_at: string; - accounts: Record; // Record - global_head: string; - current_block_number: number; - shared: boolean; -} +// interface Fork { +// id: string; +// project_id: string; +// alias: string; +// network_id: string; +// block_number: number; +// transaction_index: number; +// chain_config: ChainConfig | null; +// fork_config: any | null; +// created_at: string; +// accounts: Record; // Record +// global_head: string; +// current_block_number: number; +// shared: boolean; +// } -/** See https://docs.tenderly.co/reference/api#/operations/createVnet */ -export interface CreateVirtualNetworkBody { - slug: string; - display_name?: string; - description?: string; - fork_config: { - network_id: number; - block_number: string; - }; - virtual_network_config: { - chain_config: { - chain_id: number; - }; - }; - sync_state_config?: { - enabled?: boolean; - }; - explorer_page_config?: { - enabled?: boolean; - verification_visibility?: 'bytecode' | 'src' | 'abi'; - }; -} +// /** See https://docs.tenderly.co/reference/api#/operations/createVnet */ +// export interface CreateVirtualNetworkBody { +// slug: string; +// display_name?: string; +// description?: string; +// fork_config: { +// network_id: number; +// block_number: string; +// }; +// virtual_network_config: { +// chain_config: { +// chain_id: number; +// }; +// }; +// sync_state_config?: { +// enabled?: boolean; +// }; +// explorer_page_config?: { +// enabled?: boolean; +// verification_visibility?: 'bytecode' | 'src' | 'abi'; +// }; +// } -/** See https://docs.tenderly.co/reference/api#/operations/createVnet#Responses */ -export interface CreateVirtualNetworkResponse { - id: string; - slug: string; - rpcs: { - url: string; - name: string; - }[]; -} +// /** See https://docs.tenderly.co/reference/api#/operations/createVnet#Responses */ +// export interface CreateVirtualNetworkResponse { +// id: string; +// slug: string; +// rpcs: { +// url: string; +// name: string; +// }[]; +// } -export const createVirtualNetwork = async (body: CreateVirtualNetworkBody) => { - body.slug += `-${crypto.randomUUID()}`; - const req = new Request(baseUrl, { - method: 'POST', - body: JSON.stringify(body), - headers, - }); - const clone = req.clone(); - const res = await fetch(req); - if (!res.ok) return tenderlyError(clone, res); - return res.json() as Promise; -}; +// export const createVirtualNetwork = async (body: CreateVirtualNetworkBody) => { +// body.slug += `-${crypto.randomUUID()}`; +// const req = new Request(baseUrl, { +// method: 'POST', +// body: JSON.stringify(body), +// headers, +// }); +// const clone = req.clone(); +// const res = await fetch(req); +// if (!res.ok) return tenderlyError(clone, res); +// return res.json() as Promise; +// }; -export interface GetForkResponse { - simulation_fork: Fork; -} +// export interface GetForkResponse { +// simulation_fork: Fork; +// } -export const waitForTenderlyRpc = (page: Page, timeout?: number) => { - const tenderlyRegExp = /.*rpc\.tenderly\.co.*$/; - return page.waitForResponse(tenderlyRegExp, { timeout }); -}; +// export const waitForTenderlyRpc = (page: Page, timeout?: number) => { +// const tenderlyRegExp = /.*rpc\.tenderly\.co.*$/; +// return page.waitForResponse(tenderlyRegExp, { timeout }); +// }; -export const getVirtualNetwork = async (id: string) => { - const req = new Request(`${baseUrl}/${id}`, { - method: 'GET', - headers, - }); - const clone = req.clone(); - const res = await fetch(req); - if (!res.ok) return tenderlyError(clone, res); - return res.json(); -}; +// export const getVirtualNetwork = async (id: string) => { +// const req = new Request(`${baseUrl}/${id}`, { +// method: 'GET', +// headers, +// }); +// const clone = req.clone(); +// const res = await fetch(req); +// if (!res.ok) return tenderlyError(clone, res); +// return res.json(); +// }; -export const deleteVirtualNetwork = async (id: string) => { - const req = new Request(`${baseUrl}/${id}`, { - method: 'DELETE', - headers, - }); - const clone = req.clone(); - const res = await fetch(req); - if (!res.ok) return tenderlyError(clone, res); - // Delete returns No Content -}; +// export const deleteVirtualNetwork = async (id: string) => { +// const req = new Request(`${baseUrl}/${id}`, { +// method: 'DELETE', +// headers, +// }); +// const clone = req.clone(); +// const res = await fetch(req); +// if (!res.ok) return tenderlyError(clone, res); +// // Delete returns No Content +// }; -interface TenderlyError { - id: string; - slug: string; - message: string; -} -interface TenderlyErrorResponse { - error: TenderlyError; -} -const tenderlyError = async (req: Request, res: Response) => { - const { status, statusText } = res; - const { error }: TenderlyErrorResponse = await res.json(); - const body = await req.text(); - const message = { - res: `[${status} ${statusText}] ${error?.message}`, - req: `[${req.url}] ${body}`, - }; - throw new Error(JSON.stringify(message)); -}; +// interface TenderlyError { +// id: string; +// slug: string; +// message: string; +// } +// interface TenderlyErrorResponse { +// error: TenderlyError; +// } +// const tenderlyError = async (req: Request, res: Response) => { +// const { status, statusText } = res; +// const { error }: TenderlyErrorResponse = await res.json(); +// const body = await req.text(); +// const message = { +// res: `[${status} ${statusText}] ${error?.message}`, +// req: `[${req.url}] ${body}`, +// }; +// throw new Error(JSON.stringify(message)); +// }; diff --git a/package.json b/package.json index 29729209b2..cac9922051 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@floating-ui/dom": "^1.7.4", "@floating-ui/react": "0.27.16", "@oddbird/popover-polyfill": "0.6.1", - "@playwright/test": "1.52.0", + "@playwright/test": "1.60.0", "@sentry/react": "8.17.0", "@sentry/vite-plugin": "2.21.1", "@tailwindcss/vite": "^4.1.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bea96cdb7..2da00ede0c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: 0.6.1 version: 0.6.1 '@playwright/test': - specifier: 1.52.0 - version: 1.52.0 + specifier: 1.60.0 + version: 1.60.0 '@sentry/react': specifier: 8.17.0 version: 8.17.0(react@19.0.0) @@ -1457,8 +1457,8 @@ packages: resolution: {integrity: sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - '@playwright/test@1.52.0': - resolution: {integrity: sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==} + '@playwright/test@1.60.0': + resolution: {integrity: sha512-O71yZIbAh/PxDMNGns37GHBIfrVkEVyn+AXyIa5dOTfb4/xNvRWV+Vv/NMbNCtODB/pO7vLlF2OTmMVLhmr7Ag==} engines: {node: '>=18'} hasBin: true @@ -5231,10 +5231,6 @@ packages: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} engines: {node: '>= 6.13.0'} - node-gyp-build@4.6.0: - resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==} - hasBin: true - node-gyp-build@4.8.4: resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==} hasBin: true @@ -5481,13 +5477,13 @@ packages: pkg-types@1.1.2: resolution: {integrity: sha512-VEGf1he2DR5yowYRl0XJhWJq5ktm9gYIsH+y8sNJpHlxch7JPDaufgrsl4vYjd9hMUY8QVjoNncKbow9I7exyA==} - playwright-core@1.52.0: - resolution: {integrity: sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==} + playwright-core@1.60.0: + resolution: {integrity: sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==} engines: {node: '>=18'} hasBin: true - playwright@1.52.0: - resolution: {integrity: sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==} + playwright@1.60.0: + resolution: {integrity: sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==} engines: {node: '>=18'} hasBin: true @@ -7637,7 +7633,7 @@ snapshots: '@ethersproject/bytes': 5.8.0 '@ethersproject/logger': 5.8.0 '@ethersproject/properties': 5.8.0 - bn.js: 5.2.2 + bn.js: 5.2.3 elliptic: 6.6.1 hash.js: 1.1.7 @@ -7867,16 +7863,16 @@ snapshots: '@metamask/json-rpc-engine@8.0.2': dependencies: '@metamask/rpc-errors': 6.2.1 - '@metamask/safe-event-emitter': 3.1.1 - '@metamask/utils': 8.4.0 + '@metamask/safe-event-emitter': 3.1.2 + '@metamask/utils': 8.5.0 transitivePeerDependencies: - supports-color '@metamask/json-rpc-middleware-stream@7.0.2': dependencies: '@metamask/json-rpc-engine': 8.0.2 - '@metamask/safe-event-emitter': 3.1.1 - '@metamask/utils': 8.4.0 + '@metamask/safe-event-emitter': 3.1.2 + '@metamask/utils': 8.5.0 readable-stream: 3.6.2 transitivePeerDependencies: - supports-color @@ -7909,7 +7905,7 @@ snapshots: '@metamask/rpc-errors@6.2.1': dependencies: - '@metamask/utils': 8.4.0 + '@metamask/utils': 8.5.0 fast-safe-stringify: 2.1.1 transitivePeerDependencies: - supports-color @@ -8014,11 +8010,11 @@ snapshots: '@ethereumjs/tx': 4.2.0 '@metamask/superstruct': 3.2.1 '@noble/hashes': 1.8.0 - '@scure/base': 1.2.6 - '@types/debug': 4.1.12 + '@scure/base': 1.1.8 + '@types/debug': 4.1.8 debug: 4.4.3(supports-color@8.1.1) pony-cause: 2.1.11 - semver: 7.7.4 + semver: 7.7.2 uuid: 9.0.1 transitivePeerDependencies: - supports-color @@ -8288,9 +8284,9 @@ snapshots: '@pkgr/core@0.2.7': {} - '@playwright/test@1.52.0': + '@playwright/test@1.60.0': dependencies: - playwright: 1.52.0 + playwright: 1.60.0 '@react-native/assets-registry@0.83.1': {} @@ -10463,7 +10459,7 @@ snapshots: bufferutil@4.0.8: dependencies: - node-gyp-build: 4.6.0 + node-gyp-build: 4.8.4 bytes@3.1.2: {} @@ -13117,8 +13113,6 @@ snapshots: node-forge@1.3.1: {} - node-gyp-build@4.6.0: {} - node-gyp-build@4.8.4: {} node-int64@0.4.0: {} @@ -13365,11 +13359,11 @@ snapshots: mlly: 1.7.1 pathe: 1.1.2 - playwright-core@1.52.0: {} + playwright-core@1.60.0: {} - playwright@1.52.0: + playwright@1.60.0: dependencies: - playwright-core: 1.52.0 + playwright-core: 1.60.0 optionalDependencies: fsevents: 2.3.2 @@ -14444,7 +14438,7 @@ snapshots: utf-8-validate@5.0.10: dependencies: - node-gyp-build: 4.6.0 + node-gyp-build: 4.8.4 util-deprecate@1.0.2: {} diff --git a/src/libs/queries/sdk/strategy.ts b/src/libs/queries/sdk/strategy.ts index 9fe39c7468..6620aaddda 100644 --- a/src/libs/queries/sdk/strategy.ts +++ b/src/libs/queries/sdk/strategy.ts @@ -37,7 +37,10 @@ const buildStrategyFromAPI = ( budget: order.budget, min: order.min, max: order.max, - marginalPrice: order.marginal, + marginalPrice: + 'marginalPrice' in order + ? (order.marginalPrice as string) + : order.marginal, }); const buy = toOrder(s.buy); const sell = toOrder(s.sell);