From 1916b3f60df3d9b5879ef1eb4f0c9f05998574c0 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Wed, 23 Nov 2022 13:49:04 -0500
Subject: [PATCH 01/31] Fix side nav animation

---
 .../src/components/navigation/components/Multiwallet.vue    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/navigation/components/Multiwallet.vue b/apps/web/src/components/navigation/components/Multiwallet.vue
index bb5dece8b..8faa353ba 100644
--- a/apps/web/src/components/navigation/components/Multiwallet.vue
+++ b/apps/web/src/components/navigation/components/Multiwallet.vue
@@ -87,7 +87,7 @@ const connectedWallets = ref([
           </div>
           <span
             v-show="open"
-            class="text-body text-grey_5"
+            class="text-body text-grey_5 w-[195px]"
           >
             Drag the <i class="iconoir-keyframe-align-center text-blue_4 text-[12px] mx-[5px] inline-block" />
             icon to change your master wallet (Master wallet is the wallet that you connect
@@ -101,7 +101,7 @@ const connectedWallets = ref([
     >
       <div
         v-if="open"
-        class="px-[5px] w-[px] overflow-hidden "
+        class="px-[5px] w-[195px]"
       >
         <li class=" list-none text-body text-grey_5 font-semibold mb-[10px]">
           Get Started with Casimir's Multiwallet Connect
@@ -114,7 +114,7 @@ const connectedWallets = ref([
             View and manage your assets across all types of wallets
           </li>
           <li class="my-[5px]">
-            Stake t our supported protocoals with any of your connected wallets
+            Stake to our supported protocoals with any of your connected wallets
           </li>
         </ul>
       </div>

From 94fcbc02e62253bc8991c0717ffa530b2cff6669 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Wed, 23 Nov 2022 18:26:35 -0500
Subject: [PATCH 02/31] Add Staking page modal

---
 apps/web/public/ETH.svg                       |   9 ++
 .../web/src/components/navigation/SideNav.vue |  14 +--
 .../navigation/components/Multiwallet.vue     |   4 +-
 apps/web/src/composables/router.ts            |  10 +-
 apps/web/src/index.css                        |  24 +++-
 apps/web/src/pages/staking/Staking.vue        | 116 ++++++++++++++++--
 .../pages/staking/components/ETHStaking.vue   |  24 ++++
 apps/web/tailwind.config.js                   |   8 +-
 8 files changed, 182 insertions(+), 27 deletions(-)
 create mode 100644 apps/web/public/ETH.svg
 create mode 100644 apps/web/src/pages/staking/components/ETHStaking.vue

diff --git a/apps/web/public/ETH.svg b/apps/web/public/ETH.svg
new file mode 100644
index 000000000..c68a17466
--- /dev/null
+++ b/apps/web/public/ETH.svg
@@ -0,0 +1,9 @@
+<svg width="67" height="66" viewBox="0 0 67 66" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="67" height="66" rx="33" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_857_561" transform="translate(0 -0.00757576) scale(0.0078125 0.00793087)"/>
+</pattern>
+<image id="image0_857_561" width="128" height="128" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAMQGlDQ1BJQ0MgUHJvZmlsZQAASImVVwdYU8kWnluSkEBooUsJvQkiUgJICaGF3hFshCRAKDEGgogdWVRw7aICNnRVRLEDYkERO4ti7wsiCsq6WLArb5IAuu4r35vvmzv//efMf86cO3PvHQBUTnFEoixUFYBsYa44OtCXPiExiU56CsgAA2rADhA43BwRMzIyFMAy3P69vLsFEGl73U6q9c/+/1rUePwcLgBIJMQpvBxuNsSHAcAruSJxLgBEKW86I1ckxbACDTEMEOLFUpwmx5VSnCLH+2U2sdEsiFsAUFDicMRpAChfhTw9j5sGNZT7IXYQ8gRCAFToEHtlZ0/jQZwMsRW0EUEs1Wek/KCT9jfNlBFNDidtBMvnIisKfoIcURZn5v+Zjv9dsrMkwz4sYFVKFwdFS+cM83Ync1qIFCtB3CdMCY+AWB3iDwKezB5ilJIuCYqT26P63BwWzBnQgtiBx/ELgVgf4gBhVnjoEJ+SKghgQwxXCJovyGXHQqwD8WJ+jn/MkM0W8bToIV9oXaqYxRziL3DEMr9SX48kmXHMIf3X6Xz2kD6mXJAemwAxBWKzPEF8OMTKENvnZMaEDNmML0hnhQ/biCXR0vjNII7mCwN95fpYXqo4IHrIviQ7Z3i+2JZ0ATt8CB/MTY8NkucHa+FyZPHDuWBX+UJm3LAOP2dC6PBceHw/f/ncsR6+MC5mSOeDKNc3Wj4Wp4iyIofscRN+VqCUN4HYKScvZmgsHp8LF6RcH08V5UbGyuPECzI4wZHyePAVIBSwgB+gAwmsKWAayACCtr76Pngn7wkAHCAGaYAPd6WcGR6RIOsRwmsMKAB/QsQHOSPjfGW9fJAH+a8jrPxqB1JlvXmyEZngKcTZIARkwXuJbJRwxFs8eAIZwT+8c2DlwnizYJX2/3t+mP3OMCETOsRIhj3SVYYtif5EP2IQMYBojevhXrgHHgqvPrA64gzcbXge3+0JTwnthMeEm4QOwt2pgkLxT1GGgQ6oHzCUi5Qfc4FbQE1n3Bf3hOpQGdfC9YAd7gT9MHFv6NkZsqyhuKVZof+k/bcZ/PA0huzIDmSUrE32IVv9PFLZRtl5REWa6x/zI481ZSTfrJGen/2zfsg+D7YhP1tii7FD2HnsNHYRO47VAzrWhDVgrdgJKR5ZXU9kq2vYW7QsnkyoI/iHv+EnK81kjkONQ6/DF3lfLj9f+o4GrGmimWJBWnounQm/CHw6W8i1H013dHB0BED6fZG/vt5Eyb4biFbrd27hHwB4Ng0ODh77zgU3AXDAFW7/o985Kwb8dCgCcOEoVyLOk3O49EKAbwkVuNN0gSEwBVZwPo7ABXgAH+APgkEEiAWJYAqMPh2uczGYAWaDBaAYlIIVYC0oB5vBNrAL7AUHQT04Dk6Dc+AyuApugvtw9XSDF6AfvAOfEQQhIVSEhugiRog5Yos4IgzEC/FHQpFoJBFJRtIQISJBZiMLkVJkFVKObEWqkQPIUeQ0chFpR+4inUgv8hr5hGKoEqqBGqAW6BiUgTLREDQWnYymodPRArQIXYauR6vQPWgdehq9jN5EO9AX6AAGMEVMCzPG7DAGxsIisCQsFRNjc7ESrAyrwmqxRvicr2MdWB/2ESfiNJyO28EVHITH4Vx8Oj4XX4qX47vwOrwFv4534v34NwKVoE+wJbgT2IQJhDTCDEIxoYywg3CEcBbupW7COyKRqEW0JLrCvZhIzCDOIi4lbiTuI54ithO7iAMkEkmXZEvyJEWQOKRcUjFpA2kPqYl0jdRN+qCgqGCk4KgQoJCkIFQoVChT2K1wUuGawjOFz2RVsjnZnRxB5pFnkpeTt5MbyVfI3eTPFDWKJcWTEkvJoCygrKfUUs5SHlDeKCoqmii6KUYpChTnK65X3K94QbFT8aOSupKNEktpkpJEaZnSTqVTSneV3lCpVAuqDzWJmktdRq2mnqE+on5QpinbK7OVecrzlCuU65SvKb9UIauYqzBVpqgUqJSpHFK5otKnSla1UGWpclTnqlaoHlW9rTqgRlMbqxahlq22VG232kW1HnWSuoW6vzpPvUh9m/oZ9S4aRjOlsWhc2kLadtpZWrcGUcNSg62RoVGqsVejTaNfU13TSTNeM1+zQvOEZocWpmWhxdbK0lqudVDrltYnbQNtpjZfe4l2rfY17fc6o3R8dPg6JTr7dG7qfNKl6/rrZuqu1K3XfaiH69noRenN0Nukd1avb5TGKI9R3FElow6OuqeP6tvoR+vP0t+m36o/YGBoEGggMthgcMagz1DL0Mcww3CN4UnDXiOakZeRwGiNUZPRc7omnUnPoq+nt9D7jfWNg4wlxluN24w/m1iaxJkUmuwzeWhKMWWYppquMW027TczMgszm21WY3bPnGzOME83X2d+3vy9haVFgsUii3qLHksdS7ZlgWWN5QMrqpW31XSrKqsb1kRrhnWm9UbrqzaojbNNuk2FzRVb1NbFVmC70bZ9NGG022jh6KrRt+2U7Jh2eXY1dp32Wvah9oX29fYvx5iNSRqzcsz5Md8cnB2yHLY73B+rPjZ4bOHYxrGvHW0cuY4VjjfGUccFjJs3rmHcKydbJ77TJqc7zjTnMOdFzs3OX11cXcQutS69rmauya6VrrcZGoxIxlLGBTeCm6/bPLfjbh/dXdxz3Q+6/+Vh55HpsdujZ7zleP747eO7PE08OZ5bPTu86F7JXlu8OryNvTneVd6PfUx9eD47fJ4xrZkZzD3Ml74OvmLfI77vWe6sOaxTfphfoF+JX5u/un+cf7n/owCTgLSAmoD+QOfAWYGngghBIUErg26zDdhcdjW7P9g1eE5wS4hSSExIecjjUJtQcWhjGBoWHLY67EG4ebgwvD4CRLAjVkc8jLSMnB55LIoYFRlVEfU0emz07OjzMbSYqTG7Y97F+sYuj70fZxUniWuOV4mfFF8d/z7BL2FVQseEMRPmTLicqJcoSGxIIiXFJ+1IGpjoP3HtxO5JzpOKJ92abDk5f/LFKXpTsqacmKoylTP1UDIhOSF5d/IXTgSnijOQwk6pTOnnsrjruC94Prw1vF6+J38V/1mqZ+qq1J40z7TVab3p3ull6X0ClqBc8CojKGNzxvvMiMydmYNZCVn7shWyk7OPCtWFmcKWaYbT8qe1i2xFxaKO6e7T107vF4eId+QgOZNzGnI14I98q8RK8oukM88rryLvw4z4GYfy1fKF+a0zbWYumfmsIKDgt1n4LO6s5tnGsxfM7pzDnLN1LjI3ZW7zPNN5RfO65wfO37WAsiBzwe+FDoWrCt8uTFjYWGRQNL+o65fAX2qKlYvFxbcXeSzavBhfLFjctmTckg1LvpXwSi6VOpSWlX5Zyl166dexv67/dXBZ6rK25S7LN60grhCuuLXSe+WuVWqrClZ1rQ5bXbeGvqZkzdu1U9deLHMq27yOsk6yrmN96PqGDWYbVmz4Up5efrPCt2JfpX7lksr3G3kbr23y2VS72WBz6eZPWwRb7mwN3FpXZVFVto24LW/b0+3x28//xviteofejtIdX3cKd3bsit7VUu1aXb1bf/fyGrRGUtO7Z9Keq3v99jbU2tVu3ae1r3Q/2C/Z//xA8oFbB0MONh9iHKo9bH648gjtSEkdUjezrr8+vb6jIbGh/Wjw0eZGj8Yjx+yP7TxufLzihOaJ5ScpJ4tODjYVNA2cEp3qO512uqt5avP9MxPO3GiJamk7G3L2wrmAc2fOM883XfC8cPyi+8WjlxiX6i+7XK5rdW498rvz70faXNrqrrheabjqdrWxfXz7yWve105f97t+7gb7xuWb4Tfbb8XdunN70u2OO7w7PXez7r66l3fv8/35DwgPSh6qPix7pP+o6g/rP/Z1uHSc6PTrbH0c8/h+F7frxZOcJ1+6i55Sn5Y9M3pW3ePYc7w3oPfq84nPu1+IXnzuK/5T7c/Kl1YvD//l81dr/4T+7lfiV4Ovl77RfbPzrdPb5oHIgUfvst99fl/yQffDro+Mj+c/JXx69nnGF9KX9V+tvzZ+C/n2YDB7cFDEEXNkvwIYrGhqKgCvdwJATQSABs9nlIny85+sIPIzqwyB/4TlZ0RZcQGgFv6/R/XBv5vbAOzfDo9fUF9lEgCRVABi3QA6btxIHT6ryc6V0kKE54At7K8p2Sng3xT5mfOHuH9ugVTVCfzc/gsrN3xQ6F0MlQAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAgKADAAQAAAABAAAAgAAAAABrRiZNAAASaUlEQVR4Ae1dX2wUxxmf2T0bY5twJPxtk3IkTYE01EfURE2QGlM1/fOQQNSX5KGKcZ4iVQqobZ4AHxBVylNAyltVME9JH1ogL03TSHakJq2SSBg1VZK2BBNCMAbCAcYY+26n32+POdZ7O3e7d3t7M+CRTrs7uzvz/fntN9/3zeweZ7dg6cudybCClbWt1ErHmVnFbWuhcFiGcfpR4ay09bMuGBulujwTLM+ZyAshTlpW24mi5RxjdDyYWzriv8f0Y5KF2cVVdtHu5cLJMst6nDOeIWWlm8MVByhGmHCOCcaHWcoZGcytGG1OX8m0ahwA+nInSLndWV4obiaFb1I9zcmIj6DG2AgXbMSx+cHB3JLhpPqNqx9jANCXO9drCfEcE3xz857wRsXKafgQhx0hjgy+vOxwo60lcb/WAOjLjWcth28iQWzVV+lKNY2SeRh27OIunYcJLQGAp50XxQDnrFcpXoNOCAKCsDkBQb8hQisA3GqKD8DoKGdW7g+7Fx8MONeSKi0AcBso3q9cbYDQUgAghONF+8CtYur9Wq55DIfRdra10kdoCQAQyllO94vk2OVqCum2uIDnnMsT+wb3rsonzW7iAHDDOUccIEYzSTOreX+jjsW3JO0oJgYA96kX3QMUJ1NIN1eUEhB87/49S7Ypz8d8IhEAYKy3HHuIaM/ETP+t2hxZg+LGJHwDq9kSfH7n+ecsJ3WU+sk0u69bqH08MEf7d4w13Vo21QL0D5x7dc7kNwpLntu/e8muRltR3d8UAGC858WuQ7dteKeSdr31CBevTG5pRpQQ+xCA8d52uoZMUP6GbAdbttiuVy3J3cf5ZuuOrqPu1HfMvcYKAOns0RRpNmY6m9LcUxs7GUDQnmqKIYybZteRjhsEsQFAKp+4zsTNeTPa27Sxiy1O26y702Jr72trRhfNaDN2EMQCANOUvzhtsad6O8sKWntvO+uab4QVAM2xgqBhAJimfEjwqd4ubMqlvY2zDevnl48N2IkNBA0BoJTTNyvBgzF/w/qOCh0vJ2fQCIfwJuUZ7tiH+rZiiVz9pSEAWMVu43L6cPxUBeAwqdCgleULug41QnPdAOjfeW6AcbG5kc6Tvlc6fqp+4RD2rG5XndayHuF2/w5KuNVZ6gLA8zsvGDeV63f8VPIyzCEsscHF1i07x59T8VStPjIA4PQJ5uSqNarjOb/jp6IRDuHDD5o1FIAXGg72QjcqvlT1kQFQmtVr1osXKjIbq1c5fqpWv7UiZZpDCFZokY09FNUpjAQAd3LHkESPV7nVHD/vdd590xzCG7RnrAW05iJCCQ0ArOQxcWavluOnkpWJDqHLC/kDrq5UjPnqQwGgFO+7y7h8t+t9CMfvxz+oP8FjpENIKrFoyV3YoSAUAEoLOM3I8XshCcevs6P+FK+pDiHJIGPd0RlqMUlNAJQ8S/NW765f0x6Y8fMCJMy+oQ4hscYHwkQFNQFgiVTdSYYwAm7WNc/8vDu2ph/+rnlhIZjHOxe1hFAVAP07xvvI8TMq2weG63X8VMK6cyFNGdOMoWkFWcJaDmFVAFB2IVJIoYOAGnX8VDwgRWzIwpFZLOAl21kVvgMlANyn38SYv0HHzyef8iEcwu+vm1c+NmWnlhVQAsDEpz8ux0+l3G/f02ZihpB8AbUVCARA3/YzvSSEjEoQutbH6fipeDTRIaxmBQIBwLldddxQCaeV9XE7fipejHUIFVagAgCIHYEYlQB0rIfj91g2ufHZRIewZAXGs379VQCAF6yc/yLdj5HxwwrfpIqpDiGliCtC+koAWPzxpAQZRz/3LE/FkvGLSouZDiGnhTyzyywAPL/9LBCSmX2J3ke/evaOlhHY853khp2YmEz7E0OzAOAwVmEiYuq4Kc088ej8RE2/nwmsJDYtQ+h+a9HDyCwAcMv9Jp/ntL67zcr4ReXYOIdQsM3eqeIyAG7E/umoAmjV9Uk7fio+4RB+b41RQ0Gapbuzkp8yAOj7dX2yUvdtqxw/lVweuNesDKH7neUbzJQBYFm8R8WgbvWtdPxUsjDJIeT0kW3JhwsAJH+EIa90Y7FmkjG/FFStrWEOYUYuFnEBYNOfK9RiUIfzcPzqWeGbFO0mOYQW/ccC5OICgL5P5x6gQucSp+OXv+KwY/+ZZsc+u86+OleIhW2THEKBP9igknI5F6yHpn+1Lnj6g97qjUJ0oSDYqbNF9vXlIpuYpEGPCoCA36mxAsu4L4SURBKlXe+1cAhPjc2ws+eL3mr99unfVUCUyy1NFGg/BPx2S7puIULxp88V2Zek/EKxpHh/Y1PXBft0dIaNnikBYeECm3XMq++pgEP49vlJfxdaHRNnGRDE+3Jf0p8ytB/VijofMXD8+p9e4KutfRhG8e9+dC2wISg/3W2xld9oqwsIH358nX3y+XRg27pU0scoV6VYwU6XPAFdyJpNRz2OH0z62QtFNka/egsswtj1UhvL77IjAwEO4fEvZtg0WR9dC3faelIWT5H515fIKI4fFH+STDi2cRYACT+En99cZrM0DQ+1inQIP/p4qtalLTvPRWFVSnCRqW+kaz7dYR2/r2h8P3exGLvi/RyezxcZft2dnN29FG8QV3cYdXcI6a9sMiku+Er60oefVy2Oqzl+cnwfI297ajpZ+hFBeB3GakDQ2SHEH2qmBP3Joo4WQJXxk4qv5tEnhV5v5AA/YdldqQqHUWYIdXQI8W+q5AOwdLLPT231BDl+EPbp8QKNxY4ylKvdcnOuAG2jXxXcX5DDqKtDSOF/hiwAqz/Abo483e/4yXx/sxy7JpHuOotwGL1A0NkhhBeTaZYw6mlXOn6mKd7Pq4wc0gssN3KAQ3j8i2l28XK8EYq/34jHmepubMTW4rj8l08ucHP0cYdycdBWTxvgA7+OeQWGV80vXtYrOVReD1APc8245/d/usL+9d/rzWi6pW3m6cn/9//0Uj4Eoh0AJiYdNvTBFHvv6BRN2GhlLusCEKKWc18X3cxkof7EZF19h7lJuyFAEn381Iw7Q7eWxs6e1UatuXNZcBzBrlwV7PKEw2hX26ItACCx6RlB8/XT7PipAn28sZ3ds9yM7/ojLLxAGUMdn3g/EjEEjPordTs2ZViAucc6AExEmaB86F47H2B1Rv2UY1j48ztX3VU8OoEU5v4SefpnaE5ClZZuo7+luY++L6BToZEpTy+K6GUBLuQdlnthkftfPiphYVgAEACIVheYeygeoZ5qrF9GaeKfbugkyxDP0rPYeBYsn6KJoJPup4Zja7WxhjDb9neKALAAZPWqNvbm0FWagauMBjAsIFLAZBBSrfiyZ5IF5h5gVT3xoKVrfmkZG+YDPqRpYbkMLUk6q/bFnUvkBPJ81YtacPKdf15ja0j5mBDC783hSXaEgBBUYAXwAwiSiBbCePcw9w/c107vDbYxpIFB3yeft95aVcjPYaP2Qz98aQ0tCP1ZxckWV3xMSZNH1nW4X/qEX4AFodemaFEnLd4MKnC8EC1A4HcurL1gQ7ZxkiZxwhaY+3GK6SeJDlVkh7eWNj4y38362TZ3cxnvj0xRRBO2l+Su40z8kQDwm+WM82eS6zZcTzOkFyhbrgTu7LDY+rXzSLBt7PMvZ1wl+FtC2Ih7YGrxKReAoVYJA4BSMsdhl6rE9DD3UPy6++lzcp5+MUydv1g5hNWiK4nzjm29Yvf86NdTXFhbk+gwah8YY/GtX6/3vILG0yce7STMclfZAIq/YMJFmtzlNVbtVAMAzP3lCcrkkQJVYR3M/br757nK9/shWAMg6fDTqMOx4Gyf+4j07xy/SARpNy0MIQEAAy/cSevxKp08OIxvDk2y98jEqor87LsXRN5rVauCJ6ccdvGSWvFoA+b+4QfnBTqgcFIRqWhc8vt3L13kSpVQMKoroRhvX3v9UiB5WDOAaOElemcgCCC4SUYLQx9cc/cDG/JUymTOua/Vyl90h8V+8lhn4FMvm3r7fb3fC6DwfwS0ugCgEepdSbiOW4zrr/9lQkkanMRXtt3FnqUPRKuAgDZkEgm+gr/IZM7p8erJHPyf0JP0USqEdqqC1820C/n8xArnGKrcuQBaEzpCkYDWBaHhQ+QEVssU4s8hsvSZ+GrDgpxbQNgohwVYCZh7VSIHgsG1MPdeBy9IYGPnC+78RdA5reqs1BDoKVkAuzisFXEKYvYfuhLo/Xsvl8MCsokqayCHhb+SmUbuHs6mSvnI4sHcIxqppXy0i5DPhCKsGdcClJ97cgRPEOEZ3YmP+poYHERVNrEar/Dus/TpFyRzwhaEfDqkp2vRSwPgyIHdS9fjurJrTZVHat2ow3koFIIOWwAYvF+AbdiCL3/94omuSMqXGcmwfbTyOoqgXQcQNNwEgFM83EqiovT9xlsTgfMDqjbksPDKtuBwUt4nzX2YsV7egy1MPxw/U4rD+UFJaxkALNUBVOTlCZ23CA33H7ocmUQAAdECQkevfwBzD+8eM3bVvHtVh7BI2nv9N4nPD+aWDMvDMgAGc4vylOE2YhgA8Z/Ru/x/+0d9sbZ3WKjH3EvhYYsnH/MQxhTOZln6MgDAgHCcQWMYIULfeOuqcnKoFh9yWIhq7r3tlky/fit9vTT694Ww1AAYfHnFMN1gxDAgGXvt9cs1Q0N5bdxb3bN9fn7Jwo8e2L14lpWfZQFKN4h9/ht1PsZ8gGqtQDPp1nKBRw2GaQJt2H9JBQAca2aWifDfoOMxsoTwCZIq2i7wqCEAhxd3+S+pAMBg7u4RmigY9l+o+3GYLGEcPJgW8kmeodPB3IpReSy3FQDACSEqkSJv0HWLoaCe0DAqP5hLMCjkK7MnbF7x9ONkIADgDJpoBY5+Ol13aFiWVJUdLPAwIdXrZwHOnzf2954PBAAuMNEKgG4sIA1aRYxzjRQTQ76b/PLczf3Ze0oAmGoF6s0SzhZL5RFCvqB1BJVX6lVTCv2WllO/fuqUAMCFploBRARxhoZGLPDwa7Z8rH76cUlVAJhqBcAYhoI4QkOjTb8Qh2naV/n01wQALhB2cQu2JpZGQ0OYfNOyfV49ObazzXsctF/VAuCGUuwoAkOIoAZ1qms0S2i26Re7guJ+v35qAgA3OFb7XjgT/ptNOEaW8Oin0efqTc32QSfQlWNN7g2jn1AAcKeKHcfooSBKaGhqtk8qnGZ1twzmVoWa1AsFADTsOoSMGTVRJAUSNTTEp95NzPaBX1L+PuhK8l5rGxoAaEhYbTlTh4KwC0gw7uMdAhOLG/O/vHxrFNojAcAdCixnI3UQyrxEISSJa2tlCU0O+WhRb16UdBNJlJEAgJbhWTqiWDO8iERFQhdXe80MJJgc8nHhhPL6/aKODAA0MLhnxSAhzkh/QPWamekh3/49y0N5/bEAAI1QhmmriTOGoN2/gMSY17lAvL9wfnj/7mU5f3XY47osgGxc2G1PkyUYkccmbWWWEOO+Ka9z+eXrxvt8oqHwnPsbjXqMvyDljjXEGc9EvbfV1+Nl0hOnC8bO8cPpC5PtqybnhgGAxk0GQTXh6HoOT34cygd/sQAADc2BAFJofolT+aA2NgCgsTkQQArNK3ErH5Q25AT6WcV4BNMEQv3n5o4bkwDJdCQus++lJFYAoOESCNrX02e8Dns7mttvQAIkS2FNNuzwBVEQ6xDg76B/59kcjTID/vq54/ASwOTOgYj5/fCtx+wDBHXct2Nsq8UtgCAddH6uLlgClF/J07ebtu3fs3Qw+Ip4aptqASSJc86hlES4bTOcPVXPiQBAdr5l5/he6vBFeTy3rZQATL5IXcuFXdBR2UK0mkQBANL6tp/p5ZZ1wMTMYTTRRrvafeqxkifCYo5oPQRfHXsUENzNzVp3ZZFFUQIzc6HpTU7i3BO7yMtfn7TywUHiFsArNvgGlki9Sm+gbPbW3y77mE3FsvtG8/mNyKulAJCE9+0Y7+NcDNwuw4KreHoDuxVPvJS53GoBAEnMrQ4EnRQvZa4VACRRrqPI7QH6oGGvrDN5q6PipTy1BIAk7kb+IEfHj5s2PLiJHCb2OQV+ePB3S7VdNKM1ACQQsO3bfnYztxg5i3wTEa1lVtFVOn2HzykWD+owvnvlp9o3BgBeBm7kEvoIDD3EQNZ7Lul9UvoovTx3RDjiMEtNjSSVwImLTyMB4GUewwQrWFluiV56c6WHAttssywEnnDqGwp/lz64OMLoM/utDOG8cqh333gABDHelxvP0r88pZllk4VwVnFur6QnNE3gwNCRJqYzQfeVnmY6Q/+mSsPNqBDOJcGsE/RnAidZyqGnu/IrW0HtmFT3f5YArUSL5U9NAAAAAElFTkSuQmCC"/>
+</defs>
+</svg>
diff --git a/apps/web/src/components/navigation/SideNav.vue b/apps/web/src/components/navigation/SideNav.vue
index b85f94222..34425a0b8 100644
--- a/apps/web/src/components/navigation/SideNav.vue
+++ b/apps/web/src/components/navigation/SideNav.vue
@@ -7,10 +7,10 @@ const open = ref(false)
 
 
 
-const selectedPage = ref(router.currentRoute.value.fullPath)
+const selectedPage = ref(router.currentRoute.value.fullPath.split('/')[1])
 
 watch (router.currentRoute, () => {
-  selectedPage.value = router.currentRoute.value.fullPath
+  selectedPage.value = router.currentRoute.value.fullPath.split('/')[1]
 })
 
 // To Do: connect this to our Auth and see if an account exsists
@@ -20,7 +20,7 @@ const account = ref(true)
   
 <template>
   <div 
-    class="side-nav-container"
+    class="side-nav-container text-white"
     @mouseenter="open = true"
     @mouseleave="open = false"
   >
@@ -42,7 +42,7 @@ const account = ref(true)
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === '/'? 'side-nav-tabs-selected' : 'text-white'"
+        :class="selectedPage === ''? 'side-nav-tabs-selected' : 'text-white'"
       >
         <i
           class="iconoir-report-columns"
@@ -61,7 +61,7 @@ const account = ref(true)
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === '/Staking'? 'side-nav-tabs-selected' : ''"
+        :class="selectedPage === 'Staking'? 'side-nav-tabs-selected' : ''"
         :style="!account? {
           'cursor' : 'default'
         } : {}"
@@ -69,7 +69,7 @@ const account = ref(true)
         <div :class="!account? 'flex text-grey_5': 'flex text-white'">
           <i>
             <img
-              src="Staking-Icon.svg"
+              src="/Staking-Icon.svg"
               alt="Staking Icon"
               :class="!account? 'opacity-50': 'opacity-100'"
             >
@@ -90,7 +90,7 @@ const account = ref(true)
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === '/Assets'? 'side-nav-tabs-selected' : ''"
+        :class="selectedPage === 'Assets'? 'side-nav-tabs-selected' : ''"
         :style="!account? {
           'cursor' : 'default',
         } : {}"
diff --git a/apps/web/src/components/navigation/components/Multiwallet.vue b/apps/web/src/components/navigation/components/Multiwallet.vue
index 8faa353ba..465061d30 100644
--- a/apps/web/src/components/navigation/components/Multiwallet.vue
+++ b/apps/web/src/components/navigation/components/Multiwallet.vue
@@ -87,7 +87,7 @@ const connectedWallets = ref([
           </div>
           <span
             v-show="open"
-            class="text-body text-grey_5 w-[195px]"
+            class="text-body text-grey_5 w-[205px]"
           >
             Drag the <i class="iconoir-keyframe-align-center text-blue_4 text-[12px] mx-[5px] inline-block" />
             icon to change your master wallet (Master wallet is the wallet that you connect
@@ -101,7 +101,7 @@ const connectedWallets = ref([
     >
       <div
         v-if="open"
-        class="px-[5px] w-[195px]"
+        class="px-[5px] w-[210px]"
       >
         <li class=" list-none text-body text-grey_5 font-semibold mb-[10px]">
           Get Started with Casimir's Multiwallet Connect
diff --git a/apps/web/src/composables/router.ts b/apps/web/src/composables/router.ts
index 79668003b..5fe9e7496 100644
--- a/apps/web/src/composables/router.ts
+++ b/apps/web/src/composables/router.ts
@@ -6,6 +6,8 @@ import Landing from '@/pages/landing/Landing.vue'
 // @ts-ignore
 import Staking from '@/pages/staking/Staking.vue'
 // @ts-ignore
+// import ETHStaking from '@/pages/staking/components/ETHStaking.vue'
+// @ts-ignore
 import Assets from '@/pages/assets/Assets.vue'
 // @ts-ignore
 import Test from '@/pages/test/Test.vue'
@@ -24,7 +26,13 @@ const routes = [
     path: '/Staking', 
     name: Staking, 
     component: Staking,
-    meta: { authorize: [] }
+    meta: { authorize: [] },
+    // children: [
+    //     {
+    //         path: 'ETH-Staking', 
+    //         component: ETHStaking,
+    //     }
+    // ]
 },{ 
     path: '/Assets', 
     name: Assets, 
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index ae3103b91..ba91117d2 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -85,11 +85,29 @@ background: #fff;
 @layer components {
     .btn_primary {
         @apply  flex  flex-row  items-center 
-        justify-center  px-[6px]  py-[12px] 
+        justify-center  px-[24px]  py-[12px] 
         gap-[10px] bg-primary  text-white
         hover:bg-blue_7 disabled:bg-blue_2
         disabled:text-grey_6;
     }
+    .modal {
+        display: block; 
+        position: absolute; 
+        z-index: 1; 
+        left: -50px;
+        top: -25px;
+        width: calc(100% + 98px);
+        height: calc(100vh + 1px);
+        overflow: auto; 
+        background-color: rgb(0,0,0); 
+        background-color: rgba(0, 0, 0, 0.8);
+    }
+    .modal-content {
+        background-color: #fff;
+        padding: 20px 30px;
+        border: 1px solid #888;
+        width: 100vw;
+      }
 }
 @layer utilities {
     .side-nav-container {
@@ -129,13 +147,13 @@ background: #fff;
         @apply bg-blue_5 text-white;
     }
     .slowExpand {
-        transition: 0.3s all ease-in-out;
+        transition: 0.5s all ease-in-out;
     }
     .slowExpandText {
         display: inline-block;
         vertical-align: bottom;
         overflow: hidden;
-        animation: slowNavBarText 1s ease forwards;
+        animation: slowNavBarText 1.5s ease forwards;
     }
     @keyframes slowNavBarText {
         from {
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index 9063ca495..4709d0495 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -1,17 +1,107 @@
-<script lang="ts" setup></script>
-  
+<script lang="ts" setup>
+// To Do: Grab all staking info 
+// balance, staked, reward info
+
+import { ref, shallowRef, onBeforeMount, onMounted } from 'vue'
+
+import ETHStaking from './components/ETHStaking.vue'
+
+const selectedComponent = shallowRef(null)
+
+const toggleModal = (component: any) => {
+  selectedComponent.value = component
+}
+
+onMounted(() => {
+  const modal = document.getElementById('staking_modal')
+  window.onclick = function(event) {
+    if (event.target === modal) {
+      toggleModal(null)
+    }
+  }
+})
+
+
+
+</script>
 <template>
-  <div class="min-h-full grid place-content-center">
-    <div class="text-center text-white bg-blue_9 px-[10vw] py-[30px]">
-      <h6 class="font-bold">
-        Staking Page
-      </h6>
-      <h2 class="my-[20px]">
-        Coming Soon!
-      </h2>
-      <h6 class="font-semibold mb-[10px]">
-        Thank You For Being Patient!
-      </h6>
+  <div class="flex flex-col h-full w-full">
+    <div
+      v-show="selectedComponent"
+      class="relative h-[0px]"
+    >
+      <div
+        id="staking_modal"
+        class="modal grid grid-cols-1 place-content-center p-[50px]"
+      >
+        <component
+          :is="selectedComponent"
+          :toggle-modal="toggleModal"
+          class="modal-content"
+        />
+      </div>
+    </div>
+    
+    <div>
+      <h5 class="font-bold mb-[30px]">
+        Casimir Staking
+      </h5>
+    </div>
+    <!-- to do: put all of the css into classes -->
+    <div class="grid grid-cols-1 place-content-center w-full h-full">
+      <div class="border bordedr-[#E4E4E7] px-[25px] py-[50px] flex justify-between">
+        <div class="flex">
+          <img
+            src="/ETH.svg"
+            alt="eth icon"
+            class="w-[50px] h-[50px] mr-[20px]"
+          >
+          <div class="flex flex-col justify-between  sr-only s_xsm:not-sr-only">
+            <h6 class="font-bold">
+              Ethereum Staking
+            </h6>
+            <h6 class="font-light">
+              ETH
+            </h6>
+          </div>
+        </div>
+        
+        <div class="flex flex-col justify-between sr-only s_sm:not-sr-only">
+          <h6 class="font-medium">
+            Balance
+          </h6>
+          <h6 class="font-medium text-grey_3">
+            <!-- random -->
+            46 ETH | $73816.89
+          </h6>
+        </div>
+        <div class="flex flex-col justify-between sr-only s_md:not-sr-only">
+          <h6 class="font-medium">
+            Staked
+          </h6>
+          <h6 class="font-medium text-grey_3">
+            <!-- random -->
+            32 ETH | $51350.88
+          </h6>
+        </div>
+        <div class="flex flex-col justify-between sr-only s_lg:not-sr-only">
+          <h6 class="font-medium">
+            Rewards
+          </h6>
+          <h6 class="font-medium text-grey_3">
+            <!-- random -->
+            6 ETH | $9628.29 | 3% AR
+          </h6>
+        </div>
+        <div class="flex flex-col justify-between">
+          <button
+            class="btn_primary"
+            @click="toggleModal(ETHStaking)"
+          >
+            Stake
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
\ No newline at end of file
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
new file mode 100644
index 000000000..12c0b54ed
--- /dev/null
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -0,0 +1,24 @@
+<script lang="ts" setup>
+
+// eslint-disable-next-line no-undef
+const props = defineProps({
+    toggleModal: {
+        type: Function,
+        required: true
+    }
+})
+
+</script>
+  
+<template>
+  <div class="w-full">
+    eth staking
+
+    <button
+      class="btn_primary"
+      @click="toggleModal(null)"
+    >
+      X
+    </button>
+  </div>
+</template>
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index c78832677..2a4c2b599 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -82,7 +82,13 @@ module.exports = {
             // nav-bar text-container
             'nav-mid': {'min': '720px', 'max': '1100px'},
             'nav-sm': {'min': '500px', 'max': '719px'},
-            'nav-xsm': {'min': '0px', 'max': '499px'}
+            'nav-xsm': {'min': '0px', 'max': '499px'},
+
+            // breakpoints for staking page
+            's_lg' : {'min':'1100px'},
+            's_md' : {'min':'900px'},
+            's_sm' : {'min':'700px'},
+            's_xsm' : {'min':'550px'},
         },
     },
     plugins: []

From e1f72131c3c2d0d25a176ba93424f7dea574b9a2 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Wed, 30 Nov 2022 04:12:56 -0500
Subject: [PATCH 03/31] Add ETH staking pool view page

---
 .../navigation/components/Multiwallet.vue     |  40 ++-
 apps/web/src/composables/router.ts            |  20 +-
 apps/web/src/index.css                        |   7 +
 apps/web/src/layouts/default-layout.vue       |   2 +-
 apps/web/src/pages/staking/Staking.vue        |  30 +-
 .../pages/staking/components/ETHStaking.vue   | 256 +++++++++++++++++-
 .../staking/components/ETHWalletSelect.vue    |   7 +
 .../pages/staking/components/StakingModal.vue |  46 ++++
 8 files changed, 362 insertions(+), 46 deletions(-)
 create mode 100644 apps/web/src/pages/staking/components/ETHWalletSelect.vue
 create mode 100644 apps/web/src/pages/staking/components/StakingModal.vue

diff --git a/apps/web/src/components/navigation/components/Multiwallet.vue b/apps/web/src/components/navigation/components/Multiwallet.vue
index 465061d30..fb096a96f 100644
--- a/apps/web/src/components/navigation/components/Multiwallet.vue
+++ b/apps/web/src/components/navigation/components/Multiwallet.vue
@@ -17,22 +17,22 @@ const account = ref(false)
 const connectedWallets = ref([
     {
         name: 'Metamask',
-        icon: 'metamask.svg',
+        icon: '/metamask.svg',
         master: true,
     },
     {
         name: 'Coinbase',
-        icon: 'coinbase.svg',
+        icon: '/coinbase.svg',
         master: false,
     },
     {
         name: 'Wallet Connect',
-        icon: 'walletconnect.svg',
+        icon: '/walletconnect.svg',
         master: false,
     },
     {
         name: 'Ledger',
-        icon: 'ledger.svg',
+        icon: '/ledger.svg',
         master: false,
     },
 ])
@@ -67,12 +67,12 @@ const connectedWallets = ref([
           >
             <div class="flex">
               <!-- To Do: Make this icon dragable and once it's placed in a wallet, that wallet becomes master wallet -->
-              <i
+              <!-- <i
                 v-show="item.master && open"
                 class="iconoir-keyframe-align-center text-blue_4 text-[24px] mr-[10px]"
-              />
+              /> -->
               <img
-                class="w-[24px]"
+                class="w-[20px]"
                 :src="item.icon"
                 :alt="item.name + ' Icon'"
               >
@@ -80,19 +80,20 @@ const connectedWallets = ref([
             
             <h6
               v-show="open"
-              class="slowExpandText h-min text-clip ml-gutter mt-[3px] text-body"
+              class="slowExpandText h-min text-clip ml-gutter mt-[3px] text-body font-medium"
             >
               {{ item.name }}
             </h6>
           </div>
-          <span
+          <!-- Will add this back when draggable icon is implemented -->
+          <!-- <span
             v-show="open"
             class="text-body text-grey_5 w-[205px]"
           >
             Drag the <i class="iconoir-keyframe-align-center text-blue_4 text-[12px] mx-[5px] inline-block" />
             icon to change your master wallet (Master wallet is the wallet that you connect
             to view your assets across all wallets)
-          </span>
+          </span> -->
         </div>
       </div>
     </div>
@@ -121,9 +122,26 @@ const connectedWallets = ref([
     </div>
     <button
       v-show="open"
+      v-if="!account"
       class="btn_primary my-[15px] text-body w-full"
+      @click="account = !account"
     >
-      Launch Casimir Multiwallet
+      Launch Demo 
+      <i
+        class="iconoir-play-outline font-bold text-body"
+      />
+    </button>
+
+    <button
+      v-show="open"
+      v-else
+      class="btn_primary my-[15px] text-body w-full"
+      @click="account = !account"
+    >
+      Close Demo 
+      <i
+        class="iconoir-cancel font-bold text-body"
+      />
     </button>
 
     <!-- This button will be romoved once we get a way to get dynamic accouts in -->
diff --git a/apps/web/src/composables/router.ts b/apps/web/src/composables/router.ts
index 5fe9e7496..e074e43a9 100644
--- a/apps/web/src/composables/router.ts
+++ b/apps/web/src/composables/router.ts
@@ -6,7 +6,9 @@ import Landing from '@/pages/landing/Landing.vue'
 // @ts-ignore
 import Staking from '@/pages/staking/Staking.vue'
 // @ts-ignore
-// import ETHStaking from '@/pages/staking/components/ETHStaking.vue'
+import ETHStaking from '@/pages/staking/components/ETHStaking.vue'
+// @ts-ignore
+import ETHWalletSelect from '@/pages/staking/components/ETHWalletSelect.vue'
 // @ts-ignore
 import Assets from '@/pages/assets/Assets.vue'
 // @ts-ignore
@@ -27,12 +29,16 @@ const routes = [
     name: Staking, 
     component: Staking,
     meta: { authorize: [] },
-    // children: [
-    //     {
-    //         path: 'ETH-Staking', 
-    //         component: ETHStaking,
-    //     }
-    // ]
+    children: [
+        {
+            path: 'ETH', 
+            component: ETHStaking,
+        },
+        {
+            path: 'ETH/Select-Wallet', 
+            component: ETHWalletSelect,
+        }
+    ]
 },{ 
     path: '/Assets', 
     name: Assets, 
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index ba91117d2..cb04f62c9 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -83,6 +83,13 @@ background: #fff;
     }
 }
 @layer components {
+    .pill_primary{
+        @apply py-[6px] px-[12px]
+        bg-[#EAF1FF] text-primary 
+        border border-primary border-[0.25px]
+        rounded-[100px] text-body font-bold text-center
+        flex items-center;
+    }
     .btn_primary {
         @apply  flex  flex-row  items-center 
         justify-center  px-[24px]  py-[12px] 
diff --git a/apps/web/src/layouts/default-layout.vue b/apps/web/src/layouts/default-layout.vue
index 4b9313a74..443e351ac 100644
--- a/apps/web/src/layouts/default-layout.vue
+++ b/apps/web/src/layouts/default-layout.vue
@@ -5,7 +5,7 @@ import SideNav from '@/components/navigation/SideNav.vue'
 <template>
   <div
     id="layout"
-    class="h-screen flex"
+    class="h-screen flex min-h-[600px]"
   >
     <SideNav />
     <div
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index 4709d0495..c77fa7ee3 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -2,9 +2,10 @@
 // To Do: Grab all staking info 
 // balance, staked, reward info
 
+import router from '@/composables/router'
 import { ref, shallowRef, onBeforeMount, onMounted } from 'vue'
 
-import ETHStaking from './components/ETHStaking.vue'
+import StakingModal from './components/StakingModal.vue'
 
 const selectedComponent = shallowRef(null)
 
@@ -13,16 +14,18 @@ const toggleModal = (component: any) => {
 }
 
 onMounted(() => {
+  if( router.currentRoute.value.fullPath.split('/').length > 1 ) {
+    toggleModal(StakingModal)
+  }
   const modal = document.getElementById('staking_modal')
   window.onclick = function(event) {
     if (event.target === modal) {
       toggleModal(null)
+      router.push('/Staking')
     }
   }
 })
 
-
-
 </script>
 <template>
   <div class="flex flex-col h-full w-full">
@@ -32,16 +35,17 @@ onMounted(() => {
     >
       <div
         id="staking_modal"
-        class="modal grid grid-cols-1 place-content-center p-[50px]"
+        class="modal grid grid-cols-1 place-content-center p-[50px] min-h-[650px]"
       >
         <component
           :is="selectedComponent"
           :toggle-modal="toggleModal"
           class="modal-content"
-        />
+        >
+          <RouterView />
+        </component>
       </div>
     </div>
-    
     <div>
       <h5 class="font-bold mb-[30px]">
         Casimir Staking
@@ -94,12 +98,14 @@ onMounted(() => {
           </h6>
         </div>
         <div class="flex flex-col justify-between">
-          <button
-            class="btn_primary"
-            @click="toggleModal(ETHStaking)"
-          >
-            Stake
-          </button>
+          <RouterLink to="Staking/ETH">
+            <button
+              class="btn_primary"
+              @click="toggleModal(StakingModal)"
+            >
+              Stake
+            </button>
+          </RouterLink>
         </div>
       </div>
     </div>
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index 12c0b54ed..602516d67 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -1,24 +1,250 @@
 <script lang="ts" setup>
+import { ref } from 'vue'
 
-// eslint-disable-next-line no-undef
-const props = defineProps({
-    toggleModal: {
-        type: Function,
-        required: true
-    }
-})
+
+const ETHStakingStats = ref(
+    [
+        'Total Amount Staked: 78.32 ETH | #123,123.11',
+        'Total Rewards: 78.32 ETH | $123,123.11',
+        '4.11% Anual Reward Rate',
+        '11% Avg Fee',
+    ]
+)
+
+const CurrentStakedItems = ref(
+    [
+        {
+            totalAmmountStaked: '5 ETH | $123.12',
+            timeOfStaking: '11/30/22',
+            wallet: {
+                provider: '/coinbase.svg',
+                address: 'asdfasasdf'
+            },
+            // list of pools distributed in
+            pools: [
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '123',
+                    // InWaiting || Active
+                    status: 'Active',
+                    ammountStaked: '5 ETH',
+                    rewardsAccumulated: '10 ETH | $123.12',
+                    operatorScore: '32%',
+                    avgAPR: '2.3%'
+                }
+            ],
+        },
+        {
+            totalAmmountStaked: '5 ETH | $123.12',
+            timeOfStaking: '11/30/22',
+            wallet: {
+                provider: '/coinbase.svg',
+                address: 'asdfasasdf'
+            },
+            // list of pools distributed in
+            pools: [
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '123',
+                    // InWaiting || Active
+                    status: 'Active',
+                    ammountStaked: '2.5 ETH',
+                    rewardsAccumulated: '10 ETH | $123.12',
+                    operatorScore: '32%',
+                    avgAPR: '2.3%'
+                },
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '',
+                    // InWaiting || Active
+                    status: 'InWaiting',
+                    ammountStaked: '2.5 ETH',
+                    wallet: {
+                        provider: '/coinbase.svg',
+                        address: 'asdfasasdf'
+                    },
+                    rewardsAccumulated: '',
+                    operatorScore: '',
+                    avgAPR: ''
+                }
+            ],
+        },
+        {
+            totalAmmountStaked: '5 ETH | $123.12',
+            timeOfStaking: '11/30/22',
+            wallet: {
+                provider: '/coinbase.svg',
+                address: 'asdfasasdf'
+            },
+            // list of pools distributed in
+            pools: [
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '123',
+                    // InWaiting || Active
+                    status: 'Active',
+                    ammountStaked: '1.25 ETH',
+                    rewardsAccumulated: '10 ETH | $123.12',
+                    operatorScore: '32%',
+                    avgAPR: '2.3%'
+                },
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '123',
+                    // InWaiting || Active
+                    status: 'Active',
+                    ammountStaked: '1.25 ETH',
+                    rewardsAccumulated: '10 ETH | $123.12',
+                    operatorScore: '32%',
+                    avgAPR: '2.3%'
+                },
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '123',
+                    // InWaiting || Active
+                    status: 'Active',
+                    ammountStaked: '2.5 ETH',
+                    rewardsAccumulated: '10 ETH | $123.12',
+                    operatorScore: '32%',
+                    avgAPR: '2.3%'
+                }
+            ],
+        },
+        {
+            totalAmmountStaked: '5 ETH | $123.12',
+            timeOfStaking: '11/30/22',
+            wallet: {
+                provider: '/coinbase.svg',
+                address: 'asdfasasdf'
+            },
+            // list of pools distributed in
+            pools: [
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '123',
+                    // InWaiting || Active
+                    status: 'Active',
+                    ammountStaked: '2.5 ETH',
+                    rewardsAccumulated: '10 ETH | $123.12',
+                    operatorScore: '32%',
+                    avgAPR: '2.3%'
+                },
+                {
+                    poolAddress: '123123',
+                    validatorAddress: '',
+                    // InWaiting || Active
+                    status: 'InWaiting',
+                    ammountStaked: '2.5 ETH',
+                    rewardsAccumulated: '',
+                    operatorScore: '',
+                    avgAPR: ''
+                }
+            ],
+        },
+    ]
+)
 
 </script>
   
 <template>
-  <div class="w-full">
-    eth staking
+  <div class="flex flex-col gap-[20px] h-full w-full">
+    <div class="flex w-full overflow-auto gap-[20px]">
+      <div
+        v-for="item in ETHStakingStats"
+        :key="item"
+        class="pill_primary whitespace-nowrap"
+      >
+        {{ item }}
+      </div>
+    </div>
+    <div class="min-h-[78%] max-h-[80%] overflow-auto">
+      <div class="flex w-full h-full overflow-auto gap-[20px]">
+        <div
+          class="min-w-[150px] border border-grey_2 border-[2px] p-[15px] flex items-center justify-center gap-[15px] "
+        >
+          <RouterLink to="/Staking/ETH/Select-Wallet">
+            <button class="btn_primary text-body font-bold">
+              Stake <img
+                src="/Staking-Icon.svg"
+                alt="Staking Icon"
+              >
+            </button>
+          </RouterLink>
+        </div>
+        <div
+          v-for="pool in CurrentStakedItems"
+          :key="`${pool as any}`"
+          class="min-w-[300px] relative border border-grey_2 border-[2px] p-[15px] flex flex-col gap-[15px] overflow-y-auto"
+        >
+          <div class="absolute top-0 right-0">
+            <!-- Add tool tip to whow which wallet is being used -->
+            <img
+              :src="pool.wallet.provider"
+              :alt="pool.wallet.provider"
+              class="w-[30px] opacity-[0.2]"
+            >
+          </div>
+          <div class="w-full text-center">
+            <h6 class="font-bold text-grey_5">
+              {{ pool.totalAmmountStaked }}
+            </h6>
+          </div>
+          <div class="w-full text-center">
+            <h6 class="font-bold text-grey_3">
+              {{ pool.timeOfStaking }}
+            </h6>
+          </div>
+          <hr>
+          <div
+            v-for="item in pool.pools"
+            :key="`${item as any}`"
+            class="bg-grey_1 p-[15px]"
+          >
+            <div
+              v-if="item.status === 'InWaiting'"
+              class="flex flex-col w-full gap-[15px] justify-center"
+            >
+              <h6 class="font-bold text-grey_5">
+                {{ item.ammountStaked }}
+              </h6>
+              <h6 class="font-medium  text-grey_5">
+                Pool: {{ item.poolAddress }}
+              </h6>
+              <hr class="h-[2px] bg-decline">
+              <h6 class="font-bold  text-decline p-[10px] border border-decline">
+                Not Yet Staked
+              </h6>
+            </div>
+            <div
+              v-else-if="item.status === 'Active'" 
+              class="flex flex-col w-full gap-[10px] justify-center"
+            >
+              <h6 class="font-bold text-grey_5">
+                {{ item.ammountStaked }}
+              </h6>
+              <h6 class="font-medium  text-grey_5">
+                Pool: {{ item.poolAddress }}
+              </h6>
+              <hr class="h-[2px] bg-grey_5">
+              <div class="flex flex-col gap-[15px] border border-grey_5 p-[10px] text-grey_5">
+                <h6 class="">
+                  Validator: {{ item.validatorAddress }}
+                </h6>
+                <h6 class="">
+                  {{ item.rewardsAccumulated }} in Rewards
+                </h6>
+                <h6 class="">
+                  {{ item.operatorScore }} Avg Operator Score
+                </h6>
 
-    <button
-      class="btn_primary"
-      @click="toggleModal(null)"
-    >
-      X
-    </button>
+                <h6 class="">
+                  {{ item.avgAPR }} Avg APR
+                </h6>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
new file mode 100644
index 000000000..9cb543902
--- /dev/null
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+  
+<template>
+  <div>
+    wallet select here
+  </div>
+</template>
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
new file mode 100644
index 000000000..6ed762031
--- /dev/null
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+
+// eslint-disable-next-line no-undef
+const props = defineProps({
+    toggleModal: {
+        type: Function,
+        required: true
+    }
+})
+
+const currentBalance = ref('45 ETH | $123,123.11')
+
+</script>
+  
+<template>
+  <div class="flex flex-col min-w-[290px] w-full min-h-[500px] h-[80vh]">
+    <div class="flex items-center justify-between mb-[20px]">
+      <h5 class="font-bold flex items-center gap-[10px]">
+        <img
+          src="/ETH.svg"
+          alt="eth icon"
+          class="w-[24px] h-[24px]"
+        >
+        ETH Staking
+        <span class="font-semibold text-primary text-body mt-[10px] sr-only s_sm:not-sr-only">
+          {{ currentBalance }}
+        </span>
+      </h5>
+      <RouterLink to="/Staking">
+        <button
+          class="btn_primary px-[12px] py-[6px] bg-white text-black hover:bg-grey_1"
+          @click="toggleModal(null)"
+        >
+          <i
+            class="iconoir-cancel font-bold text-[24px]"
+          />
+        </button>
+      </RouterLink>
+    </div>
+    <div class="h-full">
+      <slot />
+    </div>
+  </div>
+</template>

From 66bcebc6d4de67c1f464e6824b5674e2d7613289 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Wed, 30 Nov 2022 04:38:34 -0500
Subject: [PATCH 04/31] Set up wallet select view

---
 .../staking/components/ETHWalletSelect.vue    | 51 +++++++++++++++++--
 .../pages/staking/components/StakingModal.vue |  8 +--
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
index 9cb543902..51017809d 100644
--- a/apps/web/src/pages/staking/components/ETHWalletSelect.vue
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -1,7 +1,52 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+
+
+const connectedWallets = ref([
+    {
+        name: 'Metamask',
+        icon: '/metamask.svg',
+    },
+    {
+        name: 'Coinbase',
+        icon: '/coinbase.svg',
+    },
+    {
+        name: 'Wallet Connect',
+        icon: '/walletconnect.svg',
+    },
+    {
+        name: 'Ledger',
+        icon: '/ledger.svg',
+    },
+])
+</script>
   
 <template>
-  <div>
-    wallet select here
+  <div class="w-full flex flex-col gap-[20px] min-h-[80%] max-h-[90%]">
+    <h6 class="text-grey_5 font-medium">
+      Select wallet and amount to stake
+      <hr class="bg-grey_2 h-[2px] mt-[10px]">
+    </h6>
+    <h6 class="text-grey_5 font-medium flex flex-wrap justify-between">
+      Distributed SSV Validators
+      <!-- make it a button with a modal -->
+      <span class="text-primary text-body font-bold sr-only s_sm:not-sr-only"> Learn More </span>
+      <hr class="bg-grey_2 h-[2px] mt-[10px] w-full">
+    </h6>
+    <div class="h-[50%] overflow-auto">
+      <div>
+        Wallets here 
+      </div>
+    </div> 
+    <div class="h-[48px] flex gap-[10px]">
+      <button class="w-[90%] btn_primary font-bold">
+        Next
+      </button>
+      <button class="min-w-[100px] w-[10%] btn_primary border border-primary bg-white text-primary">
+        <i class="iconoir-undo-action text-[24px]" />
+      </button>
+    </div>
   </div>
 </template>
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index 6ed762031..1e80d7973 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -24,9 +24,11 @@ const currentBalance = ref('45 ETH | $123,123.11')
           class="w-[24px] h-[24px]"
         >
         ETH Staking
-        <span class="font-semibold text-primary text-body mt-[10px] sr-only s_sm:not-sr-only">
-          {{ currentBalance }}
-        </span>
+        <div>
+          <span class="font-semibold text-primary text-body sr-only s_sm:not-sr-only">
+            {{ currentBalance }}
+          </span>
+        </div>
       </h5>
       <RouterLink to="/Staking">
         <button

From 55ca0930968c65fe60ee0589a66e3f91f8be371f Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Thu, 1 Dec 2022 02:20:04 -0500
Subject: [PATCH 05/31] Add confirm and sign page

---
 apps/web/src/composables/router.ts            |   6 +
 apps/web/src/index.css                        |  33 +++-
 apps/web/src/pages/staking/Staking.vue        |  12 +-
 .../staking/components/ETHConfirmStake.vue    | 126 +++++++++++++
 .../staking/components/ETHWalletSelect.vue    | 171 +++++++++++++++---
 .../pages/staking/components/StakingModal.vue |   2 +-
 apps/web/tailwind.config.js                   |   1 +
 7 files changed, 314 insertions(+), 37 deletions(-)
 create mode 100644 apps/web/src/pages/staking/components/ETHConfirmStake.vue

diff --git a/apps/web/src/composables/router.ts b/apps/web/src/composables/router.ts
index e074e43a9..a8aec1470 100644
--- a/apps/web/src/composables/router.ts
+++ b/apps/web/src/composables/router.ts
@@ -10,6 +10,8 @@ import ETHStaking from '@/pages/staking/components/ETHStaking.vue'
 // @ts-ignore
 import ETHWalletSelect from '@/pages/staking/components/ETHWalletSelect.vue'
 // @ts-ignore
+import ETHConfirmStake from '@/pages/staking/components/ETHConfirmStake.vue'
+// @ts-ignore
 import Assets from '@/pages/assets/Assets.vue'
 // @ts-ignore
 import Test from '@/pages/test/Test.vue'
@@ -37,6 +39,10 @@ const routes = [
         {
             path: 'ETH/Select-Wallet', 
             component: ETHWalletSelect,
+        },
+        {
+            path: 'ETH/Confirm-Stake', 
+            component: ETHConfirmStake,
         }
     ]
 },{ 
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index cb04f62c9..ea3f2ad6f 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -83,6 +83,19 @@ background: #fff;
     }
 }
 @layer components {
+    .slider {
+        @apply flex items-center justify-between gap-[20px];
+    }
+    .slider input[type="range"] {
+        width: calc(100% - 250px);
+        height: 2px;
+        background: #d9d9d9;
+        border: none;
+        outline: none;
+    }
+    .slider input[type="range"]::-webkit-slider-thumb {
+        cursor: pointer;
+    }
     .pill_primary{
         @apply py-[6px] px-[12px]
         bg-[#EAF1FF] text-primary 
@@ -114,9 +127,27 @@ background: #fff;
         padding: 20px 30px;
         border: 1px solid #888;
         width: 100vw;
-      }
+    }
 }
 @layer utilities {
+    .loading {
+        background: linear-gradient(50deg, 
+        #80ABFF,#4D89FF, #0D5FFF, #0D5FFF,#4D89FF, #80ABFF);
+        animation: movingBackground 2s ease infinite;
+        background-size: 200%;
+      }
+    
+      @keyframes movingBackground {
+        0% {
+            background-position: 0% 50%;
+        }
+        50% {
+            background-position: 100% 50%;
+        }
+        0% {
+            background-position: 0% 50%;
+        }
+      }
     .side-nav-container {
         @apply 
         w-sidebar-closed 
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index c77fa7ee3..5d9bc876e 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -14,8 +14,10 @@ const toggleModal = (component: any) => {
 }
 
 onMounted(() => {
-  if( router.currentRoute.value.fullPath.split('/').length > 1 ) {
+  if( router.currentRoute.value.fullPath.split('/').length > 2 ) {
     toggleModal(StakingModal)
+  } else {
+    toggleModal(null)
   }
   const modal = document.getElementById('staking_modal')
   window.onclick = function(event) {
@@ -35,7 +37,7 @@ onMounted(() => {
     >
       <div
         id="staking_modal"
-        class="modal grid grid-cols-1 place-content-center p-[50px] min-h-[650px]"
+        class="modal grid grid-cols-1 place-content-center p-[50px] csm:p-[0px] min-h-[650px]"
       >
         <component
           :is="selectedComponent"
@@ -47,7 +49,7 @@ onMounted(() => {
       </div>
     </div>
     <div>
-      <h5 class="font-bold mb-[30px]">
+      <h5 class="font-bold mb-[30px] whitespace-nowrap">
         Casimir Staking
       </h5>
     </div>
@@ -72,7 +74,7 @@ onMounted(() => {
         
         <div class="flex flex-col justify-between sr-only s_sm:not-sr-only">
           <h6 class="font-medium">
-            Balance
+            Unstaked ETH
           </h6>
           <h6 class="font-medium text-grey_3">
             <!-- random -->
@@ -90,7 +92,7 @@ onMounted(() => {
         </div>
         <div class="flex flex-col justify-between sr-only s_lg:not-sr-only">
           <h6 class="font-medium">
-            Rewards
+            In Rewards
           </h6>
           <h6 class="font-medium text-grey_3">
             <!-- random -->
diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
new file mode 100644
index 000000000..bc3051d37
--- /dev/null
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -0,0 +1,126 @@
+<script lang="ts" setup>
+import router from '@/composables/router'
+import { ref } from 'vue'
+
+
+const stakingInfo = ref(
+    {
+        to: 'Distributed SSV Validatore',
+        ammount: '6 ETH',
+        fees: '0.25 %',
+        expectedRewards: '4.3 %',
+        from: {
+            name: 'Coinbase',
+            icon: '/coinbase.svg',
+            account: {
+                name: 'Account One',
+                balance: '48 ETH',
+                address: 'asdfasdfasdf'
+            }
+        }
+    }
+)
+
+const loading = ref(false)
+
+const handleConfirm = () => {
+    loading.value = true
+
+    setTimeout(()=> {
+        loading.value = false
+        router.push('/Staking/ETH')
+    }, 2000)
+}
+
+</script>
+  
+<template>
+  <div
+    class="flex flex-col h-full overflow-auto relative whitespace-nowrap"
+  >
+    <div class="mb-[30px]">
+      <h6 class="text-grey_5 font-medium">
+        Confirm Stake & Sign Transaction
+      </h6>
+    </div>
+
+    <div class="flex flex-wrap justify-between items-center">
+      <h6 class="text-grey_5">
+        Staking To
+      </h6>
+      <h6 class="font-bold">
+        {{ stakingInfo.to }}
+      </h6>
+    </div>
+    <hr class="bg-grey h-[2px] my-[10px]">
+    <div class="flex justify-between items-center">
+      <h6 class="text-grey_5">
+        Ammount Staking
+      </h6>
+      <h6 class="font-bold">
+        {{ stakingInfo.ammount }}
+      </h6>
+    </div>
+    <hr class="bg-grey h-[2px] my-[10px]">
+    <div class="flex justify-between items-center">
+      <h6 class="text-grey_5">
+        Fees
+      </h6>
+      <h6 class="font-bold">
+        {{ stakingInfo.fees }}
+      </h6>
+    </div>
+    <hr class="bg-grey h-[2px] my-[10px]">
+    <div class="flex justify-between items-center">
+      <h6 class="text-grey_5">
+        Expected Rewards
+      </h6>
+      <h6 class="font-bold">
+        {{ stakingInfo.expectedRewards }}
+      </h6>
+    </div>
+    
+    <div class="my-[40px] border">
+      <div class="flex justify-between items-center px-[12px] py-[24px]">
+        <img
+          :src="stakingInfo.from.icon"
+          :alt="stakingInfo.from.name"
+          class="w-[24px]"
+        >
+        <h6 class="font-semibold text-blue_3">
+          {{ stakingInfo.from.name }}
+        </h6>
+      </div>
+      <div
+        class="flex justify-between items-center my-[20px] px-[12px] py-[6px]"
+      >
+        <h6 class="text-grey_6 font-semibold">
+          {{ stakingInfo.from.account.name }} | 
+          <span class="px-[6px] text-grey_2 sr-only s_xsm:not-sr-only">{{ stakingInfo.from.account.address }}</span>
+        </h6>
+        <h6 class="text-grey_5 font-light">
+          {{ stakingInfo.from.account.balance }}
+        </h6>
+      </div>
+    </div>
+
+    <div class="absolute bottom-0 w-full flex justify-between items-center gap-[10px] mt-[20px]">
+      <button
+        class="w-full btn_primary font-bold text-body py-[8px]"
+        :class="loading? 'loading' : ''"
+        @click="handleConfirm"
+      >
+        Sign Transaction
+      </button>
+      
+      <RouterLink
+        to="/Staking/ETH/Select-Wallet"
+        class="w-[100px]"
+      >
+        <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] border-primary bg-white text-primary">
+          <i class="iconoir-undo-action text-[16px]" />
+        </button>
+      </RouterLink>
+    </div>
+  </div>
+</template>
diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
index 51017809d..494f59d63 100644
--- a/apps/web/src/pages/staking/components/ETHWalletSelect.vue
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -1,52 +1,163 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-
-
+import { ref, watch } from 'vue'
 
 const connectedWallets = ref([
     {
         name: 'Metamask',
         icon: '/metamask.svg',
+        accounts: [
+            {
+                name: 'Acount One',
+                address: ';aalskdkfj;alsdk;fj',
+                amount: '32 ETH'
+            },
+            {
+                name: 'Acount Two',
+                address: ';alskddkfj;alsdk;fj',
+                amount: '0 ETH'
+            },
+        ]
     },
     {
         name: 'Coinbase',
         icon: '/coinbase.svg',
-    },
-    {
-        name: 'Wallet Connect',
-        icon: '/walletconnect.svg',
-    },
-    {
-        name: 'Ledger',
-        icon: '/ledger.svg',
+        accounts: [
+            {
+                name: 'Acount One',
+                address: ';alskdkfgj;alsdk;fj',
+                amount: '48 ETH'
+            },
+            {
+                name: 'Acount Two',
+                address: ';alskdkfj;adlsdk;fj',
+                amount: '20 ETH'
+            },
+        ]
     },
 ])
+
+const maxAmmountToStake = ref(100)
+
+const amountToStake = ref(0.00)
+
+const disableNext = ref(true)
+
+const selectedWalletToStakeFrom = ref(
+    {
+        name: '',
+        address: '',
+        amount: ''
+    }
+)
+
+watch([amountToStake, selectedWalletToStakeFrom], () => {
+    if(!(/^[0-9.,]+$/.test(amountToStake.value + ''))){
+        amountToStake.value = 0.00
+    }
+    if(amountToStake.value > maxAmmountToStake.value){
+        amountToStake.value = maxAmmountToStake.value
+    }
+
+    if(
+        amountToStake.value > 0 &&
+        selectedWalletToStakeFrom.value.address.length > 0
+    ) {
+        disableNext.value = false
+    } else { disableNext.value = true}
+})
+
+
 </script>
   
 <template>
-  <div class="w-full flex flex-col gap-[20px] min-h-[80%] max-h-[90%]">
-    <h6 class="text-grey_5 font-medium">
-      Select wallet and amount to stake
+  <div
+    class="flex flex-col h-full overflow-auto relative"
+  >
+    <h6 class="text-grey_5 font-medium mb-[20px] truncate">
+      Select wallet and amount to stake to our Distributed SSV Validators
       <hr class="bg-grey_2 h-[2px] mt-[10px]">
     </h6>
-    <h6 class="text-grey_5 font-medium flex flex-wrap justify-between">
-      Distributed SSV Validators
-      <!-- make it a button with a modal -->
-      <span class="text-primary text-body font-bold sr-only s_sm:not-sr-only"> Learn More </span>
-      <hr class="bg-grey_2 h-[2px] mt-[10px] w-full">
-    </h6>
-    <div class="h-[50%] overflow-auto">
-      <div>
-        Wallets here 
+    <!-- Add tooltip of min and max -->
+    <div class="slider mb-[20px]">
+      <div class="border border-grey px-[16px] py-[8px] flex justify-between gap-[10px] items-center">
+        <input
+          v-model="amountToStake"
+          type="text"
+          placeholder="0.00"
+          class="p-0 w-[65px] outline-none text-grey_5"
+        >
+        <h6 class="text-primary">
+          | ETH to Stake
+        </h6>
+      </div>
+      <input
+        v-model="amountToStake"
+        type="range"
+        min="0.0"
+        step="0.0001"
+        :max="maxAmmountToStake"
+        class="sr-only s_xsm:not-sr-only"
+      >
+    </div> 
+    <hr>
+    <div class="h-[40vh] overflow-auto">
+      <div
+        v-for="item in connectedWallets"
+        :key="`${item as any}`"
+        class="w-full border border-grey my-[10px]"
+      >
+        <div class="flex justify-between items-center px-[12px] py-[6px]">
+          <img
+            :src="item.icon"
+            :alt="item.name"
+            class="w-[24px]"
+          >
+          <h6 class="font-semibold text-blue_3">
+            {{ item.name }}
+          </h6>
+        </div>
+        <div
+          v-for="account in item.accounts"
+          :key="`${account as any}`"
+          class="flex justify-between items-center my-[20px] px-[12px] py-[6px] hover:bg-blue_3 cursor-pointer"
+          :class="selectedWalletToStakeFrom.address === account.address? 'bg-blue_3 hover:bg-blue_2' : ''"
+          @click="selectedWalletToStakeFrom = account"
+        >
+          <h6 class="text-grey_6 font-semibold">
+            {{ account.name }} | 
+            <span class="px-[6px] text-grey_2  sr-only s_xsm:not-sr-only">{{ account.address }}</span>
+          </h6>
+          <h6 class="text-grey_5 font-light">
+            {{ account.amount }}
+          </h6>
+        </div>
       </div>
     </div> 
-    <div class="h-[48px] flex gap-[10px]">
-      <button class="w-[90%] btn_primary font-bold">
-        Next
-      </button>
-      <button class="min-w-[100px] w-[10%] btn_primary border border-primary bg-white text-primary">
-        <i class="iconoir-undo-action text-[24px]" />
-      </button>
+    <hr>
+    
+    <div class="absolute bottom-0 w-full flex justify-between items-center gap-[10px] mt-[20px]">
+      <RouterLink
+        :to="!disableNext? '/Staking/ETH/Confirm-Stake' : '/Staking/ETH/Select-Wallet'"
+        :style="{
+          width: 'calc(100% - 100px)'
+        }"
+      >
+        <button
+          class="w-full btn_primary font-bold text-body py-[8px]"
+          :disabled="disableNext"
+        >
+          Next
+        </button>
+      </RouterLink>
+      
+      <RouterLink
+        to="/Staking/ETH"
+        class="w-[100px]"
+      >
+        <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] border-primary bg-white text-primary">
+          <i class="iconoir-undo-action text-[16px]" />
+        </button>
+      </RouterLink>
     </div>
   </div>
 </template>
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index 1e80d7973..576a44a2f 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -15,7 +15,7 @@ const currentBalance = ref('45 ETH | $123,123.11')
 </script>
   
 <template>
-  <div class="flex flex-col min-w-[290px] w-full min-h-[500px] h-[80vh]">
+  <div class="flex flex-col min-w-[300px] w-full min-h-[500px] h-[80vh]">
     <div class="flex items-center justify-between mb-[20px]">
       <h5 class="font-bold flex items-center gap-[10px]">
         <img
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index 2a4c2b599..33a14335b 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -15,6 +15,7 @@ module.exports = {
                 'secondary': '#C1D3F8',
                 'white': '#fff',
                 'shade': '#615959',
+                'grey' : '#E4E4E7',
 
                 // Blues
                 'blue_1': '#E5EEFF',

From 23185795dae904a66a578cd591c6053743034ead Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Mon, 5 Dec 2022 00:28:44 -0500
Subject: [PATCH 06/31] Update Staking layout

---
 .../navigation/components/Multiwallet.vue     |  25 +--
 apps/web/src/pages/staking/Staking.vue        | 140 ++++++------
 .../staking/components/ETHConfirmStake.vue    | 128 +++++------
 .../pages/staking/components/ETHStaking.vue   | 212 +++++++++++-------
 .../staking/components/ETHWalletSelect.vue    |  29 +--
 .../pages/staking/components/StakingModal.vue |  23 +-
 6 files changed, 294 insertions(+), 263 deletions(-)

diff --git a/apps/web/src/components/navigation/components/Multiwallet.vue b/apps/web/src/components/navigation/components/Multiwallet.vue
index fb096a96f..fe6a7c4f9 100644
--- a/apps/web/src/components/navigation/components/Multiwallet.vue
+++ b/apps/web/src/components/navigation/components/Multiwallet.vue
@@ -11,7 +11,7 @@ const props = defineProps({
 })
 
 // To Do: connect this to our Auth and see if an account exsists
-const account = ref(false)
+const account = ref(true)
 
 // To Do: get list of connected wallets
 const connectedWallets = ref([
@@ -80,7 +80,7 @@ const connectedWallets = ref([
             
             <h6
               v-show="open"
-              class="slowExpandText h-min text-clip ml-gutter mt-[3px] text-body font-medium"
+              class="slowExpandText h-min text-clip ml-gutter mt-[3px] text-body font-medium whitespace-nowrap"
             >
               {{ item.name }}
             </h6>
@@ -120,7 +120,8 @@ const connectedWallets = ref([
         </ul>
       </div>
     </div>
-    <button
+    <!-- Add this back after demo -->
+    <!-- <button
       v-show="open"
       v-if="!account"
       class="btn_primary my-[15px] text-body w-full"
@@ -142,23 +143,7 @@ const connectedWallets = ref([
       <i
         class="iconoir-cancel font-bold text-body"
       />
-    </button>
-
-    <!-- This button will be romoved once we get a way to get dynamic accouts in -->
-    <div class="absolute bottom-0 left-[10px] flex">
-      <button
-        class="btn_primary text-body mr-[5px]"
-        @click="account = !account"
-      >
-        toggle accout
-      </button>
-      <RouterLink
-        to="/test"
-        class="btn_primary text-caption"
-      >
-        go to test
-      </RouterLink>
-    </div>
+    </button> -->
 
     <!-- To Do: Add settings button with settings page below -->
   </div>
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index 5d9bc876e..8fea6870a 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -3,7 +3,7 @@
 // balance, staked, reward info
 
 import router from '@/composables/router'
-import { ref, shallowRef, onBeforeMount, onMounted } from 'vue'
+import { ref, shallowRef, onBeforeMount, onMounted, watch } from 'vue'
 
 import StakingModal from './components/StakingModal.vue'
 
@@ -28,86 +28,90 @@ onMounted(() => {
   }
 })
 
+watch(router.currentRoute,  () => {
+  if( router.currentRoute.value.fullPath.split('/').length > 2 ) {
+    toggleModal(StakingModal)
+  } else {
+    toggleModal(null)
+  }
+})
+
 </script>
 <template>
-  <div class="flex flex-col h-full w-full">
+  <div class="h-full">
+    <div class="mb-[20px]">
+      <h5 class="font-bold whitespace-nowrap">
+        Casimir Staking
+      </h5>
+    </div>
     <div
-      v-show="selectedComponent"
-      class="relative h-[0px]"
+      :style="{height: 'calc(100% - 55px)'}"
     >
-      <div
-        id="staking_modal"
-        class="modal grid grid-cols-1 place-content-center p-[50px] csm:p-[0px] min-h-[650px]"
-      >
+      <div class="h-full">
         <component
           :is="selectedComponent"
+          v-if="selectedComponent"
           :toggle-modal="toggleModal"
-          class="modal-content"
         >
           <RouterView />
         </component>
-      </div>
-    </div>
-    <div>
-      <h5 class="font-bold mb-[30px] whitespace-nowrap">
-        Casimir Staking
-      </h5>
-    </div>
-    <!-- to do: put all of the css into classes -->
-    <div class="grid grid-cols-1 place-content-center w-full h-full">
-      <div class="border bordedr-[#E4E4E7] px-[25px] py-[50px] flex justify-between">
-        <div class="flex">
-          <img
-            src="/ETH.svg"
-            alt="eth icon"
-            class="w-[50px] h-[50px] mr-[20px]"
-          >
-          <div class="flex flex-col justify-between  sr-only s_xsm:not-sr-only">
-            <h6 class="font-bold">
-              Ethereum Staking
+        <div
+          v-else
+          class="border bordedr-[#E4E4E7] px-[25px] py-[50px] flex justify-between"
+        >
+          <div class="flex">
+            <img
+              src="/ETH.svg"
+              alt="eth icon"
+              class="w-[50px] h-[50px] mr-[20px]"
+            >
+            <div class="flex flex-col justify-between  sr-only s_xsm:not-sr-only">
+              <h6 class="font-bold">
+                Ethereum Staking
+              </h6>
+              <h6 class="font-light">
+                ETH
+              </h6>
+            </div>
+          </div>
+        
+          <div class="flex flex-col justify-between sr-only s_sm:not-sr-only">
+            <h6 class="font-medium">
+              Unstaked ETH
             </h6>
-            <h6 class="font-light">
-              ETH
+            <h6 class="font-medium text-grey_3">
+              <!-- random -->
+              46 ETH | $73816.89
             </h6>
           </div>
-        </div>
-        
-        <div class="flex flex-col justify-between sr-only s_sm:not-sr-only">
-          <h6 class="font-medium">
-            Unstaked ETH
-          </h6>
-          <h6 class="font-medium text-grey_3">
-            <!-- random -->
-            46 ETH | $73816.89
-          </h6>
-        </div>
-        <div class="flex flex-col justify-between sr-only s_md:not-sr-only">
-          <h6 class="font-medium">
-            Staked
-          </h6>
-          <h6 class="font-medium text-grey_3">
-            <!-- random -->
-            32 ETH | $51350.88
-          </h6>
-        </div>
-        <div class="flex flex-col justify-between sr-only s_lg:not-sr-only">
-          <h6 class="font-medium">
-            In Rewards
-          </h6>
-          <h6 class="font-medium text-grey_3">
-            <!-- random -->
-            6 ETH | $9628.29 | 3% AR
-          </h6>
-        </div>
-        <div class="flex flex-col justify-between">
-          <RouterLink to="Staking/ETH">
-            <button
-              class="btn_primary"
-              @click="toggleModal(StakingModal)"
-            >
-              Stake
-            </button>
-          </RouterLink>
+          <div class="flex flex-col justify-between sr-only s_md:not-sr-only">
+            <h6 class="font-medium">
+              Staked
+            </h6>
+            <h6 class="font-medium text-grey_3">
+              <!-- random -->
+              32 ETH | $51350.88
+            </h6>
+          </div>
+          <div class="flex flex-col justify-between sr-only s_lg:not-sr-only">
+            <h6 class="font-medium">
+              In Rewards
+            </h6>
+            <h6 class="font-medium text-grey_3">
+              <!-- random -->
+              6 ETH | $9628.29 | 3% AR
+            </h6>
+          </div>
+          <div class="flex flex-col justify-between">
+            <RouterLink to="Staking/ETH">
+              <button
+                class="btn_primary"
+                @click="toggleModal(StakingModal)"
+              >
+                Stake
+              </button>
+            </RouterLink>
+          </div>
         </div>
       </div>
     </div>
diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
index bc3051d37..495c8289f 100644
--- a/apps/web/src/pages/staking/components/ETHConfirmStake.vue
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -35,78 +35,74 @@ const handleConfirm = () => {
 </script>
   
 <template>
-  <div
-    class="flex flex-col h-full overflow-auto relative whitespace-nowrap"
-  >
-    <div class="mb-[30px]">
-      <h6 class="text-grey_5 font-medium">
-        Confirm Stake & Sign Transaction
-      </h6>
-    </div>
-
-    <div class="flex flex-wrap justify-between items-center">
-      <h6 class="text-grey_5">
-        Staking To
-      </h6>
-      <h6 class="font-bold">
-        {{ stakingInfo.to }}
-      </h6>
-    </div>
-    <hr class="bg-grey h-[2px] my-[10px]">
-    <div class="flex justify-between items-center">
-      <h6 class="text-grey_5">
-        Ammount Staking
-      </h6>
-      <h6 class="font-bold">
-        {{ stakingInfo.ammount }}
-      </h6>
-    </div>
-    <hr class="bg-grey h-[2px] my-[10px]">
-    <div class="flex justify-between items-center">
-      <h6 class="text-grey_5">
-        Fees
-      </h6>
-      <h6 class="font-bold">
-        {{ stakingInfo.fees }}
-      </h6>
-    </div>
-    <hr class="bg-grey h-[2px] my-[10px]">
-    <div class="flex justify-between items-center">
-      <h6 class="text-grey_5">
-        Expected Rewards
-      </h6>
-      <h6 class="font-bold">
-        {{ stakingInfo.expectedRewards }}
-      </h6>
-    </div>
-    
-    <div class="my-[40px] border">
-      <div class="flex justify-between items-center px-[12px] py-[24px]">
-        <img
-          :src="stakingInfo.from.icon"
-          :alt="stakingInfo.from.name"
-          class="w-[24px]"
-        >
-        <h6 class="font-semibold text-blue_3">
-          {{ stakingInfo.from.name }}
+  <div class="h-full flex flex-col gap-[15px]">
+    <h6 class="text-grey_5 font-medium">
+      Confirm Stake & Sign Transaction
+    </h6>
+    <hr class="bg-grey_2 h-[2px]">
+    <div class="h-full overflow-auto">
+      <div class="flex flex-wrap justify-between items-center">
+        <h6 class="text-grey_5">
+          Staking To
+        </h6>
+        <h6 class="font-bold">
+          {{ stakingInfo.to }}
         </h6>
       </div>
-      <div
-        class="flex justify-between items-center my-[20px] px-[12px] py-[6px]"
-      >
-        <h6 class="text-grey_6 font-semibold">
-          {{ stakingInfo.from.account.name }} | 
-          <span class="px-[6px] text-grey_2 sr-only s_xsm:not-sr-only">{{ stakingInfo.from.account.address }}</span>
+      <hr class="bg-grey h-[2px] my-[10px]">
+      <div class="flex justify-between items-center">
+        <h6 class="text-grey_5">
+          Ammount Staking
         </h6>
-        <h6 class="text-grey_5 font-light">
-          {{ stakingInfo.from.account.balance }}
+        <h6 class="font-bold">
+          {{ stakingInfo.ammount }}
         </h6>
       </div>
+      <hr class="bg-grey h-[2px] my-[10px]">
+      <div class="flex justify-between items-center">
+        <h6 class="text-grey_5">
+          Fees
+        </h6>
+        <h6 class="font-bold">
+          {{ stakingInfo.fees }}
+        </h6>
+      </div>
+      <hr class="bg-grey h-[2px] my-[10px]">
+      <div class="flex justify-between items-center">
+        <h6 class="text-grey_5">
+          Expected Rewards
+        </h6>
+        <h6 class="font-bold">
+          {{ stakingInfo.expectedRewards }}
+        </h6>
+      </div>
+      <div class="my-[40px] border">
+        <div class="flex justify-between items-center px-[12px] py-[24px]">
+          <img
+            :src="stakingInfo.from.icon"
+            :alt="stakingInfo.from.name"
+            class="w-[24px]"
+          >
+          <h6 class="font-semibold text-blue_3">
+            {{ stakingInfo.from.name }}
+          </h6>
+        </div>
+        <div
+          class="flex justify-between items-center my-[20px] px-[12px] py-[6px]"
+        >
+          <h6 class="text-grey_6 font-semibold">
+            {{ stakingInfo.from.account.name }} | 
+            <span class="px-[6px] text-grey_2 sr-only s_xsm:not-sr-only">{{ stakingInfo.from.account.address }}</span>
+          </h6>
+          <h6 class="text-grey_5 font-light">
+            {{ stakingInfo.from.account.balance }}
+          </h6>
+        </div>
+      </div>
     </div>
-
-    <div class="absolute bottom-0 w-full flex justify-between items-center gap-[10px] mt-[20px]">
+    <div class="flex justify-between items-center gap-[20px]">
       <button
-        class="w-full btn_primary font-bold text-body py-[8px]"
+        class="w-full btn_primary font-bold text-body py-[8px] whitespace-nowrap"
         :class="loading? 'loading' : ''"
         @click="handleConfirm"
       >
@@ -117,7 +113,7 @@ const handleConfirm = () => {
         to="/Staking/ETH/Select-Wallet"
         class="w-[100px]"
       >
-        <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] border-primary bg-white text-primary">
+        <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] csm:px-[4px] border-primary bg-white text-primary">
           <i class="iconoir-undo-action text-[16px]" />
         </button>
       </RouterLink>
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index 602516d67..4a0c45348 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -18,7 +18,8 @@ const CurrentStakedItems = ref(
             timeOfStaking: '11/30/22',
             wallet: {
                 provider: '/coinbase.svg',
-                address: 'asdfasasdf'
+                address: 'asdfasasdf',
+                name: 'Account One'
             },
             // list of pools distributed in
             pools: [
@@ -147,104 +148,161 @@ const CurrentStakedItems = ref(
 </script>
   
 <template>
-  <div class="flex flex-col gap-[20px] h-full w-full">
-    <div class="flex w-full overflow-auto gap-[20px]">
-      <div
-        v-for="item in ETHStakingStats"
-        :key="item"
-        class="pill_primary whitespace-nowrap"
-      >
-        {{ item }}
-      </div>
-    </div>
-    <div class="min-h-[78%] max-h-[80%] overflow-auto">
-      <div class="flex w-full h-full overflow-auto gap-[20px]">
+  <div class="h-full flex flex-col gap-[15px]">
+    <!-- add rotating pills here when in overflow -->
+    <div>
+      <div class="flex w-full overflow-auto gap-[20px]">
         <div
-          class="min-w-[150px] border border-grey_2 border-[2px] p-[15px] flex items-center justify-center gap-[15px] "
+          v-for="item in ETHStakingStats"
+          :key="item"
+          class="pill_primary whitespace-nowrap"
         >
-          <RouterLink to="/Staking/ETH/Select-Wallet">
-            <button class="btn_primary text-body font-bold">
-              Stake <img
-                src="/Staking-Icon.svg"
-                alt="Staking Icon"
-              >
-            </button>
-          </RouterLink>
+          {{ item }}
         </div>
-        <div
-          v-for="pool in CurrentStakedItems"
-          :key="`${pool as any}`"
-          class="min-w-[300px] relative border border-grey_2 border-[2px] p-[15px] flex flex-col gap-[15px] overflow-y-auto"
-        >
-          <div class="absolute top-0 right-0">
-            <!-- Add tool tip to whow which wallet is being used -->
-            <img
-              :src="pool.wallet.provider"
-              :alt="pool.wallet.provider"
-              class="w-[30px] opacity-[0.2]"
-            >
-          </div>
-          <div class="w-full text-center">
-            <h6 class="font-bold text-grey_5">
-              {{ pool.totalAmmountStaked }}
-            </h6>
-          </div>
-          <div class="w-full text-center">
-            <h6 class="font-bold text-grey_3">
-              {{ pool.timeOfStaking }}
-            </h6>
-          </div>
-          <hr>
+      </div>
+    </div>
+    
+    <div class="h-full overflow-auto border-y border-grey">
+      <div
+        v-for="pool in CurrentStakedItems"
+        :key="`${pool as any}`"
+        class="border border-grey_2 border-[1px] p-[15px] mb-[55px]"
+      >
+        <div class="">
+          <h6 class="font-bold text-grey_5 flex justify-between w-full">
+            <span>{{ pool.totalAmmountStaked }}</span> 
+            <span class="text-grey_3 flex gap-[10px] sr-only s_xsm:not-sr-only">
+              {{ pool.wallet.address }}
+              <img
+                :src="pool.wallet.provider"
+                :alt="pool.wallet.provider"
+                class="w-[20px] opacity-[0.2]"
+              >
+            </span>
+          </h6>
+          <hr class="h-[2px] bg-grey my-[20px]">
+          <h6 class="font-bold text-grey_3">
+            Stake Distribution
+          </h6>
           <div
             v-for="item in pool.pools"
             :key="`${item as any}`"
-            class="bg-grey_1 p-[15px]"
+            class="my-[20px] border border-grey border-dashed border-[2px] p-[15px]"
           >
-            <div
-              v-if="item.status === 'InWaiting'"
-              class="flex flex-col w-full gap-[15px] justify-center"
-            >
-              <h6 class="font-bold text-grey_5">
-                {{ item.ammountStaked }}
-              </h6>
+            <div class="flex flex-wrap gap-[20px] justify-between items-center mb-[15px]">
               <h6 class="font-medium  text-grey_5">
                 Pool: {{ item.poolAddress }}
               </h6>
-              <hr class="h-[2px] bg-decline">
-              <h6 class="font-bold  text-decline p-[10px] border border-decline">
-                Not Yet Staked
+              <h6 class="font-bold text-grey_5">
+                {{ item.ammountStaked }}
               </h6>
             </div>
             <div
-              v-else-if="item.status === 'Active'" 
-              class="flex flex-col w-full gap-[10px] justify-center"
+              v-if="item.status === 'InWaiting'"
             >
-              <h6 class="font-bold text-grey_5">
-                {{ item.ammountStaked }}
-              </h6>
-              <h6 class="font-medium  text-grey_5">
-                Pool: {{ item.poolAddress }}
+              <h6 class="font-medium w-full text-center text-decline p-[10px] border border-decline my-[15px]">
+                In Waiting: Not Yet Staked
               </h6>
-              <hr class="h-[2px] bg-grey_5">
-              <div class="flex flex-col gap-[15px] border border-grey_5 p-[10px] text-grey_5">
-                <h6 class="">
+            </div>
+            <div
+              v-else-if="item.status === 'Active'"
+              class="text-grey_5 whitespace-nowrap"
+            >
+              <h6 class="flex gap-[20px] flex-wrap justify-between items-center mb-[10px] truncate">
+                <span>
                   Validator: {{ item.validatorAddress }}
-                </h6>
-                <h6 class="">
-                  {{ item.rewardsAccumulated }} in Rewards
-                </h6>
-                <h6 class="">
+                </span>
+                <span>
                   {{ item.operatorScore }} Avg Operator Score
-                </h6>
-
-                <h6 class="">
+                </span>
+              </h6>
+              <h6 class="flex gap-[20px] flex-wrap justify-between items-center truncate">
+                <span>
+                  {{ item.rewardsAccumulated }} in Rewards
+                </span>
+                <span>
                   {{ item.avgAPR }} Avg APR
-                </h6>
-              </div>
+                </span>
+              </h6>
             </div>
           </div>
         </div>
       </div>
     </div>
+    <div class="flex justify-between items-center gap-[20px]">
+      <RouterLink
+        to="/Staking/ETH/Select-Wallet"
+        class="w-full"
+      >
+        <button
+          class="w-full btn_primary font-bold text-body py-[8px]"
+        >
+          Stake 
+          <img
+            src="/Staking-Icon.svg"
+            alt="Staking Icon"
+            class="w-[16px]"
+          >
+        </button>
+      </RouterLink>
+      <RouterLink
+        to="/Staking"
+        class="w-[100px]"
+      >
+        <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] border-primary bg-white text-primary">
+          <i class="iconoir-undo-action text-[16px]" />
+        </button>
+      </RouterLink>
+    </div>
   </div>
+  <!-- 
+          <div
+            v-else-if="item.status === 'Active'" 
+            class="flex flex-col w-full gap-[10px] justify-center"
+          >
+            <div class="flex justify-between items-center">
+              <h6 class="font-medium  text-grey_5">
+                Pool: {{ item.poolAddress }}
+              </h6>
+              <h6 class="font-bold text-grey_5">
+                {{ item.ammountStaked }}
+              </h6>
+            </div>
+            <div class="flex flex-col gap-[15px] border border-grey_5 p-[10px] text-grey_5">
+              <h6 class="">
+                Validator: {{ item.validatorAddress }}
+              </h6>
+              <h6 class="">
+                {{ item.rewardsAccumulated }} in Rewards
+              </h6>
+              <h6 class="">
+                {{ item.operatorScore }} Avg Operator Score
+              </h6>
+
+              <h6 class="">
+                {{ item.avgAPR }} Avg APR
+              </h6>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="absolute bottom-10 w-full">
+      <RouterLink
+        to="/Staking/ETH/Select-Wallet"
+        class="w-full"
+      >
+        <button
+          class="w-full btn_primary font-bold text-body py-[8px]"
+        >
+          Stake 
+          <img
+            src="/Staking-Icon.svg"
+            alt="Staking Icon"
+            class="w-[16px]"
+          >
+        </button>
+      </RouterLink>
+    </div>
+  </div> -->
 </template>
diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
index 494f59d63..6b0ce4a5e 100644
--- a/apps/web/src/pages/staking/components/ETHWalletSelect.vue
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -70,13 +70,11 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
 </script>
   
 <template>
-  <div
-    class="flex flex-col h-full overflow-auto relative"
-  >
-    <h6 class="text-grey_5 font-medium mb-[20px] truncate">
+  <div class="h-full flex flex-col gap-[15px]">
+    <h6 class="text-grey_5 font-medium">
       Select wallet and amount to stake to our Distributed SSV Validators
-      <hr class="bg-grey_2 h-[2px] mt-[10px]">
     </h6>
+    <hr class="bg-grey_2 h-[2px]">
     <!-- Add tooltip of min and max -->
     <div class="slider mb-[20px]">
       <div class="border border-grey px-[16px] py-[8px] flex justify-between gap-[10px] items-center">
@@ -84,10 +82,10 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
           v-model="amountToStake"
           type="text"
           placeholder="0.00"
-          class="p-0 w-[65px] outline-none text-grey_5"
+          class="p-0 w-[65px] xsm:w-full outline-none text-grey_5"
         >
-        <h6 class="text-primary">
-          | ETH to Stake
+        <h6 class="text-primary whitespace-nowrap">
+          | ETH <span class="sr-only s_xsm:not-sr-only">to Stake</span> 
         </h6>
       </div>
       <input
@@ -99,14 +97,13 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
         class="sr-only s_xsm:not-sr-only"
       >
     </div> 
-    <hr>
-    <div class="h-[40vh] overflow-auto">
+    <div class="h-full overflow-auto border-y border-grey">
       <div
         v-for="item in connectedWallets"
         :key="`${item as any}`"
         class="w-full border border-grey my-[10px]"
       >
-        <div class="flex justify-between items-center px-[12px] py-[6px]">
+        <div class="flex justify-between items-center px-[12px] py-[12px]">
           <img
             :src="item.icon"
             :alt="item.name"
@@ -132,15 +129,11 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
           </h6>
         </div>
       </div>
-    </div> 
-    <hr>
-    
-    <div class="absolute bottom-0 w-full flex justify-between items-center gap-[10px] mt-[20px]">
+    </div>
+    <div class="flex justify-between items-center gap-[20px]">
       <RouterLink
         :to="!disableNext? '/Staking/ETH/Confirm-Stake' : '/Staking/ETH/Select-Wallet'"
-        :style="{
-          width: 'calc(100% - 100px)'
-        }"
+        class="w-full"
       >
         <button
           class="w-full btn_primary font-bold text-body py-[8px]"
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index 576a44a2f..6831c503a 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -15,33 +15,28 @@ const currentBalance = ref('45 ETH | $123,123.11')
 </script>
   
 <template>
-  <div class="flex flex-col min-w-[300px] w-full min-h-[500px] h-[80vh]">
-    <div class="flex items-center justify-between mb-[20px]">
+  <div
+    class="h-full"
+  >
+    <div class="flex items-center mb-[20px]">
       <h5 class="font-bold flex items-center gap-[10px]">
         <img
           src="/ETH.svg"
           alt="eth icon"
           class="w-[24px] h-[24px]"
         >
-        ETH Staking
+        ETH 2.0
         <div>
           <span class="font-semibold text-primary text-body sr-only s_sm:not-sr-only">
             {{ currentBalance }}
           </span>
         </div>
       </h5>
-      <RouterLink to="/Staking">
-        <button
-          class="btn_primary px-[12px] py-[6px] bg-white text-black hover:bg-grey_1"
-          @click="toggleModal(null)"
-        >
-          <i
-            class="iconoir-cancel font-bold text-[24px]"
-          />
-        </button>
-      </RouterLink>
     </div>
-    <div class="h-full">
+    <div
+      :style="{height: 'calc(100% - 45px)'}"
+      class="overflow-auto"
+    >
       <slot />
     </div>
   </div>

From bae488e88ae0af26e5b9b7138a1616712946dfe0 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Mon, 5 Dec 2022 21:38:48 -0600
Subject: [PATCH 07/31] Calculate fees and add to staking total

---
 apps/web/src/composables/wallet.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index 3b362daf5..6d85361d4 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -161,9 +161,15 @@ export default function useWallet() {
       const signerKey = selectedProvider.value as keyof typeof ethersSignerCreator
       let signer = ethersSignerCreator[signerKey](selectedProvider.value)
       if (isWalletConnectSigner(signer)) signer = await signer
-      const value = ethers.utils.parseEther(amountToStake.value)
-      const ssvSigner = ssv.connect(signer as ethers.Signer)
-      await ssvSigner.deposit({ value, type: 0 })
+      const ssvProvider = ssv.connect(signer)
+      const fees = await ssvProvider.getFees()
+      const { LINK, SSV } = fees
+      // TODO: Fix types
+      const feesTotalPercent = LINK + SSV
+      const depositAmount = amountToStake.value * ((100 + feesTotalPercent) / 100)
+      const value = ethers.utils.parseEther(depositAmount.toString())
+      const result = await ssvProvider.deposit({ value, type: 0 })
+      return await result.wait()
     } else {
       // Todo @ccali11 this should happen sooner - ideally we'll this disable method if missing ssv provider
       console.log('Please connect to one of the following providers:', ethersProviderList)

From eb4cbe6a04d909aa7a3a8f3ce328cdf70920e417 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Mon, 5 Dec 2022 22:59:41 -0500
Subject: [PATCH 08/31] Tidy up wordings & styling

---
 apps/web/src/index.css                        | 22 +++++
 apps/web/src/pages/staking/Staking.vue        | 87 +++++++++++-------
 .../staking/components/ETHConfirmStake.vue    | 11 ++-
 .../pages/staking/components/ETHStaking.vue   | 91 ++++++-------------
 .../staking/components/ETHWalletSelect.vue    | 71 ++++++++++-----
 .../pages/staking/components/StakingModal.vue |  5 +-
 6 files changed, 164 insertions(+), 123 deletions(-)

diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index ea3f2ad6f..36fb6c7e7 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -83,6 +83,28 @@ background: #fff;
     }
 }
 @layer components {
+    .tooltip {
+        position: relative;
+        display: inline-block;
+    }
+    .tooltip .tooltiptext {
+        visibility: hidden;
+        background-color: black;
+        color: #fff;
+        text-align: center;
+        padding: 6px 12px;
+        position: absolute;
+        z-index: 1;
+        /* location of tooltip */
+        top: calc(100% + 5px);
+        right: 0%;
+        margin-left: -60px;
+    }
+    .tooltip:hover .tooltiptext {
+        visibility: visible;
+        transition-delay: 1.0s;
+        transition-property: visibility;
+    }
     .slider {
         @apply flex items-center justify-between gap-[20px];
     }
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index 8fea6870a..64748abf5 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -57,14 +57,20 @@ watch(router.currentRoute,  () => {
         </component>
         <div
           v-else
-          class="border bordedr-[#E4E4E7] px-[25px] py-[50px] flex justify-between"
+          class="border border-grey px-[25px] py-[50px] flex justify-between"
         >
           <div class="flex">
-            <img
-              src="/ETH.svg"
-              alt="eth icon"
-              class="w-[50px] h-[50px] mr-[20px]"
-            >
+            <div class="tooltip">
+              <img
+                src="/ETH.svg"
+                alt="eth icon"
+                class="w-[50px] h-[50px] mr-[20px]"
+              >
+              <span class="tooltiptext text-body font-bold">
+                Ethereum Icon
+              </span>
+            </div>
+            
             <div class="flex flex-col justify-between  sr-only s_xsm:not-sr-only">
               <h6 class="font-bold">
                 Ethereum Staking
@@ -74,38 +80,55 @@ watch(router.currentRoute,  () => {
               </h6>
             </div>
           </div>
-        
-          <div class="flex flex-col justify-between sr-only s_sm:not-sr-only">
-            <h6 class="font-medium">
-              Unstaked ETH
-            </h6>
-            <h6 class="font-medium text-grey_3">
-              <!-- random -->
-              46 ETH | $73816.89
-            </h6>
+          <div class="tooltip">
+            <div class="flex flex-col justify-between gap-[15px] sr-only s_sm:not-sr-only">
+              <h6 class="font-medium">
+                Unstaked ETH
+              </h6>
+              <h6 class="font-medium text-grey_3">
+                <!-- random -->
+                46 ETH | $73816.89
+              </h6>
+            </div>
+            <span class="tooltiptext text-body font-bold">
+              Avaliable ETH: Collection of all connected wallets
+            </span>
           </div>
-          <div class="flex flex-col justify-between sr-only s_md:not-sr-only">
-            <h6 class="font-medium">
-              Staked
-            </h6>
-            <h6 class="font-medium text-grey_3">
-              <!-- random -->
-              32 ETH | $51350.88
-            </h6>
+          
+          <div class="tooltip">
+            <div class="flex flex-col justify-between sr-only gap-[15px] s_md:not-sr-only">
+              <h6 class="font-medium">
+                Staked
+              </h6>
+              <h6 class="font-medium text-grey_3">
+                <!-- random -->
+                32 ETH | $51350.88
+              </h6>
+            </div>
+            <span class="tooltiptext text-body font-bold">
+              ETH Staked: Collection of all connected wallets
+            </span>
           </div>
-          <div class="flex flex-col justify-between sr-only s_lg:not-sr-only">
-            <h6 class="font-medium">
-              In Rewards
-            </h6>
-            <h6 class="font-medium text-grey_3">
-              <!-- random -->
-              6 ETH | $9628.29 | 3% AR
-            </h6>
+          
+          <div class="tooltip">
+            <div class="flex flex-col justify-between gap-[15px] sr-only s_lg:not-sr-only">
+              <h6 class="font-medium">
+                In Rewards
+              </h6>
+              <h6 class="font-medium text-grey_3">
+                <!-- random -->
+                6 ETH | $9628.29 | 3% AR
+              </h6>
+            </div>
+            <span class="tooltiptext text-body font-bold">
+              ETH Rewards From Staking: Collection of all connected wallets staked to SSVs
+            </span>
           </div>
+          
           <div class="flex flex-col justify-between">
             <RouterLink to="Staking/ETH">
               <button
-                class="btn_primary"
+                class="btn_primary xsm:px-[6px]"
                 @click="toggleModal(StakingModal)"
               >
                 Stake
diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
index 495c8289f..f4fb2a1ef 100644
--- a/apps/web/src/pages/staking/components/ETHConfirmStake.vue
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -6,9 +6,9 @@ import { ref } from 'vue'
 const stakingInfo = ref(
     {
         to: 'Distributed SSV Validatore',
-        ammount: '6 ETH',
-        fees: '0.25 %',
-        expectedRewards: '4.3 %',
+        amount: '6 ETH',
+        fees: '3.25 %',
+        expectedRewards: '4.56%',
         from: {
             name: 'Coinbase',
             icon: '/coinbase.svg',
@@ -49,13 +49,14 @@ const handleConfirm = () => {
           {{ stakingInfo.to }}
         </h6>
       </div>
+      
       <hr class="bg-grey h-[2px] my-[10px]">
       <div class="flex justify-between items-center">
         <h6 class="text-grey_5">
-          Ammount Staking
+          Amount Staking
         </h6>
         <h6 class="font-bold">
-          {{ stakingInfo.ammount }}
+          {{ stakingInfo.amount }}
         </h6>
       </div>
       <hr class="bg-grey h-[2px] my-[10px]">
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index 4a0c45348..13a12db4b 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { watch } from 'fs'
+import { ref, onMounted } from 'vue'
 
 
 const ETHStakingStats = ref(
@@ -151,7 +152,10 @@ const CurrentStakedItems = ref(
   <div class="h-full flex flex-col gap-[15px]">
     <!-- add rotating pills here when in overflow -->
     <div>
-      <div class="flex w-full overflow-auto gap-[20px]">
+      <div
+        id="pills_container"
+        class="flex w-full overflow-auto gap-[20px]"
+      >
         <div
           v-for="item in ETHStakingStats"
           :key="item"
@@ -171,14 +175,24 @@ const CurrentStakedItems = ref(
         <div class="">
           <h6 class="font-bold text-grey_5 flex justify-between w-full">
             <span>{{ pool.totalAmmountStaked }}</span> 
-            <span class="text-grey_3 flex gap-[10px] sr-only s_xsm:not-sr-only">
-              {{ pool.wallet.address }}
+            <div class="tooltip">
+              <span class="text-grey_3 flex gap-[10px] sr-only s_xsm:not-sr-only">
+                <span class="w-[100px] truncate">{{ pool.wallet.address }}</span>
+                <img
+                  :src="pool.wallet.provider"
+                  :alt="pool.wallet.provider"
+                  class="w-[20px] opacity-[0.2]"
+                >
+              </span>
               <img
                 :src="pool.wallet.provider"
                 :alt="pool.wallet.provider"
-                class="w-[20px] opacity-[0.2]"
+                class="w-[20px] opacity-[0.2] s_xsm:sr-only not-sr-only"
               >
-            </span>
+              <span class="tooltiptext text-body font-bold">
+                {{ pool.wallet.name }}: {{ pool.wallet.address }}
+              </span>
+            </div>
           </h6>
           <hr class="h-[2px] bg-grey my-[20px]">
           <h6 class="font-bold text-grey_3">
@@ -191,7 +205,7 @@ const CurrentStakedItems = ref(
           >
             <div class="flex flex-wrap gap-[20px] justify-between items-center mb-[15px]">
               <h6 class="font-medium  text-grey_5">
-                Pool: {{ item.poolAddress }}
+                Pool #{{ item.poolAddress }}
               </h6>
               <h6 class="font-bold text-grey_5">
                 {{ item.ammountStaked }}
@@ -209,11 +223,16 @@ const CurrentStakedItems = ref(
               class="text-grey_5 whitespace-nowrap"
             >
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center mb-[10px] truncate">
-                <span>
-                  Validator: {{ item.validatorAddress }}
+                <span class="min-w-[135px] w-[45%] flex gap-[5px] items-center">
+                  <!-- add address for link from Shane's format -->
+                  Validator: <span class="truncate">{{ item.validatorAddress }}asdfahsdklfj;laksdj;lkajsdl;kfajs;ld</span> 
+                  <a
+                    href=""
+                    target="_blank"
+                  ><i class="iconoir-open-new-window text-primary" /></a>
                 </span>
                 <span>
-                  {{ item.operatorScore }} Avg Operator Score
+                  {{ item.operatorScore }} Validator Effectiveness 
                 </span>
               </h6>
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center truncate">
@@ -221,7 +240,7 @@ const CurrentStakedItems = ref(
                   {{ item.rewardsAccumulated }} in Rewards
                 </span>
                 <span>
-                  {{ item.avgAPR }} Avg APR
+                  {{ item.avgAPR }} Validator APR
                 </span>
               </h6>
             </div>
@@ -255,54 +274,4 @@ const CurrentStakedItems = ref(
       </RouterLink>
     </div>
   </div>
-  <!-- 
-          <div
-            v-else-if="item.status === 'Active'" 
-            class="flex flex-col w-full gap-[10px] justify-center"
-          >
-            <div class="flex justify-between items-center">
-              <h6 class="font-medium  text-grey_5">
-                Pool: {{ item.poolAddress }}
-              </h6>
-              <h6 class="font-bold text-grey_5">
-                {{ item.ammountStaked }}
-              </h6>
-            </div>
-            <div class="flex flex-col gap-[15px] border border-grey_5 p-[10px] text-grey_5">
-              <h6 class="">
-                Validator: {{ item.validatorAddress }}
-              </h6>
-              <h6 class="">
-                {{ item.rewardsAccumulated }} in Rewards
-              </h6>
-              <h6 class="">
-                {{ item.operatorScore }} Avg Operator Score
-              </h6>
-
-              <h6 class="">
-                {{ item.avgAPR }} Avg APR
-              </h6>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="absolute bottom-10 w-full">
-      <RouterLink
-        to="/Staking/ETH/Select-Wallet"
-        class="w-full"
-      >
-        <button
-          class="w-full btn_primary font-bold text-body py-[8px]"
-        >
-          Stake 
-          <img
-            src="/Staking-Icon.svg"
-            alt="Staking Icon"
-            class="w-[16px]"
-          >
-        </button>
-      </RouterLink>
-    </div>
-  </div> -->
 </template>
diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
index 6b0ce4a5e..57801e266 100644
--- a/apps/web/src/pages/staking/components/ETHWalletSelect.vue
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -9,12 +9,14 @@ const connectedWallets = ref([
             {
                 name: 'Acount One',
                 address: ';aalskdkfj;alsdk;fj',
-                amount: '32 ETH'
+                amount: '32 ETH',
+                active: true
             },
             {
                 name: 'Acount Two',
                 address: ';alskddkfj;alsdk;fj',
-                amount: '0 ETH'
+                amount: '0 ETH',
+                active: false
             },
         ]
     },
@@ -25,12 +27,14 @@ const connectedWallets = ref([
             {
                 name: 'Acount One',
                 address: ';alskdkfgj;alsdk;fj',
-                amount: '48 ETH'
+                amount: '48 ETH',
+                active: false
             },
             {
                 name: 'Acount Two',
                 address: ';alskdkfj;adlsdk;fj',
-                amount: '20 ETH'
+                amount: '20 ETH',
+                active: true
             },
         ]
     },
@@ -64,6 +68,14 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
     ) {
         disableNext.value = false
     } else { disableNext.value = true}
+
+    if(Number(selectedWalletToStakeFrom.value.amount.split(' ')[0]) < amountToStake.value){
+      selectedWalletToStakeFrom.value = {
+        name: '',
+        address: '',
+        amount: ''
+      }
+    }
 })
 
 
@@ -75,28 +87,33 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
       Select wallet and amount to stake to our Distributed SSV Validators
     </h6>
     <hr class="bg-grey_2 h-[2px]">
-    <!-- Add tooltip of min and max -->
-    <div class="slider mb-[20px]">
-      <div class="border border-grey px-[16px] py-[8px] flex justify-between gap-[10px] items-center">
+    <div class="tooltip">
+      <div class="slider mb-[20px]">
+        <div class="border border-grey px-[16px] py-[8px] flex justify-between gap-[10px] items-center">
+          <input
+            v-model="(amountToStake)"
+            type="text"
+            placeholder="0.00"
+            class="p-0 w-[65px] xsm:w-full outline-none text-grey_5"
+          >
+          <h6 class="text-primary whitespace-nowrap">
+            | ETH <span class="sr-only s_xsm:not-sr-only">to Stake</span> 
+          </h6>
+        </div>
         <input
           v-model="amountToStake"
-          type="text"
-          placeholder="0.00"
-          class="p-0 w-[65px] xsm:w-full outline-none text-grey_5"
+          type="range"
+          min="0.0"
+          step="0.0001"
+          :max="maxAmmountToStake"
+          class="sr-only s_xsm:not-sr-only"
         >
-        <h6 class="text-primary whitespace-nowrap">
-          | ETH <span class="sr-only s_xsm:not-sr-only">to Stake</span> 
-        </h6>
-      </div>
-      <input
-        v-model="amountToStake"
-        type="range"
-        min="0.0"
-        step="0.0001"
-        :max="maxAmmountToStake"
-        class="sr-only s_xsm:not-sr-only"
-      >
-    </div> 
+      </div> 
+      <span class="tooltiptext text-body font-bold">
+        You can stake from your wallets with the max of {{ maxAmmountToStake }} ETH
+      </span>
+    </div>
+    
     <div class="h-full overflow-auto border-y border-grey">
       <div
         v-for="item in connectedWallets"
@@ -116,8 +133,9 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
         <div
           v-for="account in item.accounts"
           :key="`${account as any}`"
-          class="flex justify-between items-center my-[20px] px-[12px] py-[6px] hover:bg-blue_3 cursor-pointer"
+          class="flex justify-between items-center my-[20px] px-[12px] py-[6px] hover:bg-blue_3 cursor-pointer tooltip"
           :class="selectedWalletToStakeFrom.address === account.address? 'bg-blue_3 hover:bg-blue_2' : ''"
+          :style="Number(account.amount.split(' ')[0]) < amountToStake || !account.active? 'background: rgba(251, 190, 132, 0.2); cursor: default; ' : '' "
           @click="selectedWalletToStakeFrom = account"
         >
           <h6 class="text-grey_6 font-semibold">
@@ -127,6 +145,11 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
           <h6 class="text-grey_5 font-light">
             {{ account.amount }}
           </h6>
+          <span class="tooltiptext text-body font-bold">
+            <span v-if="!account.active">Current account not connected via device or extention</span>
+            <span v-else-if="Number(account.amount.split(' ')[0]) < amountToStake">Insufficient Funds</span>
+            <span v-else />
+          </span>
         </div>
       </div>
     </div>
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index 6831c503a..ad4676e55 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -26,10 +26,13 @@ const currentBalance = ref('45 ETH | $123,123.11')
           class="w-[24px] h-[24px]"
         >
         ETH 2.0
-        <div>
+        <div class="tooltip">
           <span class="font-semibold text-primary text-body sr-only s_sm:not-sr-only">
             {{ currentBalance }}
           </span>
+          <span class="tooltiptext text-body font-bold">
+            Balance is summed up from all connected wallets
+          </span>
         </div>
       </h5>
     </div>

From 9c8c9d64c0f90585d782d62fed0112128c25e5c3 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Mon, 5 Dec 2022 23:02:14 -0500
Subject: [PATCH 09/31] Tidy up wordings & styling

---
 apps/landing/src/pages/home/Home.vue                   | 2 +-
 apps/web/src/pages/staking/components/StakingModal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/landing/src/pages/home/Home.vue b/apps/landing/src/pages/home/Home.vue
index 0ea9d2973..85999aa8e 100644
--- a/apps/landing/src/pages/home/Home.vue
+++ b/apps/landing/src/pages/home/Home.vue
@@ -19,7 +19,7 @@
     },
     {
       name: 'google',
-      content: 'Contact us at Info@conensusnetworks.com!',
+      content: 'Contact us at Info@consensusnetworks.com!',
       link: 'mailto:Info@consensusnetworks.com?subject=Me&body=Dear Casimir Dev Team!'
     },
   ])
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index ad4676e55..e61ea1859 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -25,7 +25,7 @@ const currentBalance = ref('45 ETH | $123,123.11')
           alt="eth icon"
           class="w-[24px] h-[24px]"
         >
-        ETH 2.0
+        ETH
         <div class="tooltip">
           <span class="font-semibold text-primary text-body sr-only s_sm:not-sr-only">
             {{ currentBalance }}

From e0b9c7cdda9f4a80fe6972be9b48cde5fbaf8bf4 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 00:07:58 -0500
Subject: [PATCH 10/31] Add mock validator init

---
 .github/workflows/push.yml                    |   2 +-
 .github/workflows/release.yml                 |   2 +-
 apps/web/src/composables/wallet.ts            |   6 +-
 apps/web/src/interfaces/Pool.ts               |   8 +-
 common/ethers-helpers/src/index.ts            |   9 +
 contracts/ethereum/src/SSVManager.sol         | 191 ++++++++++--------
 .../ethereum/src/external/MockOracle.sol      |  38 +++-
 contracts/ethereum/test/ssv.test.ts           |  31 ++-
 8 files changed, 190 insertions(+), 97 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 41a83e096..a990ca9fd 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -66,7 +66,7 @@ jobs:
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": ":construction: Development Deployment → :space_invader: Casimir"
+                    "text": ":construction: Development Deployment → :ocean: Casimir"
                   }
                 },
                 {
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 192bc2d89..886c2b68c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -80,7 +80,7 @@ jobs:
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": ":trumpet: Production Release → :space_invader: Casimir"
+                    "text": ":trumpet: Production Release → :ocean: Casimir"
                   }
                 },
                 {
diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index 3b362daf5..c6ed9084d 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -145,12 +145,16 @@ export default function useWallet() {
       pools.value = await Promise.all(usersPoolsIds.map(async (poolId: number) => {
         const { stake: totalStake, rewards: totalRewards } = await ssvProvider.getPoolBalance(poolId)
         const { stake: userStake, rewards: userRewards } = await ssvProvider.getPoolUserBalance(poolId, userAddress)
+        const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId)
+        const operatorIds = await ssvProvider.getPoolOperatorIds(poolId)
         return {
           id: poolId,
           totalStake: ethers.utils.formatEther(totalStake),
           totalRewards: ethers.utils.formatEther(totalRewards),
           userStake: ethers.utils.formatEther(userStake),
-          userRewards: ethers.utils.formatEther(userRewards)
+          userRewards: ethers.utils.formatEther(userRewards),
+          validatorPublicKey,
+          operatorIds
         }
       }))
     }
diff --git a/apps/web/src/interfaces/Pool.ts b/apps/web/src/interfaces/Pool.ts
index f4b3be4c6..e3f0d2b51 100644
--- a/apps/web/src/interfaces/Pool.ts
+++ b/apps/web/src/interfaces/Pool.ts
@@ -4,6 +4,10 @@ export interface Pool {
     totalRewards: string
     userStake: string
     userRewards: string
-    validatorAddress?: string
-    operatorIds?: number[]
+    validator?: {
+        publicKey: string
+    }
+    operators?: {
+        id: number
+    }
 }
\ No newline at end of file
diff --git a/common/ethers-helpers/src/index.ts b/common/ethers-helpers/src/index.ts
index 3ebf6f4eb..55d29ca51 100644
--- a/common/ethers-helpers/src/index.ts
+++ b/common/ethers-helpers/src/index.ts
@@ -1,5 +1,10 @@
 import { ethers } from 'ethers'
 
+
+function formatBytes(hexstring: string) {
+    return ethers.utils.arrayify(hexstring)
+}
+
 async function getKeystore(mnemonic?: string) {
     const wallet = getWallet(mnemonic)
     console.log(wallet.privateKey)
@@ -13,4 +18,8 @@ function getWallet(mnemonic?: string) {
     return ethers.Wallet.createRandom()
 }
 
+void function main() {
+    console.log(formatBytes('0x13b4682b21fe50088beff43530787d1dac1e50c8e0686ec55849c8c9c9c5c044'))
+}()
+
 export { getKeystore, getWallet }
diff --git a/contracts/ethereum/src/SSVManager.sol b/contracts/ethereum/src/SSVManager.sol
index 18563b9da..c1bba022b 100644
--- a/contracts/ethereum/src/SSVManager.sol
+++ b/contracts/ethereum/src/SSVManager.sol
@@ -44,6 +44,8 @@ contract SSVManager is ChainlinkClient {
     struct Pool {
         Balance balance;
         mapping(address => Balance) userBalances;
+        bytes validatorPublicKey;
+        uint32[] operatorIds;
     }
 
     /** User account for storing pool addresses */
@@ -56,7 +58,7 @@ contract SSVManager is ChainlinkClient {
     Counters.Counter _lastPoolId;
 
     /** Uniswap 0.3% fee tier */
-    uint24 swapFee = 3000;
+    uint24 private immutable swapFee = 3000;
 
     /** Uniswap ISwapRouter */
     ISwapRouter public immutable swapRouter;
@@ -76,19 +78,23 @@ contract SSVManager is ChainlinkClient {
     /** Pool IDs of pools completed and staked */
     uint32[] private stakedPoolIds;
 
-    /** Chainlink sample request lastStakePoolId */
-    uint32 public lastStakePoolId;
-
-    /** Chainlink sample request job ID */
+    /** Chainlink request job ID */
     bytes32 private immutable jobId;
 
-    /** Chainlink sample request fee */
-    uint256 private immutable fee;
+    /** Chainlink request fee */
+    uint256 private immutable linkFee;
 
     address private oracleAddress;
 
-    /** Chainlink sample request */
-    event ValidatorInitFullfilled(uint32 lastStakePoolId);
+    /** Event signaling a validator init request fulfillment */
+    event ValidatorInitFullfilled(
+        uint32 poolId,
+        uint32[] operatorIds,
+        bytes[] encryptedShares, 
+        bytes[] sharePublicKeys, 
+        bytes validatorPublicKey, 
+        bytes depositDataSignature
+    );
 
     /** Event signaling a user deposit to the manager */
     event ManagerDeposit(
@@ -109,23 +115,31 @@ contract SSVManager is ChainlinkClient {
         uint256 stakeTime
     );
 
+    /**
+     * @notice Constructor
+     * @param _linkOracleAddress - The Chainlink oracle address
+     * @param _swapRouterAddress - The Uniswap router address
+     * @param _linkTokenAddress - The Chainlink token address
+     * @param _ssvTokenAddress - The SSV token address
+     * @param _wethTokenAddress - The WETH contract address
+     */
     constructor(
-        address linkOracleAddress,
-        address swapRouterAddress,
-        address linkTokenAddress,
-        address ssvTokenAddress,
-        address wethTokenAddress
+        address _linkOracleAddress,
+        address _swapRouterAddress,
+        address _linkTokenAddress,
+        address _ssvTokenAddress,
+        address _wethTokenAddress
     ) {
-        swapRouter = ISwapRouter(swapRouterAddress);
-        tokens[Token.LINK] = linkTokenAddress;
-        tokens[Token.SSV] = ssvTokenAddress;
-        tokens[Token.WETH] = wethTokenAddress;
+        swapRouter = ISwapRouter(_swapRouterAddress);
+        tokens[Token.LINK] = _linkTokenAddress;
+        tokens[Token.SSV] = _ssvTokenAddress;
+        tokens[Token.WETH] = _wethTokenAddress;
 
         /// Set up Chainlink client
-        setChainlinkOracle(linkOracleAddress);
-        setChainlinkToken(linkTokenAddress);
+        setChainlinkOracle(_linkOracleAddress);
+        setChainlinkToken(_linkTokenAddress);
         jobId = '7da2702f37fd48e5b1b9a5715e3509b6';
-        fee = (1 * LINK_DIVISIBILITY) / 10;
+        linkFee = (1 * LINK_DIVISIBILITY) / 10;
     }
 
     /**
@@ -181,6 +195,9 @@ contract SSVManager is ChainlinkClient {
                 addStakeAmount = poolRequiredAmount;
                 depositFunds.stakeAmount -= poolRequiredAmount;
 
+                /// Start a new validator to stake pool
+                initValidator(poolId);
+
                 /// Remove pool from open pools when completed
                 for (uint i = 0; i < openPoolIds.length - 1; i++) {
                     openPoolIds[i] = openPoolIds[i + 1];
@@ -188,8 +205,6 @@ contract SSVManager is ChainlinkClient {
                 openPoolIds.pop();
                 /// Add completed pool to staked pools
                 stakedPoolIds.push(poolId);
-
-                stake();
             }
 
             pool.balance.stake += addStakeAmount;
@@ -216,15 +231,16 @@ contract SSVManager is ChainlinkClient {
 
     /**
      * @dev Process fee and stake deposit amounts
+     * @param _depositAmount - The deposit amount
      * @return The fee and stake deposit amounts
      */
     function processDepositFunds(
-        uint256 depositAmount
+        uint256 _depositAmount
     ) private returns (DepositFunds memory) {
         Fees memory fees = getFees();
         uint32 feesTotal = fees.LINK + fees.SSV;
-        uint256 stakeAmount = (depositAmount * 100) / (100 + feesTotal);
-        uint256 feeAmount = depositAmount - stakeAmount;
+        uint256 stakeAmount = (_depositAmount * 100) / (100 + feesTotal);
+        uint256 feeAmount = _depositAmount - stakeAmount;
 
         // /// Wrap ETH fees in ERC-20 to use in swap
         wrap(feeAmount);
@@ -246,30 +262,34 @@ contract SSVManager is ChainlinkClient {
 
     /**
      * @dev Deposit WETH to use ETH in swaps
+     * @param _amount - The amount of ETH to deposit
      */
-    function wrap(uint256 amount) private {
+    function wrap(uint256 _amount) private {
         IWETH9 wethToken = IWETH9(tokens[Token.WETH]);
-        wethToken.deposit{value: amount}();
-        wethToken.approve(address(swapRouter), amount);
+        wethToken.deposit{value: _amount}();
+        wethToken.approve(address(swapRouter), _amount);
     }
 
     /**
      * @dev Swap one token-in for another token-out
+     * @param _tokenIn - The token-in address
+     * @param _tokenOut - The token-out address
+     * @param _amountIn - The amount of token-in to input
      * @return The amount of token-out
      */
     function swap(
-        address tokenIn,
-        address tokenOut,
-        uint256 amountIn
+        address _tokenIn,
+        address _tokenOut,
+        uint256 _amountIn
     ) private returns (uint256) {
         ISwapRouter.ExactInputSingleParams memory params = ISwapRouter
             .ExactInputSingleParams({
-                tokenIn: tokenIn,
-                tokenOut: tokenOut,
+                tokenIn: _tokenIn,
+                tokenOut: _tokenOut,
                 fee: swapFee,
                 recipient: address(this),
                 deadline: block.timestamp,
-                amountIn: amountIn,
+                amountIn: _amountIn,
                 amountOutMinimum: 0,
                 sqrtPriceLimitX96: 0
             });
@@ -302,72 +322,55 @@ contract SSVManager is ChainlinkClient {
         return 1;
     }
 
-    function stake() private {
-        this.requestValidatorInit();
-    }
-
     /**
-     *
+     * @dev Init a validator for a pool
      */
+    function initValidator(uint32 _poolId) private {
+        this.requestValidatorInit(_poolId);
+    }
 
     /**
-     * @notice Creates a Chainlink request to retrieve API response, find the target
-     * data, then multiply by 1000000000000000000 (to remove decimal places from data).
-     *
-     * @return requestId - id of the request
+     * @notice Get validator init config with operators and deposit data from a DKG ceremony
+     * @return _requestId - ID of the request
      */
-    function requestValidatorInit() public returns (bytes32 requestId) {
+    function requestValidatorInit(uint32 _poolId) public returns (bytes32 _requestId) {
         Chainlink.Request memory request = buildChainlinkRequest(
             jobId,
             address(this),
             this.fulfillValidatorInit.selector
         );
 
-        // Set the URL to perform the GET request on
         request.add(
             "get",
-            "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"
+            "https://ssv.dev.casimir.co/validator-init"
         );
 
-        // Set the path to find the desired data in the API response, where the response format is:
-        // {"RAW":
-        //   {"ETH":
-        //    {"USD":
-        //     {
-        //      "VOLUME24HOUR": xxx.xxx,
-        //     }
-        //    }
-        //   }
-        //  }
-        // request.add("path", "RAW.ETH.USD.VOLUME24HOUR"); // Chainlink nodes prior to 1.0.0 support this format
-        request.add("path", "RAW,ETH,USD,VOLUME24HOUR"); // Chainlink nodes 1.0.0 and later support this format
-
-        // Multiply the result by 1000000000000000000 to remove decimals
-        int256 timesAmount = 10 ** 18;
-        request.addInt("times", timesAmount);
-
         // Sends the request
-        return sendChainlinkRequest(request, fee);
+        return sendChainlinkRequest(request, linkFee);
     }
 
     /**
      * @notice Receives the response in the form of uint32
      *
-     * @param _requestId - id of the request
-     * @param _data - response
+     * @param _requestId - ID of the Chainlink request
+     * @param _poolId - The pool ID
+     * @param _operatorIds - The operator IDs
+     * @param _encryptedShares - Standard SSV encrypted shares
+     * @param _sharePublicKeys - Each share's BLS pubkey
+     * @param _validatorPublicKey - Resulting public key corresponding to the shared private key
+     * @param _depositDataSignature - Reconstructed signature of DepositMessage according to eth2 spec
      */
-    function fulfillValidatorInit(bytes32 _requestId, uint32 _data)
+    function fulfillValidatorInit(bytes32 _requestId, uint32 _poolId, uint32[] calldata _operatorIds, bytes[] calldata _encryptedShares, bytes[] calldata _sharePublicKeys, bytes calldata _validatorPublicKey, bytes calldata _depositDataSignature)
         public
         recordChainlinkFulfillment(_requestId)
     {
-        lastStakePoolId = _data;
-        emit ValidatorInitFullfilled(lastStakePoolId);
+        emit ValidatorInitFullfilled(_poolId, _operatorIds, _encryptedShares, _sharePublicKeys, _validatorPublicKey, _depositDataSignature);
+        console.log('FULFILLED VALIDATOR INIT FOR POOL', _poolId);
+        Pool storage pool = pools[_poolId];
+        pool.operatorIds = _operatorIds;
+        pool.validatorPublicKey = _validatorPublicKey;
     }
 
-    /**
-     *
-     */
-
     /**
      * @notice Get a list of all open pool IDs
      * @return A list of all open pool IDs
@@ -386,32 +389,58 @@ contract SSVManager is ChainlinkClient {
 
     /**
      * @notice Get a list of a user's pool IDs by user address
+     * @param _userAddress - The user address
      * @return A list of a user's pool IDs
      */
     function getUserPoolIds(
-        address userAddress
+        address _userAddress
     ) external view returns (uint32[] memory) {
-        return users[userAddress].poolIds;
+        return users[_userAddress].poolIds;
     }
 
     /**
      * @notice Get a user's balance in a pool by user address and pool ID
+     * @param _poolId - The pool ID
+     * @param _userAddress - The user address
      * @return A user's balance in a pool
      */
     function getPoolUserBalance(
-        uint32 poolId,
-        address userAddress
+        uint32 _poolId,
+        address _userAddress
     ) external view returns (Balance memory) {
-        return pools[poolId].userBalances[userAddress];
+        return pools[_poolId].userBalances[_userAddress];
     }
 
     /**
      * @notice Get a pool's balance by pool ID
+     * @param _poolId - The pool ID
      * @return The pool's balance
      */
     function getPoolBalance(
-        uint32 poolId
+        uint32 _poolId
     ) external view returns (Balance memory) {
-        return pools[poolId].balance;
+        return pools[_poolId].balance;
+    }
+
+    /**
+     * @notice Get a pool's validator public key by pool ID
+     * @param _poolId - The pool ID
+     * @return The pool's validator public key
+     */
+    function getPoolValidatorPublicKey(
+        uint32 _poolId
+    ) external view returns (bytes memory) {
+        return pools[_poolId].validatorPublicKey;
+    }
+
+    /**
+     * @notice Get a pool's operators by pool ID
+     * @param _poolId - The pool ID
+     * @return The pool's operators
+     */
+    function getPoolOperatorIds(
+        uint32 _poolId
+    ) external view returns (uint32[] memory) {
+        return pools[_poolId].operatorIds;
     }
 }
diff --git a/contracts/ethereum/src/external/MockOracle.sol b/contracts/ethereum/src/external/MockOracle.sol
index f81c97372..8f7f4ce31 100644
--- a/contracts/ethereum/src/external/MockOracle.sol
+++ b/contracts/ethereum/src/external/MockOracle.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.6.6;
+pragma solidity >=0.6.6;
+pragma experimental ABIEncoderV2;
 
 import '@chainlink/contracts/src/v0.6/LinkTokenReceiver.sol';
 import '@chainlink/contracts/src/v0.6/interfaces/ChainlinkRequestInterface.sol';
@@ -13,6 +14,8 @@ import '@chainlink/contracts/src/v0.6/vendor/SafeMathChainlink.sol';
 contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
     using SafeMathChainlink for uint256;
 
+    uint _lastPoolId = 0;
+
     uint256 public constant EXPIRY_TIME = 5 minutes;
     uint256 private constant MINIMUM_CONSUMER_GAS_LIMIT = 400000;
 
@@ -92,9 +95,27 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
             _data
         );
 
-        uint32 data = uint32(1);
+        // Hardcoded mock response
+        _lastPoolId = _lastPoolId + 1;
+        uint32 poolId = uint32(_lastPoolId);
+        uint32[4] memory operatorIds = [uint32(1), uint32(2), uint32(3), uint32(4)];
+        bytes[4] memory encryptedShares = [
+            abi.encode("0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001586f656e52473751305a376462584e674b684145552b586743434f4e3472613573395a75444b4b783971554675704f7353746931426d6f72494c635a5a42546c724849644f6f457758797371727449364e59743773346e6b334f4d7269714c797a644b386a374a46446948476663736757523675624e61636a65452b395179334b31754647614d64556e6f526f6e764f7a4b4a514268447368656833425a2b77456753364a355438656e4e6664496954787239797859367571332b5141304d72654b4737795956574a642f3762343642476269716b7667702f4972586177596a6f327543544e6a514e5a4b646f617137436d6d3439617054677256386e2f6f4d6a665855696f435a2f2f30334f3254464952674847522b6745324a49714e7845734442414b303454367a502f6735734d4b4d7168724f4b7351343550556b307851654f6175695654547361764f4653326d55755a6c57673d3d0000000000000000"),
+            abi.encode("0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000158716376374f6e4e4f493530376f6e316d57766244576a4171592b4e6f5377624547667976366f53305268575375674c34364a4e62717938473762386c5672374674375352653545674c6e4938354b4f57652f76366952525245315377725a7630615a695673656762786b596d334133686e7555747150587968574f475345427652774c73612b5562502f797769636d466a746e79374c43306d4776354f615672786a66306a4737326d564f2f41453768545953666951614768546d3459593865324753305761396a6461304a48726752445868614739753461473432546f673268434a7144356977416e333433717a346e4955534f725a64502b796f6a70674f4469494b554c364c70473955334c326a7a4c4734364448587a577a5054447857755458387761564d787776446b4a455473554b703874614666673971742f6e325052566f45512b61314f636464706954427a675239673d3d0000000000000000"),
+            abi.encode("0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000015845744e3651676170587358436664497a62314d41717158426d30565663744f4a383031467467757a597654533644434c48657871336f4d693262436573797a4c4b7270384a6442753853382b70596c465865754d3579416656432b454d6c587a2f537a386b516c375353784934704e4e447364347366567263756a50632b2f592b546d624271334d6f425464727859695751586d387a336134444563425370642b6a446e2b774b4e4a4c765144504a3630416f79687165376171714c53417570694244664443584a2b796765704f38487971676c48762b384d303266373232613652645a6c74324b7077722f6d764d612b31322f2f4c434a4c637a4a353446525039366f684747734350764c6f494f4971515839333859586b5666714c353266474f54576b424c6e564579714746396438547630364a306a6a6131795a577341796d54644e486345773062376c7a4f743777444352413d3d0000000000000000"),
+            abi.encode("0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000015864315035465a6e717a696d44556475585643454b4d57434c64706358626b5137526c655466496a5a506a444e4432704143516c642f7a35655a4139684649416c2f31536b614952445372594b526f307a4438364a364e6248646854374a766d476572455545433439304f43486d44762b6459556471445569494a75654832346172472f6e4978444778666853744766474c7a5a465949626b486f4e33686572664647716933305a424e6975714474724c36466e773456433446556c4464345a494376416b4e764648593162613356575530356a2f79466961355a545a4b654e6b5a4143416c734e6c6c532b7952497273486e326e6c43495a46483157615537455576714a423565754c36622b56426c7a6c5a50493147426754705053566a58636746624b41654448722f5a654530514e2b4447616667335438744e6142684c446451316d76796a4d336d4345346b4c554a39304448413d3d0000000000000000")
+        ];
+        bytes[4] memory sharePublicKeys = [
+            abi.encode("0xb854d1aaddcec272b64f508a99c343d42ebc4c603cb03f2ca5d72760b689fd99b94963e2012f260ba655efc8110b6611"),
+            abi.encode("0x8ae4adf378c5e1f852f85b9c3dbfec10cf1e15cb1ae5e7587d1a2219a5699e0a4eb8a2420f8e689fdf3da23244ff70aa"),
+            abi.encode("0xb988ba768eb9c272f854c8e3083bff05794fb40c760196186245bb06ea2839811734e619385d500ee53579b0703ee967"),
+            abi.encode("0xb988ba768eb9c272f854c8e3083bff05794fb40c760196186245bb06ea2839811734e619385d500ee53579b0703ee967")
+        ];
+        bytes memory validatorPublicKey = abi.encode("0x8c8f35694ed6b59c2f31ed382127b0ad6551b062111d6f26e6c56dd18520515e9fbbb0dbe774045fdddcbf089aaf3042");
+        bytes memory depositDataSignature = abi.encode("0x8c8f35694ed6b59c2f31ed382127b0ad6551b062111d6f26e6c56dd18520515e9fbbb0dbe774045fdddcbf089aaf3042");
+
         /// Imediately fulfill request for mocking purposes
-        this.fulfillOracleRequest(requestId, data);
+        this.fulfillValidatorInitRequest(requestId, poolId, operatorIds, encryptedShares, sharePublicKeys, validatorPublicKey, depositDataSignature);
     }
 
     /**
@@ -103,10 +124,15 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
      * Will call the callback address' callback function without bubbling up error
      * checking in a `require` so that the node can get paid.
      * @param _requestId The fulfillment request ID that must match the requester's
-     * @param _data The data to return to the consuming contract
+     * @param _poolId The pool ID
+     * @param _operatorIds - The operator IDs
+     * @param _encryptedShares - Standard SSV encrypted shares
+     * @param _sharePublicKeys - Each share's BLS pubkey
+     * @param _validatorPublicKey - Resulting public key corresponding to the shared private key
+     * @param _depositDataSignature - Reconstructed signature of DepositMessage according to eth2 spec
      * @return Status if the external call was successful
      */
-    function fulfillOracleRequest(bytes32 _requestId, uint32 _data)
+    function fulfillValidatorInitRequest(bytes32 _requestId, uint32 _poolId, uint32[4] calldata _operatorIds, bytes[4] calldata _encryptedShares, bytes[4] calldata _sharePublicKeys, bytes calldata _validatorPublicKey, bytes calldata _depositDataSignature)
         external
         isValidRequest(_requestId)
         returns (bool)
@@ -121,7 +147,7 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
         // callback(addr+functionId) as it is untrusted.
         // See: https://solidity.readthedocs.io/en/develop/security-considerations.html#use-the-checks-effects-interactions-pattern
         (bool success, ) = req.callbackAddr.call(
-            abi.encodeWithSelector(req.callbackFunctionId, _requestId, _data)
+            abi.encodeWithSelector(req.callbackFunctionId, _requestId, _poolId, _operatorIds, _encryptedShares, _sharePublicKeys, _validatorPublicKey, _depositDataSignature)
         ); // solhint-disable-line avoid-low-level-calls
         return success;
     }
diff --git a/contracts/ethereum/test/ssv.test.ts b/contracts/ethereum/test/ssv.test.ts
index c65be1238..48b873d9e 100644
--- a/contracts/ethereum/test/ssv.test.ts
+++ b/contracts/ethereum/test/ssv.test.ts
@@ -211,12 +211,33 @@ describe('SSV manager', async function () {
     expect(openPools.length).equal(0)
   })
 
-})
+  it('First pool\'s validator public key should exist', async function () {
+    const { ssv } = await loadFixture(thirdUserDepositFixture)
+    const [firstPool] = await ssv.getStakedPoolIds()
+    const validatorPublicKey = await ssv.getPoolValidatorPublicKey(firstPool)
+    console.log(validatorPublicKey)
+    expect(validatorPublicKey).to.exist
+  })
 
-describe('Mock oracle', async function () {
-  it('Request should fulfill with provided value', async function () {
+  // it('First pool\'s operator ID count should be 4', async function () {
+  //   const { ssv } = await loadFixture(thirdUserDepositFixture)
+  //   const [firstPool] = await ssv.getStakedPoolIds()
+  //   const operatorIds = await ssv.getPoolOperatorIds(firstPool)
+  //   expect(operatorIds.length).equal(4)
+  // })
+
+  it('Second pool\'s validator public key should exist', async function () {
     const { ssv } = await loadFixture(thirdUserDepositFixture)
-    const lastStakePoolId = await ssv.lastStakePoolId()
-    expect(lastStakePoolId).equal(1)
+    const [secondPool] = await ssv.getStakedPoolIds()
+    const validatorPublicKey = await ssv.getPoolValidatorPublicKey(secondPool)
+    expect(validatorPublicKey).to.exist
   })
+
+  // it('Second pool\'s operator ID count should be 4', async function () {
+  //   const { ssv } = await loadFixture(thirdUserDepositFixture)
+  //   const [secondPool] = await ssv.getStakedPoolIds()
+  //   const operatorIds = await ssv.getPoolOperatorIds(secondPool)
+  //   expect(operatorIds.length).equal(4)
+  // })
+
 })
\ No newline at end of file

From 30b7355e112d6474384ca2520bfd9998cb8b2190 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 00:09:37 -0500
Subject: [PATCH 11/31] Add pool validator public key test

---
 contracts/ethereum/docs/index.md    | 168 ++++++++++++++++++++++------
 contracts/ethereum/test/ssv.test.ts |   4 +-
 2 files changed, 137 insertions(+), 35 deletions(-)

diff --git a/contracts/ethereum/docs/index.md b/contracts/ethereum/docs/index.md
index 9458b64f4..6e2e9291a 100644
--- a/contracts/ethereum/docs/index.md
+++ b/contracts/ethereum/docs/index.md
@@ -46,6 +46,8 @@ struct Fees {
 struct Pool {
   struct SSVManager.Balance balance;
   mapping(address => struct SSVManager.Balance) userBalances;
+  bytes validatorPublicKey;
+  uint32[] operatorIds;
 }
 ```
 
@@ -122,29 +124,21 @@ uint32[] stakedPoolIds
 
 Pool IDs of pools completed and staked
 
-### lastStakePoolId
-
-```solidity
-uint32 lastStakePoolId
-```
-
-Chainlink sample request lastStakePoolId
-
 ### jobId
 
 ```solidity
 bytes32 jobId
 ```
 
-Chainlink sample request job ID
+Chainlink request job ID
 
-### fee
+### linkFee
 
 ```solidity
-uint256 fee
+uint256 linkFee
 ```
 
-Chainlink sample request fee
+Chainlink request fee
 
 ### oracleAddress
 
@@ -155,10 +149,10 @@ address oracleAddress
 ### ValidatorInitFullfilled
 
 ```solidity
-event ValidatorInitFullfilled(uint32 lastStakePoolId)
+event ValidatorInitFullfilled(uint32 poolId, uint32[] operatorIds, bytes[] encryptedShares, bytes[] sharePublicKeys, bytes validatorPublicKey, bytes depositDataSignature)
 ```
 
-Chainlink sample request
+Event signaling a validator init request fulfillment
 
 ### ManagerDeposit
 
@@ -179,9 +173,21 @@ Event signaling a user stake to a pool
 ### constructor
 
 ```solidity
-constructor(address linkOracleAddress, address swapRouterAddress, address linkTokenAddress, address ssvTokenAddress, address wethTokenAddress) public
+constructor(address _linkOracleAddress, address _swapRouterAddress, address _linkTokenAddress, address _ssvTokenAddress, address _wethTokenAddress) public
 ```
 
+Constructor
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _linkOracleAddress | address | - The Chainlink oracle address |
+| _swapRouterAddress | address | - The Uniswap router address |
+| _linkTokenAddress | address | - The Chainlink token address |
+| _ssvTokenAddress | address | - The SSV token address |
+| _wethTokenAddress | address | - The WETH contract address |
+
 ### deposit
 
 ```solidity
@@ -193,11 +199,17 @@ Deposit to the pool manager
 ### processDepositFunds
 
 ```solidity
-function processDepositFunds(uint256 depositAmount) private returns (struct SSVManager.DepositFunds)
+function processDepositFunds(uint256 _depositAmount) private returns (struct SSVManager.DepositFunds)
 ```
 
 _Process fee and stake deposit amounts_
 
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _depositAmount | uint256 | - The deposit amount |
+
 #### Return Values
 
 | Name | Type | Description |
@@ -207,19 +219,33 @@ _Process fee and stake deposit amounts_
 ### wrap
 
 ```solidity
-function wrap(uint256 amount) private
+function wrap(uint256 _amount) private
 ```
 
 _Deposit WETH to use ETH in swaps_
 
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _amount | uint256 | - The amount of ETH to deposit |
+
 ### swap
 
 ```solidity
-function swap(address tokenIn, address tokenOut, uint256 amountIn) private returns (uint256)
+function swap(address _tokenIn, address _tokenOut, uint256 _amountIn) private returns (uint256)
 ```
 
 _Swap one token-in for another token-out_
 
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _tokenIn | address | - The token-in address |
+| _tokenOut | address | - The token-out address |
+| _amountIn | uint256 | - The amount of token-in to input |
+
 #### Return Values
 
 | Name | Type | Description |
@@ -268,31 +294,32 @@ Get the SSV fee percentage to charge on each deposit
 | ---- | ---- | ----------- |
 | [0] | uint32 | The SSV fee percentage to charge on each deposit |
 
-### stake
+### initValidator
 
 ```solidity
-function stake() private
+function initValidator(uint32 _poolId) private
 ```
 
+_Init a validator for a pool_
+
 ### requestValidatorInit
 
 ```solidity
-function requestValidatorInit() public returns (bytes32 requestId)
+function requestValidatorInit(uint32 _poolId) public returns (bytes32 _requestId)
 ```
 
-Creates a Chainlink request to retrieve API response, find the target
-data, then multiply by 1000000000000000000 (to remove decimal places from data).
+Get validator init config with operators and deposit data from a DKG ceremony
 
 #### Return Values
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| requestId | bytes32 | - id of the request |
+| _requestId | bytes32 | - ID of the request |
 
 ### fulfillValidatorInit
 
 ```solidity
-function fulfillValidatorInit(bytes32 _requestId, uint32 _data) public
+function fulfillValidatorInit(bytes32 _requestId, uint32 _poolId, uint32[] _operatorIds, bytes[] _encryptedShares, bytes[] _sharePublicKeys, bytes _validatorPublicKey, bytes _depositDataSignature) public
 ```
 
 Receives the response in the form of uint32
@@ -301,8 +328,13 @@ Receives the response in the form of uint32
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| _requestId | bytes32 | - id of the request |
-| _data | uint32 | - response |
+| _requestId | bytes32 | - ID of the Chainlink request |
+| _poolId | uint32 | - The pool ID |
+| _operatorIds | uint32[] | - The operator IDs |
+| _encryptedShares | bytes[] | - Standard SSV encrypted shares |
+| _sharePublicKeys | bytes[] | - Each share's BLS pubkey |
+| _validatorPublicKey | bytes | - Resulting public key corresponding to the shared private key |
+| _depositDataSignature | bytes | - Reconstructed signature of DepositMessage according to eth2 spec |
 
 ### getOpenPoolIds
 
@@ -335,11 +367,17 @@ Get a list of all staked pool IDs
 ### getUserPoolIds
 
 ```solidity
-function getUserPoolIds(address userAddress) external view returns (uint32[])
+function getUserPoolIds(address _userAddress) external view returns (uint32[])
 ```
 
 Get a list of a user's pool IDs by user address
 
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _userAddress | address | - The user address |
+
 #### Return Values
 
 | Name | Type | Description |
@@ -349,11 +387,18 @@ Get a list of a user's pool IDs by user address
 ### getPoolUserBalance
 
 ```solidity
-function getPoolUserBalance(uint32 poolId, address userAddress) external view returns (struct SSVManager.Balance)
+function getPoolUserBalance(uint32 _poolId, address _userAddress) external view returns (struct SSVManager.Balance)
 ```
 
 Get a user's balance in a pool by user address and pool ID
 
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _poolId | uint32 | - The pool ID |
+| _userAddress | address | - The user address |
+
 #### Return Values
 
 | Name | Type | Description |
@@ -363,17 +408,63 @@ Get a user's balance in a pool by user address and pool ID
 ### getPoolBalance
 
 ```solidity
-function getPoolBalance(uint32 poolId) external view returns (struct SSVManager.Balance)
+function getPoolBalance(uint32 _poolId) external view returns (struct SSVManager.Balance)
 ```
 
 Get a pool's balance by pool ID
 
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _poolId | uint32 | - The pool ID |
+
 #### Return Values
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | [0] | struct SSVManager.Balance | The pool's balance |
 
+### getPoolValidatorPublicKey
+
+```solidity
+function getPoolValidatorPublicKey(uint32 _poolId) external view returns (bytes)
+```
+
+Get a pool's validator public key by pool ID
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _poolId | uint32 | - The pool ID |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| [0] | bytes | The pool's validator public key |
+
+### getPoolOperatorIds
+
+```solidity
+function getPoolOperatorIds(uint32 _poolId) external view returns (uint32[])
+```
+
+Get a pool's operators by pool ID
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _poolId | uint32 | - The pool ID |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| [0] | uint32[] | The pool's operators |
+
 ## IWETH9
 
 ### deposit
@@ -392,6 +483,12 @@ function withdraw(uint256 _amount) external
 
 Chainlink smart contract developers can use this to test their contracts
 
+### _lastPoolId
+
+```solidity
+uint256 _lastPoolId
+```
+
 ### EXPIRY_TIME
 
 ```solidity
@@ -477,10 +574,10 @@ Emits OracleRequest event for the Chainlink node to detect._
 | _dataVersion | uint256 | The specified data version |
 | _data | bytes | The CBOR payload of the request |
 
-### fulfillOracleRequest
+### fulfillValidatorInitRequest
 
 ```solidity
-function fulfillOracleRequest(bytes32 _requestId, uint32 _data) external returns (bool)
+function fulfillValidatorInitRequest(bytes32 _requestId, uint32 _poolId, uint32[4] _operatorIds, bytes[4] _encryptedShares, bytes[4] _sharePublicKeys, bytes _validatorPublicKey, bytes _depositDataSignature) external returns (bool)
 ```
 
 Called by the Chainlink node to fulfill requests
@@ -494,7 +591,12 @@ checking in a `require` so that the node can get paid._
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | _requestId | bytes32 | The fulfillment request ID that must match the requester's |
-| _data | uint32 | The data to return to the consuming contract |
+| _poolId | uint32 | The pool ID |
+| _operatorIds | uint32[4] | - The operator IDs |
+| _encryptedShares | bytes[4] | - Standard SSV encrypted shares |
+| _sharePublicKeys | bytes[4] | - Each share's BLS pubkey |
+| _validatorPublicKey | bytes | - Resulting public key corresponding to the shared private key |
+| _depositDataSignature | bytes | - Reconstructed signature of DepositMessage according to eth2 spec |
 
 #### Return Values
 
diff --git a/contracts/ethereum/test/ssv.test.ts b/contracts/ethereum/test/ssv.test.ts
index 48b873d9e..3d2546d66 100644
--- a/contracts/ethereum/test/ssv.test.ts
+++ b/contracts/ethereum/test/ssv.test.ts
@@ -228,14 +228,14 @@ describe('SSV manager', async function () {
 
   it('Second pool\'s validator public key should exist', async function () {
     const { ssv } = await loadFixture(thirdUserDepositFixture)
-    const [secondPool] = await ssv.getStakedPoolIds()
+    const [, secondPool] = await ssv.getStakedPoolIds()
     const validatorPublicKey = await ssv.getPoolValidatorPublicKey(secondPool)
     expect(validatorPublicKey).to.exist
   })
 
   // it('Second pool\'s operator ID count should be 4', async function () {
   //   const { ssv } = await loadFixture(thirdUserDepositFixture)
-  //   const [secondPool] = await ssv.getStakedPoolIds()
+  //   const [, secondPool] = await ssv.getStakedPoolIds()
   //   const operatorIds = await ssv.getPoolOperatorIds(secondPool)
   //   expect(operatorIds.length).equal(4)
   // })

From 97e05695b7d41d891482d190c1b151cc62463a66 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 11:01:37 -0500
Subject: [PATCH 12/31] Hardcode goerli validator and operators

---
 apps/web/src/composables/wallet.ts            |  4 +-
 contracts/ethereum/package.json               |  2 +-
 contracts/ethereum/src/SSVManager.sol         | 31 +++++-----
 .../ethereum/src/external/MockOracle.sol      | 56 +++++--------------
 contracts/ethereum/test/ssv.test.ts           | 25 ++++-----
 services/matcher/.gitignore                   |  3 +
 services/matcher/build.js                     | 36 ++++++++++++
 services/matcher/package.json                 | 26 +++++++++
 services/matcher/src/index.ts                 | 13 +++++
 services/matcher/test/matcher.test.ts         | 10 ++++
 services/matcher/tsconfig.json                | 23 ++++++++
 11 files changed, 154 insertions(+), 75 deletions(-)
 create mode 100644 services/matcher/.gitignore
 create mode 100644 services/matcher/build.js
 create mode 100644 services/matcher/package.json
 create mode 100644 services/matcher/src/index.ts
 create mode 100644 services/matcher/test/matcher.test.ts
 create mode 100644 services/matcher/tsconfig.json

diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index c6ed9084d..dd7d4bf1b 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -145,8 +145,8 @@ export default function useWallet() {
       pools.value = await Promise.all(usersPoolsIds.map(async (poolId: number) => {
         const { stake: totalStake, rewards: totalRewards } = await ssvProvider.getPoolBalance(poolId)
         const { stake: userStake, rewards: userRewards } = await ssvProvider.getPoolUserBalance(poolId, userAddress)
-        const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId)
-        const operatorIds = await ssvProvider.getPoolOperatorIds(poolId)
+        const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId) // Public key bytes (i.e., 0x..)
+        const operatorIds = await ssvProvider.getPoolOperatorIds(poolId) // Operator ID uint32[] (i.e., [1, 2, 3, 4])
         return {
           id: poolId,
           totalStake: ethers.utils.formatEther(totalStake),
diff --git a/contracts/ethereum/package.json b/contracts/ethereum/package.json
index 016cc8f55..e4ce1d94a 100644
--- a/contracts/ethereum/package.json
+++ b/contracts/ethereum/package.json
@@ -7,7 +7,7 @@
         "docgen": "npx hardhat docgen",
         "test": "mocha --require hardhat/register --recursive --exit --extension ts --timeout 25000",
         "task:clean": "npx hardhat clean",
-        "task:compile": "npm run task:clean && npx hardhat compile",
+        "task:compile": "npm run task:clean && npx hardhat compile --show-stack-traces",
         "pretest": "npm run task:compile",
         "postinstall": "npm run task:compile"
     },
diff --git a/contracts/ethereum/src/SSVManager.sol b/contracts/ethereum/src/SSVManager.sol
index c1bba022b..989515cea 100644
--- a/contracts/ethereum/src/SSVManager.sol
+++ b/contracts/ethereum/src/SSVManager.sol
@@ -90,10 +90,7 @@ contract SSVManager is ChainlinkClient {
     event ValidatorInitFullfilled(
         uint32 poolId,
         uint32[] operatorIds,
-        bytes[] encryptedShares, 
-        bytes[] sharePublicKeys, 
-        bytes validatorPublicKey, 
-        bytes depositDataSignature
+        bytes validatorPublicKey
     );
 
     /** Event signaling a user deposit to the manager */
@@ -352,23 +349,21 @@ contract SSVManager is ChainlinkClient {
     /**
      * @notice Receives the response in the form of uint32
      *
-     * @param _requestId - ID of the Chainlink request
-     * @param _poolId - The pool ID
-     * @param _operatorIds - The operator IDs
-     * @param _encryptedShares - Standard SSV encrypted shares
-     * @param _sharePublicKeys - Each share's BLS pubkey
-     * @param _validatorPublicKey - Resulting public key corresponding to the shared private key
-     * @param _depositDataSignature - Reconstructed signature of DepositMessage according to eth2 spec
+     * @param _requestId - id of the request
+     * @param _data - response
      */
-    function fulfillValidatorInit(bytes32 _requestId, uint32 _poolId, uint32[] calldata _operatorIds, bytes[] calldata _encryptedShares, bytes[] calldata _sharePublicKeys, bytes calldata _validatorPublicKey, bytes calldata _depositDataSignature)
+    function fulfillValidatorInit(bytes32 _requestId, uint32 _data)
         public
         recordChainlinkFulfillment(_requestId)
     {
-        emit ValidatorInitFullfilled(_poolId, _operatorIds, _encryptedShares, _sharePublicKeys, _validatorPublicKey, _depositDataSignature);
-        console.log('FULFILLED VALIDATOR INIT FOR POOL', _poolId);
-        Pool storage pool = pools[_poolId];
-        pool.operatorIds = _operatorIds;
-        pool.validatorPublicKey = _validatorPublicKey;
+        console.log('Received oracle data', _data);
+
+        /// Hardcode override for mock oracle data
+        uint32 poolId = uint32(_lastPoolId.current());
+        Pool storage pool = pools[poolId];
+        pool.operatorIds = [uint32(616), uint32(799), uint32(814), uint32(594)];
+        pool.validatorPublicKey = bytes("0x8420572d646a9b9738d0d411e070f3857c120b1f3d3153bb05b5e28889a77dfc639ac2b94f34cdf84f502740166e4ebe");
+        emit ValidatorInitFullfilled(poolId, pool.operatorIds, pool.validatorPublicKey);
     }
 
     /**
@@ -443,4 +438,4 @@ contract SSVManager is ChainlinkClient {
     ) external view returns (uint32[] memory) {
         return pools[_poolId].operatorIds;
     }
-}
+}
\ No newline at end of file
diff --git a/contracts/ethereum/src/external/MockOracle.sol b/contracts/ethereum/src/external/MockOracle.sol
index 8f7f4ce31..3f9e8a43f 100644
--- a/contracts/ethereum/src/external/MockOracle.sol
+++ b/contracts/ethereum/src/external/MockOracle.sol
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.6.6;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.6.6;
 
-import '@chainlink/contracts/src/v0.6/LinkTokenReceiver.sol';
-import '@chainlink/contracts/src/v0.6/interfaces/ChainlinkRequestInterface.sol';
-import '@chainlink/contracts/src/v0.6/interfaces/LinkTokenInterface.sol';
-import '@chainlink/contracts/src/v0.6/vendor/SafeMathChainlink.sol';
+import "@chainlink/contracts/src/v0.6/LinkTokenReceiver.sol";
+import "@chainlink/contracts/src/v0.6/interfaces/ChainlinkRequestInterface.sol";
+import "@chainlink/contracts/src/v0.6/interfaces/LinkTokenInterface.sol";
+import "@chainlink/contracts/src/v0.6/vendor/SafeMathChainlink.sol";
 
 /**
  * @title The Chainlink Mock Oracle contract
@@ -14,8 +13,6 @@ import '@chainlink/contracts/src/v0.6/vendor/SafeMathChainlink.sol';
 contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
     using SafeMathChainlink for uint256;
 
-    uint _lastPoolId = 0;
-
     uint256 public constant EXPIRY_TIME = 5 minutes;
     uint256 private constant MINIMUM_CONSUMER_GAS_LIMIT = 400000;
 
@@ -95,27 +92,10 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
             _data
         );
 
-        // Hardcoded mock response
-        _lastPoolId = _lastPoolId + 1;
-        uint32 poolId = uint32(_lastPoolId);
-        uint32[4] memory operatorIds = [uint32(1), uint32(2), uint32(3), uint32(4)];
-        bytes[4] memory encryptedShares = [
-            abi.encode("0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001586f656e52473751305a376462584e674b684145552b586743434f4e3472613573395a75444b4b783971554675704f7353746931426d6f72494c635a5a42546c724849644f6f457758797371727449364e59743773346e6b334f4d7269714c797a644b386a374a46446948476663736757523675624e61636a65452b395179334b31754647614d64556e6f526f6e764f7a4b4a514268447368656833425a2b77456753364a355438656e4e6664496954787239797859367571332b5141304d72654b4737795956574a642f3762343642476269716b7667702f4972586177596a6f327543544e6a514e5a4b646f617137436d6d3439617054677256386e2f6f4d6a665855696f435a2f2f30334f3254464952674847522b6745324a49714e7845734442414b303454367a502f6735734d4b4d7168724f4b7351343550556b307851654f6175695654547361764f4653326d55755a6c57673d3d0000000000000000"),
-            abi.encode("0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000158716376374f6e4e4f493530376f6e316d57766244576a4171592b4e6f5377624547667976366f53305268575375674c34364a4e62717938473762386c5672374674375352653545674c6e4938354b4f57652f76366952525245315377725a7630615a695673656762786b596d334133686e7555747150587968574f475345427652774c73612b5562502f797769636d466a746e79374c43306d4776354f615672786a66306a4737326d564f2f41453768545953666951614768546d3459593865324753305761396a6461304a48726752445868614739753461473432546f673268434a7144356977416e333433717a346e4955534f725a64502b796f6a70674f4469494b554c364c70473955334c326a7a4c4734364448587a577a5054447857755458387761564d787776446b4a455473554b703874614666673971742f6e325052566f45512b61314f636464706954427a675239673d3d0000000000000000"),
-            abi.encode("0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000015845744e3651676170587358436664497a62314d41717158426d30565663744f4a383031467467757a597654533644434c48657871336f4d693262436573797a4c4b7270384a6442753853382b70596c465865754d3579416656432b454d6c587a2f537a386b516c375353784934704e4e447364347366567263756a50632b2f592b546d624271334d6f425464727859695751586d387a336134444563425370642b6a446e2b774b4e4a4c765144504a3630416f79687165376171714c53417570694244664443584a2b796765704f38487971676c48762b384d303266373232613652645a6c74324b7077722f6d764d612b31322f2f4c434a4c637a4a353446525039366f684747734350764c6f494f4971515839333859586b5666714c353266474f54576b424c6e564579714746396438547630364a306a6a6131795a577341796d54644e486345773062376c7a4f743777444352413d3d0000000000000000"),
-            abi.encode("0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000015864315035465a6e717a696d44556475585643454b4d57434c64706358626b5137526c655466496a5a506a444e4432704143516c642f7a35655a4139684649416c2f31536b614952445372594b526f307a4438364a364e6248646854374a766d476572455545433439304f43486d44762b6459556471445569494a75654832346172472f6e4978444778666853744766474c7a5a465949626b486f4e33686572664647716933305a424e6975714474724c36466e773456433446556c4464345a494376416b4e764648593162613356575530356a2f79466961355a545a4b654e6b5a4143416c734e6c6c532b7952497273486e326e6c43495a46483157615537455576714a423565754c36622b56426c7a6c5a50493147426754705053566a58636746624b41654448722f5a654530514e2b4447616667335438744e6142684c446451316d76796a4d336d4345346b4c554a39304448413d3d0000000000000000")
-        ];
-        bytes[4] memory sharePublicKeys = [
-            abi.encode("0xb854d1aaddcec272b64f508a99c343d42ebc4c603cb03f2ca5d72760b689fd99b94963e2012f260ba655efc8110b6611"),
-            abi.encode("0x8ae4adf378c5e1f852f85b9c3dbfec10cf1e15cb1ae5e7587d1a2219a5699e0a4eb8a2420f8e689fdf3da23244ff70aa"),
-            abi.encode("0xb988ba768eb9c272f854c8e3083bff05794fb40c760196186245bb06ea2839811734e619385d500ee53579b0703ee967"),
-            abi.encode("0xb988ba768eb9c272f854c8e3083bff05794fb40c760196186245bb06ea2839811734e619385d500ee53579b0703ee967")
-        ];
-        bytes memory validatorPublicKey = abi.encode("0x8c8f35694ed6b59c2f31ed382127b0ad6551b062111d6f26e6c56dd18520515e9fbbb0dbe774045fdddcbf089aaf3042");
-        bytes memory depositDataSignature = abi.encode("0x8c8f35694ed6b59c2f31ed382127b0ad6551b062111d6f26e6c56dd18520515e9fbbb0dbe774045fdddcbf089aaf3042");
-
+        uint32 data = uint32(1);
+        
         /// Imediately fulfill request for mocking purposes
-        this.fulfillValidatorInitRequest(requestId, poolId, operatorIds, encryptedShares, sharePublicKeys, validatorPublicKey, depositDataSignature);
+        this.fulfillOracleRequest(requestId, data);
     }
 
     /**
@@ -124,19 +104,13 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
      * Will call the callback address' callback function without bubbling up error
      * checking in a `require` so that the node can get paid.
      * @param _requestId The fulfillment request ID that must match the requester's
-     * @param _poolId The pool ID
-     * @param _operatorIds - The operator IDs
-     * @param _encryptedShares - Standard SSV encrypted shares
-     * @param _sharePublicKeys - Each share's BLS pubkey
-     * @param _validatorPublicKey - Resulting public key corresponding to the shared private key
-     * @param _depositDataSignature - Reconstructed signature of DepositMessage according to eth2 spec
+     * @param _data The data to return to the consuming contract
      * @return Status if the external call was successful
      */
-    function fulfillValidatorInitRequest(bytes32 _requestId, uint32 _poolId, uint32[4] calldata _operatorIds, bytes[4] calldata _encryptedShares, bytes[4] calldata _sharePublicKeys, bytes calldata _validatorPublicKey, bytes calldata _depositDataSignature)
-        external
-        isValidRequest(_requestId)
-        returns (bool)
-    {
+    function fulfillOracleRequest(
+        bytes32 _requestId,
+        uint32 _data
+    ) external isValidRequest(_requestId) returns (bool) {
         Request memory req = commitments[_requestId];
         delete commitments[_requestId];
         require(
@@ -147,7 +121,7 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
         // callback(addr+functionId) as it is untrusted.
         // See: https://solidity.readthedocs.io/en/develop/security-considerations.html#use-the-checks-effects-interactions-pattern
         (bool success, ) = req.callbackAddr.call(
-            abi.encodeWithSelector(req.callbackFunctionId, _requestId, _poolId, _operatorIds, _encryptedShares, _sharePublicKeys, _validatorPublicKey, _depositDataSignature)
+            abi.encodeWithSelector(req.callbackFunctionId, _requestId, _data)
         ); // solhint-disable-line avoid-low-level-calls
         return success;
     }
@@ -211,4 +185,4 @@ contract MockOracle is ChainlinkRequestInterface, LinkTokenReceiver {
         require(_to != address(LinkToken), "Cannot callback to LINK");
         _;
     }
-}
\ No newline at end of file
+}
diff --git a/contracts/ethereum/test/ssv.test.ts b/contracts/ethereum/test/ssv.test.ts
index 3d2546d66..05dba41cb 100644
--- a/contracts/ethereum/test/ssv.test.ts
+++ b/contracts/ethereum/test/ssv.test.ts
@@ -215,16 +215,15 @@ describe('SSV manager', async function () {
     const { ssv } = await loadFixture(thirdUserDepositFixture)
     const [firstPool] = await ssv.getStakedPoolIds()
     const validatorPublicKey = await ssv.getPoolValidatorPublicKey(firstPool)
-    console.log(validatorPublicKey)
     expect(validatorPublicKey).to.exist
   })
 
-  // it('First pool\'s operator ID count should be 4', async function () {
-  //   const { ssv } = await loadFixture(thirdUserDepositFixture)
-  //   const [firstPool] = await ssv.getStakedPoolIds()
-  //   const operatorIds = await ssv.getPoolOperatorIds(firstPool)
-  //   expect(operatorIds.length).equal(4)
-  // })
+  it('First pool\'s operator ID count should be 4', async function () {
+    const { ssv } = await loadFixture(thirdUserDepositFixture)
+    const [firstPool] = await ssv.getStakedPoolIds()
+    const operatorIds = await ssv.getPoolOperatorIds(firstPool)
+    expect(operatorIds.length).equal(4)
+  })
 
   it('Second pool\'s validator public key should exist', async function () {
     const { ssv } = await loadFixture(thirdUserDepositFixture)
@@ -233,11 +232,11 @@ describe('SSV manager', async function () {
     expect(validatorPublicKey).to.exist
   })
 
-  // it('Second pool\'s operator ID count should be 4', async function () {
-  //   const { ssv } = await loadFixture(thirdUserDepositFixture)
-  //   const [, secondPool] = await ssv.getStakedPoolIds()
-  //   const operatorIds = await ssv.getPoolOperatorIds(secondPool)
-  //   expect(operatorIds.length).equal(4)
-  // })
+  it('Second pool\'s operator ID count should be 4', async function () {
+    const { ssv } = await loadFixture(thirdUserDepositFixture)
+    const [, secondPool] = await ssv.getStakedPoolIds()
+    const operatorIds = await ssv.getPoolOperatorIds(secondPool)
+    expect(operatorIds.length).equal(4)
+  })
 
 })
\ No newline at end of file
diff --git a/services/matcher/.gitignore b/services/matcher/.gitignore
new file mode 100644
index 000000000..a79834c07
--- /dev/null
+++ b/services/matcher/.gitignore
@@ -0,0 +1,3 @@
+node_modules/
+dist/
+mock-logs.txt
diff --git a/services/matcher/build.js b/services/matcher/build.js
new file mode 100644
index 000000000..ae7560a88
--- /dev/null
+++ b/services/matcher/build.js
@@ -0,0 +1,36 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const esbuild = require('esbuild')
+const { spawn } = require('child_process')
+
+const esbuildArgs = process.argv.slice(2)
+const shouldWatch = esbuildArgs.includes('--watch')
+
+esbuild.build({
+    entryPoints: ['src/index.ts'],
+    outfile: 'dist/index.js',
+    bundle: true,
+    minify: true,
+    sourcemap: true,
+    platform: 'node',
+    target: 'esnext',
+    watch: shouldWatch ? {
+        onRebuild(error, buildResult) {
+            if (error) console.error('Watch build failed', error)
+            else {
+                console.log('Watch build succeeded', buildResult)
+                spawn('npm', ['run', 'cdk:synth', '--workspace', '@casimir/cdk'], { stdio: 'inherit' })
+            }
+            handleBuildProcessClose(buildResult)
+        }
+    } : false
+}).then(buildResult => {
+    console.log('Build succeeded', buildResult)
+    handleBuildProcessClose(buildResult)
+})
+
+function handleBuildProcessClose(buildProcess) {
+    process.on('SIGINT', () => {
+        console.log('...Stopping esbuild watch process')
+        buildProcess.stop()
+    })
+}
\ No newline at end of file
diff --git a/services/matcher/package.json b/services/matcher/package.json
new file mode 100644
index 000000000..a6c64cc34
--- /dev/null
+++ b/services/matcher/package.json
@@ -0,0 +1,26 @@
+{
+    "name": "@casimir/matcher",
+    "private": "true",
+    "main": "src/index.ts",
+    "scripts": {
+        "build": "node build.js",
+        "watch": "npm run build -- --watch",
+        "test": "mocha --require hardhat/register --recursive --exit --extension ts --timeout 15000"
+    },
+    "dependencies": {
+        "cors": "^2.8.5",
+        "express": "^4.18.1",
+        "serverless-http": "^3.0.1"
+    },
+    "devDependencies": {
+        "@types/aws-lambda": "8.10.97",
+        "@types/chai": "^4.3.3",
+        "@types/cors": "^2.8.12",
+        "@types/express": "^4.17.13",
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^17.0.38",
+        "chai": "^4.3.6",
+        "esbuild": "^0.15.9",
+        "mocha": "^10.0.0"
+    }
+}
\ No newline at end of file
diff --git a/services/matcher/src/index.ts b/services/matcher/src/index.ts
new file mode 100644
index 000000000..eece99c74
--- /dev/null
+++ b/services/matcher/src/index.ts
@@ -0,0 +1,13 @@
+import serverless from 'serverless-http'
+import express from 'express'
+import cors from 'cors'
+import { APIGatewayEventRequestContext, APIGatewayProxyEvent } from 'aws-lambda'
+
+const app = express()
+app.use(express.json())
+app.use(cors())
+
+export const handler = async function (event: APIGatewayProxyEvent, context: APIGatewayEventRequestContext) {
+  const serverlessApp = serverless(app)
+  return await serverlessApp(event, context)
+}
\ No newline at end of file
diff --git a/services/matcher/test/matcher.test.ts b/services/matcher/test/matcher.test.ts
new file mode 100644
index 000000000..0acad1b59
--- /dev/null
+++ b/services/matcher/test/matcher.test.ts
@@ -0,0 +1,10 @@
+import { expect } from 'chai'
+
+
+describe('Matcher', async function () {
+
+    it('Provides 4 operators', async function () {
+        expect([1, 2, 3, 4].length).equal(4)
+    })
+
+})
\ No newline at end of file
diff --git a/services/matcher/tsconfig.json b/services/matcher/tsconfig.json
new file mode 100644
index 000000000..b5ede2305
--- /dev/null
+++ b/services/matcher/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "strict": true,
+    "preserveConstEnums": true,
+    "noEmit": true,
+    "sourceMap": false,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+  },
+  "exclude": [
+    "node_modules",
+    "build.js"
+  ],
+  "include": [
+    "./src/*",
+    "env.d.ts"
+  ]
+}
\ No newline at end of file

From 53c2d2499b2c0848c4d942e1efc1294e94b64301 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 11:08:48 -0500
Subject: [PATCH 13/31] Update pool interface

---
 apps/web/src/interfaces/Pool.ts  |  8 ++++++++
 contracts/ethereum/docs/index.md | 30 +++++++-----------------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/apps/web/src/interfaces/Pool.ts b/apps/web/src/interfaces/Pool.ts
index e3f0d2b51..2262d82c4 100644
--- a/apps/web/src/interfaces/Pool.ts
+++ b/apps/web/src/interfaces/Pool.ts
@@ -6,8 +6,16 @@ export interface Pool {
     userRewards: string
     validator?: {
         publicKey: string
+        status?: string
+        effectiveness?: string
+        apr?: string // See issue #205 https://github.com/consensusnetworks/casimir/issues/205#issuecomment-1338142532
+        url?: string // https://beaconcha.in/validator/{publicKey}
     }
     operators?: {
         id: number
+        publicKey?: string
+        '24HourPerformance'?: number
+        '30DayPerformance'?: number
+        url?: string // https://explorer.ssv.network/operators/{id}
     }
 }
\ No newline at end of file
diff --git a/contracts/ethereum/docs/index.md b/contracts/ethereum/docs/index.md
index 6e2e9291a..28b9f7f5c 100644
--- a/contracts/ethereum/docs/index.md
+++ b/contracts/ethereum/docs/index.md
@@ -149,7 +149,7 @@ address oracleAddress
 ### ValidatorInitFullfilled
 
 ```solidity
-event ValidatorInitFullfilled(uint32 poolId, uint32[] operatorIds, bytes[] encryptedShares, bytes[] sharePublicKeys, bytes validatorPublicKey, bytes depositDataSignature)
+event ValidatorInitFullfilled(uint32 poolId, uint32[] operatorIds, bytes validatorPublicKey)
 ```
 
 Event signaling a validator init request fulfillment
@@ -319,7 +319,7 @@ Get validator init config with operators and deposit data from a DKG ceremony
 ### fulfillValidatorInit
 
 ```solidity
-function fulfillValidatorInit(bytes32 _requestId, uint32 _poolId, uint32[] _operatorIds, bytes[] _encryptedShares, bytes[] _sharePublicKeys, bytes _validatorPublicKey, bytes _depositDataSignature) public
+function fulfillValidatorInit(bytes32 _requestId, uint32 _data) public
 ```
 
 Receives the response in the form of uint32
@@ -328,13 +328,8 @@ Receives the response in the form of uint32
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| _requestId | bytes32 | - ID of the Chainlink request |
-| _poolId | uint32 | - The pool ID |
-| _operatorIds | uint32[] | - The operator IDs |
-| _encryptedShares | bytes[] | - Standard SSV encrypted shares |
-| _sharePublicKeys | bytes[] | - Each share's BLS pubkey |
-| _validatorPublicKey | bytes | - Resulting public key corresponding to the shared private key |
-| _depositDataSignature | bytes | - Reconstructed signature of DepositMessage according to eth2 spec |
+| _requestId | bytes32 | - id of the request |
+| _data | uint32 | - response |
 
 ### getOpenPoolIds
 
@@ -483,12 +478,6 @@ function withdraw(uint256 _amount) external
 
 Chainlink smart contract developers can use this to test their contracts
 
-### _lastPoolId
-
-```solidity
-uint256 _lastPoolId
-```
-
 ### EXPIRY_TIME
 
 ```solidity
@@ -574,10 +563,10 @@ Emits OracleRequest event for the Chainlink node to detect._
 | _dataVersion | uint256 | The specified data version |
 | _data | bytes | The CBOR payload of the request |
 
-### fulfillValidatorInitRequest
+### fulfillOracleRequest
 
 ```solidity
-function fulfillValidatorInitRequest(bytes32 _requestId, uint32 _poolId, uint32[4] _operatorIds, bytes[4] _encryptedShares, bytes[4] _sharePublicKeys, bytes _validatorPublicKey, bytes _depositDataSignature) external returns (bool)
+function fulfillOracleRequest(bytes32 _requestId, uint32 _data) external returns (bool)
 ```
 
 Called by the Chainlink node to fulfill requests
@@ -591,12 +580,7 @@ checking in a `require` so that the node can get paid._
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | _requestId | bytes32 | The fulfillment request ID that must match the requester's |
-| _poolId | uint32 | The pool ID |
-| _operatorIds | uint32[4] | - The operator IDs |
-| _encryptedShares | bytes[4] | - Standard SSV encrypted shares |
-| _sharePublicKeys | bytes[4] | - Each share's BLS pubkey |
-| _validatorPublicKey | bytes | - Resulting public key corresponding to the shared private key |
-| _depositDataSignature | bytes | - Reconstructed signature of DepositMessage according to eth2 spec |
+| _data | uint32 | The data to return to the consuming contract |
 
 #### Return Values
 

From 8a7590722e75cb4b8b40ec3aa68e9576fce321c9 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 11:16:08 -0500
Subject: [PATCH 14/31] Disable matcher build

---
 services/matcher/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/matcher/package.json b/services/matcher/package.json
index a6c64cc34..58340a020 100644
--- a/services/matcher/package.json
+++ b/services/matcher/package.json
@@ -3,7 +3,8 @@
     "private": "true",
     "main": "src/index.ts",
     "scripts": {
-        "build": "node build.js",
+        "build": "echo \"Error: no build specified\" && exit 1",
+        "buildnext": "node build.js",
         "watch": "npm run build -- --watch",
         "test": "mocha --require hardhat/register --recursive --exit --extension ts --timeout 15000"
     },

From 40bf709b54a9333a1afd0c720d04bd94b9662871 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 11:31:45 -0500
Subject: [PATCH 15/31] Update package-lock.json

---
 package-lock.json | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 19f9b0d34..3f47f2977 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2557,6 +2557,10 @@
       "resolved": "apps/landing",
       "link": true
     },
+    "node_modules/@casimir/matcher": {
+      "resolved": "services/matcher",
+      "link": true
+    },
     "node_modules/@casimir/string-helpers": {
       "resolved": "common/string-helpers",
       "link": true
@@ -45634,6 +45638,36 @@
       "engines": {
         "node": ">=12"
       }
+    },
+    "services/matcher": {
+      "dependencies": {
+        "cors": "^2.8.5",
+        "express": "^4.18.1",
+        "serverless-http": "^3.0.1"
+      },
+      "devDependencies": {
+        "@types/aws-lambda": "8.10.97",
+        "@types/chai": "^4.3.3",
+        "@types/cors": "^2.8.12",
+        "@types/express": "^4.17.13",
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^17.0.38",
+        "chai": "^4.3.6",
+        "esbuild": "^0.15.9",
+        "mocha": "^10.0.0"
+      }
+    },
+    "services/matcher/node_modules/@types/mocha": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
+      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+      "dev": true
+    },
+    "services/matcher/node_modules/@types/node": {
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+      "dev": true
     }
   },
   "dependencies": {
@@ -48530,6 +48564,37 @@
         "vue-tsc": "^0.34.7"
       }
     },
+    "@casimir/matcher": {
+      "version": "file:services/matcher",
+      "requires": {
+        "@types/aws-lambda": "8.10.97",
+        "@types/chai": "^4.3.3",
+        "@types/cors": "^2.8.12",
+        "@types/express": "^4.17.13",
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^17.0.38",
+        "chai": "^4.3.6",
+        "cors": "^2.8.5",
+        "esbuild": "^0.15.9",
+        "express": "^4.18.1",
+        "mocha": "^10.0.0",
+        "serverless-http": "^3.0.1"
+      },
+      "dependencies": {
+        "@types/mocha": {
+          "version": "10.0.1",
+          "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
+          "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+          "dev": true
+        },
+        "@types/node": {
+          "version": "17.0.45",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+          "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+          "dev": true
+        }
+      }
+    },
     "@casimir/string-helpers": {
       "version": "file:common/string-helpers",
       "requires": {

From 17d7e1b9e181bce5d7afd4fdf24e69a086ecbf92 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 11:36:36 -0500
Subject: [PATCH 16/31] Set matcher build fail code to 0

---
 services/matcher/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/matcher/package.json b/services/matcher/package.json
index 58340a020..1697f4cd9 100644
--- a/services/matcher/package.json
+++ b/services/matcher/package.json
@@ -3,7 +3,7 @@
     "private": "true",
     "main": "src/index.ts",
     "scripts": {
-        "build": "echo \"Error: no build specified\" && exit 1",
+        "build": "echo \"Error: no build specified\" && exit 0",
         "buildnext": "node build.js",
         "watch": "npm run build -- --watch",
         "test": "mocha --require hardhat/register --recursive --exit --extension ts --timeout 15000"

From b7719baad5d9db30b94b5cac8d7f9a06f2a1f5f7 Mon Sep 17 00:00:00 2001
From: hawyar <hawyarxoshnaw@gmail.com>
Date: Tue, 6 Dec 2022 12:32:05 -0500
Subject: [PATCH 17/31] Add exchnage package and composable

---
 .vscode/settings.json             |   13 +-
 apps/web/src/composables/price.ts |   70 +
 apps/web/src/pages/test/Test.vue  |    2 +
 common/exchange/package.json      |   11 +
 common/exchange/src/index.ts      |  221 ++
 common/exchange/tsconfig.json     |   21 +
 package-lock.json                 | 4179 ++++++++++++-----------------
 services/crawler/package.json     |    4 +-
 8 files changed, 2055 insertions(+), 2466 deletions(-)
 create mode 100644 apps/web/src/composables/price.ts
 create mode 100644 common/exchange/package.json
 create mode 100644 common/exchange/src/index.ts
 create mode 100644 common/exchange/tsconfig.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 36f044b5c..61aa57a14 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,5 +19,16 @@
         "typescript"
     ],
     "css.lint.unknownAtRules": "ignore",
-    "jupyter.notebookFileRoot": "${fileDirname}"
+    "jupyter.notebookFileRoot": "${fileDirname}",
+    "terminal.integrated.profiles.osx": {
+        "x86 bash": {
+            "path": "/usr/bin/arch",
+            "args": ["-arch", "x86_64", "/bin/bash"]
+        },
+        "x86 zsh": {
+            "path": "/usr/bin/arch",
+            "args": ["-arch", "x86_64", "/bin/zsh"]
+        }
+    },
+    "terminal.integrated.defaultProfile.osx": "x86 zsh"
 }
\ No newline at end of file
diff --git a/apps/web/src/composables/price.ts b/apps/web/src/composables/price.ts
new file mode 100644
index 000000000..606a5954a
--- /dev/null
+++ b/apps/web/src/composables/price.ts
@@ -0,0 +1,70 @@
+import { ethers } from 'ethers'
+
+type PriceEntry = {
+    time: number;
+    high: number;
+    low: number;
+    open: number;
+    volumeFrom: number;
+    volumeTo: number;
+    close: number;
+    conversionType: string;
+    conversionSymbol: string;
+};
+
+  
+export default function usePrice() {
+    const exchange = new Exchange('ETH', 'USD')
+
+    async function getExchangeRate(amount: ethers.BigNumber) {
+        const eth = ethers.utils.formatEther(amount)
+
+        const price = await exchange.getCurrentPrice()
+        const rate = price * parseFloat(eth)
+        return rate
+    }
+    return {
+        getExchangeRate
+    }
+}
+
+class Exchange {
+  coin: 'ETH' | 'BTC'
+  currency: 'USD'
+  constructor(coin: 'ETH' | 'BTC', currency: 'USD') {
+    this.coin = coin
+    this.currency = currency
+  }
+
+  async getCurrentPrice(): Promise<number> {
+    const opt = {
+        method: 'GET'
+    }
+
+    const now = Math.floor(Date.now() / 1000)
+
+    const url = `https://min-api.cryptocompare.com/data/v2/histominute?fsym=${this.coin}&tsym=${this.currency}&toTs=${now}&limit=1`
+
+    try {
+        const response = await fetch(url, opt)
+
+        const data = await response.json()
+
+        if (data.Response.toLowerCase() !== 'success') {
+            throw new Error(data.Message)
+        }
+
+        if (data.Data.Data.length === 0) {
+            throw new Error('Empty response from API')
+        }
+
+        const first = data.Data.Data[0] as PriceEntry
+        const mid = (first.high + first.low) / 2
+
+        return mid
+    } catch (e) {
+        console.log(e)
+        return 0
+    }
+  }
+}
\ No newline at end of file
diff --git a/apps/web/src/pages/test/Test.vue b/apps/web/src/pages/test/Test.vue
index fb0bec7bb..6fc314a24 100644
--- a/apps/web/src/pages/test/Test.vue
+++ b/apps/web/src/pages/test/Test.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
+    import Price from '@/components/Price.vue'
     import Wallet from '@/components/Wallet.vue'
 </script>
   
 <template>
   <div>
+    <Price />
     <Wallet />
   </div>
 </template>
diff --git a/common/exchange/package.json b/common/exchange/package.json
new file mode 100644
index 000000000..829cb02c1
--- /dev/null
+++ b/common/exchange/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@casimir/exchange",
+  "version": "1.0.0",
+  "description": "",
+  "main": "src/index.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "hawyar",
+  "license": "ISC"
+}
\ No newline at end of file
diff --git a/common/exchange/src/index.ts b/common/exchange/src/index.ts
new file mode 100644
index 000000000..fdb1b4c84
--- /dev/null
+++ b/common/exchange/src/index.ts
@@ -0,0 +1,221 @@
+import * as https from 'node:https'
+import { uploadToS3 } from '@casimir/aws-helpers'
+
+type PriceEntry = {
+  time: number;
+  high: number;
+  low: number;
+  open: number;
+  volumeFrom: number;
+  volumeTo: number;
+  close: number;
+  conversionType: string;
+  conversionSymbol: string;
+};
+
+export class Exchange {
+  coin: 'ETH' | 'BTC'
+  currency: 'USD'
+  constructor(coin: 'ETH' | 'BTC', currency: 'USD') {
+    this.coin = coin
+    this.currency = currency
+  }
+
+  private async request(options: https.RequestOptions): Promise<any> {
+    return new Promise((resolve, reject) => {
+      const req = https.request(options, (res) => {
+        let data = ''
+
+        res.on('data', (d) => {
+          data += d
+        })
+
+        res.on('end', () => {
+          resolve(JSON.parse(data))
+        })
+      })
+
+      req.on('error', (error) => {
+        reject(error)
+      })
+      req.end()
+    })
+  }
+
+  async getCurrentPrice(): Promise<any> {
+    const response = await this.request({
+      port: null,
+      method: 'GET',
+      host: 'alphavantage.co',
+      path: `/query?function=CRYPTO_INTRADAY&symbol=${this.coin}&market=${this.currency}&interval=1min&apikey=`,
+      headers: {
+        'Content-Length': '0',
+      },
+    })
+
+    const price = response['Time Series Crypto (1min)']
+    const val = Object.values(price)[0]
+
+    console.log(val)
+    return {}
+  }
+
+  async getPriceAtBlock(time: number): Promise<number> {
+    const { Response, Data, Message } = await this.request({
+      hostname: 'min-api.cryptocompare.com',
+      port: null,
+      method: 'GET',
+      path: `/data/v2/histohour?fsym=${this.coin}&tsym=${this.currency}&toTs=${time}&limit=1`,
+      headers: {
+        'Content-Length': '0',
+      },
+    })
+
+    if (Response.toString().toLowerCase() !== 'success') {
+      throw new Error(Message)
+    }
+
+    if (Data.Data.length === 0) {
+      throw new Error('Empty response from API')
+    }
+
+    const nearest = Data.Data[0]
+    const mid = (nearest.high + nearest.low) / 2
+    return mid
+  }
+
+  async getHistoricalPrice({
+    interval = 'hour',
+  }: { interval?: 'hour' | 'minute' } = {}): Promise<PriceEntry[]> {
+	const now = Math.floor(Date.now() / 1000)
+
+    if (interval === 'minute') {
+      const sevenDaysPrior = now - 60 * 60 * 24 * 7
+
+      let last = now
+      const batch: PriceEntry[] = []
+
+      while (last >= sevenDaysPrior) {
+        const {
+          Response: response,
+          Data: data,
+          Message: message,
+        } = await this.request({
+          hostname: 'min-api.cryptocompare.com',
+          port: null,
+          method: 'GET',
+          path: `/data/v2/histominute?fsym=${this.coin}&tsym=${this.currency}&toTs=${last}&limit=2000`,
+          headers: {
+            'Content-Length': '0',
+          },
+        })
+
+        if (response.toString().toLowerCase() !== 'success') {
+          throw new Error(message)
+        }
+
+        if (data.Data.length === 0) {
+          throw new Error('Empty response from API')
+        }
+
+        const from = new Date(data.TimeFrom * 1000)
+        const to = new Date(data.TimeTo * 1000)
+
+        console.log(`from ${from} to ${to}`)
+
+        data.Data.forEach((price: PriceEntry, i: number) => {
+          if (i === 0) {
+            return
+          }
+
+          if (price.time - data.Data[i - 1].time !== 60) {
+            throw new Error(
+              `not 1 minute apart: ${price.time} - ${data.Data[i - 1].time}`
+            )
+          }
+        })
+        batch.push(...data.Data)
+        last = data.TimeFrom
+      }
+
+      if (process.env.UPLOAD === 'enabled') {
+        await uploadToS3({
+          bucket: 'casimir-price-dev',
+          key: `${this.coin.toLowerCase()}_${this.currency.toLowerCase()}_hourly.ndjson`,
+          data: batch
+            .flat()
+            .map((e: PriceEntry) => JSON.stringify(e))
+            .join('\n'),
+        }).finally(() => {
+          console.log('saved to s3')
+        })
+      }
+      return batch
+    }
+    if (interval === 'hour') {
+      console.log('getting historical price (hourly)')
+      let hlast = now - 60 * 60 * 24 * 7
+      const batch: PriceEntry[] = []
+
+      const genesis = Math.floor(new Date(1438269973 * 1000).getTime() / 1000)
+      while (hlast > genesis) {
+        const {
+          Response: hourlyResponse,
+          Data: hourlyData,
+          Message: hourlyMessage,
+        } = await this.request({
+          hostname: 'min-api.cryptocompare.com',
+          port: null,
+          method: 'GET',
+          path: `/data/v2/histohour?fsym=${this.coin}&tsym=${this.currency}&toTs=${hlast}&limit=2000`,
+          headers: {
+            'Content-Length': '0',
+          },
+        })
+
+        if (hourlyResponse.toString().toLowerCase() !== 'success') {
+          throw new Error(hourlyMessage)
+        }
+
+        if (hourlyData.Data.length === 0) {
+          throw new Error('Empty response from API')
+        }
+
+        const from = new Date(hourlyData.TimeFrom * 1000)
+        const to = new Date(hourlyData.TimeTo * 1000)
+
+        console.log(`from ${from} to ${to}`)
+
+        hourlyData.Data.forEach((price: PriceEntry, i: number) => {
+          if (i === 0) {
+            return
+          }
+
+          if (price.time - hourlyData.Data[i - 1].time !== 60 * 60) {
+            throw new Error(
+              `not 1 hour apart: ${price.time} - ${hourlyData.Data[i - 1].time}`
+            )
+          }
+        })
+
+        batch.push(...hourlyData.Data)
+        hlast = hourlyData.TimeFrom
+      }
+
+      if (process.env.UPLOAD === 'enabled') {
+        await uploadToS3({
+          bucket: 'casimir-price-dev',
+          key: `${this.coin.toLowerCase()}_${this.currency.toLowerCase()}_hourly.ndjson`,
+          data: batch
+            .flat()
+            .map((e: PriceEntry) => JSON.stringify(e))
+            .join('\n'),
+        }).finally(() => {
+          console.log('saved to s3')
+        })
+      }
+      return batch
+    }
+    throw new Error('invalid interval')
+  }
+}
\ No newline at end of file
diff --git a/common/exchange/tsconfig.json b/common/exchange/tsconfig.json
new file mode 100644
index 000000000..4c75dca44
--- /dev/null
+++ b/common/exchange/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "strict": true,
+    "preserveConstEnums": true,
+    "noEmit": true,
+    "sourceMap": false,
+    "module": "CommonJS",
+    "moduleResolution": "Node",
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "include": [
+    "./src/*"
+  ]
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 19f9b0d34..a7ef04ef6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "casimir",
       "version": "0.0.1",
       "license": "MIT",
       "workspaces": [
@@ -172,6 +171,10 @@
         "ethers": "^5.7.1"
       }
     },
+    "common/exchange": {
+      "version": "1.0.0",
+      "license": "ISC"
+    },
     "common/hardhat-helpers": {
       "name": "@casimir/hardhat-helpers",
       "devDependencies": {
@@ -318,9 +321,9 @@
       }
     },
     "node_modules/@aws-cdk/asset-awscli-v1": {
-      "version": "2.2.24",
-      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.24.tgz",
-      "integrity": "sha512-MW8JuXwZM5XEBAFMOY8JTGkeXW8mmzdl+XoHbAwi6w0KFOALDizIq+QdWKExh+Z77Nu9KvklBA26aSL9rT3zrQ=="
+      "version": "2.2.28",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.28.tgz",
+      "integrity": "sha512-ttyJgYpk0i5coA1+jQzF1p1r+m/Dffm+xPThBeFLH4ZgQF5Ujkmc54geW/+86wOL7IyQQ9SnbksPJwgOTZ1Snw=="
     },
     "node_modules/@aws-cdk/asset-kubectl-v20": {
       "version": "2.1.1",
@@ -328,9 +331,9 @@
       "integrity": "sha512-U1ntiX8XiMRRRH5J1IdC+1t5CE89015cwyt5U63Cpk0GnMlN5+h9WsWMlKlPXZR4rdq/m806JRlBMRpBUB2Dhw=="
     },
     "node_modules/@aws-cdk/asset-node-proxy-agent-v5": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.30.tgz",
-      "integrity": "sha512-EruKG+4f0j+ft/PDu0zLoyYLadPwTve99hglbezhV8gD5ER9qIFoKYiZXW1w3ySZDgrOlTI8T1sVNdQWxbARyQ=="
+      "version": "2.0.34",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.34.tgz",
+      "integrity": "sha512-tpD3D7MUjMgfLmD/ZyeuGOVqcdFFUwKS4rooYF3Eqsq3tjZDAFPYs0AA2iA1j80ioxr/LYo9ujHOscfPqnKL7g=="
     },
     "node_modules/@aws-cdk/aws-glue-alpha": {
       "version": "2.33.0-alpha.0",
@@ -469,11 +472,11 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@aws-sdk/abort-controller": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.215.0.tgz",
-      "integrity": "sha512-HTvL542nawhVqe0oC1AJchdcomEOmPivJEzYUT1LqiG3e8ikxMNa2KWSqqLPeKi2t0A/cfQy7wDUyg9+BZhDSQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.222.0.tgz",
+      "integrity": "sha512-Ric2vJQEWrzz915wBeZlYLWAnIsnywOcZpzroPVTY/TNKRvM0GcSPVuD9vv1lOwybVnDHsipukzwQBAZXkNWVA==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -498,42 +501,42 @@
       }
     },
     "node_modules/@aws-sdk/client-athena": {
-      "version": "3.221.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-athena/-/client-athena-3.221.0.tgz",
-      "integrity": "sha512-9Vl3De6jGEHcQiHaRCdmo7OVFMFArUiwnKCrn7xadthxy1iCBexu/AUPFXOkoPhmK3Mc3z5zNy+V77dpTCeprw==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-athena/-/client-athena-3.223.0.tgz",
+      "integrity": "sha512-acGC5rm85K5YYrprm1C4Y5pOc5Jwg/K9tH2UMpgkyT8HLnrdK2owketV0HfHY4UcLrgodEmG/K7SJ7HD/Bf5Sw==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1",
@@ -544,42 +547,42 @@
       }
     },
     "node_modules/@aws-sdk/client-cognito-identity": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.218.0.tgz",
-      "integrity": "sha512-IHzM9jpLqdeqj2w7YA7FrmLCQyKaun7eXtu1OJYMFbJT5XHx6B4jlQ1T/N8xivSSzDfjpJxG6/MMmjec4pI+CA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.223.0.tgz",
+      "integrity": "sha512-mk7NLfWD3TGzlhE+PMOdxskfQQaMgq5jwxU6ngmOK+55uhsbCwXoCw69vBdbViOv5GmSDxdA8A/afgzQOg9T/g==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
@@ -589,61 +592,61 @@
       }
     },
     "node_modules/@aws-sdk/client-s3": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.218.0.tgz",
-      "integrity": "sha512-SvDQzjsW+MvmYb59y0xHRWTDRmHxBjXFqYrJ5DCXwL1LvTpqhN6bYReW8KAesMBkxf4t2H33o0hjYmD4giTqzg==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.223.0.tgz",
+      "integrity": "sha512-hIQfiseFXf04jz14iyQhfV9eRz9XgiMihl9oQhKs3CpL7bFGkhCkCIwbqUrsheqcD1O2wcOSKTAt6QdYbDyhzg==",
       "dependencies": {
         "@aws-crypto/sha1-browser": "2.0.0",
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/eventstream-serde-browser": "3.215.0",
-        "@aws-sdk/eventstream-serde-config-resolver": "3.215.0",
-        "@aws-sdk/eventstream-serde-node": "3.215.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-blob-browser": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/hash-stream-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/md5-js": "3.215.0",
-        "@aws-sdk/middleware-bucket-endpoint": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-expect-continue": "3.215.0",
-        "@aws-sdk/middleware-flexible-checksums": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-location-constraint": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-sdk-s3": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-ssec": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4-multi-region": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/eventstream-serde-browser": "3.222.0",
+        "@aws-sdk/eventstream-serde-config-resolver": "3.222.0",
+        "@aws-sdk/eventstream-serde-node": "3.222.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-blob-browser": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/hash-stream-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/md5-js": "3.222.0",
+        "@aws-sdk/middleware-bucket-endpoint": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-expect-continue": "3.222.0",
+        "@aws-sdk/middleware-flexible-checksums": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-location-constraint": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-sdk-s3": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-ssec": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4-multi-region": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-stream-browser": "3.215.0",
-        "@aws-sdk/util-stream-node": "3.215.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-stream-browser": "3.222.0",
+        "@aws-sdk/util-stream-node": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
-        "@aws-sdk/util-waiter": "3.215.0",
+        "@aws-sdk/util-waiter": "3.222.0",
         "@aws-sdk/xml-builder": "3.201.0",
         "fast-xml-parser": "4.0.11",
         "tslib": "^2.3.1"
@@ -653,42 +656,42 @@
       }
     },
     "node_modules/@aws-sdk/client-secrets-manager": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.218.0.tgz",
-      "integrity": "sha512-BDU72F03Tf0dXuqmYLICl4Xcg1+/dkTaIORJex3eJynSOwquiym+vmFb8Q7L8XH57XdJqXlwL4yQXN+hTkCMFg==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.223.0.tgz",
+      "integrity": "sha512-fmRKr2YLWyB+JhavPWLgcSBi8uJ0xac695e6zSNGXfFToJnJ5aAfx2SD4W1tGr73oFmrvGGs7aVy472UO4IQ1g==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1",
@@ -699,39 +702,39 @@
       }
     },
     "node_modules/@aws-sdk/client-sso": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.218.0.tgz",
-      "integrity": "sha512-kVMlpjaVblxgb1G8q3wD65mKxO3RzKwnjUjIBmOHpmseXzlSkAdAvYcikaDoJP+CRmys4uXk5DN8c7ZdL0OmgA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.223.0.tgz",
+      "integrity": "sha512-1gVmZ7XypZEWUeKnvjS/cZSL/cM1riOGrhp+dr+np58ZT5zSrpWAAeKE5+ftzC/vn770vnD5piLGdAZwg/Jf1g==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
@@ -741,39 +744,39 @@
       }
     },
     "node_modules/@aws-sdk/client-sso-oidc": {
-      "version": "3.216.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.216.0.tgz",
-      "integrity": "sha512-O8kmM86BHwiSwyNoIe+iHXuSpUE9PBWl3re8u+/igt/w5W5VmMVz+zQr7gRUDQ1FDgLWNEdAJa0r+JFx3pZdzA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.223.0.tgz",
+      "integrity": "sha512-MeXm6expqpBwwN5GWm8QedAxWGv1jpdxae5oSqsrfRSHFVcHVxWWQzx9/GMBpKqGLtXVmisex2vckBQa1MhybQ==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
@@ -783,42 +786,42 @@
       }
     },
     "node_modules/@aws-sdk/client-sts": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.218.0.tgz",
-      "integrity": "sha512-0A81eHvryKFEPq7IeY34Opzh5b9bVhhLlf2fDy5VuZjCFf4R9vD2ceOANvFSJeMsmdlqVDq8U1mHYl0E6FRUug==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.223.0.tgz",
+      "integrity": "sha512-RYGx6SOT38MfX4Dm8lyEwZ/bEqhl3TZyGFqtFHGTEEgyqPkuqiZPfSSWNmsaf6HAVYKObp7kJUX6w8EeEw332w==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-sdk-sts": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-sdk-sts": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "fast-xml-parser": "4.0.11",
@@ -829,14 +832,14 @@
       }
     },
     "node_modules/@aws-sdk/config-resolver": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.215.0.tgz",
-      "integrity": "sha512-DxX4R+YYLQOtg0qfceKBrjVD4t1mQBG1eb7IVr2QSlckFCX8ztUNymFMuaSEo3938Jyy/NpgfUDpFqPDaSKnng==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.222.0.tgz",
+      "integrity": "sha512-rG/Yh0R+GQe86ofEb24QAjQ19tHb4HMCyCuMZUZCsIdgNmUfcaH21Ug5s7pJrAfEy/F2gwxs+VfBeXKjT0MqSQ==",
       "dependencies": {
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-config-provider": "3.208.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -844,13 +847,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.218.0.tgz",
-      "integrity": "sha512-ndhlPBvnxUgje23TnVw0fkDgTZHh0GVapKSgeEIxmxAy3IVLN15iMs7dCV7LWvb7z1P0cYx9cwvxa0nTrVxjtg==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.223.0.tgz",
+      "integrity": "sha512-x4c1a7Gq0LT+fYSoQ8qt+4Hs1p52zjctZzNHshxb1ZeK4NQBTIMs3s2LRXWX14+5/jk94R8tCuA/as39eCdgtw==",
       "dependencies": {
-        "@aws-sdk/client-cognito-identity": "3.218.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/client-cognito-identity": "3.223.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -858,12 +861,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-env": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.215.0.tgz",
-      "integrity": "sha512-n5G7I7Pxfsn81+tNsSOzspKp9SYai78oRfImsfFY4JLTcWutv7szMgFUbtEzBfUUINHpOxLiO2Lk5yu5K1C7IQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.222.0.tgz",
+      "integrity": "sha512-xV6cmJ9zMi8nWySqBv1ze/EFlzXEfazu3i/T/5MpOufPvuGpXTQ3/PDEbC6mKBtvomoQ0fonc/cZrix7YcJV0Q==",
       "dependencies": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -871,14 +874,14 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-imds": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.215.0.tgz",
-      "integrity": "sha512-/4FUUR6u9gkNfxB6mEwBr0kk0myIkrDcXbAocWN3fPd/t7otzxpx/JqPZXgM6kcVP7M4T/QT75l1E1RRHLWCCQ==",
-      "dependencies": {
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.222.0.tgz",
+      "integrity": "sha512-n090ouw5AFhb0EfzRElUTmqCNOQ1zjlxau30oVM7+qKtXH85hEGMQOoRQAl9ch/pXcbjKLh1mbUhmonR97/Kvw==",
+      "dependencies": {
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -886,17 +889,17 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.218.0.tgz",
-      "integrity": "sha512-tDDrGW+4A+PQThVJ+l9ee03CsDoD0XLpOB5dcf+dr/dCHjcQ7x/CeVFZ8eM+XUtGQnZVvuzXZGwzS8bUWEdJIg==",
-      "dependencies": {
-        "@aws-sdk/credential-provider-env": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/credential-provider-sso": "3.218.0",
-        "@aws-sdk/credential-provider-web-identity": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.223.0.tgz",
+      "integrity": "sha512-+jB0XIqAw7Cni1uqPV6SMQl7FlpUVELdHVnR+DYL3WOV4MJ4amTu9MAXrpvbEXbK3+7eFQ2/tDe+7i8qGXZFTw==",
+      "dependencies": {
+        "@aws-sdk/credential-provider-env": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/credential-provider-sso": "3.223.0",
+        "@aws-sdk/credential-provider-web-identity": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -904,19 +907,19 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.218.0.tgz",
-      "integrity": "sha512-J9PB6XFA+V0mgxleuY5W6Jjh5WejV8HjMViTJQpp2JN+NWZP3bGvquUSQHRqWGRGg2fSJy6Z/J4zQ8fpPbGsdQ==",
-      "dependencies": {
-        "@aws-sdk/credential-provider-env": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/credential-provider-ini": "3.218.0",
-        "@aws-sdk/credential-provider-process": "3.215.0",
-        "@aws-sdk/credential-provider-sso": "3.218.0",
-        "@aws-sdk/credential-provider-web-identity": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.223.0.tgz",
+      "integrity": "sha512-mvY96yX4xQ9/Aujr0HqMXhdToiEKg7fFUoN+NgV3yB/hj2q1Ry3j8WbiIfAcBvFLjNwHT7ae/8nVRHYYlNeXFw==",
+      "dependencies": {
+        "@aws-sdk/credential-provider-env": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/credential-provider-ini": "3.223.0",
+        "@aws-sdk/credential-provider-process": "3.222.0",
+        "@aws-sdk/credential-provider-sso": "3.223.0",
+        "@aws-sdk/credential-provider-web-identity": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -924,13 +927,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-process": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.215.0.tgz",
-      "integrity": "sha512-JNvj4L5B7W8byoFdfn/8Y4scoPiwCi+Ha/fRsFCrdSC7C+snDuxM/oQj33HI8DpKY1cjuigzEnpnxiNWaA09EA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.222.0.tgz",
+      "integrity": "sha512-IgEk8Tne1b2v2k/wVjuddKi+HEAFJWUoEcvLCnYRdlVX5l+Nnatw8vGYb+gTi9X7nKNqEGfMbifKCFoePKjC0Q==",
       "dependencies": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -938,15 +941,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.218.0.tgz",
-      "integrity": "sha512-HecWvmxD+xffmY8G4SfLRfCOgSoLFki45wOOU8ESgRM9fQp2+3CfRSyiThKZI5PTmE+xhPTRvmR61HUmQjEv8w==",
-      "dependencies": {
-        "@aws-sdk/client-sso": "3.218.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/token-providers": "3.216.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.223.0.tgz",
+      "integrity": "sha512-sRxH6fhLYME+EIiHRqIzkUgPaAvc5+dV8+09jEZ1yBjum9AQycipXrbbDRNLXWJZJZTA/BsHfUpAScFOjyZf7A==",
+      "dependencies": {
+        "@aws-sdk/client-sso": "3.223.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/token-providers": "3.223.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -954,12 +957,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-web-identity": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.215.0.tgz",
-      "integrity": "sha512-AWaDDEE3VU1HeLrXvyUrkQ6Wb3PQij5bvvrMil9L0da3b1yrcpoDanQQy7wBFBXcZIVmcmSFe5MMA/nyh2Le4g==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.222.0.tgz",
+      "integrity": "sha512-dImqTEWt38nVcDe/wQqHWJ+R2zyNqVKwejfslgbH2YilUnDU43xq2KJhNe4s+YhCB6tHOTkbNnpZo7vPV5Zxog==",
       "dependencies": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -967,24 +970,24 @@
       }
     },
     "node_modules/@aws-sdk/credential-providers": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.218.0.tgz",
-      "integrity": "sha512-MWpb5k+Oq56NrHA5fYPIDX8QRYUAw4Jp8ErTELBd83kLhTgqTw025YQ05YbhIzAs84+viMeWKif0z/5kNshphw==",
-      "dependencies": {
-        "@aws-sdk/client-cognito-identity": "3.218.0",
-        "@aws-sdk/client-sso": "3.218.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/credential-provider-cognito-identity": "3.218.0",
-        "@aws-sdk/credential-provider-env": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/credential-provider-ini": "3.218.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/credential-provider-process": "3.215.0",
-        "@aws-sdk/credential-provider-sso": "3.218.0",
-        "@aws-sdk/credential-provider-web-identity": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.223.0.tgz",
+      "integrity": "sha512-oX9WTF7A579T8TT+3roU5CXkGHLSdb6MVy5COh/DH+aBTpgwBvhGzsgiefYoB04gyPx1f2Q9ju7qtCcKnm0eRw==",
+      "dependencies": {
+        "@aws-sdk/client-cognito-identity": "3.223.0",
+        "@aws-sdk/client-sso": "3.223.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/credential-provider-cognito-identity": "3.223.0",
+        "@aws-sdk/credential-provider-env": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/credential-provider-ini": "3.223.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/credential-provider-process": "3.222.0",
+        "@aws-sdk/credential-provider-sso": "3.223.0",
+        "@aws-sdk/credential-provider-web-identity": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -992,23 +995,23 @@
       }
     },
     "node_modules/@aws-sdk/eventstream-codec": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.215.0.tgz",
-      "integrity": "sha512-Uwgkq6ViQnfd1l+qhWPGdzxh+YhD1N6RYL0kEcp1ovsR+rC/0qUsM9VZrSckZn4jB+0ATqIoOXtcUYP4+xrNmg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.222.0.tgz",
+      "integrity": "sha512-sxLpo3NYrvj8CnTkpLsb2uXvUU8jnAG5q22HIBxBrpeFzgvUA9uIfPD7yPZhe4+/C7v+ER19ysXetKjiAOrQMA==",
       "dependencies": {
         "@aws-crypto/crc32": "2.0.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-hex-encoding": "3.201.0",
         "tslib": "^2.3.1"
       }
     },
     "node_modules/@aws-sdk/eventstream-serde-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.215.0.tgz",
-      "integrity": "sha512-VfTl69/C/cOjm47blgvdBz2pw8//6qkLPvQetfDOgf40JvsjBp9afUDNiKV08ulzoUeVZBosgHs09oZ2VDj09Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.222.0.tgz",
+      "integrity": "sha512-owwgmkpuLM7UtNPRZjvCOp5fo6MKY8avygQA0VMsbQSCq1DJFpmDsk7yTRB+n7jQuoDGn8uVxER3S0oS/Y/xVQ==",
       "dependencies": {
-        "@aws-sdk/eventstream-serde-universal": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/eventstream-serde-universal": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1016,11 +1019,11 @@
       }
     },
     "node_modules/@aws-sdk/eventstream-serde-config-resolver": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.215.0.tgz",
-      "integrity": "sha512-NrVb8HA0tUsruAj8yVWTaRIfcAB9lsajzksCqS7W917x/esoIRwoeF2zua63Ivro7hLeCjzS2Mws5IhvSl+/tQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.222.0.tgz",
+      "integrity": "sha512-zb8vMSbBEjUrHKpA2bZdAqfYp8oCsWgeBPOt0XJx+y6lzy67zyADs97Grl+lyZAoswao/zc2sxgm9yqcMDt7lQ==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1028,12 +1031,12 @@
       }
     },
     "node_modules/@aws-sdk/eventstream-serde-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.215.0.tgz",
-      "integrity": "sha512-DxABFUIpmFV1NOfwF8FtX+l7kzmMTTJf2BfXvGoYemmBtv9Cc31Qg83ouD8xuNSx9qlbFOgpWaNpzEZ400porA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.222.0.tgz",
+      "integrity": "sha512-rfDrTxcsYL0ZKc5MnoqbDTa0oQFiK7qTJOnQ7sASooexqoKTn3wVq68J7TZddbImmH/ENpkU+O0hcGuiwE9Ucg==",
       "dependencies": {
-        "@aws-sdk/eventstream-serde-universal": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/eventstream-serde-universal": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1041,12 +1044,12 @@
       }
     },
     "node_modules/@aws-sdk/eventstream-serde-universal": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.215.0.tgz",
-      "integrity": "sha512-8DmY3vVZtXAKzW0wOSC0bN+WF8qNZKaCqe5JCM3WwS1Wu6F6qI7b064VSe5b3d9BbJzeMccOcJeCg3ZU/3nYUQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.222.0.tgz",
+      "integrity": "sha512-+/Fc7+ZPuD6SwphYcuLJ/GU0RmVzG/M0dUYs1JL/JQJ8dkJ0AlH1fH3L5Fhm2RO/ACkE28kXAuyZ40TLeRLRNA==",
       "dependencies": {
-        "@aws-sdk/eventstream-codec": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/eventstream-codec": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1054,34 +1057,34 @@
       }
     },
     "node_modules/@aws-sdk/fetch-http-handler": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.215.0.tgz",
-      "integrity": "sha512-JfZyrJOE+0ik1PumsIUZd0NfgEx4sZ43VSdPCD9GRhssRWudNsSF1B5fz3xA5v+1y5oQPjXZyaWCzKtnYruiWw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.222.0.tgz",
+      "integrity": "sha512-0PWnOp47mNfwBFEZhuBpz5A+66jbvb2ySidnM5vWHRxu5yN7rCJEdEMSJKDzR6nH3GLZ9dHoOxTzQy21NoDTtA==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/querystring-builder": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/querystring-builder": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "node_modules/@aws-sdk/hash-blob-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.215.0.tgz",
-      "integrity": "sha512-plHPFOSEHig0g/ou1H4QW31AyPGzwR0qgUKIEUFf3lWIfBI3BnvA4t24cJ87I204oqENj/+ZSNAj5qeAZfMFXw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.222.0.tgz",
+      "integrity": "sha512-Z6y3JZPNp+os9vZdvsNkM6mIjDzeZNr9MYkQslANhGZ9WgQrzuI7xZN6XAyR83OGRCrDCorZdX+nnl5mzY1VwQ==",
       "dependencies": {
         "@aws-sdk/chunked-blob-reader": "3.188.0",
         "@aws-sdk/chunked-blob-reader-native": "3.208.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "node_modules/@aws-sdk/hash-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.215.0.tgz",
-      "integrity": "sha512-MkSRuZvo1RCRmI0VNEmRYCGGD/DkMd9lqnLtOyglMPnSX1mhyD4/DyXmcc3rYa7PsjDRAfykGWJRiMqpoMLjiQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.222.0.tgz",
+      "integrity": "sha512-Fw0acblG0LQT9tfD2/4j98QHNq+Crotig/M1/zPDcVoGb8OBHd2442zpeA0fYYjGnGGhy9psRHdJrjZGj1vDUw==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-buffer-from": "3.208.0",
         "tslib": "^2.3.1"
       },
@@ -1090,11 +1093,11 @@
       }
     },
     "node_modules/@aws-sdk/hash-stream-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.215.0.tgz",
-      "integrity": "sha512-1VEpiXu0jH7bSRYfEeSrznYq41zpUV4TtStoBXdcEVaOqT4LNQ5k1g1602544UWKUJ7D+E9NCNXpjM6TSMmG4A==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.222.0.tgz",
+      "integrity": "sha512-PO/N0PsgJjRiH9WKSOnGjDP9tWNjwSvUezicT8ItWgkk7npd278MAe7G692TLACgf6sJr2jGQbs6xzZHq0/3Zg==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1102,11 +1105,11 @@
       }
     },
     "node_modules/@aws-sdk/invalid-dependency": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.215.0.tgz",
-      "integrity": "sha512-++bK4BUQe8/CL/YcLZcQB8qPOhiXxhbuhYzfFS7PNVvW1QOLqKRZL/lKs24gzjcOmw7IhAbCybDZwvu2TM4DAg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.222.0.tgz",
+      "integrity": "sha512-tWJWWTcL7DrhFiDmPBvLaw2lopHJMsF4Uj52yIQJskwd2IeBOxjl30zLo/oidmk73IFUB7TCObc85zJrtt/KcQ==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -1122,12 +1125,12 @@
       }
     },
     "node_modules/@aws-sdk/lib-storage": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.218.0.tgz",
-      "integrity": "sha512-bXOuQu1At6sL4tKaCGPRShNLXU5BVKC8K4cp+Jvs+YJJlmVgX3Q/7gb7rdJnuUO8Uy79t+R/V6O1aMeD8RSnkA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.223.0.tgz",
+      "integrity": "sha512-MZmXUemwHyItiZ0Nm/gg47QWYcd04fk2o4+MFziX38kjM2F3lIA+4aSBX78z5Bkrnpd0xdMh0Tl4TmwHYfmsrg==",
       "dependencies": {
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
         "buffer": "5.6.0",
         "events": "3.3.0",
         "stream-browserify": "3.0.0",
@@ -1142,23 +1145,23 @@
       }
     },
     "node_modules/@aws-sdk/md5-js": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.215.0.tgz",
-      "integrity": "sha512-2f5r2raNDG9USKHKRgAW2r1MzCrkemLASlDXASgAuAD3gYGURVi4ZDhI3I1GECY5dPEgGC+3B2rkEb9MfQAaEg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.222.0.tgz",
+      "integrity": "sha512-LI44dy+ECCL+vsIYJ/Ot4rNOl3Vpa4Nv8zxireKcQGmn547Cb6i3n/bEi/DkcfgHv6R84qOtOXsxt/ILuWNQ/g==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "node_modules/@aws-sdk/middleware-bucket-endpoint": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.215.0.tgz",
-      "integrity": "sha512-zMeYrnHX8S9VFDPH3fryXdPXW1DWeX9URKAkU1oxZLGpBX91CsWzUDjaMhbkDgvwO2oeKgjnZ2vCwcNNKP266w==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.222.0.tgz",
+      "integrity": "sha512-TP4mjEWsQ/JsACAFDUlltl/0sAe5dxqdhBDAPO6LHRHvROz2oYVjZwvcaK4F9x8QLWh09H0Sw501SndFK2+o3w==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-arn-parser": "3.208.0",
         "@aws-sdk/util-config-provider": "3.208.0",
         "tslib": "^2.3.1"
@@ -1168,12 +1171,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-content-length": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.215.0.tgz",
-      "integrity": "sha512-zKJRb6jDLFl9nl/muSFbiQHA4uK3skinuDRcyLbpMvvzhuK/PVodv9QI1+wIUsFdXkaSxAlva1oG4bL8ZFi+sQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.222.0.tgz",
+      "integrity": "sha512-Wlah+nrPhcq5qcwHiK1ymVRAvcKjV2py2RXhJsNZWgYwphdt5RHaZHPDKoodI27alrDJVyBBQWGzIm/Ag1bypQ==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1181,17 +1184,17 @@
       }
     },
     "node_modules/@aws-sdk/middleware-endpoint": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.215.0.tgz",
-      "integrity": "sha512-W0QXL5emcN9IXtMbnWT/abLxBFH2tGIfnre2jPNmZ9M7uVFxUwwv5OTUXxNLGNehJHKhiJPwhfQvMy20IDzVcw==",
-      "dependencies": {
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.222.0.tgz",
+      "integrity": "sha512-e1bM+CvuUWmBdydQpV5sF8cxZrXQ++0G5s1M7pLimKdWXQvCQ1ZEwA3LLi2IWomXmS9a3BaH3iKAf87RTWjIXw==",
+      "dependencies": {
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-config-provider": "3.208.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1199,12 +1202,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-expect-continue": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.215.0.tgz",
-      "integrity": "sha512-X2G7MnBSYPPmLqqd9xDGl2ik9dUsGYcYzulf2Z1HVEGJO6btZJtPfC+IIwuJjsiCWCgbypM1X/oOSxdrmRkUNQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.222.0.tgz",
+      "integrity": "sha512-/nTCLXrau8jEyehsD7QM49gJQ6kmzQGw7plPDJzdFakfAwb2b/jLJ/Hj/ZSaaLWWEXAtZBiPzVXUJltPDoXv5g==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1212,15 +1215,15 @@
       }
     },
     "node_modules/@aws-sdk/middleware-flexible-checksums": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.215.0.tgz",
-      "integrity": "sha512-fAFcR+QsrGPCgYssdTYmayoCXDKYzlv0a14jaJtZsacXQNGefXly9D856lri+yG2jxqQ6Sa0FzU4Pm7s3j4mvg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.222.0.tgz",
+      "integrity": "sha512-P900+KLMUg0eOf75FK/wH/Gjz3rkNtB6iBfAG2Xg4DY5+78qh40deG0y0ZvtkHQP8YOqjLF3QMbEA90YXo4x9Q==",
       "dependencies": {
         "@aws-crypto/crc32": "2.0.0",
         "@aws-crypto/crc32c": "2.0.0",
         "@aws-sdk/is-array-buffer": "3.201.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1228,12 +1231,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.215.0.tgz",
-      "integrity": "sha512-GOqI7VwoENZwn+6tIMrrJ4SipIqL2JCh+BNvORVcy7CQxn1ViKkna7iaCx+QMjpg/kn9cR6kfY0n1FmgZR1w9A==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.222.0.tgz",
+      "integrity": "sha512-R4STwHkWgdxMRqOy6riYfXepsQURR5YhK6psPFZHkBYByIRc9JxJdLA0qZcfLRriQIAGmqEO2WWsqRmr8nkbBw==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1241,11 +1244,11 @@
       }
     },
     "node_modules/@aws-sdk/middleware-location-constraint": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.215.0.tgz",
-      "integrity": "sha512-taDOIGv2rsAyDEJxSm/nhKS4nsBPUKKCvIpK26E7uGshQZFLtTLTJMp8zGb1IBfUSxRngdWljRmOS5AJUexNbQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.222.0.tgz",
+      "integrity": "sha512-srrAkOHuvpXeaMG9a6kvfYrhzFFX/plBaZATy8iW6ethgvG1qdPeFj4ZVS9Eisx+13NbGFtydc1WkBZfx2nUWg==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1253,11 +1256,11 @@
       }
     },
     "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.215.0.tgz",
-      "integrity": "sha512-0h4GGF0rV3jnY3jxmcAWsOdqHCYf25s0biSjmgTei+l/5S+geOGrovRPCNep0LLg0i9D8bkZsXISojilETbf+g==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.222.0.tgz",
+      "integrity": "sha512-eAxGCcNXl1APMOFbkUaAC6pNBPUbajyGqsDf6GLdlrYHrMVAtJdYd988ov6C52h7k6iDZ+OPHwv8dwUz+PRfpw==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1265,12 +1268,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.215.0.tgz",
-      "integrity": "sha512-KQ+kiEsaluM4i6opjusUukxY78+UhfR7vzXHDkzZK/GplQ1hY0B+rwVO1eaULmlnmf3FK+Wd6lwrPV7xS2W+EA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.222.0.tgz",
+      "integrity": "sha512-4JRVs7y5JDXXjc5fkz0FCZJt/0HTP2vh3QyZsWRbCYesw2cWVqQlp/fUXp8w5KGqm5nYkTF4e5SQ7Ca8powJNA==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1278,14 +1281,14 @@
       }
     },
     "node_modules/@aws-sdk/middleware-retry": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.215.0.tgz",
-      "integrity": "sha512-I/dnUPVg2Kp3lW+MywBoPp06EOng8IfuaS9ph4bcJpQKrhNU5ekRgCHH2C4k1A6GcP8uyHxQ5TVV6j+l0QPIsA==",
-      "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/service-error-classification": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.222.0.tgz",
+      "integrity": "sha512-8FZpGuJDtntjXZ/mfJ9EdP5mYiUunQHEmk6OERk3h4XW3D/e97denwDAcBBIK8iYYGic5PoWF4KgTFJWs1YOcw==",
+      "dependencies": {
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/service-error-classification": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1",
         "uuid": "^8.3.2"
       },
@@ -1294,13 +1297,13 @@
       }
     },
     "node_modules/@aws-sdk/middleware-sdk-s3": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.215.0.tgz",
-      "integrity": "sha512-+SM+xCIFNSFIKM9KyvgIu4Ah5Z/SbHS8mDkinHkY8X/iUryrsKKBs7xnpMAaJCTFkK/8gO6Lhdda1nbvGozhdA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.222.0.tgz",
+      "integrity": "sha512-GCgbzWy3Dn9+dz/ZZjS5OiJ+feighHfMt461r1zjHNUXnb2tEf5kU+P80d3WqG8er4RRQg+Ao49SatOKgPcrlA==",
       "dependencies": {
-        "@aws-sdk/middleware-bucket-endpoint": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/middleware-bucket-endpoint": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-arn-parser": "3.208.0",
         "tslib": "^2.3.1"
       },
@@ -1309,15 +1312,15 @@
       }
     },
     "node_modules/@aws-sdk/middleware-sdk-sts": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.215.0.tgz",
-      "integrity": "sha512-wJRxoDf+2egbRgochaQL8+zzADx8FM/2W0spKNj8x+t/3iqw70QwxCfuEKW/uFQ3ph6eaIrv7gYc8RRjwhD8rg==",
-      "dependencies": {
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.222.0.tgz",
+      "integrity": "sha512-YbL4lTBFgqyL2Ob+dMyw/UNd5K9IOnZHHxjpwWlYKMrfT+pp2bvrr7XUbRHnxSoDsOg9bf6IyTSRVnVxP4psJg==",
+      "dependencies": {
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1325,11 +1328,11 @@
       }
     },
     "node_modules/@aws-sdk/middleware-serde": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.215.0.tgz",
-      "integrity": "sha512-+uhLXdKvvQZcRRFc3UmemSr/YUHA4Jc+1YMjHxc3v8vvfztFJBb0wgBx999myOi8PmkYThlRBQDzXy9UCIhIJw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.222.0.tgz",
+      "integrity": "sha512-UoeLbgCJB07dX8tRByR0KzZaOwCoIyXj/SfFTuOhBUjkpKwqFCam/hofDlK3FR6kvl+xiURv57W/FtKV/9TDHg==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1337,15 +1340,15 @@
       }
     },
     "node_modules/@aws-sdk/middleware-signing": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.215.0.tgz",
-      "integrity": "sha512-3BqzYqkmdPeOxjI8DVQE7Bm7J5QIvDy30abglXqrDg6npw6KonKI2Q3FIPFf+oLpZTMStwkoQOnwXHTPrSZ6Tg==",
-      "dependencies": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.222.0.tgz",
+      "integrity": "sha512-MwMw2Lz7SBOniAc0slWXt65ocqL+E956bdW+LOvBin6OgkVWaLRbWI9nOzA6B2d8b65fCGEc+N15i0UdrEf+MQ==",
+      "dependencies": {
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1353,11 +1356,11 @@
       }
     },
     "node_modules/@aws-sdk/middleware-ssec": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.215.0.tgz",
-      "integrity": "sha512-iIiB2fGneR8iZN2tgQoACq1jQlG50zU49cus/jAAKjy6B7QeKXy5Ld8/+eNnzcjLuBzzeLtER2YWwFLWqUOZpw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.222.0.tgz",
+      "integrity": "sha512-WThCx/+UG4gIyqx0G3QKD1RM71+adh9Jv3Sh/KiS07Jjm+pb71wW+RRzBuNyhdjwB3aoKC/YKW8eFQg6M7eaQg==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1365,9 +1368,9 @@
       }
     },
     "node_modules/@aws-sdk/middleware-stack": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.215.0.tgz",
-      "integrity": "sha512-rdSVL7LxRgjlvoluqwODD4ypBy2k/YVl6FrDplyCMSi8m2WHZG99FzdmR9bpnWK+0DGzYZSMRYx6ynJ9N9PsSw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.222.0.tgz",
+      "integrity": "sha512-ASKbstAKbOBUZhFhst6/NCr11x94BDBiQn2zDs2Lvjo89n2efMeb4wEr17VCMZVeKI6ojtPFa1ZVLsH8AOn4Yw==",
       "dependencies": {
         "tslib": "^2.3.1"
       },
@@ -1376,12 +1379,12 @@
       }
     },
     "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.215.0.tgz",
-      "integrity": "sha512-X6GfoMNoEITTw7rGL/gWs8UZ0cmmmezvKcl+KtHsA642R05OR4mY5G7LdbWAw0bcrwKsuKOGmwUrC9lzGqbWUw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.222.0.tgz",
+      "integrity": "sha512-fjdxCRIAhOTsI9OcEKwJp4lhsvyCSXoeYV49mO/bdG6pFyFRm3Jezx7TNVNeLTGuMHTTTvRrCTF8sgE5t17Pzw==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1389,13 +1392,13 @@
       }
     },
     "node_modules/@aws-sdk/node-config-provider": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.215.0.tgz",
-      "integrity": "sha512-notckD94QwwxC0GsfpTxB7VH8SREIIlMsUSddqGtpModa0cq/wRb9rqnydZSoznbYpK1ND6h0C9hr/2PNz89zw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.222.0.tgz",
+      "integrity": "sha512-hrbw90LlVa4xJJc4WiyAfaPMY/sJubSeTwuxTChLsFOavr6hSMCwLASrWmOiKRIj5hKdSfEA87n/q+DnKHlA8A==",
       "dependencies": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1403,14 +1406,14 @@
       }
     },
     "node_modules/@aws-sdk/node-http-handler": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.215.0.tgz",
-      "integrity": "sha512-btKWSR7m0UuWIN3p5MfSIvhqeYik7xri7U6nWuVI5GVzIYjzxEZOMvPAinDLDxL5wipodi0ZvTUNdDJdm7BcGQ==",
-      "dependencies": {
-        "@aws-sdk/abort-controller": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/querystring-builder": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.222.0.tgz",
+      "integrity": "sha512-k3WqxUgZzGbiCQt1HyzDGlRzq8muGIOWZs9T3HtCa5LtACvl0qlNmiwCc+C/o7GRLyC9FuWkP3lOW6MiAFQUcA==",
+      "dependencies": {
+        "@aws-sdk/abort-controller": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/querystring-builder": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1418,11 +1421,11 @@
       }
     },
     "node_modules/@aws-sdk/property-provider": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.215.0.tgz",
-      "integrity": "sha512-dDPjMCCopkRURAmOJCMSlpIQ5BGWCpYj0+FIfZ5qWQs24fn1PAkQHecOiBhJO0ZSVuQy3xcIyWsAp1NE5e+7ug==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.222.0.tgz",
+      "integrity": "sha512-rEqAgQ7itmB7GB+WWLgyT7/YWJkjEBCfggxycccChWAeqg+gjpstIiGX2BjP2K/wnzwE0D91JsozSXcQIDOtNQ==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1430,11 +1433,11 @@
       }
     },
     "node_modules/@aws-sdk/protocol-http": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.215.0.tgz",
-      "integrity": "sha512-qp6Y6v4S534LAjadiVl9p7ErK7ImphOKq6yhFyQwxko6iITLcz8ib3yU27fs4QJcnNj5ZooqW/YlL/0EikDxCQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.222.0.tgz",
+      "integrity": "sha512-Zj+ytEgrOagCE7yczjdDan7W+1a0OL5DPAx69Z00NxGoBI2h0GRZD28dRYb3Pzs5/Ft4KbCedH/RUnyaYjaZxw==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1442,11 +1445,11 @@
       }
     },
     "node_modules/@aws-sdk/querystring-builder": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.215.0.tgz",
-      "integrity": "sha512-eilk8CqG37BVhQklLif00K2dOJgDzacUi8h3KVQ72ry1V3h345i4HsmaFIxvnz8XtNyDvV8qFAzeYg9n2P9RQA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.222.0.tgz",
+      "integrity": "sha512-qrNUGDyDp9yVQMnBbz1T5YBQkA/u6D5o0PPzSwfZ9azdAcBLjHOEfsBrKhxP+K92L/nilbnmY89KrjMR8+BNtw==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-uri-escape": "3.201.0",
         "tslib": "^2.3.1"
       },
@@ -1455,11 +1458,11 @@
       }
     },
     "node_modules/@aws-sdk/querystring-parser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.215.0.tgz",
-      "integrity": "sha512-8h/9H8dWM4fZO27UGzo8W5JXln4yJMugPyUl4qFA437gzPgNFN95+oLJWXtHMlfCHC5T/PDKetY9TarMDgBD0Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.222.0.tgz",
+      "integrity": "sha512-3KfkCA/753PlF5QqhGuQ7u+NOgLyiBFeV8R8ut/pfBmG8fF6l3RKrkbcu+87QpqXntRzG+RLHDqS7ryT3B2ICg==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1467,19 +1470,19 @@
       }
     },
     "node_modules/@aws-sdk/service-error-classification": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.215.0.tgz",
-      "integrity": "sha512-SKBvClGFGzMPsjBBKjneaUazLCNr6bSxe9eFvOr3gCwuwE2jPQwW3VE1mb62howuvm6cLthEDwLQp/FsT1gMsw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.222.0.tgz",
+      "integrity": "sha512-Dn/WGtm+v5nney0CaYZjdOtJmdEuI8EQiQ5J3eQ3G0jjT6mr1/tCajsNpq3ZqHXiwLtydwaVvsL3AKXn+oxFVA==",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@aws-sdk/shared-ini-file-loader": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.215.0.tgz",
-      "integrity": "sha512-unzQeLOyUiYHr8WxxandHo0OaCj31gx0wpt8dn2cZcHm/MdCqHcHcsQqOVnQsWQrrxY/XZ27cPyMVQeicNKYwQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.222.0.tgz",
+      "integrity": "sha512-2dowzMXjvIf5gwX5gNCwpv/TzAbbXxrId3zYJgPdEtApsa7NxyFs5MfnHt1zZI6P3YORGheRnNUK9RUYOPKHgA==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1487,14 +1490,14 @@
       }
     },
     "node_modules/@aws-sdk/signature-v4": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.215.0.tgz",
-      "integrity": "sha512-Rc73uUCi3eJneO25DydLTfJYamXeuKS9YIhNMTKlpvcN1UQAmAnUbAmCuEmqvkYOiGD1i4/kd8kBga708iIikQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.222.0.tgz",
+      "integrity": "sha512-2qQZuKqx56b2uN2rdjdKL6u0Cvk82uTGNtIuetmySY9xPEAljSBdriaxTqNqK9Gs3M4obG22alUK4a85uwqS3g==",
       "dependencies": {
         "@aws-sdk/is-array-buffer": "3.201.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-hex-encoding": "3.201.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "@aws-sdk/util-uri-escape": "3.201.0",
         "tslib": "^2.3.1"
       },
@@ -1503,13 +1506,13 @@
       }
     },
     "node_modules/@aws-sdk/signature-v4-multi-region": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.215.0.tgz",
-      "integrity": "sha512-XOUUNWs6I4vAa+Byj6qL/+DCWA5CjcRyA9sitYy8sNqhLcet8WoYf7vJL2LW1nvdzRb/pGBNWLiQOZ+9sadYeg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.222.0.tgz",
+      "integrity": "sha512-SF6Qi0KW69OzgLbA9q6AsZNFQCA+DI66SnAjW774sAE6aQyJmCbUsxETk37XodSymXzDOEDDC6QoY64HUoSoVw==",
       "dependencies": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-arn-parser": "3.208.0",
         "tslib": "^2.3.1"
       },
@@ -1526,12 +1529,12 @@
       }
     },
     "node_modules/@aws-sdk/smithy-client": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.215.0.tgz",
-      "integrity": "sha512-PiZfCdZkPohzMPrRmJ46TPOf2Tr/dhKYdwQArRnOOIsJABUGXjlzCUE8vysDN35XZYRx5f9hd+/U7kayhniq2w==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.222.0.tgz",
+      "integrity": "sha512-4dnU7TvwKxVuOWduvFGClYe0EgNov5Ke1ef7O1bdKaj5MmlH6wBDgGJM4NKREBFapC2dUXkoPtwsihtYBci1Bw==",
       "dependencies": {
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1539,14 +1542,14 @@
       }
     },
     "node_modules/@aws-sdk/token-providers": {
-      "version": "3.216.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.216.0.tgz",
-      "integrity": "sha512-cEmOfG7njWl0OA5lR65Sp2SW1i8ZLjf7C95TZ1e6t2Oo5aUFeN3aKBxMOV//1yc+BNzcFBnoHP/f29GhWxUOxA==",
-      "dependencies": {
-        "@aws-sdk/client-sso-oidc": "3.216.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.223.0.tgz",
+      "integrity": "sha512-ik6IYiZO9tTzYPJKzUob4U9faC9We6UtVZGynEGLMWSLETM+LefSHK0elEaJaCqx2F4NLodw+t9uvllR+8YUow==",
+      "dependencies": {
+        "@aws-sdk/client-sso-oidc": "3.223.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1554,20 +1557,20 @@
       }
     },
     "node_modules/@aws-sdk/types": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.215.0.tgz",
-      "integrity": "sha512-eRbCVjwzTYd9C5e2mceScJ6D2kYDDEC3PLkYfJa+1wH9iiF2JlbiYozAokyeYBHQ+AjmD93MK58RBoM8iZfH0Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.222.0.tgz",
+      "integrity": "sha512-yXRYptInkfEFaOvWFxlRXsRh9jWOmQc1sZeKqjfx2UCtzNJ7ebedN0VfCz4SaDotcw9Q4JWuN66qhRMJjDx7/w==",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@aws-sdk/url-parser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.215.0.tgz",
-      "integrity": "sha512-r/qIk3TUlV36JvoRjTErFm0LzzgNKLB1YUG8zVZCGAc2TEATi8OVEmsZvi+KfTmsbszulITJVcjZKbHLbGoUzg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.222.0.tgz",
+      "integrity": "sha512-1+QbVdT/phYDb5JDQRJWoZeCujkXaI5m8z3bIiPxcRRY3NPuluDGrfX3kfnFen5s9QGByLvJxWKWZS+i+iUFRg==",
       "dependencies": {
-        "@aws-sdk/querystring-parser": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/querystring-parser": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -1637,12 +1640,12 @@
       }
     },
     "node_modules/@aws-sdk/util-defaults-mode-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.215.0.tgz",
-      "integrity": "sha512-MiNfZgB0I4dR8CBxH163W7c9KvE38sgCHNPWopMqSX5ezz7cuCPohCU0XsWd4I7K31PvzuqmKgOiKBAZraQJMA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.222.0.tgz",
+      "integrity": "sha512-+dGsp59lrEkDmK7OO5ecMYasrTGIKacFHjqZ6aqmbn1xtcUd/o3Qe7g5YSRXMGwtZ6xhvBD+NJLkEERI7U7cMw==",
       "dependencies": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "bowser": "^2.11.0",
         "tslib": "^2.3.1"
       },
@@ -1651,15 +1654,15 @@
       }
     },
     "node_modules/@aws-sdk/util-defaults-mode-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.215.0.tgz",
-      "integrity": "sha512-mSp3R8GljQ+4UT3QMOksQk9L0cWbFLvR7bBmAlt4+GobgTjpRfzFjBP3uwrCqFa3BKDUR3FeJq3qwo+xeY1Krg==",
-      "dependencies": {
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.222.0.tgz",
+      "integrity": "sha512-W/duYMtmCCWdzHP+yscBB6yrARgAqWpFdxgBvMSlT8TjOTrh/F+aj4NPamiNMeUfqfMFGnboYfyWRr1avkcAGQ==",
+      "dependencies": {
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1667,11 +1670,11 @@
       }
     },
     "node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.216.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.216.0.tgz",
-      "integrity": "sha512-uHje4H6Qj/z/op8UZoSuvGpEZhz/r+AGY0rCihFo7XjhT4RYVxb2Eb9uHRK/IAeHU4kjHAdpQiWGMSmnT/UacA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.222.0.tgz",
+      "integrity": "sha512-qujJQv8lFysAr1lOlBTJhz7949NZyq5cj74Q9dR99AcAMXXeI9CQayPKH7477AnXRGOTMahZ3mV0HZ1bCJoNTw==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1701,9 +1704,9 @@
       }
     },
     "node_modules/@aws-sdk/util-middleware": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.215.0.tgz",
-      "integrity": "sha512-DfHGlFlQCr+T/xhjS36HH8JEThDVB5lg5NZ6x4Cibhyeps9YX/4ovLAIx3B19H34sdWhZi7q6LfslCHLRu2+7Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.222.0.tgz",
+      "integrity": "sha512-Y4BPtSa+6+qvg6OVW6RrdDx0OADfWa2Uxsxqdozpdnx2OQY0q+1diqsNgFMV+FIvdXqffE147KG7roG+/AfPeA==",
       "dependencies": {
         "tslib": "^2.3.1"
       },
@@ -1712,12 +1715,12 @@
       }
     },
     "node_modules/@aws-sdk/util-stream-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.215.0.tgz",
-      "integrity": "sha512-UVyCJJ5sCYLVHCW4Lpm8+ae+ISHPHZ/OqAoLbUpehk2RLGP6QhpQOrpJADLXPuB8YuWFMkoLLIVL8VE7mmTPWA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.222.0.tgz",
+      "integrity": "sha512-GW9Y1/pLHS7WYHHdswcDd4vaM9mzxDwewcDVujCd/L9MRbG1nA/wfCL7hAAXT1AN2GbGfbfT+jjHQqzexpKBnA==",
       "dependencies": {
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-hex-encoding": "3.201.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
@@ -1725,12 +1728,12 @@
       }
     },
     "node_modules/@aws-sdk/util-stream-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.215.0.tgz",
-      "integrity": "sha512-7Vyp61P/2dGA9Fzn6uN/KdRd+Z7n8gCGmXBd/dQSrHx3UFIm1TuEmMwROzbWWxPOS6qDWY/dwQgMZH/tq78Llg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.222.0.tgz",
+      "integrity": "sha512-iMwKG+RaGVAjzXDuzmMl63SnN6qVc+0VbbfaKW1eIK9Ihr5mko3GuYAFqKaECSQ+XdMNuMSVXzphveKw6t2zwg==",
       "dependencies": {
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-buffer-from": "3.208.0",
         "tslib": "^2.3.1"
       },
@@ -1750,22 +1753,22 @@
       }
     },
     "node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.215.0.tgz",
-      "integrity": "sha512-uZz6BJWr8sJcA+onveS1lFqnbIXBHwvkyHLgCuuGhAxd5yY6YNLhpJBnhy9Fb8/aSbk6yao3qxlokqw9gthmAw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.222.0.tgz",
+      "integrity": "sha512-DREMeL0XHl4QIS2GVSHFwVH4mJZ+Dr04R3U8WfiMktXdA93j5tDMJpU3+PNaCZPeaqz2QNwrVSBWKwbwA357zQ==",
       "dependencies": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "bowser": "^2.11.0",
         "tslib": "^2.3.1"
       }
     },
     "node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.215.0.tgz",
-      "integrity": "sha512-4lrdd1oGRwJEwfvgvg1jcJ2O0bwElsvtiqZfTRHN6MNTFUqsKl0xHlgFChQsz3Hfrc1niWtZCmbqQKGdO5ARpw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.222.0.tgz",
+      "integrity": "sha512-BMRMrPXL/HS3dSha9vcABkoANluKjB0pH78bc659EY2WUj9wCZdbUNQpACiYx8bwm7xKSxugCkmPd6NLWXUURw==",
       "dependencies": {
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -1801,12 +1804,12 @@
       }
     },
     "node_modules/@aws-sdk/util-waiter": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.215.0.tgz",
-      "integrity": "sha512-RX/EkRcuDjWKP/5K6XOnbq5cPaO9KSJ5Etotn+z5sPGUJ0xmGWEyFyfXKSL51az32tHcNoGAqboBTFDISB0LyA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.222.0.tgz",
+      "integrity": "sha512-/07RkfxvDncsMeQ+GhigPdiSRd2v/1FJoCV4a5e9XDI1ZSMvUKm36wFqw5Bzts+AUY8f4HOPpGI9ZQeNb7u27Q==",
       "dependencies": {
-        "@aws-sdk/abort-controller": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/abort-controller": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       },
       "engines": {
@@ -2549,6 +2552,10 @@
       "resolved": "common/ethers-trezor-signer",
       "link": true
     },
+    "node_modules/@casimir/exchange": {
+      "resolved": "common/exchange",
+      "link": true
+    },
     "node_modules/@casimir/hardhat-helpers": {
       "resolved": "common/hardhat-helpers",
       "link": true
@@ -3061,9 +3068,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.16.tgz",
-      "integrity": "sha512-nyB6CH++2mSgx3GbnrJsZSxzne5K0HMyNIWafDHqYy7IwxFc4fd/CgHVZXr8Eh+Q3KbIAcAe3vGyqIPhGblvMQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
       "cpu": [
         "arm"
       ],
@@ -3077,9 +3084,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.16.tgz",
-      "integrity": "sha512-SDLfP1uoB0HZ14CdVYgagllgrG7Mdxhkt4jDJOKl/MldKrkQ6vDJMZKl2+5XsEY/Lzz37fjgLQoJBGuAw/x8kQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
       "cpu": [
         "loong64"
       ],
@@ -4876,9 +4883,9 @@
       }
     },
     "node_modules/@ledgerhq/hw-app-eth/node_modules/bignumber.js": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-      "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
       "engines": {
         "node": "*"
       }
@@ -5013,9 +5020,9 @@
       ]
     },
     "node_modules/@noble/hashes": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.3.tgz",
-      "integrity": "sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.4.tgz",
+      "integrity": "sha512-+PYsVPrTSqtVjatKt2A/Proukn2Yrz61OBThOCKErc5w2/r1Fh37vbDv0Eah7pyNltrmacjwTvdw3JoR+WE4TA==",
       "funding": [
         {
           "type": "individual",
@@ -6291,9 +6298,9 @@
       }
     },
     "node_modules/@solana/web3.js": {
-      "version": "1.67.2",
-      "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-1.67.2.tgz",
-      "integrity": "sha512-qfdV0m/qcTpoJsIwonvXJQz8YY5mrSfBVLS/Cp+MPaaUzDzkpSV7WU1QeHsj+dkHX82W37zuhhg/DadRJls7+g==",
+      "version": "1.69.0",
+      "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-1.69.0.tgz",
+      "integrity": "sha512-iU2Q0IG25RITsxBkY1Vkk74LffRokViEcSblz4CGxyt+/V7xSkC2DNM0n0rB3aY/9+FvMiz4l5wHnD9UC4Ac/w==",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@noble/ed25519": "^1.7.0",
@@ -6385,9 +6392,9 @@
       }
     },
     "node_modules/@trezor/blockchain-link/node_modules/bignumber.js": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-      "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
       "engines": {
         "node": "*"
       }
@@ -6429,9 +6436,9 @@
       }
     },
     "node_modules/@trezor/connect/node_modules/bignumber.js": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-      "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
       "engines": {
         "node": "*"
       }
@@ -6707,10 +6714,13 @@
       }
     },
     "node_modules/@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
-      "dev": true
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/debug": {
       "version": "4.1.7",
@@ -7141,14 +7151,14 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.45.0.tgz",
-      "integrity": "sha512-CXXHNlf0oL+Yg021cxgOdMHNTXD17rHkq7iW6RFHoybdFgQBjU3yIXhhcPpGwr1CjZlo6ET8C6tzX5juQoXeGA==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.45.1.tgz",
+      "integrity": "sha512-cOizjPlKEh0bXdFrBLTrI/J6B/QMlhwE9auOov53tgB+qMukH6/h8YAK/qw+QJGct/PTbdh2lytGyipxCcEtAw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.45.0",
-        "@typescript-eslint/type-utils": "5.45.0",
-        "@typescript-eslint/utils": "5.45.0",
+        "@typescript-eslint/scope-manager": "5.45.1",
+        "@typescript-eslint/type-utils": "5.45.1",
+        "@typescript-eslint/utils": "5.45.1",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
         "natural-compare-lite": "^1.4.0",
@@ -7281,14 +7291,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.45.0.tgz",
-      "integrity": "sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.45.1.tgz",
+      "integrity": "sha512-JQ3Ep8bEOXu16q0ztsatp/iQfDCtvap7sp/DKo7DWltUquj5AfCOpX2zSzJ8YkAVnrQNqQ5R62PBz2UtrfmCkA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.45.0",
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/typescript-estree": "5.45.0",
+        "@typescript-eslint/scope-manager": "5.45.1",
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/typescript-estree": "5.45.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -7308,13 +7318,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz",
-      "integrity": "sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.45.1.tgz",
+      "integrity": "sha512-D6fCileR6Iai7E35Eb4Kp+k0iW7F1wxXYrOhX/3dywsOJpJAQ20Fwgcf+P/TDtvQ7zcsWsrJaglaQWDhOMsspQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/visitor-keys": "5.45.0"
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/visitor-keys": "5.45.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7325,13 +7335,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.45.0.tgz",
-      "integrity": "sha512-DY7BXVFSIGRGFZ574hTEyLPRiQIvI/9oGcN8t1A7f6zIs6ftbrU0nhyV26ZW//6f85avkwrLag424n+fkuoJ1Q==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.45.1.tgz",
+      "integrity": "sha512-aosxFa+0CoYgYEl3aptLe1svP910DJq68nwEJzyQcrtRhC4BN0tJAvZGAe+D0tzjJmFXe+h4leSsiZhwBa2vrA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.45.0",
-        "@typescript-eslint/utils": "5.45.0",
+        "@typescript-eslint/typescript-estree": "5.45.1",
+        "@typescript-eslint/utils": "5.45.1",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -7352,9 +7362,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
-      "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.1.tgz",
+      "integrity": "sha512-HEW3U0E5dLjUT+nk7b4lLbOherS1U4ap+b9pfu2oGsW3oPu7genRaY9dDv3nMczC1rbnRY2W/D7SN05wYoGImg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7365,13 +7375,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
-      "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.1.tgz",
+      "integrity": "sha512-76NZpmpCzWVrrb0XmYEpbwOz/FENBi+5W7ipVXAsG3OoFrQKJMiaqsBMbvGRyLtPotGqUfcY7Ur8j0dksDJDng==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/visitor-keys": "5.45.0",
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/visitor-keys": "5.45.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -7392,16 +7402,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.45.0.tgz",
-      "integrity": "sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.45.1.tgz",
+      "integrity": "sha512-rlbC5VZz68+yjAzQBc4I7KDYVzWG2X/OrqoZrMahYq3u8FFtmQYc+9rovo/7wlJH5kugJ+jQXV5pJMnofGmPRw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.45.0",
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/typescript-estree": "5.45.0",
+        "@typescript-eslint/scope-manager": "5.45.1",
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/typescript-estree": "5.45.1",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -7418,12 +7428,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
-      "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.1.tgz",
+      "integrity": "sha512-cy9ln+6rmthYWjH9fmx+5FU/JDpjQb586++x2FZlveq7GdGuLLW9a2Jcst2TGekH82bXpfmRNSwP9tyEs6RjvQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
+        "@typescript-eslint/types": "5.45.1",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -8164,49 +8174,6 @@
         "string-width": "^2.0.0"
       }
     },
-    "node_modules/ansi-align/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
@@ -9392,15 +9359,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/boxen/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/boxen/node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -9469,40 +9427,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/boxen/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/boxen/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/boxen/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/boxen/node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -9922,9 +9846,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001435",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001435.tgz",
-      "integrity": "sha512-kdCkUTjR+v4YAJelyiDTqiu82BDr4W4CP5sgTA0ZBmqn30XfS2ZghPLMowik9TPhS+psWJiUNxsqLyurDbmutA==",
+      "version": "1.0.30001436",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz",
+      "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==",
       "funding": [
         {
           "type": "opencollective",
@@ -10348,67 +10272,70 @@
         "colors": "^1.1.2"
       }
     },
-    "node_modules/cli-table3/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+    "node_modules/cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
-      "peer": true,
+      "dependencies": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cli-table3/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
-      "peer": true,
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cli-table3/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "node": ">=12"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/cli-table3/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dev": true,
       "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/cli-width": {
@@ -10428,12 +10355,6 @@
         "wrap-ansi": "^6.2.0"
       }
     },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/cliui/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -10901,9 +10822,9 @@
       "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "node_modules/constructs": {
-      "version": "10.1.176",
-      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.176.tgz",
-      "integrity": "sha512-1+fQUc9AcJImVlRfyC0lAAhB4coAqvV+M7ZqfCX/8FLq2X1xuY1eDhlR2MHB6h1ndkyrPHqpbQaxoJhoQzLb8w==",
+      "version": "10.1.180",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.180.tgz",
+      "integrity": "sha512-jMT+GN3es3hUFtFq4o9vts8sJ2kr9ShyobQ0jjvrNhLU/MIb6PUZPni0XQGwS8O9nXXX+0hAU/tzQl/Ft+hCOQ==",
       "engines": {
         "node": ">= 14.17.0"
       }
@@ -12324,14 +12245,14 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
-      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "engines": {
         "node": ">=0.10"
       }
@@ -12354,9 +12275,9 @@
       "dev": true
     },
     "node_modules/deep-eql": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz",
-      "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "dependencies": {
         "type-detect": "^4.0.0"
       },
@@ -12833,10 +12754,9 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -13005,9 +12925,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.16.tgz",
-      "integrity": "sha512-o6iS9zxdHrrojjlj6pNGC2NAg86ECZqIETswTM5KmJitq+R1YmahhWtMumeQp9lHqJaROGnsBi2RLawGnfo5ZQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -13017,34 +12937,34 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.15.16",
-        "@esbuild/linux-loong64": "0.15.16",
-        "esbuild-android-64": "0.15.16",
-        "esbuild-android-arm64": "0.15.16",
-        "esbuild-darwin-64": "0.15.16",
-        "esbuild-darwin-arm64": "0.15.16",
-        "esbuild-freebsd-64": "0.15.16",
-        "esbuild-freebsd-arm64": "0.15.16",
-        "esbuild-linux-32": "0.15.16",
-        "esbuild-linux-64": "0.15.16",
-        "esbuild-linux-arm": "0.15.16",
-        "esbuild-linux-arm64": "0.15.16",
-        "esbuild-linux-mips64le": "0.15.16",
-        "esbuild-linux-ppc64le": "0.15.16",
-        "esbuild-linux-riscv64": "0.15.16",
-        "esbuild-linux-s390x": "0.15.16",
-        "esbuild-netbsd-64": "0.15.16",
-        "esbuild-openbsd-64": "0.15.16",
-        "esbuild-sunos-64": "0.15.16",
-        "esbuild-windows-32": "0.15.16",
-        "esbuild-windows-64": "0.15.16",
-        "esbuild-windows-arm64": "0.15.16"
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
       }
     },
     "node_modules/esbuild-android-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.16.tgz",
-      "integrity": "sha512-Vwkv/sT0zMSgPSVO3Jlt1pUbnZuOgtOQJkJkyyJFAlLe7BiT8e9ESzo0zQSx4c3wW4T6kGChmKDPMbWTgtliQA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
       "cpu": [
         "x64"
       ],
@@ -13058,9 +12978,9 @@
       }
     },
     "node_modules/esbuild-android-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.16.tgz",
-      "integrity": "sha512-lqfKuofMExL5niNV3gnhMUYacSXfsvzTa/58sDlBET/hCOG99Zmeh+lz6kvdgvGOsImeo6J9SW21rFCogNPLxg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
       "cpu": [
         "arm64"
       ],
@@ -13074,9 +12994,9 @@
       }
     },
     "node_modules/esbuild-darwin-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.16.tgz",
-      "integrity": "sha512-wo2VWk/n/9V2TmqUZ/KpzRjCEcr00n7yahEdmtzlrfQ3lfMCf3Wa+0sqHAbjk3C6CKkR3WKK/whkMq5Gj4Da9g==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
       "cpu": [
         "x64"
       ],
@@ -13090,9 +13010,9 @@
       }
     },
     "node_modules/esbuild-darwin-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.16.tgz",
-      "integrity": "sha512-fMXaUr5ou0M4WnewBKsspMtX++C1yIa3nJ5R2LSbLCfJT3uFdcRoU/NZjoM4kOMKyOD9Sa/2vlgN8G07K3SJnw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
       "cpu": [
         "arm64"
       ],
@@ -13106,9 +13026,9 @@
       }
     },
     "node_modules/esbuild-freebsd-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.16.tgz",
-      "integrity": "sha512-UzIc0xlRx5x9kRuMr+E3+hlSOxa/aRqfuMfiYBXu2jJ8Mzej4lGL7+o6F5hzhLqWfWm1GWHNakIdlqg1ayaTNQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
       "cpu": [
         "x64"
       ],
@@ -13122,9 +13042,9 @@
       }
     },
     "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.16.tgz",
-      "integrity": "sha512-8xyiYuGc0DLZphFQIiYaLHlfoP+hAN9RHbE+Ibh8EUcDNHAqbQgUrQg7pE7Bo00rXmQ5Ap6KFgcR0b4ALZls1g==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
       "cpu": [
         "arm64"
       ],
@@ -13138,9 +13058,9 @@
       }
     },
     "node_modules/esbuild-linux-32": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.16.tgz",
-      "integrity": "sha512-iGijUTV+0kIMyUVoynK0v+32Oi8yyp0xwMzX69GX+5+AniNy/C/AL1MjFTsozRp/3xQPl7jVux/PLe2ds10/2w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
       "cpu": [
         "ia32"
       ],
@@ -13154,9 +13074,9 @@
       }
     },
     "node_modules/esbuild-linux-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.16.tgz",
-      "integrity": "sha512-tuSOjXdLw7VzaUj89fIdAaQT7zFGbKBcz4YxbWrOiXkwscYgE7HtTxUavreBbnRkGxKwr9iT/gmeJWNm4djy/g==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
       "cpu": [
         "x64"
       ],
@@ -13170,9 +13090,9 @@
       }
     },
     "node_modules/esbuild-linux-arm": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.16.tgz",
-      "integrity": "sha512-XKcrxCEXDTOuoRj5l12tJnkvuxXBMKwEC5j0JISw3ziLf0j4zIwXbKbTmUrKFWbo6ZgvNpa7Y5dnbsjVvH39bQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
       "cpu": [
         "arm"
       ],
@@ -13186,9 +13106,9 @@
       }
     },
     "node_modules/esbuild-linux-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.16.tgz",
-      "integrity": "sha512-mPYksnfHnemNrvjrDhZyixL/AfbJN0Xn9S34ZOHYdh6/jJcNd8iTsv3JwJoEvTJqjMggjMhGUPJAdjnFBHoH8A==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
       "cpu": [
         "arm64"
       ],
@@ -13202,9 +13122,9 @@
       }
     },
     "node_modules/esbuild-linux-mips64le": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.16.tgz",
-      "integrity": "sha512-kSJO2PXaxfm0pWY39+YX+QtpFqyyrcp0ZeI8QPTrcFVQoWEPiPVtOfTZeS3ZKedfH+Ga38c4DSzmKMQJocQv6A==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
       "cpu": [
         "mips64el"
       ],
@@ -13218,9 +13138,9 @@
       }
     },
     "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.16.tgz",
-      "integrity": "sha512-NimPikwkBY0yGABw6SlhKrtT35sU4O23xkhlrTT/O6lSxv3Pm5iSc6OYaqVAHWkLdVf31bF4UDVFO+D990WpAA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
       "cpu": [
         "ppc64"
       ],
@@ -13234,9 +13154,9 @@
       }
     },
     "node_modules/esbuild-linux-riscv64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.16.tgz",
-      "integrity": "sha512-ty2YUHZlwFOwp7pR+J87M4CVrXJIf5ZZtU/umpxgVJBXvWjhziSLEQxvl30SYfUPq0nzeWKBGw5i/DieiHeKfw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
       "cpu": [
         "riscv64"
       ],
@@ -13250,9 +13170,9 @@
       }
     },
     "node_modules/esbuild-linux-s390x": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.16.tgz",
-      "integrity": "sha512-VkZaGssvPDQtx4fvVdZ9czezmyWyzpQhEbSNsHZZN0BHvxRLOYAQ7sjay8nMQwYswP6O2KlZluRMNPYefFRs+w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
       "cpu": [
         "s390x"
       ],
@@ -13266,9 +13186,9 @@
       }
     },
     "node_modules/esbuild-netbsd-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.16.tgz",
-      "integrity": "sha512-ElQ9rhdY51et6MJTWrCPbqOd/YuPowD7Cxx3ee8wlmXQQVW7UvQI6nSprJ9uVFQISqSF5e5EWpwWqXZsECLvXg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
       "cpu": [
         "x64"
       ],
@@ -13282,9 +13202,9 @@
       }
     },
     "node_modules/esbuild-openbsd-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.16.tgz",
-      "integrity": "sha512-KgxMHyxMCT+NdLQE1zVJEsLSt2QQBAvJfmUGDmgEq8Fvjrf6vSKB00dVHUEDKcJwMID6CdgCpvYNt999tIYhqA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
       "cpu": [
         "x64"
       ],
@@ -13298,9 +13218,9 @@
       }
     },
     "node_modules/esbuild-sunos-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.16.tgz",
-      "integrity": "sha512-exSAx8Phj7QylXHlMfIyEfNrmqnLxFqLxdQF6MBHPdHAjT7fsKaX6XIJn+aQEFiOcE4X8e7VvdMCJ+WDZxjSRQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
       "cpu": [
         "x64"
       ],
@@ -13314,9 +13234,9 @@
       }
     },
     "node_modules/esbuild-windows-32": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.16.tgz",
-      "integrity": "sha512-zQgWpY5pUCSTOwqKQ6/vOCJfRssTvxFuEkpB4f2VUGPBpdddZfdj8hbZuFRdZRPIVHvN7juGcpgCA/XCF37mAQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
       "cpu": [
         "ia32"
       ],
@@ -13330,9 +13250,9 @@
       }
     },
     "node_modules/esbuild-windows-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.16.tgz",
-      "integrity": "sha512-HjW1hHRLSncnM3MBCP7iquatHVJq9l0S2xxsHHj4yzf4nm9TU4Z7k4NkeMlD/dHQ4jPlQQhwcMvwbJiOefSuZw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
       "cpu": [
         "x64"
       ],
@@ -13346,9 +13266,9 @@
       }
     },
     "node_modules/esbuild-windows-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.16.tgz",
-      "integrity": "sha512-oCcUKrJaMn04Vxy9Ekd8x23O8LoU01+4NOkQ2iBToKgnGj5eo1vU9i27NQZ9qC8NFZgnQQZg5oZWAejmbsppNA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
       "cpu": [
         "arm64"
       ],
@@ -13469,9 +13389,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
-      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
+      "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.3",
@@ -14149,13 +14069,13 @@
       }
     },
     "node_modules/eth-gas-reporter/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/eth-gas-reporter/node_modules/ansi-styles": {
@@ -14250,16 +14170,6 @@
         "wrap-ansi": "^5.1.0"
       }
     },
-    "node_modules/eth-gas-reporter/node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eth-gas-reporter/node_modules/cliui/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -14275,19 +14185,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/eth-gas-reporter/node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eth-gas-reporter/node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -14672,31 +14569,17 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/eth-gas-reporter/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eth-gas-reporter/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/eth-gas-reporter/node_modules/strip-json-comments": {
@@ -14768,16 +14651,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/eth-gas-reporter/node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eth-gas-reporter/node_modules/wrap-ansi/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -14793,19 +14666,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/eth-gas-reporter/node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eth-gas-reporter/node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -14851,16 +14711,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/eth-gas-reporter/node_modules/yargs/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eth-gas-reporter/node_modules/yargs/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -14876,19 +14726,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/eth-gas-reporter/node_modules/yargs/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eth-json-rpc-filters": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz",
@@ -15946,9 +15783,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -26476,11 +26313,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/gauge/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
     "node_modules/gauge/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -29143,15 +28975,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/inquirer/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/inquirer/node_modules/mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
@@ -29198,40 +29021,6 @@
         "npm": ">=2.0.0"
       }
     },
-    "node_modules/inquirer/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/string-width/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/inquirer/node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -31794,9 +31583,11 @@
       ]
     },
     "node_modules/jsonschema": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.2.tgz",
-      "integrity": "sha512-iX5OFQ6yx9NgbHCwse51ohhKgLuLL7Z5cNOeZOPIlDUtAMrxlruHLzVZxbltdHE5mEDXN+75oFOwq6Gn0MZwsA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
+      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+      "dev": true,
+      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -32145,9 +31936,9 @@
       "dev": true
     },
     "node_modules/lint-staged": {
-      "version": "13.0.4",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.4.tgz",
-      "integrity": "sha512-HxlHCXoYRsq9QCby5wFozmZW00hMs/9e3l+/dz6Qr8Kle4UH0kJTdABAbqhzG+3pcG6QjL9kz7NgGBfph+a5dw==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.1.0.tgz",
+      "integrity": "sha512-pn/sR8IrcF/T0vpWLilih8jmVouMlxqXxKuAojmbiGX5n/gDnz+abdPptlj0vYnbfE0SQNl3CY/HwtM0+yfOVQ==",
       "dev": true,
       "dependencies": {
         "cli-truncate": "^3.1.0",
@@ -32353,12 +32144,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/listr2/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/listr2/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -32501,12 +32286,6 @@
         }
       }
     },
-    "node_modules/localtunnel/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/localtunnel/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -32700,12 +32479,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/log-update/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -33450,12 +33223,6 @@
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/mocha/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/mocha/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -37300,6 +37067,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/ripple-lib/node_modules/jsonschema": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.2.tgz",
+      "integrity": "sha512-iX5OFQ6yx9NgbHCwse51ohhKgLuLL7Z5cNOeZOPIlDUtAMrxlruHLzVZxbltdHE5mEDXN+75oFOwq6Gn0MZwsA==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/rlp": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz",
@@ -37478,9 +37253,9 @@
       "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA=="
     },
     "node_modules/rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz",
+      "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.1.0"
@@ -38914,13 +38689,13 @@
       }
     },
     "node_modules/solidity-coverage/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/solidity-coverage/node_modules/ansi-styles": {
@@ -38995,16 +38770,6 @@
         "wrap-ansi": "^5.1.0"
       }
     },
-    "node_modules/solidity-coverage/node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/cliui/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -39020,19 +38785,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/solidity-coverage/node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -39217,16 +38969,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/solidity-coverage/node_modules/jsonschema": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
-      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -39412,31 +39154,17 @@
         "node": ">= 8"
       }
     },
-    "node_modules/solidity-coverage/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/solidity-coverage/node_modules/strip-json-comments": {
@@ -39500,16 +39228,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/solidity-coverage/node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/wrap-ansi/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -39525,19 +39243,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/solidity-coverage/node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -39583,16 +39288,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/solidity-coverage/node_modules/yargs/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/solidity-coverage/node_modules/yargs/node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -39608,23 +39303,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/solidity-coverage/node_modules/yargs/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/solidity-docgen": {
-      "version": "0.6.0-beta.31",
-      "resolved": "https://registry.npmjs.org/solidity-docgen/-/solidity-docgen-0.6.0-beta.31.tgz",
-      "integrity": "sha512-MFQ1PkdyHx1I2DvJhPM88hEfsf0CAg1iwUUEJ2tJPRtK4ITGorZ2ld4Vjs3g0zznTmzVrFMSWrZBaxuWwFQXeA==",
+      "version": "0.6.0-beta.32",
+      "resolved": "https://registry.npmjs.org/solidity-docgen/-/solidity-docgen-0.6.0-beta.32.tgz",
+      "integrity": "sha512-LGcosbgqxrqTo9winVq3+Xz1shS9k4p+RKwqPVPI0HtjfsKF9Mc5GzBzOUhce9uwzy0yJfhf832whfY1UKt4Aw==",
       "dev": true,
       "dependencies": {
         "handlebars": "^4.7.7",
@@ -39683,7 +39365,8 @@
     "node_modules/sourcemap-codec": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
     },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
@@ -40055,47 +39738,42 @@
       }
     },
     "node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
     "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=4"
+      }
+    },
+    "node_modules/string-width/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/string.prototype.matchall": {
@@ -40362,12 +40040,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/table/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/table/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -43592,32 +43264,6 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
-    "node_modules/wide-align/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
@@ -43630,49 +43276,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/widest-line/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/widest-line/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/widest-line/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/widest-line/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/wif": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
@@ -43920,12 +43523,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -44195,12 +43792,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/yargs/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -44887,12 +44478,6 @@
         "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "services/crawler/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "services/crawler/node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -45647,9 +45232,9 @@
       }
     },
     "@aws-cdk/asset-awscli-v1": {
-      "version": "2.2.24",
-      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.24.tgz",
-      "integrity": "sha512-MW8JuXwZM5XEBAFMOY8JTGkeXW8mmzdl+XoHbAwi6w0KFOALDizIq+QdWKExh+Z77Nu9KvklBA26aSL9rT3zrQ=="
+      "version": "2.2.28",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.28.tgz",
+      "integrity": "sha512-ttyJgYpk0i5coA1+jQzF1p1r+m/Dffm+xPThBeFLH4ZgQF5Ujkmc54geW/+86wOL7IyQQ9SnbksPJwgOTZ1Snw=="
     },
     "@aws-cdk/asset-kubectl-v20": {
       "version": "2.1.1",
@@ -45657,9 +45242,9 @@
       "integrity": "sha512-U1ntiX8XiMRRRH5J1IdC+1t5CE89015cwyt5U63Cpk0GnMlN5+h9WsWMlKlPXZR4rdq/m806JRlBMRpBUB2Dhw=="
     },
     "@aws-cdk/asset-node-proxy-agent-v5": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.30.tgz",
-      "integrity": "sha512-EruKG+4f0j+ft/PDu0zLoyYLadPwTve99hglbezhV8gD5ER9qIFoKYiZXW1w3ySZDgrOlTI8T1sVNdQWxbARyQ=="
+      "version": "2.0.34",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.34.tgz",
+      "integrity": "sha512-tpD3D7MUjMgfLmD/ZyeuGOVqcdFFUwKS4rooYF3Eqsq3tjZDAFPYs0AA2iA1j80ioxr/LYo9ujHOscfPqnKL7g=="
     },
     "@aws-cdk/aws-glue-alpha": {
       "version": "2.33.0-alpha.0",
@@ -45808,11 +45393,11 @@
       }
     },
     "@aws-sdk/abort-controller": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.215.0.tgz",
-      "integrity": "sha512-HTvL542nawhVqe0oC1AJchdcomEOmPivJEzYUT1LqiG3e8ikxMNa2KWSqqLPeKi2t0A/cfQy7wDUyg9+BZhDSQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.222.0.tgz",
+      "integrity": "sha512-Ric2vJQEWrzz915wBeZlYLWAnIsnywOcZpzroPVTY/TNKRvM0GcSPVuD9vv1lOwybVnDHsipukzwQBAZXkNWVA==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -45834,42 +45419,42 @@
       }
     },
     "@aws-sdk/client-athena": {
-      "version": "3.221.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-athena/-/client-athena-3.221.0.tgz",
-      "integrity": "sha512-9Vl3De6jGEHcQiHaRCdmo7OVFMFArUiwnKCrn7xadthxy1iCBexu/AUPFXOkoPhmK3Mc3z5zNy+V77dpTCeprw==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-athena/-/client-athena-3.223.0.tgz",
+      "integrity": "sha512-acGC5rm85K5YYrprm1C4Y5pOc5Jwg/K9tH2UMpgkyT8HLnrdK2owketV0HfHY4UcLrgodEmG/K7SJ7HD/Bf5Sw==",
       "requires": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1",
@@ -45877,145 +45462,145 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.218.0.tgz",
-      "integrity": "sha512-IHzM9jpLqdeqj2w7YA7FrmLCQyKaun7eXtu1OJYMFbJT5XHx6B4jlQ1T/N8xivSSzDfjpJxG6/MMmjec4pI+CA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.223.0.tgz",
+      "integrity": "sha512-mk7NLfWD3TGzlhE+PMOdxskfQQaMgq5jwxU6ngmOK+55uhsbCwXoCw69vBdbViOv5GmSDxdA8A/afgzQOg9T/g==",
       "requires": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/client-s3": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.218.0.tgz",
-      "integrity": "sha512-SvDQzjsW+MvmYb59y0xHRWTDRmHxBjXFqYrJ5DCXwL1LvTpqhN6bYReW8KAesMBkxf4t2H33o0hjYmD4giTqzg==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.223.0.tgz",
+      "integrity": "sha512-hIQfiseFXf04jz14iyQhfV9eRz9XgiMihl9oQhKs3CpL7bFGkhCkCIwbqUrsheqcD1O2wcOSKTAt6QdYbDyhzg==",
       "requires": {
         "@aws-crypto/sha1-browser": "2.0.0",
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/eventstream-serde-browser": "3.215.0",
-        "@aws-sdk/eventstream-serde-config-resolver": "3.215.0",
-        "@aws-sdk/eventstream-serde-node": "3.215.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-blob-browser": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/hash-stream-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/md5-js": "3.215.0",
-        "@aws-sdk/middleware-bucket-endpoint": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-expect-continue": "3.215.0",
-        "@aws-sdk/middleware-flexible-checksums": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-location-constraint": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-sdk-s3": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-ssec": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4-multi-region": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/eventstream-serde-browser": "3.222.0",
+        "@aws-sdk/eventstream-serde-config-resolver": "3.222.0",
+        "@aws-sdk/eventstream-serde-node": "3.222.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-blob-browser": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/hash-stream-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/md5-js": "3.222.0",
+        "@aws-sdk/middleware-bucket-endpoint": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-expect-continue": "3.222.0",
+        "@aws-sdk/middleware-flexible-checksums": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-location-constraint": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-sdk-s3": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-ssec": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4-multi-region": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-stream-browser": "3.215.0",
-        "@aws-sdk/util-stream-node": "3.215.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-stream-browser": "3.222.0",
+        "@aws-sdk/util-stream-node": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
-        "@aws-sdk/util-waiter": "3.215.0",
+        "@aws-sdk/util-waiter": "3.222.0",
         "@aws-sdk/xml-builder": "3.201.0",
         "fast-xml-parser": "4.0.11",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/client-secrets-manager": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.218.0.tgz",
-      "integrity": "sha512-BDU72F03Tf0dXuqmYLICl4Xcg1+/dkTaIORJex3eJynSOwquiym+vmFb8Q7L8XH57XdJqXlwL4yQXN+hTkCMFg==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.223.0.tgz",
+      "integrity": "sha512-fmRKr2YLWyB+JhavPWLgcSBi8uJ0xac695e6zSNGXfFToJnJ5aAfx2SD4W1tGr73oFmrvGGs7aVy472UO4IQ1g==",
       "requires": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1",
@@ -46023,120 +45608,120 @@
       }
     },
     "@aws-sdk/client-sso": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.218.0.tgz",
-      "integrity": "sha512-kVMlpjaVblxgb1G8q3wD65mKxO3RzKwnjUjIBmOHpmseXzlSkAdAvYcikaDoJP+CRmys4uXk5DN8c7ZdL0OmgA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.223.0.tgz",
+      "integrity": "sha512-1gVmZ7XypZEWUeKnvjS/cZSL/cM1riOGrhp+dr+np58ZT5zSrpWAAeKE5+ftzC/vn770vnD5piLGdAZwg/Jf1g==",
       "requires": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.216.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.216.0.tgz",
-      "integrity": "sha512-O8kmM86BHwiSwyNoIe+iHXuSpUE9PBWl3re8u+/igt/w5W5VmMVz+zQr7gRUDQ1FDgLWNEdAJa0r+JFx3pZdzA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.223.0.tgz",
+      "integrity": "sha512-MeXm6expqpBwwN5GWm8QedAxWGv1jpdxae5oSqsrfRSHFVcHVxWWQzx9/GMBpKqGLtXVmisex2vckBQa1MhybQ==",
       "requires": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/client-sts": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.218.0.tgz",
-      "integrity": "sha512-0A81eHvryKFEPq7IeY34Opzh5b9bVhhLlf2fDy5VuZjCFf4R9vD2ceOANvFSJeMsmdlqVDq8U1mHYl0E6FRUug==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.223.0.tgz",
+      "integrity": "sha512-RYGx6SOT38MfX4Dm8lyEwZ/bEqhl3TZyGFqtFHGTEEgyqPkuqiZPfSSWNmsaf6HAVYKObp7kJUX6w8EeEw332w==",
       "requires": {
         "@aws-crypto/sha256-browser": "2.0.0",
         "@aws-crypto/sha256-js": "2.0.0",
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/hash-node": "3.215.0",
-        "@aws-sdk/invalid-dependency": "3.215.0",
-        "@aws-sdk/middleware-content-length": "3.215.0",
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/middleware-host-header": "3.215.0",
-        "@aws-sdk/middleware-logger": "3.215.0",
-        "@aws-sdk/middleware-recursion-detection": "3.215.0",
-        "@aws-sdk/middleware-retry": "3.215.0",
-        "@aws-sdk/middleware-sdk-sts": "3.215.0",
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/middleware-user-agent": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/hash-node": "3.222.0",
+        "@aws-sdk/invalid-dependency": "3.222.0",
+        "@aws-sdk/middleware-content-length": "3.222.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/middleware-host-header": "3.222.0",
+        "@aws-sdk/middleware-logger": "3.222.0",
+        "@aws-sdk/middleware-recursion-detection": "3.222.0",
+        "@aws-sdk/middleware-retry": "3.222.0",
+        "@aws-sdk/middleware-sdk-sts": "3.222.0",
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/middleware-user-agent": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-body-length-browser": "3.188.0",
         "@aws-sdk/util-body-length-node": "3.208.0",
-        "@aws-sdk/util-defaults-mode-browser": "3.215.0",
-        "@aws-sdk/util-defaults-mode-node": "3.215.0",
-        "@aws-sdk/util-endpoints": "3.216.0",
-        "@aws-sdk/util-user-agent-browser": "3.215.0",
-        "@aws-sdk/util-user-agent-node": "3.215.0",
+        "@aws-sdk/util-defaults-mode-browser": "3.222.0",
+        "@aws-sdk/util-defaults-mode-node": "3.222.0",
+        "@aws-sdk/util-endpoints": "3.222.0",
+        "@aws-sdk/util-user-agent-browser": "3.222.0",
+        "@aws-sdk/util-user-agent-node": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "fast-xml-parser": "4.0.11",
@@ -46144,236 +45729,236 @@
       }
     },
     "@aws-sdk/config-resolver": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.215.0.tgz",
-      "integrity": "sha512-DxX4R+YYLQOtg0qfceKBrjVD4t1mQBG1eb7IVr2QSlckFCX8ztUNymFMuaSEo3938Jyy/NpgfUDpFqPDaSKnng==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.222.0.tgz",
+      "integrity": "sha512-rG/Yh0R+GQe86ofEb24QAjQ19tHb4HMCyCuMZUZCsIdgNmUfcaH21Ug5s7pJrAfEy/F2gwxs+VfBeXKjT0MqSQ==",
       "requires": {
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-config-provider": "3.208.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.218.0.tgz",
-      "integrity": "sha512-ndhlPBvnxUgje23TnVw0fkDgTZHh0GVapKSgeEIxmxAy3IVLN15iMs7dCV7LWvb7z1P0cYx9cwvxa0nTrVxjtg==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.223.0.tgz",
+      "integrity": "sha512-x4c1a7Gq0LT+fYSoQ8qt+4Hs1p52zjctZzNHshxb1ZeK4NQBTIMs3s2LRXWX14+5/jk94R8tCuA/as39eCdgtw==",
       "requires": {
-        "@aws-sdk/client-cognito-identity": "3.218.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/client-cognito-identity": "3.223.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.215.0.tgz",
-      "integrity": "sha512-n5G7I7Pxfsn81+tNsSOzspKp9SYai78oRfImsfFY4JLTcWutv7szMgFUbtEzBfUUINHpOxLiO2Lk5yu5K1C7IQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.222.0.tgz",
+      "integrity": "sha512-xV6cmJ9zMi8nWySqBv1ze/EFlzXEfazu3i/T/5MpOufPvuGpXTQ3/PDEbC6mKBtvomoQ0fonc/cZrix7YcJV0Q==",
       "requires": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-imds": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.215.0.tgz",
-      "integrity": "sha512-/4FUUR6u9gkNfxB6mEwBr0kk0myIkrDcXbAocWN3fPd/t7otzxpx/JqPZXgM6kcVP7M4T/QT75l1E1RRHLWCCQ==",
-      "requires": {
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.222.0.tgz",
+      "integrity": "sha512-n090ouw5AFhb0EfzRElUTmqCNOQ1zjlxau30oVM7+qKtXH85hEGMQOoRQAl9ch/pXcbjKLh1mbUhmonR97/Kvw==",
+      "requires": {
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.218.0.tgz",
-      "integrity": "sha512-tDDrGW+4A+PQThVJ+l9ee03CsDoD0XLpOB5dcf+dr/dCHjcQ7x/CeVFZ8eM+XUtGQnZVvuzXZGwzS8bUWEdJIg==",
-      "requires": {
-        "@aws-sdk/credential-provider-env": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/credential-provider-sso": "3.218.0",
-        "@aws-sdk/credential-provider-web-identity": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.223.0.tgz",
+      "integrity": "sha512-+jB0XIqAw7Cni1uqPV6SMQl7FlpUVELdHVnR+DYL3WOV4MJ4amTu9MAXrpvbEXbK3+7eFQ2/tDe+7i8qGXZFTw==",
+      "requires": {
+        "@aws-sdk/credential-provider-env": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/credential-provider-sso": "3.223.0",
+        "@aws-sdk/credential-provider-web-identity": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.218.0.tgz",
-      "integrity": "sha512-J9PB6XFA+V0mgxleuY5W6Jjh5WejV8HjMViTJQpp2JN+NWZP3bGvquUSQHRqWGRGg2fSJy6Z/J4zQ8fpPbGsdQ==",
-      "requires": {
-        "@aws-sdk/credential-provider-env": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/credential-provider-ini": "3.218.0",
-        "@aws-sdk/credential-provider-process": "3.215.0",
-        "@aws-sdk/credential-provider-sso": "3.218.0",
-        "@aws-sdk/credential-provider-web-identity": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.223.0.tgz",
+      "integrity": "sha512-mvY96yX4xQ9/Aujr0HqMXhdToiEKg7fFUoN+NgV3yB/hj2q1Ry3j8WbiIfAcBvFLjNwHT7ae/8nVRHYYlNeXFw==",
+      "requires": {
+        "@aws-sdk/credential-provider-env": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/credential-provider-ini": "3.223.0",
+        "@aws-sdk/credential-provider-process": "3.222.0",
+        "@aws-sdk/credential-provider-sso": "3.223.0",
+        "@aws-sdk/credential-provider-web-identity": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.215.0.tgz",
-      "integrity": "sha512-JNvj4L5B7W8byoFdfn/8Y4scoPiwCi+Ha/fRsFCrdSC7C+snDuxM/oQj33HI8DpKY1cjuigzEnpnxiNWaA09EA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.222.0.tgz",
+      "integrity": "sha512-IgEk8Tne1b2v2k/wVjuddKi+HEAFJWUoEcvLCnYRdlVX5l+Nnatw8vGYb+gTi9X7nKNqEGfMbifKCFoePKjC0Q==",
       "requires": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.218.0.tgz",
-      "integrity": "sha512-HecWvmxD+xffmY8G4SfLRfCOgSoLFki45wOOU8ESgRM9fQp2+3CfRSyiThKZI5PTmE+xhPTRvmR61HUmQjEv8w==",
-      "requires": {
-        "@aws-sdk/client-sso": "3.218.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/token-providers": "3.216.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.223.0.tgz",
+      "integrity": "sha512-sRxH6fhLYME+EIiHRqIzkUgPaAvc5+dV8+09jEZ1yBjum9AQycipXrbbDRNLXWJZJZTA/BsHfUpAScFOjyZf7A==",
+      "requires": {
+        "@aws-sdk/client-sso": "3.223.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/token-providers": "3.223.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.215.0.tgz",
-      "integrity": "sha512-AWaDDEE3VU1HeLrXvyUrkQ6Wb3PQij5bvvrMil9L0da3b1yrcpoDanQQy7wBFBXcZIVmcmSFe5MMA/nyh2Le4g==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.222.0.tgz",
+      "integrity": "sha512-dImqTEWt38nVcDe/wQqHWJ+R2zyNqVKwejfslgbH2YilUnDU43xq2KJhNe4s+YhCB6tHOTkbNnpZo7vPV5Zxog==",
       "requires": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.218.0.tgz",
-      "integrity": "sha512-MWpb5k+Oq56NrHA5fYPIDX8QRYUAw4Jp8ErTELBd83kLhTgqTw025YQ05YbhIzAs84+viMeWKif0z/5kNshphw==",
-      "requires": {
-        "@aws-sdk/client-cognito-identity": "3.218.0",
-        "@aws-sdk/client-sso": "3.218.0",
-        "@aws-sdk/client-sts": "3.218.0",
-        "@aws-sdk/credential-provider-cognito-identity": "3.218.0",
-        "@aws-sdk/credential-provider-env": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/credential-provider-ini": "3.218.0",
-        "@aws-sdk/credential-provider-node": "3.218.0",
-        "@aws-sdk/credential-provider-process": "3.215.0",
-        "@aws-sdk/credential-provider-sso": "3.218.0",
-        "@aws-sdk/credential-provider-web-identity": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.223.0.tgz",
+      "integrity": "sha512-oX9WTF7A579T8TT+3roU5CXkGHLSdb6MVy5COh/DH+aBTpgwBvhGzsgiefYoB04gyPx1f2Q9ju7qtCcKnm0eRw==",
+      "requires": {
+        "@aws-sdk/client-cognito-identity": "3.223.0",
+        "@aws-sdk/client-sso": "3.223.0",
+        "@aws-sdk/client-sts": "3.223.0",
+        "@aws-sdk/credential-provider-cognito-identity": "3.223.0",
+        "@aws-sdk/credential-provider-env": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/credential-provider-ini": "3.223.0",
+        "@aws-sdk/credential-provider-node": "3.223.0",
+        "@aws-sdk/credential-provider-process": "3.222.0",
+        "@aws-sdk/credential-provider-sso": "3.223.0",
+        "@aws-sdk/credential-provider-web-identity": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/eventstream-codec": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.215.0.tgz",
-      "integrity": "sha512-Uwgkq6ViQnfd1l+qhWPGdzxh+YhD1N6RYL0kEcp1ovsR+rC/0qUsM9VZrSckZn4jB+0ATqIoOXtcUYP4+xrNmg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.222.0.tgz",
+      "integrity": "sha512-sxLpo3NYrvj8CnTkpLsb2uXvUU8jnAG5q22HIBxBrpeFzgvUA9uIfPD7yPZhe4+/C7v+ER19ysXetKjiAOrQMA==",
       "requires": {
         "@aws-crypto/crc32": "2.0.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-hex-encoding": "3.201.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/eventstream-serde-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.215.0.tgz",
-      "integrity": "sha512-VfTl69/C/cOjm47blgvdBz2pw8//6qkLPvQetfDOgf40JvsjBp9afUDNiKV08ulzoUeVZBosgHs09oZ2VDj09Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.222.0.tgz",
+      "integrity": "sha512-owwgmkpuLM7UtNPRZjvCOp5fo6MKY8avygQA0VMsbQSCq1DJFpmDsk7yTRB+n7jQuoDGn8uVxER3S0oS/Y/xVQ==",
       "requires": {
-        "@aws-sdk/eventstream-serde-universal": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/eventstream-serde-universal": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/eventstream-serde-config-resolver": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.215.0.tgz",
-      "integrity": "sha512-NrVb8HA0tUsruAj8yVWTaRIfcAB9lsajzksCqS7W917x/esoIRwoeF2zua63Ivro7hLeCjzS2Mws5IhvSl+/tQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.222.0.tgz",
+      "integrity": "sha512-zb8vMSbBEjUrHKpA2bZdAqfYp8oCsWgeBPOt0XJx+y6lzy67zyADs97Grl+lyZAoswao/zc2sxgm9yqcMDt7lQ==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/eventstream-serde-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.215.0.tgz",
-      "integrity": "sha512-DxABFUIpmFV1NOfwF8FtX+l7kzmMTTJf2BfXvGoYemmBtv9Cc31Qg83ouD8xuNSx9qlbFOgpWaNpzEZ400porA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.222.0.tgz",
+      "integrity": "sha512-rfDrTxcsYL0ZKc5MnoqbDTa0oQFiK7qTJOnQ7sASooexqoKTn3wVq68J7TZddbImmH/ENpkU+O0hcGuiwE9Ucg==",
       "requires": {
-        "@aws-sdk/eventstream-serde-universal": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/eventstream-serde-universal": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/eventstream-serde-universal": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.215.0.tgz",
-      "integrity": "sha512-8DmY3vVZtXAKzW0wOSC0bN+WF8qNZKaCqe5JCM3WwS1Wu6F6qI7b064VSe5b3d9BbJzeMccOcJeCg3ZU/3nYUQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.222.0.tgz",
+      "integrity": "sha512-+/Fc7+ZPuD6SwphYcuLJ/GU0RmVzG/M0dUYs1JL/JQJ8dkJ0AlH1fH3L5Fhm2RO/ACkE28kXAuyZ40TLeRLRNA==",
       "requires": {
-        "@aws-sdk/eventstream-codec": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/eventstream-codec": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/fetch-http-handler": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.215.0.tgz",
-      "integrity": "sha512-JfZyrJOE+0ik1PumsIUZd0NfgEx4sZ43VSdPCD9GRhssRWudNsSF1B5fz3xA5v+1y5oQPjXZyaWCzKtnYruiWw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.222.0.tgz",
+      "integrity": "sha512-0PWnOp47mNfwBFEZhuBpz5A+66jbvb2ySidnM5vWHRxu5yN7rCJEdEMSJKDzR6nH3GLZ9dHoOxTzQy21NoDTtA==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/querystring-builder": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/querystring-builder": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/hash-blob-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.215.0.tgz",
-      "integrity": "sha512-plHPFOSEHig0g/ou1H4QW31AyPGzwR0qgUKIEUFf3lWIfBI3BnvA4t24cJ87I204oqENj/+ZSNAj5qeAZfMFXw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.222.0.tgz",
+      "integrity": "sha512-Z6y3JZPNp+os9vZdvsNkM6mIjDzeZNr9MYkQslANhGZ9WgQrzuI7xZN6XAyR83OGRCrDCorZdX+nnl5mzY1VwQ==",
       "requires": {
         "@aws-sdk/chunked-blob-reader": "3.188.0",
         "@aws-sdk/chunked-blob-reader-native": "3.208.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/hash-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.215.0.tgz",
-      "integrity": "sha512-MkSRuZvo1RCRmI0VNEmRYCGGD/DkMd9lqnLtOyglMPnSX1mhyD4/DyXmcc3rYa7PsjDRAfykGWJRiMqpoMLjiQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.222.0.tgz",
+      "integrity": "sha512-Fw0acblG0LQT9tfD2/4j98QHNq+Crotig/M1/zPDcVoGb8OBHd2442zpeA0fYYjGnGGhy9psRHdJrjZGj1vDUw==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-buffer-from": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/hash-stream-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.215.0.tgz",
-      "integrity": "sha512-1VEpiXu0jH7bSRYfEeSrznYq41zpUV4TtStoBXdcEVaOqT4LNQ5k1g1602544UWKUJ7D+E9NCNXpjM6TSMmG4A==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.222.0.tgz",
+      "integrity": "sha512-PO/N0PsgJjRiH9WKSOnGjDP9tWNjwSvUezicT8ItWgkk7npd278MAe7G692TLACgf6sJr2jGQbs6xzZHq0/3Zg==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/invalid-dependency": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.215.0.tgz",
-      "integrity": "sha512-++bK4BUQe8/CL/YcLZcQB8qPOhiXxhbuhYzfFS7PNVvW1QOLqKRZL/lKs24gzjcOmw7IhAbCybDZwvu2TM4DAg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.222.0.tgz",
+      "integrity": "sha512-tWJWWTcL7DrhFiDmPBvLaw2lopHJMsF4Uj52yIQJskwd2IeBOxjl30zLo/oidmk73IFUB7TCObc85zJrtt/KcQ==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -46386,12 +45971,12 @@
       }
     },
     "@aws-sdk/lib-storage": {
-      "version": "3.218.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.218.0.tgz",
-      "integrity": "sha512-bXOuQu1At6sL4tKaCGPRShNLXU5BVKC8K4cp+Jvs+YJJlmVgX3Q/7gb7rdJnuUO8Uy79t+R/V6O1aMeD8RSnkA==",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.223.0.tgz",
+      "integrity": "sha512-MZmXUemwHyItiZ0Nm/gg47QWYcd04fk2o4+MFziX38kjM2F3lIA+4aSBX78z5Bkrnpd0xdMh0Tl4TmwHYfmsrg==",
       "requires": {
-        "@aws-sdk/middleware-endpoint": "3.215.0",
-        "@aws-sdk/smithy-client": "3.215.0",
+        "@aws-sdk/middleware-endpoint": "3.222.0",
+        "@aws-sdk/smithy-client": "3.222.0",
         "buffer": "5.6.0",
         "events": "3.3.0",
         "stream-browserify": "3.0.0",
@@ -46399,334 +45984,334 @@
       }
     },
     "@aws-sdk/md5-js": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.215.0.tgz",
-      "integrity": "sha512-2f5r2raNDG9USKHKRgAW2r1MzCrkemLASlDXASgAuAD3gYGURVi4ZDhI3I1GECY5dPEgGC+3B2rkEb9MfQAaEg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.222.0.tgz",
+      "integrity": "sha512-LI44dy+ECCL+vsIYJ/Ot4rNOl3Vpa4Nv8zxireKcQGmn547Cb6i3n/bEi/DkcfgHv6R84qOtOXsxt/ILuWNQ/g==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
         "@aws-sdk/util-utf8-node": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-bucket-endpoint": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.215.0.tgz",
-      "integrity": "sha512-zMeYrnHX8S9VFDPH3fryXdPXW1DWeX9URKAkU1oxZLGpBX91CsWzUDjaMhbkDgvwO2oeKgjnZ2vCwcNNKP266w==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.222.0.tgz",
+      "integrity": "sha512-TP4mjEWsQ/JsACAFDUlltl/0sAe5dxqdhBDAPO6LHRHvROz2oYVjZwvcaK4F9x8QLWh09H0Sw501SndFK2+o3w==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-arn-parser": "3.208.0",
         "@aws-sdk/util-config-provider": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-content-length": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.215.0.tgz",
-      "integrity": "sha512-zKJRb6jDLFl9nl/muSFbiQHA4uK3skinuDRcyLbpMvvzhuK/PVodv9QI1+wIUsFdXkaSxAlva1oG4bL8ZFi+sQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.222.0.tgz",
+      "integrity": "sha512-Wlah+nrPhcq5qcwHiK1ymVRAvcKjV2py2RXhJsNZWgYwphdt5RHaZHPDKoodI27alrDJVyBBQWGzIm/Ag1bypQ==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-endpoint": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.215.0.tgz",
-      "integrity": "sha512-W0QXL5emcN9IXtMbnWT/abLxBFH2tGIfnre2jPNmZ9M7uVFxUwwv5OTUXxNLGNehJHKhiJPwhfQvMy20IDzVcw==",
-      "requires": {
-        "@aws-sdk/middleware-serde": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/url-parser": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.222.0.tgz",
+      "integrity": "sha512-e1bM+CvuUWmBdydQpV5sF8cxZrXQ++0G5s1M7pLimKdWXQvCQ1ZEwA3LLi2IWomXmS9a3BaH3iKAf87RTWjIXw==",
+      "requires": {
+        "@aws-sdk/middleware-serde": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/url-parser": "3.222.0",
         "@aws-sdk/util-config-provider": "3.208.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-expect-continue": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.215.0.tgz",
-      "integrity": "sha512-X2G7MnBSYPPmLqqd9xDGl2ik9dUsGYcYzulf2Z1HVEGJO6btZJtPfC+IIwuJjsiCWCgbypM1X/oOSxdrmRkUNQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.222.0.tgz",
+      "integrity": "sha512-/nTCLXrau8jEyehsD7QM49gJQ6kmzQGw7plPDJzdFakfAwb2b/jLJ/Hj/ZSaaLWWEXAtZBiPzVXUJltPDoXv5g==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-flexible-checksums": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.215.0.tgz",
-      "integrity": "sha512-fAFcR+QsrGPCgYssdTYmayoCXDKYzlv0a14jaJtZsacXQNGefXly9D856lri+yG2jxqQ6Sa0FzU4Pm7s3j4mvg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.222.0.tgz",
+      "integrity": "sha512-P900+KLMUg0eOf75FK/wH/Gjz3rkNtB6iBfAG2Xg4DY5+78qh40deG0y0ZvtkHQP8YOqjLF3QMbEA90YXo4x9Q==",
       "requires": {
         "@aws-crypto/crc32": "2.0.0",
         "@aws-crypto/crc32c": "2.0.0",
         "@aws-sdk/is-array-buffer": "3.201.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.215.0.tgz",
-      "integrity": "sha512-GOqI7VwoENZwn+6tIMrrJ4SipIqL2JCh+BNvORVcy7CQxn1ViKkna7iaCx+QMjpg/kn9cR6kfY0n1FmgZR1w9A==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.222.0.tgz",
+      "integrity": "sha512-R4STwHkWgdxMRqOy6riYfXepsQURR5YhK6psPFZHkBYByIRc9JxJdLA0qZcfLRriQIAGmqEO2WWsqRmr8nkbBw==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-location-constraint": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.215.0.tgz",
-      "integrity": "sha512-taDOIGv2rsAyDEJxSm/nhKS4nsBPUKKCvIpK26E7uGshQZFLtTLTJMp8zGb1IBfUSxRngdWljRmOS5AJUexNbQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.222.0.tgz",
+      "integrity": "sha512-srrAkOHuvpXeaMG9a6kvfYrhzFFX/plBaZATy8iW6ethgvG1qdPeFj4ZVS9Eisx+13NbGFtydc1WkBZfx2nUWg==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.215.0.tgz",
-      "integrity": "sha512-0h4GGF0rV3jnY3jxmcAWsOdqHCYf25s0biSjmgTei+l/5S+geOGrovRPCNep0LLg0i9D8bkZsXISojilETbf+g==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.222.0.tgz",
+      "integrity": "sha512-eAxGCcNXl1APMOFbkUaAC6pNBPUbajyGqsDf6GLdlrYHrMVAtJdYd988ov6C52h7k6iDZ+OPHwv8dwUz+PRfpw==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.215.0.tgz",
-      "integrity": "sha512-KQ+kiEsaluM4i6opjusUukxY78+UhfR7vzXHDkzZK/GplQ1hY0B+rwVO1eaULmlnmf3FK+Wd6lwrPV7xS2W+EA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.222.0.tgz",
+      "integrity": "sha512-4JRVs7y5JDXXjc5fkz0FCZJt/0HTP2vh3QyZsWRbCYesw2cWVqQlp/fUXp8w5KGqm5nYkTF4e5SQ7Ca8powJNA==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-retry": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.215.0.tgz",
-      "integrity": "sha512-I/dnUPVg2Kp3lW+MywBoPp06EOng8IfuaS9ph4bcJpQKrhNU5ekRgCHH2C4k1A6GcP8uyHxQ5TVV6j+l0QPIsA==",
-      "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/service-error-classification": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.222.0.tgz",
+      "integrity": "sha512-8FZpGuJDtntjXZ/mfJ9EdP5mYiUunQHEmk6OERk3h4XW3D/e97denwDAcBBIK8iYYGic5PoWF4KgTFJWs1YOcw==",
+      "requires": {
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/service-error-classification": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1",
         "uuid": "^8.3.2"
       }
     },
     "@aws-sdk/middleware-sdk-s3": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.215.0.tgz",
-      "integrity": "sha512-+SM+xCIFNSFIKM9KyvgIu4Ah5Z/SbHS8mDkinHkY8X/iUryrsKKBs7xnpMAaJCTFkK/8gO6Lhdda1nbvGozhdA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.222.0.tgz",
+      "integrity": "sha512-GCgbzWy3Dn9+dz/ZZjS5OiJ+feighHfMt461r1zjHNUXnb2tEf5kU+P80d3WqG8er4RRQg+Ao49SatOKgPcrlA==",
       "requires": {
-        "@aws-sdk/middleware-bucket-endpoint": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/middleware-bucket-endpoint": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-arn-parser": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-sdk-sts": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.215.0.tgz",
-      "integrity": "sha512-wJRxoDf+2egbRgochaQL8+zzADx8FM/2W0spKNj8x+t/3iqw70QwxCfuEKW/uFQ3ph6eaIrv7gYc8RRjwhD8rg==",
-      "requires": {
-        "@aws-sdk/middleware-signing": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.222.0.tgz",
+      "integrity": "sha512-YbL4lTBFgqyL2Ob+dMyw/UNd5K9IOnZHHxjpwWlYKMrfT+pp2bvrr7XUbRHnxSoDsOg9bf6IyTSRVnVxP4psJg==",
+      "requires": {
+        "@aws-sdk/middleware-signing": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-serde": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.215.0.tgz",
-      "integrity": "sha512-+uhLXdKvvQZcRRFc3UmemSr/YUHA4Jc+1YMjHxc3v8vvfztFJBb0wgBx999myOi8PmkYThlRBQDzXy9UCIhIJw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.222.0.tgz",
+      "integrity": "sha512-UoeLbgCJB07dX8tRByR0KzZaOwCoIyXj/SfFTuOhBUjkpKwqFCam/hofDlK3FR6kvl+xiURv57W/FtKV/9TDHg==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-signing": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.215.0.tgz",
-      "integrity": "sha512-3BqzYqkmdPeOxjI8DVQE7Bm7J5QIvDy30abglXqrDg6npw6KonKI2Q3FIPFf+oLpZTMStwkoQOnwXHTPrSZ6Tg==",
-      "requires": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.222.0.tgz",
+      "integrity": "sha512-MwMw2Lz7SBOniAc0slWXt65ocqL+E956bdW+LOvBin6OgkVWaLRbWI9nOzA6B2d8b65fCGEc+N15i0UdrEf+MQ==",
+      "requires": {
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-ssec": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.215.0.tgz",
-      "integrity": "sha512-iIiB2fGneR8iZN2tgQoACq1jQlG50zU49cus/jAAKjy6B7QeKXy5Ld8/+eNnzcjLuBzzeLtER2YWwFLWqUOZpw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.222.0.tgz",
+      "integrity": "sha512-WThCx/+UG4gIyqx0G3QKD1RM71+adh9Jv3Sh/KiS07Jjm+pb71wW+RRzBuNyhdjwB3aoKC/YKW8eFQg6M7eaQg==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-stack": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.215.0.tgz",
-      "integrity": "sha512-rdSVL7LxRgjlvoluqwODD4ypBy2k/YVl6FrDplyCMSi8m2WHZG99FzdmR9bpnWK+0DGzYZSMRYx6ynJ9N9PsSw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.222.0.tgz",
+      "integrity": "sha512-ASKbstAKbOBUZhFhst6/NCr11x94BDBiQn2zDs2Lvjo89n2efMeb4wEr17VCMZVeKI6ojtPFa1ZVLsH8AOn4Yw==",
       "requires": {
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.215.0.tgz",
-      "integrity": "sha512-X6GfoMNoEITTw7rGL/gWs8UZ0cmmmezvKcl+KtHsA642R05OR4mY5G7LdbWAw0bcrwKsuKOGmwUrC9lzGqbWUw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.222.0.tgz",
+      "integrity": "sha512-fjdxCRIAhOTsI9OcEKwJp4lhsvyCSXoeYV49mO/bdG6pFyFRm3Jezx7TNVNeLTGuMHTTTvRrCTF8sgE5t17Pzw==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/node-config-provider": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.215.0.tgz",
-      "integrity": "sha512-notckD94QwwxC0GsfpTxB7VH8SREIIlMsUSddqGtpModa0cq/wRb9rqnydZSoznbYpK1ND6h0C9hr/2PNz89zw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.222.0.tgz",
+      "integrity": "sha512-hrbw90LlVa4xJJc4WiyAfaPMY/sJubSeTwuxTChLsFOavr6hSMCwLASrWmOiKRIj5hKdSfEA87n/q+DnKHlA8A==",
       "requires": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/node-http-handler": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.215.0.tgz",
-      "integrity": "sha512-btKWSR7m0UuWIN3p5MfSIvhqeYik7xri7U6nWuVI5GVzIYjzxEZOMvPAinDLDxL5wipodi0ZvTUNdDJdm7BcGQ==",
-      "requires": {
-        "@aws-sdk/abort-controller": "3.215.0",
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/querystring-builder": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.222.0.tgz",
+      "integrity": "sha512-k3WqxUgZzGbiCQt1HyzDGlRzq8muGIOWZs9T3HtCa5LtACvl0qlNmiwCc+C/o7GRLyC9FuWkP3lOW6MiAFQUcA==",
+      "requires": {
+        "@aws-sdk/abort-controller": "3.222.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/querystring-builder": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/property-provider": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.215.0.tgz",
-      "integrity": "sha512-dDPjMCCopkRURAmOJCMSlpIQ5BGWCpYj0+FIfZ5qWQs24fn1PAkQHecOiBhJO0ZSVuQy3xcIyWsAp1NE5e+7ug==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.222.0.tgz",
+      "integrity": "sha512-rEqAgQ7itmB7GB+WWLgyT7/YWJkjEBCfggxycccChWAeqg+gjpstIiGX2BjP2K/wnzwE0D91JsozSXcQIDOtNQ==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/protocol-http": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.215.0.tgz",
-      "integrity": "sha512-qp6Y6v4S534LAjadiVl9p7ErK7ImphOKq6yhFyQwxko6iITLcz8ib3yU27fs4QJcnNj5ZooqW/YlL/0EikDxCQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.222.0.tgz",
+      "integrity": "sha512-Zj+ytEgrOagCE7yczjdDan7W+1a0OL5DPAx69Z00NxGoBI2h0GRZD28dRYb3Pzs5/Ft4KbCedH/RUnyaYjaZxw==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/querystring-builder": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.215.0.tgz",
-      "integrity": "sha512-eilk8CqG37BVhQklLif00K2dOJgDzacUi8h3KVQ72ry1V3h345i4HsmaFIxvnz8XtNyDvV8qFAzeYg9n2P9RQA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.222.0.tgz",
+      "integrity": "sha512-qrNUGDyDp9yVQMnBbz1T5YBQkA/u6D5o0PPzSwfZ9azdAcBLjHOEfsBrKhxP+K92L/nilbnmY89KrjMR8+BNtw==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-uri-escape": "3.201.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/querystring-parser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.215.0.tgz",
-      "integrity": "sha512-8h/9H8dWM4fZO27UGzo8W5JXln4yJMugPyUl4qFA437gzPgNFN95+oLJWXtHMlfCHC5T/PDKetY9TarMDgBD0Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.222.0.tgz",
+      "integrity": "sha512-3KfkCA/753PlF5QqhGuQ7u+NOgLyiBFeV8R8ut/pfBmG8fF6l3RKrkbcu+87QpqXntRzG+RLHDqS7ryT3B2ICg==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/service-error-classification": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.215.0.tgz",
-      "integrity": "sha512-SKBvClGFGzMPsjBBKjneaUazLCNr6bSxe9eFvOr3gCwuwE2jPQwW3VE1mb62howuvm6cLthEDwLQp/FsT1gMsw=="
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.222.0.tgz",
+      "integrity": "sha512-Dn/WGtm+v5nney0CaYZjdOtJmdEuI8EQiQ5J3eQ3G0jjT6mr1/tCajsNpq3ZqHXiwLtydwaVvsL3AKXn+oxFVA=="
     },
     "@aws-sdk/shared-ini-file-loader": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.215.0.tgz",
-      "integrity": "sha512-unzQeLOyUiYHr8WxxandHo0OaCj31gx0wpt8dn2cZcHm/MdCqHcHcsQqOVnQsWQrrxY/XZ27cPyMVQeicNKYwQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.222.0.tgz",
+      "integrity": "sha512-2dowzMXjvIf5gwX5gNCwpv/TzAbbXxrId3zYJgPdEtApsa7NxyFs5MfnHt1zZI6P3YORGheRnNUK9RUYOPKHgA==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/signature-v4": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.215.0.tgz",
-      "integrity": "sha512-Rc73uUCi3eJneO25DydLTfJYamXeuKS9YIhNMTKlpvcN1UQAmAnUbAmCuEmqvkYOiGD1i4/kd8kBga708iIikQ==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.222.0.tgz",
+      "integrity": "sha512-2qQZuKqx56b2uN2rdjdKL6u0Cvk82uTGNtIuetmySY9xPEAljSBdriaxTqNqK9Gs3M4obG22alUK4a85uwqS3g==",
       "requires": {
         "@aws-sdk/is-array-buffer": "3.201.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-hex-encoding": "3.201.0",
-        "@aws-sdk/util-middleware": "3.215.0",
+        "@aws-sdk/util-middleware": "3.222.0",
         "@aws-sdk/util-uri-escape": "3.201.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/signature-v4-multi-region": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.215.0.tgz",
-      "integrity": "sha512-XOUUNWs6I4vAa+Byj6qL/+DCWA5CjcRyA9sitYy8sNqhLcet8WoYf7vJL2LW1nvdzRb/pGBNWLiQOZ+9sadYeg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.222.0.tgz",
+      "integrity": "sha512-SF6Qi0KW69OzgLbA9q6AsZNFQCA+DI66SnAjW774sAE6aQyJmCbUsxETk37XodSymXzDOEDDC6QoY64HUoSoVw==",
       "requires": {
-        "@aws-sdk/protocol-http": "3.215.0",
-        "@aws-sdk/signature-v4": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/protocol-http": "3.222.0",
+        "@aws-sdk/signature-v4": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-arn-parser": "3.208.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/smithy-client": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.215.0.tgz",
-      "integrity": "sha512-PiZfCdZkPohzMPrRmJ46TPOf2Tr/dhKYdwQArRnOOIsJABUGXjlzCUE8vysDN35XZYRx5f9hd+/U7kayhniq2w==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.222.0.tgz",
+      "integrity": "sha512-4dnU7TvwKxVuOWduvFGClYe0EgNov5Ke1ef7O1bdKaj5MmlH6wBDgGJM4NKREBFapC2dUXkoPtwsihtYBci1Bw==",
       "requires": {
-        "@aws-sdk/middleware-stack": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/middleware-stack": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/token-providers": {
-      "version": "3.216.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.216.0.tgz",
-      "integrity": "sha512-cEmOfG7njWl0OA5lR65Sp2SW1i8ZLjf7C95TZ1e6t2Oo5aUFeN3aKBxMOV//1yc+BNzcFBnoHP/f29GhWxUOxA==",
-      "requires": {
-        "@aws-sdk/client-sso-oidc": "3.216.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/shared-ini-file-loader": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.223.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.223.0.tgz",
+      "integrity": "sha512-ik6IYiZO9tTzYPJKzUob4U9faC9We6UtVZGynEGLMWSLETM+LefSHK0elEaJaCqx2F4NLodw+t9uvllR+8YUow==",
+      "requires": {
+        "@aws-sdk/client-sso-oidc": "3.223.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/shared-ini-file-loader": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/types": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.215.0.tgz",
-      "integrity": "sha512-eRbCVjwzTYd9C5e2mceScJ6D2kYDDEC3PLkYfJa+1wH9iiF2JlbiYozAokyeYBHQ+AjmD93MK58RBoM8iZfH0Q=="
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.222.0.tgz",
+      "integrity": "sha512-yXRYptInkfEFaOvWFxlRXsRh9jWOmQc1sZeKqjfx2UCtzNJ7ebedN0VfCz4SaDotcw9Q4JWuN66qhRMJjDx7/w=="
     },
     "@aws-sdk/url-parser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.215.0.tgz",
-      "integrity": "sha512-r/qIk3TUlV36JvoRjTErFm0LzzgNKLB1YUG8zVZCGAc2TEATi8OVEmsZvi+KfTmsbszulITJVcjZKbHLbGoUzg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.222.0.tgz",
+      "integrity": "sha512-1+QbVdT/phYDb5JDQRJWoZeCujkXaI5m8z3bIiPxcRRY3NPuluDGrfX3kfnFen5s9QGByLvJxWKWZS+i+iUFRg==",
       "requires": {
-        "@aws-sdk/querystring-parser": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/querystring-parser": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -46781,35 +46366,35 @@
       }
     },
     "@aws-sdk/util-defaults-mode-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.215.0.tgz",
-      "integrity": "sha512-MiNfZgB0I4dR8CBxH163W7c9KvE38sgCHNPWopMqSX5ezz7cuCPohCU0XsWd4I7K31PvzuqmKgOiKBAZraQJMA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.222.0.tgz",
+      "integrity": "sha512-+dGsp59lrEkDmK7OO5ecMYasrTGIKacFHjqZ6aqmbn1xtcUd/o3Qe7g5YSRXMGwtZ6xhvBD+NJLkEERI7U7cMw==",
       "requires": {
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "bowser": "^2.11.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/util-defaults-mode-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.215.0.tgz",
-      "integrity": "sha512-mSp3R8GljQ+4UT3QMOksQk9L0cWbFLvR7bBmAlt4+GobgTjpRfzFjBP3uwrCqFa3BKDUR3FeJq3qwo+xeY1Krg==",
-      "requires": {
-        "@aws-sdk/config-resolver": "3.215.0",
-        "@aws-sdk/credential-provider-imds": "3.215.0",
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/property-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.222.0.tgz",
+      "integrity": "sha512-W/duYMtmCCWdzHP+yscBB6yrARgAqWpFdxgBvMSlT8TjOTrh/F+aj4NPamiNMeUfqfMFGnboYfyWRr1avkcAGQ==",
+      "requires": {
+        "@aws-sdk/config-resolver": "3.222.0",
+        "@aws-sdk/credential-provider-imds": "3.222.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/property-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.216.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.216.0.tgz",
-      "integrity": "sha512-uHje4H6Qj/z/op8UZoSuvGpEZhz/r+AGY0rCihFo7XjhT4RYVxb2Eb9uHRK/IAeHU4kjHAdpQiWGMSmnT/UacA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.222.0.tgz",
+      "integrity": "sha512-qujJQv8lFysAr1lOlBTJhz7949NZyq5cj74Q9dR99AcAMXXeI9CQayPKH7477AnXRGOTMahZ3mV0HZ1bCJoNTw==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -46830,20 +46415,20 @@
       }
     },
     "@aws-sdk/util-middleware": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.215.0.tgz",
-      "integrity": "sha512-DfHGlFlQCr+T/xhjS36HH8JEThDVB5lg5NZ6x4Cibhyeps9YX/4ovLAIx3B19H34sdWhZi7q6LfslCHLRu2+7Q==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.222.0.tgz",
+      "integrity": "sha512-Y4BPtSa+6+qvg6OVW6RrdDx0OADfWa2Uxsxqdozpdnx2OQY0q+1diqsNgFMV+FIvdXqffE147KG7roG+/AfPeA==",
       "requires": {
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/util-stream-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.215.0.tgz",
-      "integrity": "sha512-UVyCJJ5sCYLVHCW4Lpm8+ae+ISHPHZ/OqAoLbUpehk2RLGP6QhpQOrpJADLXPuB8YuWFMkoLLIVL8VE7mmTPWA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.222.0.tgz",
+      "integrity": "sha512-GW9Y1/pLHS7WYHHdswcDd4vaM9mzxDwewcDVujCd/L9MRbG1nA/wfCL7hAAXT1AN2GbGfbfT+jjHQqzexpKBnA==",
       "requires": {
-        "@aws-sdk/fetch-http-handler": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/fetch-http-handler": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-base64": "3.208.0",
         "@aws-sdk/util-hex-encoding": "3.201.0",
         "@aws-sdk/util-utf8-browser": "3.188.0",
@@ -46851,12 +46436,12 @@
       }
     },
     "@aws-sdk/util-stream-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.215.0.tgz",
-      "integrity": "sha512-7Vyp61P/2dGA9Fzn6uN/KdRd+Z7n8gCGmXBd/dQSrHx3UFIm1TuEmMwROzbWWxPOS6qDWY/dwQgMZH/tq78Llg==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.222.0.tgz",
+      "integrity": "sha512-iMwKG+RaGVAjzXDuzmMl63SnN6qVc+0VbbfaKW1eIK9Ihr5mko3GuYAFqKaECSQ+XdMNuMSVXzphveKw6t2zwg==",
       "requires": {
-        "@aws-sdk/node-http-handler": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/node-http-handler": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "@aws-sdk/util-buffer-from": "3.208.0",
         "tslib": "^2.3.1"
       }
@@ -46870,22 +46455,22 @@
       }
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.215.0.tgz",
-      "integrity": "sha512-uZz6BJWr8sJcA+onveS1lFqnbIXBHwvkyHLgCuuGhAxd5yY6YNLhpJBnhy9Fb8/aSbk6yao3qxlokqw9gthmAw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.222.0.tgz",
+      "integrity": "sha512-DREMeL0XHl4QIS2GVSHFwVH4mJZ+Dr04R3U8WfiMktXdA93j5tDMJpU3+PNaCZPeaqz2QNwrVSBWKwbwA357zQ==",
       "requires": {
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/types": "3.222.0",
         "bowser": "^2.11.0",
         "tslib": "^2.3.1"
       }
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.215.0.tgz",
-      "integrity": "sha512-4lrdd1oGRwJEwfvgvg1jcJ2O0bwElsvtiqZfTRHN6MNTFUqsKl0xHlgFChQsz3Hfrc1niWtZCmbqQKGdO5ARpw==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.222.0.tgz",
+      "integrity": "sha512-BMRMrPXL/HS3dSha9vcABkoANluKjB0pH78bc659EY2WUj9wCZdbUNQpACiYx8bwm7xKSxugCkmPd6NLWXUURw==",
       "requires": {
-        "@aws-sdk/node-config-provider": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/node-config-provider": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -46907,12 +46492,12 @@
       }
     },
     "@aws-sdk/util-waiter": {
-      "version": "3.215.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.215.0.tgz",
-      "integrity": "sha512-RX/EkRcuDjWKP/5K6XOnbq5cPaO9KSJ5Etotn+z5sPGUJ0xmGWEyFyfXKSL51az32tHcNoGAqboBTFDISB0LyA==",
+      "version": "3.222.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.222.0.tgz",
+      "integrity": "sha512-/07RkfxvDncsMeQ+GhigPdiSRd2v/1FJoCV4a5e9XDI1ZSMvUKm36wFqw5Bzts+AUY8f4HOPpGI9ZQeNb7u27Q==",
       "requires": {
-        "@aws-sdk/abort-controller": "3.215.0",
-        "@aws-sdk/types": "3.215.0",
+        "@aws-sdk/abort-controller": "3.222.0",
+        "@aws-sdk/types": "3.222.0",
         "tslib": "^2.3.1"
       }
     },
@@ -47848,12 +47433,6 @@
           "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
           "dev": true
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "execa": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -48494,6 +48073,9 @@
         "ethers": "^5.7.1"
       }
     },
+    "@casimir/exchange": {
+      "version": "file:common/exchange"
+    },
     "@casimir/hardhat-helpers": {
       "version": "file:common/hardhat-helpers",
       "requires": {
@@ -49016,16 +48598,16 @@
       }
     },
     "@esbuild/android-arm": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.16.tgz",
-      "integrity": "sha512-nyB6CH++2mSgx3GbnrJsZSxzne5K0HMyNIWafDHqYy7IwxFc4fd/CgHVZXr8Eh+Q3KbIAcAe3vGyqIPhGblvMQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-loong64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.16.tgz",
-      "integrity": "sha512-SDLfP1uoB0HZ14CdVYgagllgrG7Mdxhkt4jDJOKl/MldKrkQ6vDJMZKl2+5XsEY/Lzz37fjgLQoJBGuAw/x8kQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
       "dev": true,
       "optional": true
     },
@@ -50321,9 +49903,9 @@
           }
         },
         "bignumber.js": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-          "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+          "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
         }
       }
     },
@@ -50444,9 +50026,9 @@
       "integrity": "sha512-Rk4SkJFaXZiznFyC/t77Q0NKS4FL7TLJJsVG2V2oiEq3kJVeTdxysEe/yRWSpnWMe808XRDJ+VFh5pt/FN5plw=="
     },
     "@noble/hashes": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.3.tgz",
-      "integrity": "sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.4.tgz",
+      "integrity": "sha512-+PYsVPrTSqtVjatKt2A/Proukn2Yrz61OBThOCKErc5w2/r1Fh37vbDv0Eah7pyNltrmacjwTvdw3JoR+WE4TA=="
     },
     "@noble/secp256k1": {
       "version": "1.7.0",
@@ -51435,9 +51017,9 @@
       }
     },
     "@solana/web3.js": {
-      "version": "1.67.2",
-      "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-1.67.2.tgz",
-      "integrity": "sha512-qfdV0m/qcTpoJsIwonvXJQz8YY5mrSfBVLS/Cp+MPaaUzDzkpSV7WU1QeHsj+dkHX82W37zuhhg/DadRJls7+g==",
+      "version": "1.69.0",
+      "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-1.69.0.tgz",
+      "integrity": "sha512-iU2Q0IG25RITsxBkY1Vkk74LffRokViEcSblz4CGxyt+/V7xSkC2DNM0n0rB3aY/9+FvMiz4l5wHnD9UC4Ac/w==",
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@noble/ed25519": "^1.7.0",
@@ -51508,9 +51090,9 @@
       },
       "dependencies": {
         "bignumber.js": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-          "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+          "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
         }
       }
     },
@@ -51535,9 +51117,9 @@
       },
       "dependencies": {
         "bignumber.js": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-          "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+          "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
         },
         "cross-fetch": {
           "version": "3.1.5",
@@ -51808,10 +51390,13 @@
       }
     },
     "@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
-      "dev": true
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@types/debug": {
       "version": "4.1.7",
@@ -52242,14 +51827,14 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.45.0.tgz",
-      "integrity": "sha512-CXXHNlf0oL+Yg021cxgOdMHNTXD17rHkq7iW6RFHoybdFgQBjU3yIXhhcPpGwr1CjZlo6ET8C6tzX5juQoXeGA==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.45.1.tgz",
+      "integrity": "sha512-cOizjPlKEh0bXdFrBLTrI/J6B/QMlhwE9auOov53tgB+qMukH6/h8YAK/qw+QJGct/PTbdh2lytGyipxCcEtAw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.45.0",
-        "@typescript-eslint/type-utils": "5.45.0",
-        "@typescript-eslint/utils": "5.45.0",
+        "@typescript-eslint/scope-manager": "5.45.1",
+        "@typescript-eslint/type-utils": "5.45.1",
+        "@typescript-eslint/utils": "5.45.1",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
         "natural-compare-lite": "^1.4.0",
@@ -52322,53 +51907,53 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.45.0.tgz",
-      "integrity": "sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.45.1.tgz",
+      "integrity": "sha512-JQ3Ep8bEOXu16q0ztsatp/iQfDCtvap7sp/DKo7DWltUquj5AfCOpX2zSzJ8YkAVnrQNqQ5R62PBz2UtrfmCkA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.45.0",
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/typescript-estree": "5.45.0",
+        "@typescript-eslint/scope-manager": "5.45.1",
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/typescript-estree": "5.45.1",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz",
-      "integrity": "sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.45.1.tgz",
+      "integrity": "sha512-D6fCileR6Iai7E35Eb4Kp+k0iW7F1wxXYrOhX/3dywsOJpJAQ20Fwgcf+P/TDtvQ7zcsWsrJaglaQWDhOMsspQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/visitor-keys": "5.45.0"
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/visitor-keys": "5.45.1"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.45.0.tgz",
-      "integrity": "sha512-DY7BXVFSIGRGFZ574hTEyLPRiQIvI/9oGcN8t1A7f6zIs6ftbrU0nhyV26ZW//6f85avkwrLag424n+fkuoJ1Q==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.45.1.tgz",
+      "integrity": "sha512-aosxFa+0CoYgYEl3aptLe1svP910DJq68nwEJzyQcrtRhC4BN0tJAvZGAe+D0tzjJmFXe+h4leSsiZhwBa2vrA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.45.0",
-        "@typescript-eslint/utils": "5.45.0",
+        "@typescript-eslint/typescript-estree": "5.45.1",
+        "@typescript-eslint/utils": "5.45.1",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
-      "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.1.tgz",
+      "integrity": "sha512-HEW3U0E5dLjUT+nk7b4lLbOherS1U4ap+b9pfu2oGsW3oPu7genRaY9dDv3nMczC1rbnRY2W/D7SN05wYoGImg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
-      "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.1.tgz",
+      "integrity": "sha512-76NZpmpCzWVrrb0XmYEpbwOz/FENBi+5W7ipVXAsG3OoFrQKJMiaqsBMbvGRyLtPotGqUfcY7Ur8j0dksDJDng==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/visitor-keys": "5.45.0",
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/visitor-keys": "5.45.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -52377,28 +51962,28 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.45.0.tgz",
-      "integrity": "sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.45.1.tgz",
+      "integrity": "sha512-rlbC5VZz68+yjAzQBc4I7KDYVzWG2X/OrqoZrMahYq3u8FFtmQYc+9rovo/7wlJH5kugJ+jQXV5pJMnofGmPRw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.45.0",
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/typescript-estree": "5.45.0",
+        "@typescript-eslint/scope-manager": "5.45.1",
+        "@typescript-eslint/types": "5.45.1",
+        "@typescript-eslint/typescript-estree": "5.45.1",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
-      "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
+      "version": "5.45.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.1.tgz",
+      "integrity": "sha512-cy9ln+6rmthYWjH9fmx+5FU/JDpjQb586++x2FZlveq7GdGuLLW9a2Jcst2TGekH82bXpfmRNSwP9tyEs6RjvQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.45.0",
+        "@typescript-eslint/types": "5.45.1",
         "eslint-visitor-keys": "^3.3.0"
       }
     },
@@ -53043,39 +52628,6 @@
       "dev": true,
       "requires": {
         "string-width": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "ansi-colors": {
@@ -53961,12 +53513,6 @@
         "widest-line": "^2.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -54020,31 +53566,6 @@
           "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -54377,9 +53898,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001435",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001435.tgz",
-      "integrity": "sha512-kdCkUTjR+v4YAJelyiDTqiu82BDr4W4CP5sgTA0ZBmqn30XfS2ZghPLMowik9TPhS+psWJiUNxsqLyurDbmutA=="
+      "version": "1.0.30001436",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz",
+      "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -54694,55 +54215,52 @@
         "colors": "^1.1.2",
         "object-assign": "^4.1.0",
         "string-width": "^2.1.1"
+      }
+    },
+    "cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true,
-          "peer": true
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true,
-          "peer": true
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
         },
         "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
           }
         },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^6.0.1"
           }
         }
       }
     },
-    "cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
-      }
-    },
     "cli-width": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
@@ -54760,12 +54278,6 @@
         "wrap-ansi": "^6.2.0"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -55150,9 +54662,9 @@
       "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "constructs": {
-      "version": "10.1.176",
-      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.176.tgz",
-      "integrity": "sha512-1+fQUc9AcJImVlRfyC0lAAhB4coAqvV+M7ZqfCX/8FLq2X1xuY1eDhlR2MHB6h1ndkyrPHqpbQaxoJhoQzLb8w=="
+      "version": "10.1.180",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.180.tgz",
+      "integrity": "sha512-jMT+GN3es3hUFtFq4o9vts8sJ2kr9ShyobQ0jjvrNhLU/MIb6PUZPni0XQGwS8O9nXXX+0hAU/tzQl/Ft+hCOQ=="
     },
     "content-disposition": {
       "version": "0.5.4",
@@ -56265,14 +55777,14 @@
       }
     },
     "decimal.js": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
-      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
     },
     "decompress-response": {
       "version": "3.3.0",
@@ -56289,9 +55801,9 @@
       "dev": true
     },
     "deep-eql": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz",
-      "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "requires": {
         "type-detect": "^4.0.0"
       }
@@ -56678,10 +56190,9 @@
       "dev": true
     },
     "emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -56823,172 +56334,172 @@
       }
     },
     "esbuild": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.16.tgz",
-      "integrity": "sha512-o6iS9zxdHrrojjlj6pNGC2NAg86ECZqIETswTM5KmJitq+R1YmahhWtMumeQp9lHqJaROGnsBi2RLawGnfo5ZQ==",
-      "dev": true,
-      "requires": {
-        "@esbuild/android-arm": "0.15.16",
-        "@esbuild/linux-loong64": "0.15.16",
-        "esbuild-android-64": "0.15.16",
-        "esbuild-android-arm64": "0.15.16",
-        "esbuild-darwin-64": "0.15.16",
-        "esbuild-darwin-arm64": "0.15.16",
-        "esbuild-freebsd-64": "0.15.16",
-        "esbuild-freebsd-arm64": "0.15.16",
-        "esbuild-linux-32": "0.15.16",
-        "esbuild-linux-64": "0.15.16",
-        "esbuild-linux-arm": "0.15.16",
-        "esbuild-linux-arm64": "0.15.16",
-        "esbuild-linux-mips64le": "0.15.16",
-        "esbuild-linux-ppc64le": "0.15.16",
-        "esbuild-linux-riscv64": "0.15.16",
-        "esbuild-linux-s390x": "0.15.16",
-        "esbuild-netbsd-64": "0.15.16",
-        "esbuild-openbsd-64": "0.15.16",
-        "esbuild-sunos-64": "0.15.16",
-        "esbuild-windows-32": "0.15.16",
-        "esbuild-windows-64": "0.15.16",
-        "esbuild-windows-arm64": "0.15.16"
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
+      "dev": true,
+      "requires": {
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
       }
     },
     "esbuild-android-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.16.tgz",
-      "integrity": "sha512-Vwkv/sT0zMSgPSVO3Jlt1pUbnZuOgtOQJkJkyyJFAlLe7BiT8e9ESzo0zQSx4c3wW4T6kGChmKDPMbWTgtliQA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
       "dev": true,
       "optional": true
     },
     "esbuild-android-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.16.tgz",
-      "integrity": "sha512-lqfKuofMExL5niNV3gnhMUYacSXfsvzTa/58sDlBET/hCOG99Zmeh+lz6kvdgvGOsImeo6J9SW21rFCogNPLxg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.16.tgz",
-      "integrity": "sha512-wo2VWk/n/9V2TmqUZ/KpzRjCEcr00n7yahEdmtzlrfQ3lfMCf3Wa+0sqHAbjk3C6CKkR3WKK/whkMq5Gj4Da9g==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.16.tgz",
-      "integrity": "sha512-fMXaUr5ou0M4WnewBKsspMtX++C1yIa3nJ5R2LSbLCfJT3uFdcRoU/NZjoM4kOMKyOD9Sa/2vlgN8G07K3SJnw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.16.tgz",
-      "integrity": "sha512-UzIc0xlRx5x9kRuMr+E3+hlSOxa/aRqfuMfiYBXu2jJ8Mzej4lGL7+o6F5hzhLqWfWm1GWHNakIdlqg1ayaTNQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.16.tgz",
-      "integrity": "sha512-8xyiYuGc0DLZphFQIiYaLHlfoP+hAN9RHbE+Ibh8EUcDNHAqbQgUrQg7pE7Bo00rXmQ5Ap6KFgcR0b4ALZls1g==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.16.tgz",
-      "integrity": "sha512-iGijUTV+0kIMyUVoynK0v+32Oi8yyp0xwMzX69GX+5+AniNy/C/AL1MjFTsozRp/3xQPl7jVux/PLe2ds10/2w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.16.tgz",
-      "integrity": "sha512-tuSOjXdLw7VzaUj89fIdAaQT7zFGbKBcz4YxbWrOiXkwscYgE7HtTxUavreBbnRkGxKwr9iT/gmeJWNm4djy/g==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.16.tgz",
-      "integrity": "sha512-XKcrxCEXDTOuoRj5l12tJnkvuxXBMKwEC5j0JISw3ziLf0j4zIwXbKbTmUrKFWbo6ZgvNpa7Y5dnbsjVvH39bQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.16.tgz",
-      "integrity": "sha512-mPYksnfHnemNrvjrDhZyixL/AfbJN0Xn9S34ZOHYdh6/jJcNd8iTsv3JwJoEvTJqjMggjMhGUPJAdjnFBHoH8A==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.16.tgz",
-      "integrity": "sha512-kSJO2PXaxfm0pWY39+YX+QtpFqyyrcp0ZeI8QPTrcFVQoWEPiPVtOfTZeS3ZKedfH+Ga38c4DSzmKMQJocQv6A==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.16.tgz",
-      "integrity": "sha512-NimPikwkBY0yGABw6SlhKrtT35sU4O23xkhlrTT/O6lSxv3Pm5iSc6OYaqVAHWkLdVf31bF4UDVFO+D990WpAA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-riscv64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.16.tgz",
-      "integrity": "sha512-ty2YUHZlwFOwp7pR+J87M4CVrXJIf5ZZtU/umpxgVJBXvWjhziSLEQxvl30SYfUPq0nzeWKBGw5i/DieiHeKfw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-s390x": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.16.tgz",
-      "integrity": "sha512-VkZaGssvPDQtx4fvVdZ9czezmyWyzpQhEbSNsHZZN0BHvxRLOYAQ7sjay8nMQwYswP6O2KlZluRMNPYefFRs+w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-netbsd-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.16.tgz",
-      "integrity": "sha512-ElQ9rhdY51et6MJTWrCPbqOd/YuPowD7Cxx3ee8wlmXQQVW7UvQI6nSprJ9uVFQISqSF5e5EWpwWqXZsECLvXg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
       "dev": true,
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.16.tgz",
-      "integrity": "sha512-KgxMHyxMCT+NdLQE1zVJEsLSt2QQBAvJfmUGDmgEq8Fvjrf6vSKB00dVHUEDKcJwMID6CdgCpvYNt999tIYhqA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.16.tgz",
-      "integrity": "sha512-exSAx8Phj7QylXHlMfIyEfNrmqnLxFqLxdQF6MBHPdHAjT7fsKaX6XIJn+aQEFiOcE4X8e7VvdMCJ+WDZxjSRQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-32": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.16.tgz",
-      "integrity": "sha512-zQgWpY5pUCSTOwqKQ6/vOCJfRssTvxFuEkpB4f2VUGPBpdddZfdj8hbZuFRdZRPIVHvN7juGcpgCA/XCF37mAQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.16.tgz",
-      "integrity": "sha512-HjW1hHRLSncnM3MBCP7iquatHVJq9l0S2xxsHHj4yzf4nm9TU4Z7k4NkeMlD/dHQ4jPlQQhwcMvwbJiOefSuZw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.15.16",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.16.tgz",
-      "integrity": "sha512-oCcUKrJaMn04Vxy9Ekd8x23O8LoU01+4NOkQ2iBToKgnGj5eo1vU9i27NQZ9qC8NFZgnQQZg5oZWAejmbsppNA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
       "dev": true,
       "optional": true
     },
@@ -57069,9 +56580,9 @@
       }
     },
     "eslint": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
-      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
+      "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.3",
@@ -57585,9 +57096,9 @@
           "peer": true
         },
         "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true,
           "peer": true
         },
@@ -57671,13 +57182,6 @@
             "wrap-ansi": "^5.1.0"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-              "dev": true,
-              "peer": true
-            },
             "string-width": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -57689,16 +57193,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "peer": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -58012,25 +57506,14 @@
           "dev": true,
           "peer": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^4.1.0"
           }
         },
         "strip-json-comments": {
@@ -58089,13 +57572,6 @@
             "strip-ansi": "^5.0.0"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-              "dev": true,
-              "peer": true
-            },
             "string-width": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -58107,16 +57583,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "peer": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -58139,13 +57605,6 @@
             "yargs-parser": "^13.1.2"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-              "dev": true,
-              "peer": true
-            },
             "string-width": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -58157,16 +57616,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "peer": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -59148,9 +58597,9 @@
       }
     },
     "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -67438,11 +66887,6 @@
         "wide-align": "^1.1.2"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -69501,12 +68945,6 @@
           "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true
-        },
         "mimic-fn": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
@@ -69541,33 +68979,6 @@
             "tslib": "^1.9.0"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-              "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -71554,9 +70965,11 @@
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="
     },
     "jsonschema": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.2.tgz",
-      "integrity": "sha512-iX5OFQ6yx9NgbHCwse51ohhKgLuLL7Z5cNOeZOPIlDUtAMrxlruHLzVZxbltdHE5mEDXN+75oFOwq6Gn0MZwsA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
+      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+      "dev": true,
+      "peer": true
     },
     "JSONStream": {
       "version": "1.3.5",
@@ -71840,9 +71253,9 @@
       "dev": true
     },
     "lint-staged": {
-      "version": "13.0.4",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.4.tgz",
-      "integrity": "sha512-HxlHCXoYRsq9QCby5wFozmZW00hMs/9e3l+/dz6Qr8Kle4UH0kJTdABAbqhzG+3pcG6QjL9kz7NgGBfph+a5dw==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.1.0.tgz",
+      "integrity": "sha512-pn/sR8IrcF/T0vpWLilih8jmVouMlxqXxKuAojmbiGX5n/gDnz+abdPptlj0vYnbfE0SQNl3CY/HwtM0+yfOVQ==",
       "dev": true,
       "requires": {
         "cli-truncate": "^3.1.0",
@@ -71970,12 +71383,6 @@
             "string-width": "^4.2.0"
           }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -72081,12 +71488,6 @@
             "ms": "2.1.2"
           }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -72252,12 +71653,6 @@
         "wrap-ansi": "^6.2.0"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -72866,12 +72261,6 @@
             "wrap-ansi": "^7.0.0"
           }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -75797,6 +75186,11 @@
           "requires": {
             "@types/node": "*"
           }
+        },
+        "jsonschema": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.2.tgz",
+          "integrity": "sha512-iX5OFQ6yx9NgbHCwse51ohhKgLuLL7Z5cNOeZOPIlDUtAMrxlruHLzVZxbltdHE5mEDXN+75oFOwq6Gn0MZwsA=="
         }
       }
     },
@@ -75929,9 +75323,9 @@
       "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA=="
     },
     "rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz",
+      "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==",
       "dev": true,
       "requires": {
         "tslib": "^2.1.0"
@@ -77075,9 +76469,9 @@
           "peer": true
         },
         "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true,
           "peer": true
         },
@@ -77142,13 +76536,6 @@
             "wrap-ansi": "^5.1.0"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-              "dev": true,
-              "peer": true
-            },
             "string-width": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -77160,16 +76547,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "peer": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -77318,13 +76695,6 @@
             "esprima": "^4.0.0"
           }
         },
-        "jsonschema": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
-          "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
-          "dev": true,
-          "peer": true
-        },
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -77468,25 +76838,14 @@
             "picomatch": "^2.0.4"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^4.1.0"
           }
         },
         "strip-json-comments": {
@@ -77538,13 +76897,6 @@
             "strip-ansi": "^5.0.0"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-              "dev": true,
-              "peer": true
-            },
             "string-width": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -77556,16 +76908,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "peer": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -77588,13 +76930,6 @@
             "yargs-parser": "^13.1.2"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-              "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-              "dev": true,
-              "peer": true
-            },
             "string-width": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -77606,16 +76941,6 @@
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
               }
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "peer": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
             }
           }
         },
@@ -77645,9 +76970,9 @@
       }
     },
     "solidity-docgen": {
-      "version": "0.6.0-beta.31",
-      "resolved": "https://registry.npmjs.org/solidity-docgen/-/solidity-docgen-0.6.0-beta.31.tgz",
-      "integrity": "sha512-MFQ1PkdyHx1I2DvJhPM88hEfsf0CAg1iwUUEJ2tJPRtK4ITGorZ2ld4Vjs3g0zznTmzVrFMSWrZBaxuWwFQXeA==",
+      "version": "0.6.0-beta.32",
+      "resolved": "https://registry.npmjs.org/solidity-docgen/-/solidity-docgen-0.6.0-beta.32.tgz",
+      "integrity": "sha512-LGcosbgqxrqTo9winVq3+Xz1shS9k4p+RKwqPVPI0HtjfsKF9Mc5GzBzOUhce9uwzy0yJfhf832whfY1UKt4Aw==",
       "dev": true,
       "requires": {
         "handlebars": "^4.7.7",
@@ -77991,29 +77316,30 @@
       }
     },
     "string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "requires": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
         },
         "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "dev": true,
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
           "requires": {
-            "ansi-regex": "^6.0.1"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -78193,12 +77519,6 @@
             "uri-js": "^4.2.2"
           }
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -80601,28 +79921,6 @@
       "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "requires": {
         "string-width": "^1.0.2 || 2 || 3 || 4"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
       }
     },
     "widest-line": {
@@ -80632,39 +79930,6 @@
       "dev": true,
       "requires": {
         "string-width": "^2.1.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "wif": {
@@ -80857,12 +80122,6 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -81029,12 +80288,6 @@
         "yargs-parser": "^18.1.2"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
diff --git a/services/crawler/package.json b/services/crawler/package.json
index bb5767d7a..2ce5480c5 100644
--- a/services/crawler/package.json
+++ b/services/crawler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@casimir/crawler",
-    "main": "src/",
+    "main": "src/index.ts",
     "scripts": {
         "dev": "ts-node ./src/index.ts",
         "test": "jest",
@@ -39,4 +39,4 @@
             "ts-node/register"
         ]
     }
-}
+}
\ No newline at end of file

From f9bca878f2127d7b14971d3202f81918559ef4b4 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 13:12:56 -0500
Subject: [PATCH 18/31] Update .gitignore

---
 .gitignore | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 911df9670..d0d567f97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,5 @@ aws.env
 *.log
 .idea
 
-
-
-# Prevents committing node data
-scripts/ssv/resources/nimbus/data
\ No newline at end of file
+# Sensitive
+secrets/*.json
\ No newline at end of file

From f654a5e5622d704b4cd9797d0d1932f699cd05c7 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 13:14:26 -0500
Subject: [PATCH 19/31] Update dev secrets path in .gitignore

---
 .gitignore                               |   2 +-
 common/ethers-helpers/src/index.ts       |  16 ++-
 package.json                             |   1 +
 scripts/chainlink/dev.ts                 |  41 ++++++++
 scripts/chainlink/docker-compose.yml     | 127 +++++++++++++++++++++++
 scripts/chainlink/secrets/apicredentials |   2 +
 scripts/chainlink/secrets/password.txt   |   1 +
 7 files changed, 179 insertions(+), 11 deletions(-)
 create mode 100644 scripts/chainlink/docker-compose.yml
 create mode 100644 scripts/chainlink/secrets/apicredentials
 create mode 100644 scripts/chainlink/secrets/password.txt

diff --git a/.gitignore b/.gitignore
index d0d567f97..f9e16e45b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ aws.env
 .idea
 
 # Sensitive
-secrets/*.json
\ No newline at end of file
+**/**/secrets/*.json
\ No newline at end of file
diff --git a/common/ethers-helpers/src/index.ts b/common/ethers-helpers/src/index.ts
index 55d29ca51..40ffaad4f 100644
--- a/common/ethers-helpers/src/index.ts
+++ b/common/ethers-helpers/src/index.ts
@@ -1,14 +1,14 @@
 import { ethers } from 'ethers'
 
-
-function formatBytes(hexstring: string) {
-    return ethers.utils.arrayify(hexstring)
+async function getAddress(mnemonic?: string) {
+    const wallet = getWallet(mnemonic)
+    return wallet.address
 }
 
 async function getKeystore(mnemonic?: string) {
     const wallet = getWallet(mnemonic)
-    console.log(wallet.privateKey)
-    return await wallet.encrypt('')
+    const keystoreString = await wallet.encrypt('')
+    return JSON.parse(keystoreString)
 }
 
 function getWallet(mnemonic?: string) {
@@ -18,8 +18,4 @@ function getWallet(mnemonic?: string) {
     return ethers.Wallet.createRandom()
 }
 
-void function main() {
-    console.log(formatBytes('0x13b4682b21fe50088beff43530787d1dac1e50c8e0686ec55849c8c9c9c5c044'))
-}()
-
-export { getKeystore, getWallet }
+export { getAddress, getKeystore, getWallet }
diff --git a/package.json b/package.json
index 91411757d..b98c1a044 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "clean": "npm exec --workspaces -- npx rimraf node_modules && npx rimraf node_modules package-lock.json && npm i",
     "deploy": "scripts/cdk/deploy -d infrastructure/cdk",
     "dev": "npx esno -r dotenv/config scripts/local/dev.ts --app=\"$npm_config_app\" --fork=\"$npm_config_fork\" --ledger=\"$npm_config_ledger\" --mock=\"$npm_config_mock\" --network=\"$npm_config_network\" --trezor=\"$npm_config_trezor\" --external=\"$npm_config_external\"",
+    "dev:chainlink": "npx esno -r dotenv/config scripts/chainlink/dev.ts --fork=\"$npm_config_fork\"",
     "dev:crawler": "scripts/crawler/dev -c \"$npm_config_chains\" -f \"$npm_config_fork\" -n \"$npm_config_network\" -u \"$npm_config_upload\"",
     "dev:ethereum": "npx esno -r dotenv/config scripts/ethereum/dev.ts --fork=\"$npm_config_fork\"",
     "dev:landing": "npm run dev --workspace @casimir/landing",
diff --git a/scripts/chainlink/dev.ts b/scripts/chainlink/dev.ts
index e69de29bb..bc575feec 100644
--- a/scripts/chainlink/dev.ts
+++ b/scripts/chainlink/dev.ts
@@ -0,0 +1,41 @@
+import { $, argv, fs } from 'zx'
+import { getSecret } from '@casimir/aws-helpers'
+import { getAddress, getKeystore } from '@casimir/ethers-helpers'
+
+/**
+ * Run local a local Chainlink node and fulfill requests
+ * 
+ * Arguments:
+ *      --fork: mainnet, goerli, true, or false (override default goerli)
+ * 
+ * For more info see:
+ *      - https://hardhat.org/hardhat-network/docs/overview
+ */
+void async function () {
+    process.env.DOCKER_BUILDKIT = '1'
+    process.env.COMPOSE_DOCKER_CLI_BUILD = '1'
+    if (!process.env.EXPLORER_DOCKER_TAG) {
+        process.env.EXPLORER_DOCKER_TAG = 'develop'
+    }
+
+    // Get shared seed
+    const seed = await getSecret('consensus-networks-bip39-seed')
+    process.env.BIP39_SEED = seed
+
+    const address = await getAddress(seed)
+    process.env.CHAINLINK_OWNER_ADDRESS = address
+
+    const keystore = await getKeystore(seed)
+    await fs.writeJSON(`scripts/chainlink/secrets/${address}.json`, keystore, { spaces: '\t' })
+
+    const fork = argv.fork === 'true' ? 'goerli' : argv.fork === 'false' ? false : argv.fork ? argv.fork : 'goerli'
+    if (fork) {
+        const forkingChainId = { mainnet: 1, goerli: 5 }[fork]
+        process.env.ETH_CHAIN_ID = `${forkingChainId}`
+    } else {
+        process.env.ETH_CHAIN_ID = '1337'
+    }
+
+    // $`docker compose up`
+
+}()
\ No newline at end of file
diff --git a/scripts/chainlink/docker-compose.yml b/scripts/chainlink/docker-compose.yml
new file mode 100644
index 000000000..5a61df131
--- /dev/null
+++ b/scripts/chainlink/docker-compose.yml
@@ -0,0 +1,127 @@
+version: '3.5'
+
+services:
+  node:
+    container_name: chainlink-node
+    image: smartcontract/chainlink
+    # Note that the keystore import allows us to submit transactions
+    # immediately because addresses are specified when starting the
+    # parity/geth node to be prefunded with eth.
+    entrypoint: /bin/sh -c "chainlink node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
+    restart: always
+    environment:
+      - ETH_CHAIN_ID
+      - LOG_LEVEL
+      - ROOT
+      - ETH_URL
+      - MIN_OUTGOING_CONFIRMATIONS
+      - MIN_INCOMING_CONFIRMATIONS
+      - MINIMUM_CONTRACT_PAYMENT_LINK_JUELS
+      - DEFAULT_HTTP_TIMEOUT
+      - CHAINLINK_DEV
+      - EXPLORER_URL
+      - EXPLORER_ACCESS_KEY
+      - EXPLORER_SECRET
+      - SECURE_COOKIES
+      - CHAINLINK_TLS_PORT
+      - DATABASE_URL=postgresql://postgres:$CHAINLINK_PGPASSWORD@node-db:5432/$CHAINLINK_DB_NAME?sslmode=disable
+    env_file:
+      - .env
+    ports:
+      - 6688:6688
+    secrets:
+      - node_password
+      - apicredentials
+      - keystore
+    depends_on:
+      - explorer
+      - node-db
+
+  node-2:
+    container_name: chainlink-node-2
+    image: smartcontract/chainlink
+    entrypoint: /bin/sh -c "chainlink node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
+    restart: always
+    environment:
+      - ETH_CHAIN_ID
+      - LOG_LEVEL
+      - ROOT
+      - ETH_URL
+      - MIN_OUTGOING_CONFIRMATIONS
+      - MIN_INCOMING_CONFIRMATIONS
+      - MINIMUM_CONTRACT_PAYMENT_LINK_JUELS
+      - DEFAULT_HTTP_TIMEOUT
+      - CHAINLINK_DEV
+      - SECURE_COOKIES
+      - CHAINLINK_TLS_PORT
+      - DATABASE_URL=postgresql://postgres:$CHAINLINK_PGPASSWORD@node-db-2:5432/$CHAINLINK_DB_NAME?sslmode=disable
+    env_file:
+      - .env
+    ports:
+      - 6699:6688
+    secrets:
+      - node_password
+      - apicredentials
+      - keystore
+    depends_on:
+      - node-db-2
+
+  explorer:
+    container_name: chainlink-explorer
+    image: smartcontract/explorer:${EXPLORER_DOCKER_TAG}
+    entrypoint: yarn workspace @chainlink/explorer dev:compose
+    restart: always
+    ports:
+      - 3001
+    depends_on:
+      - explorer-db
+    environment:
+      - EXPLORER_COOKIE_SECRET
+      - EXPLORER_SERVER_PORT
+      - PGPASSWORD=$EXPLORER_PGPASSWORD
+
+  explorer-db:
+    container_name: chainlink-explorer-db
+    image: postgres:11.6
+    volumes:
+      - explorer-db-data:/var/lib/postgresql/data
+    ports:
+      - 5433:5432
+    environment:
+      POSTGRES_DB: $EXPLORER_DB_NAME
+      POSTGRES_PASSWORD: $EXPLORER_PGPASSWORD
+
+  node-db:
+    container_name: chainlink-db
+    image: postgres:11.6
+    volumes:
+      - node-db-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: $CHAINLINK_DB_NAME
+      POSTGRES_PASSWORD: $CHAINLINK_PGPASSWORD
+
+  node-db-2:
+    container_name: chainlink-db-2
+    image: postgres:11.6
+    volumes:
+      - node-db-2-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: $CHAINLINK_DB_NAME
+      POSTGRES_PASSWORD: $CHAINLINK_PGPASSWORD
+
+# TODO
+# - replace clroot with secrets
+# - extract explorer and tools into separate docker-compose files
+
+secrets:
+  node_password:
+    file: ./secrets/password.txt
+  apicredentials:
+    file: ./secrets/apicredentials
+  keystore:
+    file: ./secrets/${CHAINLINK_OWNER_ADDRESS}.json
+
+volumes:
+  explorer-db-data:
+  node-db-data:
+  node-db-2-data:
\ No newline at end of file
diff --git a/scripts/chainlink/secrets/apicredentials b/scripts/chainlink/secrets/apicredentials
new file mode 100644
index 000000000..b3953a279
--- /dev/null
+++ b/scripts/chainlink/secrets/apicredentials
@@ -0,0 +1,2 @@
+notreal@fakeemail.ch
+fj293fbBnlQ!f9vNs
\ No newline at end of file
diff --git a/scripts/chainlink/secrets/password.txt b/scripts/chainlink/secrets/password.txt
new file mode 100644
index 000000000..cf0d857e6
--- /dev/null
+++ b/scripts/chainlink/secrets/password.txt
@@ -0,0 +1 @@
+T.tLHkcmwePT/p,]sYuntjwHKAsrhm#4eRs4LuKHwvHejWYAC2JP4M8HimwgmbaZ
\ No newline at end of file

From 7682dafb4504472cbf2762bafeacf57031e90c6d Mon Sep 17 00:00:00 2001
From: hawyar <hawyarxoshnaw@gmail.com>
Date: Tue, 6 Dec 2022 14:22:39 -0500
Subject: [PATCH 20/31] Clean

---
 apps/web/src/composables/price.ts | 21 +++++++--------------
 apps/web/src/pages/test/Test.vue  |  2 --
 common/exchange/src/index.ts      | 21 ++++++++++++++-------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/apps/web/src/composables/price.ts b/apps/web/src/composables/price.ts
index 606a5954a..62f820901 100644
--- a/apps/web/src/composables/price.ts
+++ b/apps/web/src/composables/price.ts
@@ -14,12 +14,14 @@ type PriceEntry = {
 
   
 export default function usePrice() {
-    const exchange = new Exchange('ETH', 'USD')
-
     async function getExchangeRate(amount: ethers.BigNumber) {
+        if (ethers.utils.formatEther(amount) === '0.0') {
+            return 0
+        }
+
         const eth = ethers.utils.formatEther(amount)
 
-        const price = await exchange.getCurrentPrice()
+        const price = await getCurrentPrice({ coin: 'ETH', currency: 'USD' })
         const rate = price * parseFloat(eth)
         return rate
     }
@@ -28,22 +30,14 @@ export default function usePrice() {
     }
 }
 
-class Exchange {
-  coin: 'ETH' | 'BTC'
-  currency: 'USD'
-  constructor(coin: 'ETH' | 'BTC', currency: 'USD') {
-    this.coin = coin
-    this.currency = currency
-  }
-
-  async getCurrentPrice(): Promise<number> {
+async function getCurrentPrice({ coin, currency }: { coin: 'ETH' | 'BTC'; currency: 'USD' }) {
     const opt = {
         method: 'GET'
     }
 
     const now = Math.floor(Date.now() / 1000)
 
-    const url = `https://min-api.cryptocompare.com/data/v2/histominute?fsym=${this.coin}&tsym=${this.currency}&toTs=${now}&limit=1`
+    const url = `https://min-api.cryptocompare.com/data/v2/histominute?fsym=${coin}&tsym=${currency}&toTs=${now}&limit=1`
 
     try {
         const response = await fetch(url, opt)
@@ -66,5 +60,4 @@ class Exchange {
         console.log(e)
         return 0
     }
-  }
 }
\ No newline at end of file
diff --git a/apps/web/src/pages/test/Test.vue b/apps/web/src/pages/test/Test.vue
index 6fc314a24..fb0bec7bb 100644
--- a/apps/web/src/pages/test/Test.vue
+++ b/apps/web/src/pages/test/Test.vue
@@ -1,11 +1,9 @@
 <script lang="ts" setup>
-    import Price from '@/components/Price.vue'
     import Wallet from '@/components/Wallet.vue'
 </script>
   
 <template>
   <div>
-    <Price />
     <Wallet />
   </div>
 </template>
diff --git a/common/exchange/src/index.ts b/common/exchange/src/index.ts
index fdb1b4c84..42b85f9b7 100644
--- a/common/exchange/src/index.ts
+++ b/common/exchange/src/index.ts
@@ -43,21 +43,28 @@ export class Exchange {
   }
 
   async getCurrentPrice(): Promise<any> {
-    const response = await this.request({
+    const now = Math.floor(Date.now() / 1000)
+    const data = await this.request({
       port: null,
       method: 'GET',
-      host: 'alphavantage.co',
-      path: `/query?function=CRYPTO_INTRADAY&symbol=${this.coin}&market=${this.currency}&interval=1min&apikey=`,
+      host: 'min-api.cryptocompare.com',
+      path: `/data/v2/histominute?fsym=${this.coin}&tsym=${this.currency}&toTs=${now}&limit=1`,
       headers: {
         'Content-Length': '0',
       },
     })
 
-    const price = response['Time Series Crypto (1min)']
-    const val = Object.values(price)[0]
+    if (data.Response.toLowerCase() !== 'success') {
+        throw new Error(data.Message)
+    }
+
+    if (data.Data.Data.length === 0) {
+        throw new Error('Empty response from API')
+    }
 
-    console.log(val)
-    return {}
+    const first = data.Data.Data[0] as PriceEntry
+    const mid = (first.high + first.low) / 2
+    return mid
   }
 
   async getPriceAtBlock(time: number): Promise<number> {

From 78935870794b113eacb8661dc2794dc6d6b3acc1 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Tue, 6 Dec 2022 14:54:45 -0500
Subject: [PATCH 21/31] Update pills text on ETH Staking page

---
 .../pages/staking/components/ETHStaking.vue   | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index 13a12db4b..b3a8fc702 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -5,10 +5,21 @@ import { ref, onMounted } from 'vue'
 
 const ETHStakingStats = ref(
     [
-        'Total Amount Staked: 78.32 ETH | #123,123.11',
-        'Total Rewards: 78.32 ETH | $123,123.11',
-        '4.11% Anual Reward Rate',
-        '11% Avg Fee',
+      {
+        title: 'Staked',
+        value: '78.32 ETH | $123,123.12',
+        tooltip: 'Total ammount currently staked to SSV'
+      },
+      {
+        title: 'Rewards',
+        value: '78.32 ETH | $123,123.12',
+        tooltip: 'Total rewards accumulated with current stakes'
+      },
+      {
+        title: 'APR',
+        value: '4.11%',
+        tooltip: 'Annual Percentage Rate'
+      },
     ]
 )
 
@@ -158,10 +169,15 @@ const CurrentStakedItems = ref(
       >
         <div
           v-for="item in ETHStakingStats"
-          :key="item"
+          :key="`${item as any}`"
           class="pill_primary whitespace-nowrap"
         >
-          {{ item }}
+          <span class="text-grey_5 mr-[5px]">
+            {{ item.title }}: 
+          </span>
+          <span>
+            {{ item.value }}
+          </span>
         </div>
       </div>
     </div>

From f5d3f52d658ef461157433b01ed018f89351bda5 Mon Sep 17 00:00:00 2001
From: hawyar <hawyarxoshnaw@gmail.com>
Date: Tue, 6 Dec 2022 16:48:06 -0500
Subject: [PATCH 22/31] Fix

---
 common/exchange/package.json | 1 +
 package-lock.json            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/common/exchange/package.json b/common/exchange/package.json
index 829cb02c1..a3c83f9af 100644
--- a/common/exchange/package.json
+++ b/common/exchange/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "main": "src/index.ts",
   "scripts": {
+    "build": "echo \"Warning: no build specified\" && exit 0",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "hawyar",
diff --git a/package-lock.json b/package-lock.json
index a7ef04ef6..7a5fe4883 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,6 +172,7 @@
       }
     },
     "common/exchange": {
+      "name": "@casimir/exchange",
       "version": "1.0.0",
       "license": "ISC"
     },

From 9a9fc50e3186cb44c11a3842b32ec72fabf3ad04 Mon Sep 17 00:00:00 2001
From: hawyar <hawyarxoshnaw@gmail.com>
Date: Tue, 6 Dec 2022 16:59:18 -0500
Subject: [PATCH 23/31] Remove vscode user setting

---
 .vscode/settings.json | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 61aa57a14..6f06097f4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -20,15 +20,4 @@
     ],
     "css.lint.unknownAtRules": "ignore",
     "jupyter.notebookFileRoot": "${fileDirname}",
-    "terminal.integrated.profiles.osx": {
-        "x86 bash": {
-            "path": "/usr/bin/arch",
-            "args": ["-arch", "x86_64", "/bin/bash"]
-        },
-        "x86 zsh": {
-            "path": "/usr/bin/arch",
-            "args": ["-arch", "x86_64", "/bin/zsh"]
-        }
-    },
-    "terminal.integrated.defaultProfile.osx": "x86 zsh"
 }
\ No newline at end of file

From 0d8d9ba5b6b3f86a9a774d3f041f2ac844240ab2 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Tue, 6 Dec 2022 23:47:06 -0500
Subject: [PATCH 24/31] Add validator and operator detail fetch

---
 apps/web/src/components/Wallet.vue            |  9 +-
 apps/web/src/composables/wallet.ts            | 62 ++++++++++++--
 apps/web/src/interfaces/Pool.ts               |  3 +-
 .../src/interfaces/SSVDeploymentConfig.ts     |  4 +-
 contracts/ethereum/scripts/ssv.deploy.ts      | 41 +++++----
 contracts/ethereum/src/SSVManager.sol         | 18 ++--
 contracts/ethereum/src/external/Oracle.sol    |  3 +
 package-lock.json                             |  7 +-
 scripts/chainlink/dev.ts                      | 44 ++++++----
 scripts/chainlink/docker-compose.yml          | 84 +------------------
 scripts/ethereum/dev.ts                       |  5 +-
 scripts/ethereum/test.ts                      |  2 +-
 scripts/local/dev.ts                          |  2 +-
 services/matcher/job.toml                     | 12 +++
 services/matcher/package.json                 |  9 +-
 services/matcher/src/index.ts                 | 16 ++--
 16 files changed, 175 insertions(+), 146 deletions(-)
 create mode 100644 contracts/ethereum/src/external/Oracle.sol
 create mode 100644 services/matcher/job.toml

diff --git a/apps/web/src/components/Wallet.vue b/apps/web/src/components/Wallet.vue
index a131c7af2..460fd77b3 100644
--- a/apps/web/src/components/Wallet.vue
+++ b/apps/web/src/components/Wallet.vue
@@ -178,7 +178,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watchEffect } from 'vue'
+import { ref, watchEffect, onMounted } from 'vue'
 import useWallet from '@/composables/wallet'
 import useUsers from '@/composables/users'
 
@@ -213,9 +213,14 @@ const {
   signMessage,
   deposit,
   login,
-  getUserPools
+  getUserPools,
+  subscribeToEvents
 } = useWallet()
 
+onMounted(() => {
+  subscribeToEvents()
+})
+
 watchEffect(() => {
   if (selectedProvider.value === 'MetaMask') {
     metamaskButtonText.value = 'MetaMask Connected'
diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index dd7d4bf1b..32e746983 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -135,6 +135,20 @@ export default function useWallet() {
     }
   }
 
+  function subscribeToEvents() {
+    const provider = new ethers.providers.JsonRpcProvider(ethereumURL)
+
+    const validatorInitFilter = {
+      address: ssv.address,
+      topics: [
+        ethers.utils.id('ValidatorInitFullfilled(uint32,uint32[],string)')
+      ]
+    }
+    ssv.connect(provider).on(validatorInitFilter, () => {
+      console.log('ValidatorInit')
+    })
+  }
+
   // Todo @ccali11 should we move these ssv objects to the ssv composable?
   async function getUserPools() {
     if (ethersSignerList.includes(selectedProvider.value)) {
@@ -143,19 +157,52 @@ export default function useWallet() {
       const ssvProvider = ssv.connect(provider)
       const usersPoolsIds = await ssvProvider.getUserPoolIds(userAddress)
       pools.value = await Promise.all(usersPoolsIds.map(async (poolId: number) => {
+
         const { stake: totalStake, rewards: totalRewards } = await ssvProvider.getPoolBalance(poolId)
         const { stake: userStake, rewards: userRewards } = await ssvProvider.getPoolUserBalance(poolId, userAddress)
-        const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId) // Public key bytes (i.e., 0x..)
-        const operatorIds = await ssvProvider.getPoolOperatorIds(poolId) // Operator ID uint32[] (i.e., [1, 2, 3, 4])
-        return {
+        
+        let pool: Pool = {
           id: poolId,
           totalStake: ethers.utils.formatEther(totalStake),
           totalRewards: ethers.utils.formatEther(totalRewards),
           userStake: ethers.utils.formatEther(userStake),
-          userRewards: ethers.utils.formatEther(userRewards),
-          validatorPublicKey,
-          operatorIds
+          userRewards: ethers.utils.formatEther(userRewards)
         }
+
+        const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId) // Public key bytes (i.e., 0x..)
+        if (validatorPublicKey) {
+
+          const response = await fetch(`https://prater.beaconcha.in/api/v1/validator/${validatorPublicKey}`)
+          const { data } = await response.json()
+          const { status } = data
+          const validator = {
+            publicKey: validatorPublicKey,
+            status: status.charAt(0).toUpperCase() + status.slice(1),
+            effectiveness: '100%',
+            apr: '5.5%', // See issue #205 https://github.com/consensusnetworks/casimir/issues/205#issuecomment-1338142532
+            url: `https://prater.beaconcha.in/validator/${validatorPublicKey}`
+          }
+
+          const operatorIds = await ssvProvider.getPoolOperatorIds(poolId) // Operator ID uint32[] (i.e., [1, 2, 3, 4])
+          const operators = await Promise.all(operatorIds.map(async (operatorId: number) => {
+            const response = await fetch(`https://api.ssv.network/api/v1/operators/${operatorId}`)
+            const { performance } = await response.json()
+            return { 
+              id: operatorId, 
+              '24HourPerformance': performance['24h'],
+              '30DayPerformance': performance['30d'],
+              url: `https://explorer.ssv.network/operators/${operatorId}`
+            }
+          }))
+
+          pool = {
+            ...pool,
+            validator,
+            operators
+          }
+        }
+
+        return pool
       }))
     }
   }
@@ -200,6 +247,7 @@ export default function useWallet() {
     signMessage,
     deposit,
     login,
-    getUserPools
+    getUserPools,
+    subscribeToEvents
   }
 }
\ No newline at end of file
diff --git a/apps/web/src/interfaces/Pool.ts b/apps/web/src/interfaces/Pool.ts
index 2262d82c4..803aa556b 100644
--- a/apps/web/src/interfaces/Pool.ts
+++ b/apps/web/src/interfaces/Pool.ts
@@ -13,9 +13,8 @@ export interface Pool {
     }
     operators?: {
         id: number
-        publicKey?: string
         '24HourPerformance'?: number
         '30DayPerformance'?: number
         url?: string // https://explorer.ssv.network/operators/{id}
-    }
+    }[]
 }
\ No newline at end of file
diff --git a/common/types/src/interfaces/SSVDeploymentConfig.ts b/common/types/src/interfaces/SSVDeploymentConfig.ts
index 5de85a452..1fb0fbd89 100644
--- a/common/types/src/interfaces/SSVDeploymentConfig.ts
+++ b/common/types/src/interfaces/SSVDeploymentConfig.ts
@@ -2,6 +2,6 @@ import { ContractConfig } from './ContractConfig'
 
 export interface SSVDeploymentConfig {
     SSVManager: ContractConfig
-    MockOracle?: ContractConfig,
-    LinkToken?: ContractConfig
+    Oracle?: ContractConfig,
+    MockOracle?: ContractConfig
 }
\ No newline at end of file
diff --git a/contracts/ethereum/scripts/ssv.deploy.ts b/contracts/ethereum/scripts/ssv.deploy.ts
index adcfdfbee..73169590e 100644
--- a/contracts/ethereum/scripts/ssv.deploy.ts
+++ b/contracts/ethereum/scripts/ssv.deploy.ts
@@ -1,9 +1,11 @@
+import { ethers } from 'hardhat'
 import { deployContract } from '@casimir/hardhat-helpers'
 import { ContractConfig, SSVDeploymentConfig } from '@casimir/types'
 
 void async function () {
     const mockChainlink = process.env.MOCK_CHAINLINK === 'true'
-    let deploymentConfig: SSVDeploymentConfig = {
+    const runChainlink = process.env.RUN_CHAINLINK === 'true'
+    let config: SSVDeploymentConfig = {
         SSVManager: {
             address: '',
             args: {
@@ -18,7 +20,7 @@ void async function () {
         }
     }
 
-    const chainlinkDeploymentConfig = {
+    const mockChainlinkConfig = {
         MockOracle: {
             address: '',
             args: {
@@ -29,21 +31,22 @@ void async function () {
         }
     }
 
-    if (mockChainlink) {
-        deploymentConfig = {
-            // Deploy Chainlink contracts first
-            ...chainlinkDeploymentConfig,
-            ...deploymentConfig
+    if (mockChainlink && !runChainlink) {
+        config = {
+            // Deploy Chainlink oracle first
+            ...mockChainlinkConfig,
+            ...config
         }
     }
 
-    for (const name in deploymentConfig) {
+
+    for (const name in config) {
         console.log(`Deploying ${name} contract...`)
-        const { args, options, proxy } = deploymentConfig[name as keyof typeof deploymentConfig] as ContractConfig
+        const { args, options, proxy } = config[name as keyof typeof config] as ContractConfig
 
-        // Update SSVManager args with MockOracle address
-        if (name === 'SSVManager') {
-            args.linkOracleAddress = deploymentConfig.MockOracle?.address
+        // Update SSVManager args with Oracle or MockOracle address
+        if (name === 'SSVManager' && config.MockOracle) {
+            args.linkOracleAddress = config.MockOracle.address
         }
 
         const contract = await deployContract(name, proxy, args, options)
@@ -53,7 +56,17 @@ void async function () {
         console.log(`${name} contract deployed to ${address}`);
 
         // Save contract address for next loop
-        (deploymentConfig[name as keyof SSVDeploymentConfig] as ContractConfig).address = address
+        (config[name as keyof SSVDeploymentConfig] as ContractConfig).address = address
+    }
+    
+    // Set permission on the Oracle to use local node
+    if (runChainlink) {
+        const linkOracleOwnerAddress = '0x9d087fC03ae39b088326b67fA3C788236645b717'
+        const linkOracleNodeAddress = '0x95827898f79e2Dcda28Ceaa7294ab104746dC41b'
+        const impersonatedSigner = await ethers.getImpersonatedSigner(linkOracleOwnerAddress)
+        const oracle = await ethers.getContractAt('Oracle', linkOracleOwnerAddress)
+        const permission = await oracle.connect(impersonatedSigner).setFulfillmentPermission(linkOracleNodeAddress, true)
+        await permission.wait()
+        console.log(`Gave ${linkOracleNodeAddress} permission to fulfill requests for ${linkOracleOwnerAddress}`)
     }
-
 }()
\ No newline at end of file
diff --git a/contracts/ethereum/src/SSVManager.sol b/contracts/ethereum/src/SSVManager.sol
index 989515cea..263479411 100644
--- a/contracts/ethereum/src/SSVManager.sol
+++ b/contracts/ethereum/src/SSVManager.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.16;
 import "./interfaces/IWETH9.sol";
 import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol";
 import "@openzeppelin/contracts/utils/Counters.sol";
+import "@openzeppelin/contracts/utils/Strings.sol";
 import "@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol";
 import "hardhat/console.sol";
 
@@ -44,7 +45,7 @@ contract SSVManager is ChainlinkClient {
     struct Pool {
         Balance balance;
         mapping(address => Balance) userBalances;
-        bytes validatorPublicKey;
+        string validatorPublicKey;
         uint32[] operatorIds;
     }
 
@@ -90,7 +91,7 @@ contract SSVManager is ChainlinkClient {
     event ValidatorInitFullfilled(
         uint32 poolId,
         uint32[] operatorIds,
-        bytes validatorPublicKey
+        string validatorPublicKey
     );
 
     /** Event signaling a user deposit to the manager */
@@ -135,7 +136,7 @@ contract SSVManager is ChainlinkClient {
         /// Set up Chainlink client
         setChainlinkOracle(_linkOracleAddress);
         setChainlinkToken(_linkTokenAddress);
-        jobId = '7da2702f37fd48e5b1b9a5715e3509b6';
+        jobId = '74854cd9ba0a4fb2a12ba8a469afac49';
         linkFee = (1 * LINK_DIVISIBILITY) / 10;
     }
 
@@ -339,7 +340,12 @@ contract SSVManager is ChainlinkClient {
 
         request.add(
             "get",
-            "https://ssv.dev.casimir.co/validator-init"
+            string.concat("http://127.0.0.1:8000?pooId=", Strings.toString(_poolId))
+        );
+
+        request.add(
+            "path", 
+            "poolId"
         );
 
         // Sends the request
@@ -362,7 +368,7 @@ contract SSVManager is ChainlinkClient {
         uint32 poolId = uint32(_lastPoolId.current());
         Pool storage pool = pools[poolId];
         pool.operatorIds = [uint32(616), uint32(799), uint32(814), uint32(594)];
-        pool.validatorPublicKey = bytes("0x8420572d646a9b9738d0d411e070f3857c120b1f3d3153bb05b5e28889a77dfc639ac2b94f34cdf84f502740166e4ebe");
+        pool.validatorPublicKey = "0x8420572d646a9b9738d0d411e070f3857c120b1f3d3153bb05b5e28889a77dfc639ac2b94f34cdf84f502740166e4ebe";
         emit ValidatorInitFullfilled(poolId, pool.operatorIds, pool.validatorPublicKey);
     }
 
@@ -424,7 +430,7 @@ contract SSVManager is ChainlinkClient {
      */
     function getPoolValidatorPublicKey(
         uint32 _poolId
-    ) external view returns (bytes memory) {
+    ) external view returns (string memory) {
         return pools[_poolId].validatorPublicKey;
     }
 
diff --git a/contracts/ethereum/src/external/Oracle.sol b/contracts/ethereum/src/external/Oracle.sol
new file mode 100644
index 000000000..c612db28e
--- /dev/null
+++ b/contracts/ethereum/src/external/Oracle.sol
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.6.6;
+import "@chainlink/contracts/src/v0.6/Oracle.sol";
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 3f47f2977..db604389b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45640,6 +45640,7 @@
       }
     },
     "services/matcher": {
+      "name": "@casimir/matcher",
       "dependencies": {
         "cors": "^2.8.5",
         "express": "^4.18.1",
@@ -45654,7 +45655,8 @@
         "@types/node": "^17.0.38",
         "chai": "^4.3.6",
         "esbuild": "^0.15.9",
-        "mocha": "^10.0.0"
+        "mocha": "^10.0.0",
+        "ts-node": "^10.9.1"
       }
     },
     "services/matcher/node_modules/@types/mocha": {
@@ -48578,7 +48580,8 @@
         "esbuild": "^0.15.9",
         "express": "^4.18.1",
         "mocha": "^10.0.0",
-        "serverless-http": "^3.0.1"
+        "serverless-http": "^3.0.1",
+        "ts-node": "*"
       },
       "dependencies": {
         "@types/mocha": {
diff --git a/scripts/chainlink/dev.ts b/scripts/chainlink/dev.ts
index bc575feec..eaf209448 100644
--- a/scripts/chainlink/dev.ts
+++ b/scripts/chainlink/dev.ts
@@ -1,6 +1,5 @@
-import { $, argv, fs } from 'zx'
-import { getSecret } from '@casimir/aws-helpers'
-import { getAddress, getKeystore } from '@casimir/ethers-helpers'
+import { $, argv } from 'zx'
+import { parseStdout } from '@casimir/zx-helpers'
 
 /**
  * Run local a local Chainlink node and fulfill requests
@@ -14,19 +13,13 @@ import { getAddress, getKeystore } from '@casimir/ethers-helpers'
 void async function () {
     process.env.DOCKER_BUILDKIT = '1'
     process.env.COMPOSE_DOCKER_CLI_BUILD = '1'
-    if (!process.env.EXPLORER_DOCKER_TAG) {
-        process.env.EXPLORER_DOCKER_TAG = 'develop'
-    }
-
-    // Get shared seed
-    const seed = await getSecret('consensus-networks-bip39-seed')
-    process.env.BIP39_SEED = seed
-
-    const address = await getAddress(seed)
-    process.env.CHAINLINK_OWNER_ADDRESS = address
-
-    const keystore = await getKeystore(seed)
-    await fs.writeJSON(`scripts/chainlink/secrets/${address}.json`, keystore, { spaces: '\t' })
+    process.env.EXPLORER_DOCKER_TAG = 'develop'
+    process.env.SKIP_DATABASE_PASSWORD_COMPLEXITY_CHECK = 'true'
+    process.env.ETH_URL = 'ws://host.docker.internal:8545'
+    process.env.CHAINLINK_TLS_PORT = '0'
+    process.env.SECURE_COOKIES = 'false'
+    process.env.ALLOW_ORIGINS = '*'
+    process.env.NODE_NO_NEW_HEADS_THRESHOLD = '0'
 
     const fork = argv.fork === 'true' ? 'goerli' : argv.fork === 'false' ? false : argv.fork ? argv.fork : 'goerli'
     if (fork) {
@@ -36,6 +29,23 @@ void async function () {
         process.env.ETH_CHAIN_ID = '1337'
     }
 
-    // $`docker compose up`
+    try {
+        await $`docker compose -f scripts/chainlink/docker-compose.yml down`
+    } catch {
+        console.log('Docker is ready.')
+    }
+    $`docker compose -f scripts/chainlink/docker-compose.yml up`
+
+    // const matcherPort = 8000
+    // process.env.PUBLIC_MATCHER_PORT = `${matcherPort}`
+    // try {
+    //     if (parseStdout(await $`lsof -ti:${matcherPort}`)) {
+    //         $`kill -9 $(lsof -ti:${matcherPort})`
+    //     }
+    // } catch {
+    //     console.log(`Port ${matcherPort} is available.`)
+    // }
+
+    // $`npm run dev --workspace @casimir/matcher`
 
 }()
\ No newline at end of file
diff --git a/scripts/chainlink/docker-compose.yml b/scripts/chainlink/docker-compose.yml
index 5a61df131..87435d957 100644
--- a/scripts/chainlink/docker-compose.yml
+++ b/scripts/chainlink/docker-compose.yml
@@ -3,15 +3,12 @@ version: '3.5'
 services:
   node:
     container_name: chainlink-node
-    image: smartcontract/chainlink
-    # Note that the keystore import allows us to submit transactions
-    # immediately because addresses are specified when starting the
-    # parity/geth node to be prefunded with eth.
+    image: smartcontract/chainlink:1.10.0
     entrypoint: /bin/sh -c "chainlink node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
     restart: always
     environment:
       - ETH_CHAIN_ID
-      - LOG_LEVEL
+      - LOG_LEVEL=info
       - ROOT
       - ETH_URL
       - MIN_OUTGOING_CONFIRMATIONS
@@ -19,9 +16,6 @@ services:
       - MINIMUM_CONTRACT_PAYMENT_LINK_JUELS
       - DEFAULT_HTTP_TIMEOUT
       - CHAINLINK_DEV
-      - EXPLORER_URL
-      - EXPLORER_ACCESS_KEY
-      - EXPLORER_SECRET
       - SECURE_COOKIES
       - CHAINLINK_TLS_PORT
       - DATABASE_URL=postgresql://postgres:$CHAINLINK_PGPASSWORD@node-db:5432/$CHAINLINK_DB_NAME?sslmode=disable
@@ -34,63 +28,8 @@ services:
       - apicredentials
       - keystore
     depends_on:
-      - explorer
       - node-db
 
-  node-2:
-    container_name: chainlink-node-2
-    image: smartcontract/chainlink
-    entrypoint: /bin/sh -c "chainlink node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
-    restart: always
-    environment:
-      - ETH_CHAIN_ID
-      - LOG_LEVEL
-      - ROOT
-      - ETH_URL
-      - MIN_OUTGOING_CONFIRMATIONS
-      - MIN_INCOMING_CONFIRMATIONS
-      - MINIMUM_CONTRACT_PAYMENT_LINK_JUELS
-      - DEFAULT_HTTP_TIMEOUT
-      - CHAINLINK_DEV
-      - SECURE_COOKIES
-      - CHAINLINK_TLS_PORT
-      - DATABASE_URL=postgresql://postgres:$CHAINLINK_PGPASSWORD@node-db-2:5432/$CHAINLINK_DB_NAME?sslmode=disable
-    env_file:
-      - .env
-    ports:
-      - 6699:6688
-    secrets:
-      - node_password
-      - apicredentials
-      - keystore
-    depends_on:
-      - node-db-2
-
-  explorer:
-    container_name: chainlink-explorer
-    image: smartcontract/explorer:${EXPLORER_DOCKER_TAG}
-    entrypoint: yarn workspace @chainlink/explorer dev:compose
-    restart: always
-    ports:
-      - 3001
-    depends_on:
-      - explorer-db
-    environment:
-      - EXPLORER_COOKIE_SECRET
-      - EXPLORER_SERVER_PORT
-      - PGPASSWORD=$EXPLORER_PGPASSWORD
-
-  explorer-db:
-    container_name: chainlink-explorer-db
-    image: postgres:11.6
-    volumes:
-      - explorer-db-data:/var/lib/postgresql/data
-    ports:
-      - 5433:5432
-    environment:
-      POSTGRES_DB: $EXPLORER_DB_NAME
-      POSTGRES_PASSWORD: $EXPLORER_PGPASSWORD
-
   node-db:
     container_name: chainlink-db
     image: postgres:11.6
@@ -100,28 +39,11 @@ services:
       POSTGRES_DB: $CHAINLINK_DB_NAME
       POSTGRES_PASSWORD: $CHAINLINK_PGPASSWORD
 
-  node-db-2:
-    container_name: chainlink-db-2
-    image: postgres:11.6
-    volumes:
-      - node-db-2-data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: $CHAINLINK_DB_NAME
-      POSTGRES_PASSWORD: $CHAINLINK_PGPASSWORD
-
-# TODO
-# - replace clroot with secrets
-# - extract explorer and tools into separate docker-compose files
-
 secrets:
   node_password:
     file: ./secrets/password.txt
   apicredentials:
     file: ./secrets/apicredentials
-  keystore:
-    file: ./secrets/${CHAINLINK_OWNER_ADDRESS}.json
 
 volumes:
-  explorer-db-data:
-  node-db-data:
-  node-db-2-data:
\ No newline at end of file
+  node-db-data:
\ No newline at end of file
diff --git a/scripts/ethereum/dev.ts b/scripts/ethereum/dev.ts
index 4cc6e72f2..299045358 100644
--- a/scripts/ethereum/dev.ts
+++ b/scripts/ethereum/dev.ts
@@ -29,10 +29,11 @@ void async function () {
     }
 
     // Enable 12-second interval mining for dev networks
-    process.env.INTERVAL_MINING = 'true'
+    process.env.INTERVAL_MINING = 'false'
 
     // Using hardhat local or fork network
     process.env.MOCK_CHAINLINK = 'true'
+    process.env.RUN_CHAINLINK = 'false'
 
     $`npm run dev --workspace @casimir/ethereum`
 
@@ -40,4 +41,6 @@ void async function () {
     await new Promise(resolve => setTimeout(resolve, 1000))
     $`npm run deploy --workspace @casimir/ethereum -- --network localhost`
 
+    // $`npm run dev:chainlink --fork=${fork}`
+
 }()
\ No newline at end of file
diff --git a/scripts/ethereum/test.ts b/scripts/ethereum/test.ts
index 4756fe9c6..6178a39cc 100755
--- a/scripts/ethereum/test.ts
+++ b/scripts/ethereum/test.ts
@@ -30,6 +30,6 @@ void async function () {
     // Using hardhat local or fork network
     process.env.MOCK_CHAINLINK = 'true'
 
-    $`npm run test --workspace @casimir/ethereum -- --network localhost`
+    $`npm run test --workspace @casimir/ethereum`
 
 }()
diff --git a/scripts/local/dev.ts b/scripts/local/dev.ts
index 5ef3c2f7d..204fb32a8 100644
--- a/scripts/local/dev.ts
+++ b/scripts/local/dev.ts
@@ -51,7 +51,7 @@ void async function () {
     process.env.STAGE = stage
 
     /** Todo get network/fork nonce based on selection and predict address */
-    process.env.PUBLIC_SSV_ADDRESS = '0x07E05700CB4E946BA50244e27f01805354cD8eF0'
+    process.env.PUBLIC_SSV_ADDRESS = '0x07E05700CB4E946BA50244e27f01805354cD8eF0' // '0xaaf5751d370d2fD5F1D5642C2f88bbFa67a29301'
 
     /** Default to the web app */
     const app = argv.app || 'web'
diff --git a/services/matcher/job.toml b/services/matcher/job.toml
new file mode 100644
index 000000000..b3a123712
--- /dev/null
+++ b/services/matcher/job.toml
@@ -0,0 +1,12 @@
+type                = "directrequest"
+schemaVersion       = 1
+evmChainID          = 5
+name                = "SSV matcher"
+contractAddress     = "0xCC79157eb46F5624204f47AB42b3906cAA40eaB7"
+
+observationSource   = """
+    ds          [type="http" method=GET url="http://127.0.0.1:8000?poolId=1"]
+    ds_parse    [type="jsonparse" path="poolId"]
+
+    ds -> ds_parse
+"""
\ No newline at end of file
diff --git a/services/matcher/package.json b/services/matcher/package.json
index 1697f4cd9..af97b54ee 100644
--- a/services/matcher/package.json
+++ b/services/matcher/package.json
@@ -3,6 +3,7 @@
     "private": "true",
     "main": "src/index.ts",
     "scripts": {
+        "dev": "ts-node ./src/index.ts",
         "build": "echo \"Error: no build specified\" && exit 0",
         "buildnext": "node build.js",
         "watch": "npm run build -- --watch",
@@ -10,8 +11,7 @@
     },
     "dependencies": {
         "cors": "^2.8.5",
-        "express": "^4.18.1",
-        "serverless-http": "^3.0.1"
+        "express": "^4.18.1"
     },
     "devDependencies": {
         "@types/aws-lambda": "8.10.97",
@@ -22,6 +22,7 @@
         "@types/node": "^17.0.38",
         "chai": "^4.3.6",
         "esbuild": "^0.15.9",
-        "mocha": "^10.0.0"
+        "mocha": "^10.0.0",
+        "ts-node": "^10.9.1"
     }
-}
\ No newline at end of file
+}
diff --git a/services/matcher/src/index.ts b/services/matcher/src/index.ts
index eece99c74..2b8476103 100644
--- a/services/matcher/src/index.ts
+++ b/services/matcher/src/index.ts
@@ -1,13 +1,17 @@
-import serverless from 'serverless-http'
 import express from 'express'
 import cors from 'cors'
-import { APIGatewayEventRequestContext, APIGatewayProxyEvent } from 'aws-lambda'
+
+const port = process.env.PUBLIC_MATCHER_PORT || 8000
 
 const app = express()
 app.use(express.json())
 app.use(cors())
 
-export const handler = async function (event: APIGatewayProxyEvent, context: APIGatewayEventRequestContext) {
-  const serverlessApp = serverless(app)
-  return await serverlessApp(event, context)
-}
\ No newline at end of file
+app.use('/', (req: express.Request, res: express.Response) => {
+    const { poolId } = req.query
+    res.setHeader('Content-Type', 'application/json')
+    res.status(200)
+    res.json({ poolId })
+})
+
+app.listen(port, () => console.log(`Matcher listening on port ${port}`))
\ No newline at end of file

From 534b46abf7ebab47e0201f7cce948e541baa9894 Mon Sep 17 00:00:00 2001
From: demogorgod <ssnajeeb2020@manchester.edu>
Date: Wed, 7 Dec 2022 00:09:16 -0500
Subject: [PATCH 25/31] Tidy up styling

---
 apps/web/index.html                                    |  2 +-
 apps/web/src/components/navigation/SideNav.vue         |  8 ++++----
 .../components/navigation/components/Multiwallet.vue   |  2 +-
 apps/web/src/composables/router.ts                     | 10 +++++-----
 apps/web/src/index.css                                 |  2 +-
 apps/web/src/pages/staking/Staking.vue                 |  2 +-
 .../src/pages/staking/components/ETHConfirmStake.vue   |  4 ++--
 apps/web/src/pages/staking/components/ETHStaking.vue   |  4 ++--
 .../src/pages/staking/components/ETHWalletSelect.vue   |  4 ++--
 apps/web/src/pages/staking/components/StakingModal.vue |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/web/index.html b/apps/web/index.html
index e7e6b54f0..faee840a9 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -17,7 +17,7 @@
     <title>Casimir</title>
   </head>
   <body>
-    <div style="background: #00091A; min-width: 360px; overflow: auto;">
+    <div style="background: #001A4D; min-width: 360px; overflow: auto;">
       <div id="app"></div>
     </div>
     <script type="module" src="/src/main.ts"></script>
diff --git a/apps/web/src/components/navigation/SideNav.vue b/apps/web/src/components/navigation/SideNav.vue
index 34425a0b8..ea9f0b551 100644
--- a/apps/web/src/components/navigation/SideNav.vue
+++ b/apps/web/src/components/navigation/SideNav.vue
@@ -57,11 +57,11 @@ const account = ref(true)
     </RouterLink>
 
     <RouterLink 
-      :to="!account ? '' : '/Staking'"
+      :to="!account ? '' : '/stake'"
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === 'Staking'? 'side-nav-tabs-selected' : ''"
+        :class="selectedPage === 'stake'? 'side-nav-tabs-selected' : ''"
         :style="!account? {
           'cursor' : 'default'
         } : {}"
@@ -85,12 +85,12 @@ const account = ref(true)
     </RouterLink>
 
     <RouterLink 
-      :to="!account ? '' : '/Assets'"
+      :to="!account ? '' : '/assets'"
       class="disabled"
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === 'Assets'? 'side-nav-tabs-selected' : ''"
+        :class="selectedPage === 'assets'? 'side-nav-tabs-selected' : ''"
         :style="!account? {
           'cursor' : 'default',
         } : {}"
diff --git a/apps/web/src/components/navigation/components/Multiwallet.vue b/apps/web/src/components/navigation/components/Multiwallet.vue
index fe6a7c4f9..2bb097b13 100644
--- a/apps/web/src/components/navigation/components/Multiwallet.vue
+++ b/apps/web/src/components/navigation/components/Multiwallet.vue
@@ -56,6 +56,7 @@ const connectedWallets = ref([
     </div>
     <div v-if="account">
       <div
+        v-show="open"
         class="flex mb-gutter overflow-hidden py-[12px] pl-[5px]"
       >
         <!-- List of connected Wallet -->
@@ -79,7 +80,6 @@ const connectedWallets = ref([
             </div>
             
             <h6
-              v-show="open"
               class="slowExpandText h-min text-clip ml-gutter mt-[3px] text-body font-medium whitespace-nowrap"
             >
               {{ item.name }}
diff --git a/apps/web/src/composables/router.ts b/apps/web/src/composables/router.ts
index a8aec1470..cbdf92afd 100644
--- a/apps/web/src/composables/router.ts
+++ b/apps/web/src/composables/router.ts
@@ -27,26 +27,26 @@ const routes = [
     meta: { authorize: [] }
 },
 { 
-    path: '/Staking', 
+    path: '/stake', 
     name: Staking, 
     component: Staking,
     meta: { authorize: [] },
     children: [
         {
-            path: 'ETH', 
+            path: 'eth', 
             component: ETHStaking,
         },
         {
-            path: 'ETH/Select-Wallet', 
+            path: 'eth/select-wallet', 
             component: ETHWalletSelect,
         },
         {
-            path: 'ETH/Confirm-Stake', 
+            path: 'eth/confirm-stake', 
             component: ETHConfirmStake,
         }
     ]
 },{ 
-    path: '/Assets', 
+    path: '/assets', 
     name: Assets, 
     component: Assets,
     meta: { authorize: [] }
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 36fb6c7e7..7dc7a2c10 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -176,7 +176,7 @@ background: #fff;
         hover:w-sidebar-open 
         max-w-[300px]
         slowExpand 
-        bg-black 
+        bg-blue_10 
         py-marginsY 
         table ;
     }
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index 64748abf5..216baab9b 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -126,7 +126,7 @@ watch(router.currentRoute,  () => {
           </div>
           
           <div class="flex flex-col justify-between">
-            <RouterLink to="Staking/ETH">
+            <RouterLink to="stake/eth">
               <button
                 class="btn_primary xsm:px-[6px]"
                 @click="toggleModal(StakingModal)"
diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
index f4fb2a1ef..16495d337 100644
--- a/apps/web/src/pages/staking/components/ETHConfirmStake.vue
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -28,7 +28,7 @@ const handleConfirm = () => {
 
     setTimeout(()=> {
         loading.value = false
-        router.push('/Staking/ETH')
+        router.push('/stake/eth')
     }, 2000)
 }
 
@@ -111,7 +111,7 @@ const handleConfirm = () => {
       </button>
       
       <RouterLink
-        to="/Staking/ETH/Select-Wallet"
+        to="/stake/eth/select-wallet"
         class="w-[100px]"
       >
         <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] csm:px-[4px] border-primary bg-white text-primary">
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index b3a8fc702..e4ca50128 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -266,7 +266,7 @@ const CurrentStakedItems = ref(
     </div>
     <div class="flex justify-between items-center gap-[20px]">
       <RouterLink
-        to="/Staking/ETH/Select-Wallet"
+        to="/stake/eth/select-wallet"
         class="w-full"
       >
         <button
@@ -281,7 +281,7 @@ const CurrentStakedItems = ref(
         </button>
       </RouterLink>
       <RouterLink
-        to="/Staking"
+        to="/stake"
         class="w-[100px]"
       >
         <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] border-primary bg-white text-primary">
diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
index 57801e266..7026ddb74 100644
--- a/apps/web/src/pages/staking/components/ETHWalletSelect.vue
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -155,7 +155,7 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
     </div>
     <div class="flex justify-between items-center gap-[20px]">
       <RouterLink
-        :to="!disableNext? '/Staking/ETH/Confirm-Stake' : '/Staking/ETH/Select-Wallet'"
+        :to="!disableNext? '/stake/eth/confirm-stake' : '/Staking/ETH/Select-Wallet'"
         class="w-full"
       >
         <button
@@ -167,7 +167,7 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
       </RouterLink>
       
       <RouterLink
-        to="/Staking/ETH"
+        to="/stake/eth"
         class="w-[100px]"
       >
         <button class="w-full btn_primary hover:bg-grey_1 border py-[8px] border-primary bg-white text-primary">
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index e61ea1859..7b5b98470 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -19,7 +19,7 @@ const currentBalance = ref('45 ETH | $123,123.11')
     class="h-full"
   >
     <div class="flex items-center mb-[20px]">
-      <h5 class="font-bold flex items-center gap-[10px]">
+      <h5 class="flex items-center gap-[10px]">
         <img
           src="/ETH.svg"
           alt="eth icon"

From 146eb7e1875483432ca110337174ddac0b3915a0 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Wed, 7 Dec 2022 09:04:55 -0500
Subject: [PATCH 26/31] Add live data to /stake

---
 apps/web/src/components/USDAmount.vue         |  28 ++++
 apps/web/src/components/Wallet.vue            |  11 +-
 apps/web/src/composables/format.ts            |   7 +
 apps/web/src/composables/price.ts             |  10 +-
 apps/web/src/composables/users.ts             |  56 ++++++-
 apps/web/src/composables/wallet.ts            | 154 ++++++++----------
 apps/web/src/interfaces/User.ts               |   9 +-
 apps/web/src/pages/staking/Staking.vue        |  39 +++--
 .../staking/components/ETHConfirmStake.vue    |   6 +-
 .../pages/staking/components/ETHStaking.vue   |   4 +-
 contracts/ethereum/hardhat.config.ts          |   2 +-
 package-lock.json                             |   7 +-
 12 files changed, 190 insertions(+), 143 deletions(-)
 create mode 100644 apps/web/src/components/USDAmount.vue
 create mode 100644 apps/web/src/composables/format.ts

diff --git a/apps/web/src/components/USDAmount.vue b/apps/web/src/components/USDAmount.vue
new file mode 100644
index 000000000..bb48c774a
--- /dev/null
+++ b/apps/web/src/components/USDAmount.vue
@@ -0,0 +1,28 @@
+<script lang="ts" setup>
+import { defineProps, onMounted, ref, toRef, watch } from 'vue'
+import useFormat from '@/composables/format'
+import usePrice from '@/composables/price'
+
+const { formatDecimalString } = useFormat()
+const { getExchangeRate } = usePrice()
+
+const usdAmount = ref(0)
+const props = defineProps({
+    etherAmount: {
+        type: String,
+        required: true,
+    }
+})
+const etherAmount = toRef(props, 'etherAmount')
+onMounted(async () => {
+    usdAmount.value = await getExchangeRate(props.etherAmount)
+})
+watch(etherAmount, async () => {
+    usdAmount.value = await getExchangeRate(props.etherAmount)
+})
+
+</script>
+
+<template>
+  <div>${{ formatDecimalString(usdAmount.toString()) }}</div>
+</template>
\ No newline at end of file
diff --git a/apps/web/src/components/Wallet.vue b/apps/web/src/components/Wallet.vue
index 460fd77b3..8e7a53ada 100644
--- a/apps/web/src/components/Wallet.vue
+++ b/apps/web/src/components/Wallet.vue
@@ -22,7 +22,7 @@
     <div>
       <ul>
         <li
-          v-for="(_value, _key) in usersAccounts"
+          v-for="(_value, _key) in user"
           :key="_key"
         >
           <ul v-if="_key === 'accounts'">
@@ -200,7 +200,7 @@ const trezorAccountsResult = ref<string>('Address Not Active')
 const walletConnectButtonText = ref<string>('Connect WalletConnect')
 const walletConnectAccountsResult = ref<string>('Address Not Active')
 
-const { addAccount, removeAccount, usersAccounts } = useUsers()
+const { addAccount, removeAccount, user } = useUsers()
 const {
   selectedProvider,
   selectedAccount,
@@ -213,14 +213,9 @@ const {
   signMessage,
   deposit,
   login,
-  getUserPools,
-  subscribeToEvents
+  getUserPools
 } = useWallet()
 
-onMounted(() => {
-  subscribeToEvents()
-})
-
 watchEffect(() => {
   if (selectedProvider.value === 'MetaMask') {
     metamaskButtonText.value = 'MetaMask Connected'
diff --git a/apps/web/src/composables/format.ts b/apps/web/src/composables/format.ts
new file mode 100644
index 000000000..e29a3e167
--- /dev/null
+++ b/apps/web/src/composables/format.ts
@@ -0,0 +1,7 @@
+export default function useFormat() {
+    function formatDecimalString(decimalString: string) {
+        return parseFloat(decimalString).toFixed(2)
+    }
+
+    return { formatDecimalString }
+}
\ No newline at end of file
diff --git a/apps/web/src/composables/price.ts b/apps/web/src/composables/price.ts
index 62f820901..1ad6d6d5b 100644
--- a/apps/web/src/composables/price.ts
+++ b/apps/web/src/composables/price.ts
@@ -14,15 +14,15 @@ type PriceEntry = {
 
   
 export default function usePrice() {
-    async function getExchangeRate(amount: ethers.BigNumber) {
-        if (ethers.utils.formatEther(amount) === '0.0') {
+    async function getExchangeRate(amount: string) {
+
+        if (amount === '0.0') {
             return 0
         }
 
-        const eth = ethers.utils.formatEther(amount)
-
         const price = await getCurrentPrice({ coin: 'ETH', currency: 'USD' })
-        const rate = price * parseFloat(eth)
+        const rate = price * parseFloat(amount)
+
         return rate
     }
     return {
diff --git a/apps/web/src/composables/users.ts b/apps/web/src/composables/users.ts
index 4397f4b17..e9b4fbe29 100644
--- a/apps/web/src/composables/users.ts
+++ b/apps/web/src/composables/users.ts
@@ -1,14 +1,26 @@
+import { ethers } from 'ethers'
+import useEnvironment from '@/composables/environment'
+import useSSV from '@/composables/ssv'
+import useWallet from '@/composables/wallet'
 import { ProviderString } from '@/types/ProviderString'
 import { User } from '@/interfaces/User'
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
+
+const user = ref<User>({
+    id: '0xd557a5745d4560B24D36A68b52351ffF9c86A212',
+    accounts: {
+        MetaMask: ['0xd557a5745d4560B24D36A68b52351ffF9c86A212']
+    } as Record<ProviderString, string[]>,
+    pools: []
+})
 
 export default function useUsers () {
-    const usersAccounts = ref<User>({
-        id: '',
-        accounts: {} as Record<ProviderString, string[]>,
-    })
 
-    function updateUser ({id, accounts} : User) {
+    const { ethereumURL } = useEnvironment()
+    const { getUserBalance, getUserPools } = useWallet()
+    const { ssv } = useSSV()
+
+    function updateUser ({ id, accounts } : User) {
         localStorage.setItem('accounts', JSON.stringify(accounts))
     }
 
@@ -32,7 +44,7 @@ export default function useUsers () {
         }
 
         for (const provider in accounts) {
-            usersAccounts.value.accounts[provider as ProviderString] = accounts[provider]
+            user.value.accounts[provider as ProviderString] = accounts[provider]
         }
         
         // TODO: Swap in real user
@@ -50,7 +62,7 @@ export default function useUsers () {
         }
 
         for (const provider in accounts) {
-            usersAccounts.value.accounts[provider as ProviderString] = accounts[provider]
+            user.value.accounts[provider as ProviderString] = accounts[provider]
         }
 
         // TODO: Swap in real user
@@ -76,8 +88,34 @@ export default function useUsers () {
         return message
     }
 
+    // Todo filter for events for user addresses
+    function subscribeToUserEvents() {
+        const provider = new ethers.providers.JsonRpcProvider(ethereumURL)
+    
+        const validatorInitFilter = {
+          address: ssv.address,
+          topics: [
+            ethers.utils.id('ValidatorInitFullfilled(uint32,uint32[],string)')
+          ]
+        }
+        ssv.connect(provider).on(validatorInitFilter, async () => {
+          console.log('ValidatorInit event... updating pools')
+          user.value.balance = ethers.utils.formatEther(await getUserBalance(user.value.id))
+          user.value.pools = await getUserPools(user.value.id)
+          user.value.stake = user.value.pools?.reduce((a, c) => a + parseFloat(c.userStake), 0).toString()
+          user.value.rewards = user.value.pools?.reduce((a, c) => a + parseFloat(c.userRewards), 0).toString()
+        })
+    }
+
+    onMounted(async () => {
+        // Just get pools for primary account for demo
+        user.value.balance = ethers.utils.formatEther(await getUserBalance(user.value.id))
+        user.value.pools = await getUserPools(user.value.id)
+        subscribeToUserEvents()
+    })
+
     return {
-        usersAccounts,
+        user,
         addAccount,
         removeAccount,
         getMessage,
diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index 533b19ff1..b826d0127 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -135,109 +135,85 @@ export default function useWallet() {
     }
   }
 
-  function subscribeToEvents() {
+  async function getUserBalance(userAddress: string): Promise<ethers.BigNumber> {
     const provider = new ethers.providers.JsonRpcProvider(ethereumURL)
-
-    const validatorInitFilter = {
-      address: ssv.address,
-      topics: [
-        ethers.utils.id('ValidatorInitFullfilled(uint32,uint32[],string)')
-      ]
-    }
-    ssv.connect(provider).on(validatorInitFilter, () => {
-      console.log('ValidatorInit')
-    })
+    return await provider.getBalance(userAddress)
   }
 
-  // Todo @ccali11 should we move these ssv objects to the ssv composable?
-  async function getUserPools() {
-    if (ethersSignerList.includes(selectedProvider.value)) {
-      const provider = new ethers.providers.JsonRpcProvider(ethereumURL)
-      const userAddress = selectedAccount.value
-      const ssvProvider = ssv.connect(provider)
-      const usersPoolsIds = await ssvProvider.getUserPoolIds(userAddress)
-      pools.value = await Promise.all(usersPoolsIds.map(async (poolId: number) => {
+  async function getUserPools(userAddress: string): Promise<Pool[]> {
+    const provider = new ethers.providers.JsonRpcProvider(ethereumURL)
+    const ssvProvider = ssv.connect(provider)
+    const usersPoolsIds = await ssvProvider.getUserPoolIds(userAddress)
+    return await Promise.all(usersPoolsIds.map(async (poolId: number) => {
+
+      const { stake: totalStake, rewards: totalRewards } = await ssvProvider.getPoolBalance(poolId)
+      const { stake: userStake, rewards: userRewards } = await ssvProvider.getPoolUserBalance(poolId, userAddress)
+
+      let pool: Pool = {
+        id: poolId,
+        totalStake: ethers.utils.formatEther(totalStake),
+        totalRewards: ethers.utils.formatEther(totalRewards),
+        userStake: ethers.utils.formatEther(userStake),
+        userRewards: ethers.utils.formatEther(userRewards)
+      }
 
-        const { stake: totalStake, rewards: totalRewards } = await ssvProvider.getPoolBalance(poolId)
-        const { stake: userStake, rewards: userRewards } = await ssvProvider.getPoolUserBalance(poolId, userAddress)
-        
-        let pool: Pool = {
-          id: poolId,
-          totalStake: ethers.utils.formatEther(totalStake),
-          totalRewards: ethers.utils.formatEther(totalRewards),
-          userStake: ethers.utils.formatEther(userStake),
-          userRewards: ethers.utils.formatEther(userRewards)
+      const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId) // Public key bytes (i.e., 0x..)
+      if (validatorPublicKey) {
+
+        const response = await fetch(`https://prater.beaconcha.in/api/v1/validator/${validatorPublicKey}`)
+        const { data } = await response.json()
+        const { status } = data
+        const validator = {
+          publicKey: validatorPublicKey,
+          status: (status.charAt(0).toUpperCase() + status.slice(1)).replace('_status', ''),
+          effectiveness: '100%',
+          apr: '5.5%', // See issue #205 https://github.com/consensusnetworks/casimir/issues/205#issuecomment-1338142532
+          url: `https://prater.beaconcha.in/validator/${validatorPublicKey}`
         }
 
-        const validatorPublicKey = await ssvProvider.getPoolValidatorPublicKey(poolId) // Public key bytes (i.e., 0x..)
-        if (validatorPublicKey) {
-
-          const response = await fetch(`https://prater.beaconcha.in/api/v1/validator/${validatorPublicKey}`)
-          const { data } = await response.json()
-          const { status } = data
-          const validator = {
-            publicKey: validatorPublicKey,
-            status: status.charAt(0).toUpperCase() + status.slice(1),
-            effectiveness: '100%',
-            apr: '5.5%', // See issue #205 https://github.com/consensusnetworks/casimir/issues/205#issuecomment-1338142532
-            url: `https://prater.beaconcha.in/validator/${validatorPublicKey}`
+        const operatorIds = await ssvProvider.getPoolOperatorIds(poolId) // Operator ID uint32[] (i.e., [1, 2, 3, 4])
+        const operators = await Promise.all(operatorIds.map(async (operatorId: number) => {
+          const response = await fetch(`https://api.ssv.network/api/v1/operators/${operatorId}`)
+          const { performance } = await response.json()
+          return {
+            id: operatorId,
+            '24HourPerformance': performance['24h'],
+            '30DayPerformance': performance['30d'],
+            url: `https://explorer.ssv.network/operators/${operatorId}`
           }
+        }))
 
-          const operatorIds = await ssvProvider.getPoolOperatorIds(poolId) // Operator ID uint32[] (i.e., [1, 2, 3, 4])
-          const operators = await Promise.all(operatorIds.map(async (operatorId: number) => {
-            const response = await fetch(`https://api.ssv.network/api/v1/operators/${operatorId}`)
-            const { performance } = await response.json()
-            return { 
-              id: operatorId, 
-              '24HourPerformance': performance['24h'],
-              '30DayPerformance': performance['30d'],
-              url: `https://explorer.ssv.network/operators/${operatorId}`
-            }
-          }))
-
-          pool = {
-            ...pool,
-            validator,
-            operators
-          }
+        pool = {
+          ...pool,
+          validator,
+          operators
         }
+      }
 
-        return pool
-      }))
-    }
+      return pool
+    }))
   }
 
   async function deposit() {
-    if (Object.keys(ethersSignerCreator).includes(selectedProvider.value)) {
-      const signerKey = selectedProvider.value as keyof typeof ethersSignerCreator
-      let signer = ethersSignerCreator[signerKey](selectedProvider.value)
-      if (isWalletConnectSigner(signer)) signer = await signer
-      const ssvProvider = ssv.connect(signer)
-      const fees = await ssvProvider.getFees()
-      const { LINK, SSV } = fees
-      // TODO: Fix types
-      const feesTotalPercent = LINK + SSV
-      const depositAmount = amountToStake.value * ((100 + feesTotalPercent) / 100)
-      const value = ethers.utils.parseEther(depositAmount.toString())
-      const result = await ssvProvider.deposit({ value, type: 0 })
-      return await result.wait()
-    } else {
-      // Todo @ccali11 this should happen sooner - ideally we'll this disable method if missing ssv provider
-      console.log('Please connect to one of the following providers:', ethersProviderList)
-    }
-    return
+    const signerKey = selectedProvider.value as keyof typeof ethersSignerCreator
+    let signer = ethersSignerCreator[signerKey](selectedProvider.value)
+    if (isWalletConnectSigner(signer)) signer = await signer
+    const ssvProvider = ssv.connect(signer as ethers.Signer)
+    const fees = await ssvProvider.getFees()
+    const { LINK, SSV } = fees
+    const feesTotalPercent = LINK + SSV
+    const depositAmount = parseFloat(amountToStake.value) * ((100 + feesTotalPercent) / 100)
+    const value = ethers.utils.parseEther(depositAmount.toString())
+    const result = await ssvProvider.deposit({ value, type: 0 })
+    return await result.wait()
   }
 
   async function login() {
-    try {
-      if (ethersProviderList.includes(selectedProvider.value)) {
-        const loggedIn = await loginWithEthers(selectedProvider.value, selectedAccount.value)
-        console.log('loggedIn :>> ', loggedIn)
-      } else {
-        console.log('Login not yet supported for this wallet provider')
-      }
-    } catch (err) {
-      console.log(`There was an error logging in: ${err}`)
+    if (ethersProviderList.includes(selectedProvider.value)) {
+      const loggedIn = await loginWithEthers(selectedProvider.value, selectedAccount.value)
+      console.log('loggedIn :>> ', loggedIn)
+    } else {
+      console.log('Login not yet supported for this wallet provider')
     }
   }
 
@@ -253,7 +229,7 @@ export default function useWallet() {
     signMessage,
     deposit,
     login,
-    getUserPools,
-    subscribeToEvents
+    getUserBalance,
+    getUserPools
   }
 }
\ No newline at end of file
diff --git a/apps/web/src/interfaces/User.ts b/apps/web/src/interfaces/User.ts
index dc82450e9..be40c9728 100644
--- a/apps/web/src/interfaces/User.ts
+++ b/apps/web/src/interfaces/User.ts
@@ -1,6 +1,11 @@
 import { ProviderString } from '@/types/ProviderString'
+import { Pool } from './Pool'
 
 export interface User {
-    id: string;
-    accounts: Record<ProviderString, string[]>;
+    id: string
+    accounts: Record<ProviderString, string[]>
+    balance?: string
+    stake?: string
+    rewards?: string
+    pools?: Pool[]
 }
\ No newline at end of file
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index 216baab9b..d87979ccb 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-// To Do: Grab all staking info 
-// balance, staked, reward info
-
 import router from '@/composables/router'
-import { ref, shallowRef, onBeforeMount, onMounted, watch } from 'vue'
-
+import { shallowRef, onMounted, watch } from 'vue'
 import StakingModal from './components/StakingModal.vue'
+import useFormat from '@/composables/format'
+import useUsers from '@/composables/users'
+import USDAmount from '@/components/USDAmount.vue'
 
+const { formatDecimalString } = useFormat()
+const { user } = useUsers()
 const selectedComponent = shallowRef(null)
-
 const toggleModal = (component: any) => {
   selectedComponent.value = component
 }
@@ -26,6 +26,8 @@ onMounted(() => {
       router.push('/Staking')
     }
   }
+
+  console.log('User', user)
 })
 
 watch(router.currentRoute,  () => {
@@ -83,15 +85,14 @@ watch(router.currentRoute,  () => {
           <div class="tooltip">
             <div class="flex flex-col justify-between gap-[15px] sr-only s_sm:not-sr-only">
               <h6 class="font-medium">
-                Unstaked ETH
+                Available
               </h6>
-              <h6 class="font-medium text-grey_3">
-                <!-- random -->
-                46 ETH | $73816.89
+              <h6 class="flex font-medium text-grey_3">
+                {{ formatDecimalString(user.balance || '0.0') }} |&nbsp;<USDAmount :ether-amount="(user.balance || '0.0')" />
               </h6>
             </div>
             <span class="tooltiptext text-body font-bold">
-              Avaliable ETH: Collection of all connected wallets
+              ETH avaiable for staking: total of all connected wallets
             </span>
           </div>
           
@@ -100,28 +101,26 @@ watch(router.currentRoute,  () => {
               <h6 class="font-medium">
                 Staked
               </h6>
-              <h6 class="font-medium text-grey_3">
-                <!-- random -->
-                32 ETH | $51350.88
+              <h6 class="flex font-medium text-grey_3">
+                {{ formatDecimalString(user.stake || '0.0') }} |&nbsp;<USDAmount :ether-amount="(user.stake || '0.0')" />
               </h6>
             </div>
             <span class="tooltiptext text-body font-bold">
-              ETH Staked: Collection of all connected wallets
+              ETH currently staked: total of all connected wallets
             </span>
           </div>
           
           <div class="tooltip">
             <div class="flex flex-col justify-between gap-[15px] sr-only s_lg:not-sr-only">
               <h6 class="font-medium">
-                In Rewards
+                Rewards
               </h6>
-              <h6 class="font-medium text-grey_3">
-                <!-- random -->
-                6 ETH | $9628.29 | 3% AR
+              <h6 class="flex font-medium text-grey_3">
+                {{ formatDecimalString(user.rewards || '0.0') }} |&nbsp;<USDAmount :ether-amount="(user.rewards || '0.0')" />
               </h6>
             </div>
             <span class="tooltiptext text-body font-bold">
-              ETH Rewards From Staking: Collection of all connected wallets staked to SSVs
+              ETH rewards from staking: total of all connected wallets
             </span>
           </div>
           
diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
index 16495d337..e5819a578 100644
--- a/apps/web/src/pages/staking/components/ETHConfirmStake.vue
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -5,10 +5,10 @@ import { ref } from 'vue'
 
 const stakingInfo = ref(
     {
-        to: 'Distributed SSV Validatore',
+        to: 'Distributed SSV Validator',
         amount: '6 ETH',
-        fees: '3.25 %',
-        expectedRewards: '4.56%',
+        fees: '2.00%',
+        expectedRewards: '5.56%',
         from: {
             name: 'Coinbase',
             icon: '/coinbase.svg',
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index e4ca50128..5cdcef2bf 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -18,7 +18,7 @@ const ETHStakingStats = ref(
       {
         title: 'APR',
         value: '4.11%',
-        tooltip: 'Annual Percentage Rate'
+        tooltip: 'Annual percentage return'
       },
     ]
 )
@@ -231,7 +231,7 @@ const CurrentStakedItems = ref(
               v-if="item.status === 'InWaiting'"
             >
               <h6 class="font-medium w-full text-center text-decline p-[10px] border border-decline my-[15px]">
-                In Waiting: Not Yet Staked
+                Pool is currently open
               </h6>
             </div>
             <div
diff --git a/contracts/ethereum/hardhat.config.ts b/contracts/ethereum/hardhat.config.ts
index 81e236efb..032b72f9b 100644
--- a/contracts/ethereum/hardhat.config.ts
+++ b/contracts/ethereum/hardhat.config.ts
@@ -77,7 +77,7 @@ const config: HardhatUserConfig = {
   },
   networks: {
     hardhat: {
-      accounts: mnemonic ? { ...hid, accountsBalance: '48000000000000000000' } : undefined,
+      accounts: mnemonic ? { ...hid, accountsBalance: '96000000000000000000' } : undefined,
       chainId: forkingChainId || 1337,
       forking: forkingUrl ? { url: forkingUrl } : undefined,
       mining: intervalMining ? miningInterval : undefined,
diff --git a/package-lock.json b/package-lock.json
index 7393b1878..8e7e5afec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "casimir",
       "version": "0.0.1",
       "license": "MIT",
       "workspaces": [
@@ -45229,8 +45230,7 @@
       "name": "@casimir/matcher",
       "dependencies": {
         "cors": "^2.8.5",
-        "express": "^4.18.1",
-        "serverless-http": "^3.0.1"
+        "express": "^4.18.1"
       },
       "devDependencies": {
         "@types/aws-lambda": "8.10.97",
@@ -48163,8 +48163,7 @@
         "esbuild": "^0.15.9",
         "express": "^4.18.1",
         "mocha": "^10.0.0",
-        "serverless-http": "^3.0.1",
-        "ts-node": "*"
+        "ts-node": "^10.9.1"
       },
       "dependencies": {
         "@types/mocha": {

From 10a2daa0a2ddd3cc9b7b73116fdaec2c19488e95 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Wed, 7 Dec 2022 09:59:55 -0500
Subject: [PATCH 27/31] Add live staking flow

---
 apps/web/src/composables/wallet.ts            |   8 +-
 apps/web/src/pages/staking/Staking.vue        |   2 -
 .../staking/components/ETHConfirmStake.vue    |  32 ++--
 .../pages/staking/components/ETHStaking.vue   |  95 ++++++------
 .../staking/components/ETHWalletSelect.vue    | 140 ++++++++----------
 .../pages/staking/components/StakingModal.vue |  20 +--
 contracts/ethereum/docs/index.md              |   8 +-
 7 files changed, 142 insertions(+), 163 deletions(-)

diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index b826d0127..d728581a3 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -13,12 +13,12 @@ import { TransactionInit } from '@/interfaces/TransactionInit'
 import { MessageInit } from '@/interfaces/MessageInit'
 import { Pool } from '@/interfaces/Pool'
 
-const amount = ref<string>('0.1')
+const amount = ref<string>('0.0')
 const toAddress = ref<string>('0x728474D29c2F81eb17a669a7582A2C17f1042b57')
-const amountToStake = ref<string>('0.1')
+const amountToStake = ref<string>('0.0')
 const pools = ref<Pool[]>([])
-const selectedProvider = ref<ProviderString>('')
-const selectedAccount = ref<string>('')
+const selectedProvider = ref<ProviderString>('MetaMask')
+const selectedAccount = ref<string>('0xd557a5745d4560B24D36A68b52351ffF9c86A212')
 // Test ethereum send to address : 0xD4e5faa8aD7d499Aa03BDDE2a3116E66bc8F8203
 // Test solana address: 7aVow9eVQjwn7Y4y7tAbPM1pfrE1TzjmJhxcRt8QwX5F
 // Test iotex send to address: acc://06da5e904240736b1e21ca6dbbd5f619860803af04ff3d54/acme
diff --git a/apps/web/src/pages/staking/Staking.vue b/apps/web/src/pages/staking/Staking.vue
index d87979ccb..013951d09 100644
--- a/apps/web/src/pages/staking/Staking.vue
+++ b/apps/web/src/pages/staking/Staking.vue
@@ -26,8 +26,6 @@ onMounted(() => {
       router.push('/Staking')
     }
   }
-
-  console.log('User', user)
 })
 
 watch(router.currentRoute,  () => {
diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
index e5819a578..91402ccad 100644
--- a/apps/web/src/pages/staking/components/ETHConfirmStake.vue
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -1,21 +1,27 @@
 <script lang="ts" setup>
 import router from '@/composables/router'
 import { ref } from 'vue'
+import useFormat from '@/composables/format'
+import useUsers from '@/composables/users'
+import useWallet from '@/composables/wallet'
 
+const { formatDecimalString } = useFormat()
+const { user } = useUsers()
+const { amountToStake, deposit } = useWallet()
 
 const stakingInfo = ref(
     {
         to: 'Distributed SSV Validator',
-        amount: '6 ETH',
+        amount: formatDecimalString(amountToStake.value),
         fees: '2.00%',
-        expectedRewards: '5.56%',
+        expectedRewards: '5.67%',
         from: {
-            name: 'Coinbase',
-            icon: '/coinbase.svg',
+            name: 'MetaMask',
+            icon: '/metamask.svg',
             account: {
-                name: 'Account One',
-                balance: '48 ETH',
-                address: 'asdfasdfasdf'
+                name: 'Primary Account',
+                balance: formatDecimalString(user.value.balance || '0.0'),
+                address: user.value.id
             }
         }
     }
@@ -23,13 +29,11 @@ const stakingInfo = ref(
 
 const loading = ref(false)
 
-const handleConfirm = () => {
-    loading.value = true
-
-    setTimeout(()=> {
-        loading.value = false
-        router.push('/stake/eth')
-    }, 2000)
+const handleConfirm = async () => {
+  loading.value = true
+  await deposit()
+  loading.value = false
+  router.push('/stake/eth')
 }
 
 </script>
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index 5cdcef2bf..e6830fb6c 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -1,27 +1,11 @@
 <script lang="ts" setup>
-import { watch } from 'fs'
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
+import useFormat from '@/composables/format'
+import useUsers from '@/composables/users'
+import USDAmount from '@/components/USDAmount.vue'
 
-
-const ETHStakingStats = ref(
-    [
-      {
-        title: 'Staked',
-        value: '78.32 ETH | $123,123.12',
-        tooltip: 'Total ammount currently staked to SSV'
-      },
-      {
-        title: 'Rewards',
-        value: '78.32 ETH | $123,123.12',
-        tooltip: 'Total rewards accumulated with current stakes'
-      },
-      {
-        title: 'APR',
-        value: '4.11%',
-        tooltip: 'Annual percentage return'
-      },
-    ]
-)
+const { formatDecimalString } = useFormat()
+const { user } = useUsers()
 
 const CurrentStakedItems = ref(
     [
@@ -167,16 +151,28 @@ const CurrentStakedItems = ref(
         id="pills_container"
         class="flex w-full overflow-auto gap-[20px]"
       >
-        <div
-          v-for="item in ETHStakingStats"
-          :key="`${item as any}`"
-          class="pill_primary whitespace-nowrap"
-        >
+        <div class="pill_primary whitespace-nowrap">
+          <span class="text-grey_5 mr-[5px]">
+            Staked 
+          </span>
+          <span class="flex">
+            {{ formatDecimalString(user.stake || '0.0') }} |&nbsp;<USDAmount :ether-amount="(user.stake || '0.0')" />
+          </span>
+        </div>
+        <div class="pill_primary whitespace-nowrap">
+          <span class="text-grey_5 mr-[5px]">
+            Rewards 
+          </span>
+          <span class="flex">
+            {{ formatDecimalString(user.rewards || '0.0') }} |&nbsp;<USDAmount :ether-amount="(user.rewards || '0.0')" />
+          </span>
+        </div>
+        <div class="pill_primary whitespace-nowrap">
           <span class="text-grey_5 mr-[5px]">
-            {{ item.title }}: 
+            APR 
           </span>
-          <span>
-            {{ item.value }}
+          <span class="flex">
+            5.67%
           </span>
         </div>
       </div>
@@ -184,29 +180,31 @@ const CurrentStakedItems = ref(
     
     <div class="h-full overflow-auto border-y border-grey">
       <div
-        v-for="pool in CurrentStakedItems"
+        v-for="pool in user.pools"
         :key="`${pool as any}`"
         class="border border-grey_2 border-[1px] p-[15px] mb-[55px]"
       >
         <div class="">
           <h6 class="font-bold text-grey_5 flex justify-between w-full">
-            <span>{{ pool.totalAmmountStaked }}</span> 
+            <span class="flex">
+              {{ formatDecimalString(pool.userStake || '0.0') }} |&nbsp;<USDAmount :ether-amount="(pool.userStake || '0.0')" />
+            </span> 
             <div class="tooltip">
               <span class="text-grey_3 flex gap-[10px] sr-only s_xsm:not-sr-only">
-                <span class="w-[100px] truncate">{{ pool.wallet.address }}</span>
+                <span class="w-[100px] truncate">{{ user.id }}</span>
                 <img
-                  :src="pool.wallet.provider"
-                  :alt="pool.wallet.provider"
+                  :src="'/metamask.svg'"
+                  :alt="'MetaMask'"
                   class="w-[20px] opacity-[0.2]"
                 >
               </span>
               <img
-                :src="pool.wallet.provider"
-                :alt="pool.wallet.provider"
+                :src="'/metamask.svg'"
+                :alt="'MetaMask'"
                 class="w-[20px] opacity-[0.2] s_xsm:sr-only not-sr-only"
               >
               <span class="tooltiptext text-body font-bold">
-                {{ pool.wallet.name }}: {{ pool.wallet.address }}
+                MetaMask: {{ user.id }}
               </span>
             </div>
           </h6>
@@ -215,48 +213,45 @@ const CurrentStakedItems = ref(
             Stake Distribution
           </h6>
           <div
-            v-for="item in pool.pools"
-            :key="`${item as any}`"
             class="my-[20px] border border-grey border-dashed border-[2px] p-[15px]"
           >
             <div class="flex flex-wrap gap-[20px] justify-between items-center mb-[15px]">
               <h6 class="font-medium  text-grey_5">
-                Pool #{{ item.poolAddress }}
+                Pool #{{ pool.id }}
               </h6>
               <h6 class="font-bold text-grey_5">
-                {{ item.ammountStaked }}
+                {{ pool.userStake }}
               </h6>
             </div>
             <div
-              v-if="item.status === 'InWaiting'"
+              v-if="!pool.validator"
             >
               <h6 class="font-medium w-full text-center text-decline p-[10px] border border-decline my-[15px]">
                 Pool is currently open
               </h6>
             </div>
             <div
-              v-else-if="item.status === 'Active'"
+              v-else
               class="text-grey_5 whitespace-nowrap"
             >
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center mb-[10px] truncate">
                 <span class="min-w-[135px] w-[45%] flex gap-[5px] items-center">
-                  <!-- add address for link from Shane's format -->
-                  Validator: <span class="truncate">{{ item.validatorAddress }}asdfahsdklfj;laksdj;lkajsdl;kfajs;ld</span> 
+                  Validator: <span class="truncate">{{ pool.validator.publicKey }}</span> 
                   <a
-                    href=""
+                    :href="pool.validator.url"
                     target="_blank"
                   ><i class="iconoir-open-new-window text-primary" /></a>
                 </span>
                 <span>
-                  {{ item.operatorScore }} Validator Effectiveness 
+                  {{ pool.validator.effectiveness }} Validator Effectiveness 
                 </span>
               </h6>
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center truncate">
                 <span>
-                  {{ item.rewardsAccumulated }} in Rewards
+                  {{ pool.userRewards }} in Rewards
                 </span>
                 <span>
-                  {{ item.avgAPR }} Validator APR
+                  {{ pool.validator.apr }} Validator APR
                 </span>
               </h6>
             </div>
diff --git a/apps/web/src/pages/staking/components/ETHWalletSelect.vue b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
index 7026ddb74..3358b0370 100644
--- a/apps/web/src/pages/staking/components/ETHWalletSelect.vue
+++ b/apps/web/src/pages/staking/components/ETHWalletSelect.vue
@@ -1,81 +1,69 @@
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
+import useFormat from '@/composables/format'
+import useUsers from '@/composables/users'
+import useWallet from '@/composables/wallet'
 
-const connectedWallets = ref([
-    {
-        name: 'Metamask',
-        icon: '/metamask.svg',
-        accounts: [
-            {
-                name: 'Acount One',
-                address: ';aalskdkfj;alsdk;fj',
-                amount: '32 ETH',
-                active: true
-            },
-            {
-                name: 'Acount Two',
-                address: ';alskddkfj;alsdk;fj',
-                amount: '0 ETH',
-                active: false
-            },
-        ]
-    },
+const { formatDecimalString } = useFormat()
+const { user } = useUsers()
+const { amountToStake } = useWallet()
+
+const connectedWallets = computed(() => {
+  return [
     {
-        name: 'Coinbase',
-        icon: '/coinbase.svg',
-        accounts: [
-            {
-                name: 'Acount One',
-                address: ';alskdkfgj;alsdk;fj',
-                amount: '48 ETH',
-                active: false
-            },
-            {
-                name: 'Acount Two',
-                address: ';alskdkfj;adlsdk;fj',
-                amount: '20 ETH',
-                active: true
-            },
-        ]
-    },
-])
+      name: 'Metamask',
+      icon: '/metamask.svg',
+      accounts: [
+        {
+          name: 'Primary Account',
+          address: user.value.id,
+          amount: formatDecimalString(user.value.balance || '0.0'),
+          active: true
+        }
+      ]
+    }
+  ]
+})
 
 const maxAmmountToStake = ref(100)
 
-const amountToStake = ref(0.00)
+const amountToStakeNumber = ref(0.00)
+watch(amountToStakeNumber, (newValue) => {
+  amountToStake.value = newValue.toString()
+})
 
 const disableNext = ref(true)
 
 const selectedWalletToStakeFrom = ref(
-    {
-        name: '',
-        address: '',
-        amount: ''
-    }
+  {
+    name: '',
+    address: '',
+    amount: ''
+  }
 )
 
-watch([amountToStake, selectedWalletToStakeFrom], () => {
-    if(!(/^[0-9.,]+$/.test(amountToStake.value + ''))){
-        amountToStake.value = 0.00
-    }
-    if(amountToStake.value > maxAmmountToStake.value){
-        amountToStake.value = maxAmmountToStake.value
-    }
+watch([amountToStakeNumber, selectedWalletToStakeFrom], () => {
+  if (!(/^[0-9.,]+$/.test(amountToStakeNumber.value + ''))) {
+    amountToStakeNumber.value = 0.00
+  }
+  if (amountToStakeNumber.value > maxAmmountToStake.value) {
+    amountToStakeNumber.value = maxAmmountToStake.value
+  }
 
-    if(
-        amountToStake.value > 0 &&
-        selectedWalletToStakeFrom.value.address.length > 0
-    ) {
-        disableNext.value = false
-    } else { disableNext.value = true}
+  if (
+    amountToStakeNumber.value > 0 &&
+    selectedWalletToStakeFrom.value.address.length > 0
+  ) {
+    disableNext.value = false
+  } else { disableNext.value = true }
 
-    if(Number(selectedWalletToStakeFrom.value.amount.split(' ')[0]) < amountToStake.value){
-      selectedWalletToStakeFrom.value = {
-        name: '',
-        address: '',
-        amount: ''
-      }
+  if (Number(selectedWalletToStakeFrom.value.amount.split(' ')[0]) < amountToStakeNumber.value) {
+    selectedWalletToStakeFrom.value = {
+      name: '',
+      address: '',
+      amount: ''
     }
+  }
 })
 
 
@@ -91,29 +79,29 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
       <div class="slider mb-[20px]">
         <div class="border border-grey px-[16px] py-[8px] flex justify-between gap-[10px] items-center">
           <input
-            v-model="(amountToStake)"
+            v-model="(amountToStakeNumber)"
             type="text"
             placeholder="0.00"
             class="p-0 w-[65px] xsm:w-full outline-none text-grey_5"
           >
           <h6 class="text-primary whitespace-nowrap">
-            | ETH <span class="sr-only s_xsm:not-sr-only">to Stake</span> 
+            | ETH <span class="sr-only s_xsm:not-sr-only">to stake</span>
           </h6>
         </div>
         <input
-          v-model="amountToStake"
+          v-model="amountToStakeNumber"
           type="range"
           min="0.0"
-          step="0.0001"
+          step="0.01"
           :max="maxAmmountToStake"
           class="sr-only s_xsm:not-sr-only"
         >
-      </div> 
+      </div>
       <span class="tooltiptext text-body font-bold">
         You can stake from your wallets with the max of {{ maxAmmountToStake }} ETH
       </span>
     </div>
-    
+
     <div class="h-full overflow-auto border-y border-grey">
       <div
         v-for="item in connectedWallets"
@@ -134,20 +122,20 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
           v-for="account in item.accounts"
           :key="`${account as any}`"
           class="flex justify-between items-center my-[20px] px-[12px] py-[6px] hover:bg-blue_3 cursor-pointer tooltip"
-          :class="selectedWalletToStakeFrom.address === account.address? 'bg-blue_3 hover:bg-blue_2' : ''"
-          :style="Number(account.amount.split(' ')[0]) < amountToStake || !account.active? 'background: rgba(251, 190, 132, 0.2); cursor: default; ' : '' "
+          :class="selectedWalletToStakeFrom.address === account.address ? 'bg-blue_3 hover:bg-blue_2' : ''"
+          :style="Number(account.amount.split(' ')[0]) < amountToStakeNumber || !account.active ? 'background: rgba(251, 190, 132, 0.2); cursor: default; ' : ''"
           @click="selectedWalletToStakeFrom = account"
         >
           <h6 class="text-grey_6 font-semibold">
-            {{ account.name }} | 
+            {{ account.name }} |
             <span class="px-[6px] text-grey_2  sr-only s_xsm:not-sr-only">{{ account.address }}</span>
           </h6>
           <h6 class="text-grey_5 font-light">
             {{ account.amount }}
           </h6>
           <span class="tooltiptext text-body font-bold">
-            <span v-if="!account.active">Current account not connected via device or extention</span>
-            <span v-else-if="Number(account.amount.split(' ')[0]) < amountToStake">Insufficient Funds</span>
+            <span v-if="!account.active">Current account not connected via device or extension</span>
+            <span v-else-if="Number(account.amount.split(' ')[0]) < amountToStakeNumber">Insufficient funds</span>
             <span v-else />
           </span>
         </div>
@@ -155,7 +143,7 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
     </div>
     <div class="flex justify-between items-center gap-[20px]">
       <RouterLink
-        :to="!disableNext? '/stake/eth/confirm-stake' : '/Staking/ETH/Select-Wallet'"
+        :to="!disableNext ? '/stake/eth/confirm-stake' : '/Staking/ETH/Select-Wallet'"
         class="w-full"
       >
         <button
@@ -165,7 +153,7 @@ watch([amountToStake, selectedWalletToStakeFrom], () => {
           Next
         </button>
       </RouterLink>
-      
+
       <RouterLink
         to="/stake/eth"
         class="w-[100px]"
diff --git a/apps/web/src/pages/staking/components/StakingModal.vue b/apps/web/src/pages/staking/components/StakingModal.vue
index 7b5b98470..e5861932a 100644
--- a/apps/web/src/pages/staking/components/StakingModal.vue
+++ b/apps/web/src/pages/staking/components/StakingModal.vue
@@ -1,16 +1,10 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
+import useFormat from '@/composables/format'
+import useUsers from '@/composables/users'
+import USDAmount from '@/components/USDAmount.vue'
 
-
-// eslint-disable-next-line no-undef
-const props = defineProps({
-    toggleModal: {
-        type: Function,
-        required: true
-    }
-})
-
-const currentBalance = ref('45 ETH | $123,123.11')
+const { formatDecimalString } = useFormat()
+const { user } = useUsers()
 
 </script>
   
@@ -27,8 +21,8 @@ const currentBalance = ref('45 ETH | $123,123.11')
         >
         ETH
         <div class="tooltip">
-          <span class="font-semibold text-primary text-body sr-only s_sm:not-sr-only">
-            {{ currentBalance }}
+          <span class="flex font-semibold text-primary text-body sr-only s_sm:not-sr-only">
+            {{ formatDecimalString(user.balance || '0.0') }} |&nbsp;<USDAmount :ether-amount="(user.balance || '0.0')" />
           </span>
           <span class="tooltiptext text-body font-bold">
             Balance is summed up from all connected wallets
diff --git a/contracts/ethereum/docs/index.md b/contracts/ethereum/docs/index.md
index 28b9f7f5c..4060f5288 100644
--- a/contracts/ethereum/docs/index.md
+++ b/contracts/ethereum/docs/index.md
@@ -46,7 +46,7 @@ struct Fees {
 struct Pool {
   struct SSVManager.Balance balance;
   mapping(address => struct SSVManager.Balance) userBalances;
-  bytes validatorPublicKey;
+  string validatorPublicKey;
   uint32[] operatorIds;
 }
 ```
@@ -149,7 +149,7 @@ address oracleAddress
 ### ValidatorInitFullfilled
 
 ```solidity
-event ValidatorInitFullfilled(uint32 poolId, uint32[] operatorIds, bytes validatorPublicKey)
+event ValidatorInitFullfilled(uint32 poolId, uint32[] operatorIds, string validatorPublicKey)
 ```
 
 Event signaling a validator init request fulfillment
@@ -423,7 +423,7 @@ Get a pool's balance by pool ID
 ### getPoolValidatorPublicKey
 
 ```solidity
-function getPoolValidatorPublicKey(uint32 _poolId) external view returns (bytes)
+function getPoolValidatorPublicKey(uint32 _poolId) external view returns (string)
 ```
 
 Get a pool's validator public key by pool ID
@@ -438,7 +438,7 @@ Get a pool's validator public key by pool ID
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| [0] | bytes | The pool's validator public key |
+| [0] | string | The pool's validator public key |
 
 ### getPoolOperatorIds
 

From d464235b3a68ee6bad4e353d87b3ad3b63e2e186 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Wed, 7 Dec 2022 10:48:58 -0500
Subject: [PATCH 28/31] Add operator list to pools

---
 .../pages/staking/components/ETHStaking.vue   | 157 ++----------------
 1 file changed, 18 insertions(+), 139 deletions(-)

diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index e6830fb6c..cf4cb4300 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -7,140 +7,6 @@ import USDAmount from '@/components/USDAmount.vue'
 const { formatDecimalString } = useFormat()
 const { user } = useUsers()
 
-const CurrentStakedItems = ref(
-    [
-        {
-            totalAmmountStaked: '5 ETH | $123.12',
-            timeOfStaking: '11/30/22',
-            wallet: {
-                provider: '/coinbase.svg',
-                address: 'asdfasasdf',
-                name: 'Account One'
-            },
-            // list of pools distributed in
-            pools: [
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '123',
-                    // InWaiting || Active
-                    status: 'Active',
-                    ammountStaked: '5 ETH',
-                    rewardsAccumulated: '10 ETH | $123.12',
-                    operatorScore: '32%',
-                    avgAPR: '2.3%'
-                }
-            ],
-        },
-        {
-            totalAmmountStaked: '5 ETH | $123.12',
-            timeOfStaking: '11/30/22',
-            wallet: {
-                provider: '/coinbase.svg',
-                address: 'asdfasasdf'
-            },
-            // list of pools distributed in
-            pools: [
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '123',
-                    // InWaiting || Active
-                    status: 'Active',
-                    ammountStaked: '2.5 ETH',
-                    rewardsAccumulated: '10 ETH | $123.12',
-                    operatorScore: '32%',
-                    avgAPR: '2.3%'
-                },
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '',
-                    // InWaiting || Active
-                    status: 'InWaiting',
-                    ammountStaked: '2.5 ETH',
-                    wallet: {
-                        provider: '/coinbase.svg',
-                        address: 'asdfasasdf'
-                    },
-                    rewardsAccumulated: '',
-                    operatorScore: '',
-                    avgAPR: ''
-                }
-            ],
-        },
-        {
-            totalAmmountStaked: '5 ETH | $123.12',
-            timeOfStaking: '11/30/22',
-            wallet: {
-                provider: '/coinbase.svg',
-                address: 'asdfasasdf'
-            },
-            // list of pools distributed in
-            pools: [
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '123',
-                    // InWaiting || Active
-                    status: 'Active',
-                    ammountStaked: '1.25 ETH',
-                    rewardsAccumulated: '10 ETH | $123.12',
-                    operatorScore: '32%',
-                    avgAPR: '2.3%'
-                },
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '123',
-                    // InWaiting || Active
-                    status: 'Active',
-                    ammountStaked: '1.25 ETH',
-                    rewardsAccumulated: '10 ETH | $123.12',
-                    operatorScore: '32%',
-                    avgAPR: '2.3%'
-                },
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '123',
-                    // InWaiting || Active
-                    status: 'Active',
-                    ammountStaked: '2.5 ETH',
-                    rewardsAccumulated: '10 ETH | $123.12',
-                    operatorScore: '32%',
-                    avgAPR: '2.3%'
-                }
-            ],
-        },
-        {
-            totalAmmountStaked: '5 ETH | $123.12',
-            timeOfStaking: '11/30/22',
-            wallet: {
-                provider: '/coinbase.svg',
-                address: 'asdfasasdf'
-            },
-            // list of pools distributed in
-            pools: [
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '123',
-                    // InWaiting || Active
-                    status: 'Active',
-                    ammountStaked: '2.5 ETH',
-                    rewardsAccumulated: '10 ETH | $123.12',
-                    operatorScore: '32%',
-                    avgAPR: '2.3%'
-                },
-                {
-                    poolAddress: '123123',
-                    validatorAddress: '',
-                    // InWaiting || Active
-                    status: 'InWaiting',
-                    ammountStaked: '2.5 ETH',
-                    rewardsAccumulated: '',
-                    operatorScore: '',
-                    avgAPR: ''
-                }
-            ],
-        },
-    ]
-)
-
 </script>
   
 <template>
@@ -234,6 +100,14 @@ const CurrentStakedItems = ref(
               v-else
               class="text-grey_5 whitespace-nowrap"
             >
+              <h6 class="flex gap-[20px] flex-wrap justify-between items-center truncate">
+                <span>
+                  {{ pool.userRewards }} in rewards
+                </span>
+                <span>
+                  {{ pool.validator.apr }} validator APR
+                </span>
+              </h6>
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center mb-[10px] truncate">
                 <span class="min-w-[135px] w-[45%] flex gap-[5px] items-center">
                   Validator: <span class="truncate">{{ pool.validator.publicKey }}</span> 
@@ -243,15 +117,20 @@ const CurrentStakedItems = ref(
                   ><i class="iconoir-open-new-window text-primary" /></a>
                 </span>
                 <span>
-                  {{ pool.validator.effectiveness }} Validator Effectiveness 
+                  {{ pool.validator.effectiveness }} validator effectiveness 
                 </span>
               </h6>
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center truncate">
                 <span>
-                  {{ pool.userRewards }} in Rewards
-                </span>
-                <span>
-                  {{ pool.validator.apr }} Validator APR
+                  Operators:
+                  <a
+                    v-for="operator in pool.operators"
+                    :key="operator.id"
+                    :href="operator.url"
+                    target="_blank"
+                  >
+                    #{{ operator.id }}{{ operator.id === 594 ? '' : ', ' }}
+                  </a>
                 </span>
               </h6>
             </div>

From 798caebc9b7e11fba7da15cbe24e4938ea1724ef Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Wed, 7 Dec 2022 10:55:22 -0500
Subject: [PATCH 29/31] Add todo notes

---
 apps/web/src/pages/staking/components/ETHStaking.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index cf4cb4300..01b597b33 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -129,6 +129,7 @@ const { user } = useUsers()
                     :href="operator.url"
                     target="_blank"
                   >
+                    <!-- Todo fix hardcoded check on the last operator -->
                     #{{ operator.id }}{{ operator.id === 594 ? '' : ', ' }}
                   </a>
                 </span>

From 3c06854cb1d5a177f0dc52d3ca9ae40fb266ef68 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Wed, 7 Dec 2022 10:57:16 -0500
Subject: [PATCH 30/31] Set starting pool apr and effectiveness to 0

---
 apps/web/src/composables/wallet.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index d728581a3..ee46c5bec 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -166,8 +166,8 @@ export default function useWallet() {
         const validator = {
           publicKey: validatorPublicKey,
           status: (status.charAt(0).toUpperCase() + status.slice(1)).replace('_status', ''),
-          effectiveness: '100%',
-          apr: '5.5%', // See issue #205 https://github.com/consensusnetworks/casimir/issues/205#issuecomment-1338142532
+          effectiveness: '0%',
+          apr: '0%', // See issue #205 https://github.com/consensusnetworks/casimir/issues/205#issuecomment-1338142532
           url: `https://prater.beaconcha.in/validator/${validatorPublicKey}`
         }
 

From 48beb79178a4b8d83965bc293ca99bd7762ae611 Mon Sep 17 00:00:00 2001
From: Shane Earley <shanejearley@gmail.com>
Date: Wed, 7 Dec 2022 11:15:13 -0500
Subject: [PATCH 31/31] Add ETH annotations when needed

---
 apps/web/src/pages/staking/components/ETHConfirmStake.vue | 4 ++--
 apps/web/src/pages/staking/components/ETHStaking.vue      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/pages/staking/components/ETHConfirmStake.vue b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
index 91402ccad..67192c680 100644
--- a/apps/web/src/pages/staking/components/ETHConfirmStake.vue
+++ b/apps/web/src/pages/staking/components/ETHConfirmStake.vue
@@ -60,7 +60,7 @@ const handleConfirm = async () => {
           Amount Staking
         </h6>
         <h6 class="font-bold">
-          {{ stakingInfo.amount }}
+          {{ stakingInfo.amount }} ETH
         </h6>
       </div>
       <hr class="bg-grey h-[2px] my-[10px]">
@@ -100,7 +100,7 @@ const handleConfirm = async () => {
             <span class="px-[6px] text-grey_2 sr-only s_xsm:not-sr-only">{{ stakingInfo.from.account.address }}</span>
           </h6>
           <h6 class="text-grey_5 font-light">
-            {{ stakingInfo.from.account.balance }}
+            {{ stakingInfo.from.account.balance }} ETH
           </h6>
         </div>
       </div>
diff --git a/apps/web/src/pages/staking/components/ETHStaking.vue b/apps/web/src/pages/staking/components/ETHStaking.vue
index 01b597b33..51aa2dbf5 100644
--- a/apps/web/src/pages/staking/components/ETHStaking.vue
+++ b/apps/web/src/pages/staking/components/ETHStaking.vue
@@ -53,7 +53,7 @@ const { user } = useUsers()
         <div class="">
           <h6 class="font-bold text-grey_5 flex justify-between w-full">
             <span class="flex">
-              {{ formatDecimalString(pool.userStake || '0.0') }} |&nbsp;<USDAmount :ether-amount="(pool.userStake || '0.0')" />
+              {{ formatDecimalString(pool.userStake || '0.0') }} ETH |&nbsp;<USDAmount :ether-amount="(pool.userStake || '0.0')" />
             </span> 
             <div class="tooltip">
               <span class="text-grey_3 flex gap-[10px] sr-only s_xsm:not-sr-only">
@@ -86,7 +86,7 @@ const { user } = useUsers()
                 Pool #{{ pool.id }}
               </h6>
               <h6 class="font-bold text-grey_5">
-                {{ pool.userStake }}
+                {{ pool.totalStake }} ETH
               </h6>
             </div>
             <div
@@ -102,7 +102,7 @@ const { user } = useUsers()
             >
               <h6 class="flex gap-[20px] flex-wrap justify-between items-center truncate">
                 <span>
-                  {{ pool.userRewards }} in rewards
+                  <span class="font-bold text-grey_5">{{ pool.userRewards }} ETH</span> in rewards
                 </span>
                 <span>
                   {{ pool.validator.apr }} validator APR