From e77eddfea30700e70483f347f422df6c48bb59ac Mon Sep 17 00:00:00 2001 From: shrijana Date: Thu, 19 Aug 2021 19:32:17 +0545 Subject: [PATCH 01/39] farms UI --- package.json | 10 +- public/favicon.ico | Bin 143278 -> 15406 bytes public/i18n/en.json | 78 ++-- public/i18n/zh-CN.json | 88 ++--- public/i18n/zh-TW.json | 84 ++--- public/images/farms/bison-bnb.png | Bin 0 -> 7435 bytes public/images/farms/bison-busd.png | Bin 0 -> 7435 bytes public/images/farms/bison.png | Bin 0 -> 7435 bytes public/index.html | 8 +- public/logo.png | Bin 23975 -> 7435 bytes public/manifest.json | 6 +- src/App.tsx | 6 +- src/components/Menu/config.ts | 2 +- src/config/constants/contracts.ts | 4 +- src/config/constants/farms.ts | 343 +----------------- src/contexts/ThemeContext.tsx | 2 +- src/state/hooks.ts | 2 +- src/views/Farms/Farms.tsx | 23 +- .../FarmCard/ApyCalculatorModal.tsx | 2 +- .../FarmCard/CardActionsContainer.tsx | 2 +- .../components/FarmCard/DetailsSection.tsx | 4 +- .../Farms/components/FarmCard/FarmCard.tsx | 4 +- .../Farms/components/FarmTabButtons/index.tsx | 2 +- src/views/Home/Home.tsx | 2 +- src/views/Home/components/CakeStats.tsx | 2 +- src/views/Home/components/FarmStakingCard.tsx | 6 +- src/views/Home/components/TwitterCard.tsx | 2 +- yarn.lock | 10 + 28 files changed, 192 insertions(+), 500 deletions(-) create mode 100644 public/images/farms/bison-bnb.png create mode 100644 public/images/farms/bison-busd.png create mode 100644 public/images/farms/bison.png diff --git a/package.json b/package.json index 2cd36441a..0fabed7fb 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,17 @@ { - "name": "goose-frontend", + "name": "bishares-frontend", "version": "0.1.0", "private": true, "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "react-scripts start", - "build": "react-scripts build", + "build-mainnet": "react-scripts build && rm -rf ../bishares-mainnet/* && mv ./build/* ../bishares-mainnet/ && mv ../mainnet/CNAME-MAINNET ../bishares-mainnet/CNAME", + "build-testnet": "react-scripts build && rm -rf ../bishares-testnet/* && mv ./build/* ../bishares-testnet/ && mv ../testnet/CNAME-TESTNET ../bishares-testnet/CNAME", "test": "react-scripts test", "eject": "react-scripts eject", "lint": "eslint 'src/**/*.{js,jsx,ts,tsx}'", - "format": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'" + "format": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'", + "uikit": "cd ../bishares-uikit && yarn && yarn build && rm -rf ../bishares-frontend-farms/node_modules/@pancakeswap-libs/uikit/dist && cp -Rp ./dist ../bishares-frontend-farms/node_modules/@pancakeswap-libs/uikit/" }, "husky": { "hooks": { @@ -33,7 +35,7 @@ "@binance-chain/bsc-use-wallet": "^0.8.1", "@crowdin/crowdin-api-client": "^1.10.1", "@ethersproject/abi": "^5.0.7", - "@pancakeswap-libs/uikit": "goosedefi/goose-uikit", + "@pancakeswap-libs/uikit": "bisharesindexfund/bishares-uikit", "@reduxjs/toolkit": "^1.5.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", diff --git a/public/favicon.ico b/public/favicon.ico index f0548dd7bf7bb7b945685ebf3072b873c32c6537..3d323b3f0c0fbfcd1bfaa07e30a36423e1e4838a 100644 GIT binary patch literal 15406 zcmeHO32;=`m2IiDwbqt;(bnB+wOYSh5(1onB*55?ZES?GfdB>q31G8$0StJ)CZWH7s#h=UlR06YoFnR4mC-!;Md93fN~F$ME_Ci9(0WefY#;IGIK@x6YGS#u|s6c+ai+go+#;LE~xOldwP?gJmjVJrwpq6 z(Y8Dh9+xD?o$}BuVVtl?7=OG#WGy=&a<~19h#zpb(8edr{vP=kY_r0y46qGVe(yaz zT*MX(5xU$T2-D;jgiiUPcZ_VqKGdI_gP|jDdj3F5b1U}4{bHI;%&(xHyIjA4gnIZl{fr&gJ-Fzf zZuuufSbo!&PIp7cbfvy+nNr)b+EsgQ4KF?`jcv>Ljcqh#W&VET7MNR_ztOpx+NU~q zd|ICN*ox-FenXCBI&x2C*|RU^7X!ojX1*cQtfQW8a%*jqxfC zEv3#a@7L%{Mjgz`mi(^RY&MaQkRYO>qP%v`XTIY%$a4j4zt$I*9(Ha%Rjo93jM9MC zjmVKv`NvqLuBFU8anT-|-F^WyMNCYLmmg?#`OLQL1HD`@kAG&5QrA{Snmv)hUUxyS zRG%r=7nB@vxmO1?AhQ6Tas8V&d!nWruqGITu9C!8E@?>Y>uM|bO8V+9* zigr)mlLl!e=M?-}0qu;+PlD@#^9`Nr3yP1hz3O{=%BQP#q(z#NHh2WH2c@B-)I5IC z9_p(%#vLfnH9h>zJYnHp^1^rTkL$#_>HQj8mi@x5%r^*jIbU*(z@D9(->>#vo35tL zsrr)ALk@?d%l_Tb@5y)aATRQi3c$S6U)Zx97h`lfp`pz&*U?6Zu!u+z9uq6H2`M7d zkRhVdvIS$QF82-*+i#eN|Ka_(Mu^zLVM6B`Bx17riRetHh%{M+HpwKyb@8A9KLJ`A zL$lJ1!(5{Eo2;(u_Tl#MwA zbCkG9~AAEMzw+ZS;rKR2( zFUV7kp-!js-_&n`cg|Nfb41XS7ji|8%lwm3qR~(kM6F4rFzf#|_+8#vzw71mhWirQ9cKyLiH*NMBIbO@+U2?r;VLrH4 zEQ>3>Z8&!0xcS12{FF9H9s2V3>L0wBw*<96*nGzPt}(`Kd^May{1jog#kl zgMzx(CM1ijvV%g|^%?Zuc1;G%(Zt1aZR%Wu{diLjul>RHnKOl2f6U2!WhXD@|FL-` zQZF25LdipN4?#cVSbtpd&zxT_eODO#PIz46cldkOUkTP<$8_m`rkA}z|KqEpP|snJ z@MrL4iNnVU?mu+OAbEFUAK|KNg)ZI@;jvxk4CFblS4-1RNXnJY3UWX^OWYm;r+ z2YZ)`*njMGWB);#-7@xV0DGWK(pL4wBj4njrQe|M;<&one<7FqT3=Lp*nz$`v;XoH zgKN{X|NOWd`PLiQfBu5;g7F*j{E-*qmlf|4^SS?A-t63dy27=)b6Uu~hA)GjK0_al zy4GB||3=(U>dw8c#&13|k5c`4Z|=W)D&9Y8JK`jOXf-o%^$Jb`I>CPTyeA?Y&0i(C z_g%2(H(n@K8d@hQ^{tEC^&QJy4Xr=t#b>_bH@0!tU9htc`v#-g7w=p(?FsIN&LOa^ zdAL^PY&p3DdxG7xbHk`PNA>qkK9n?k>_J|9=DRfH6PA~onsPRuEC=?m%2nUKz*T>4 z7-{u|%;b^Zd@d@l>HG*+Q%4iHExH+`CsW&c`nx&NbIVd4J_9z6K3 zB_$=7dGVR=_$|YhbulW*_%Zun-LG?1ovC#@Rd(G%Rj6(j(d8a(dsyb*!SPq--yi2Oc5U+ z@0C@Rxw||2urF!g`m-r3=L6%Ir}sI_e^-n6@RYK*!`K^RaPIE3z=!U#z1mzElWu

fgWrx8QX;WA>U|uDX_HjHADA?Wd>Xq3pSp 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 literal 143278 zcmXVX1z1!6`}Q_+bPCcPBHdjE4T{p;h;-`c6loFZl2D|(8QqPN!azDVy2keI`}@DU zu3cwmyLQfVp17a;xzG6k06+jP;J+6TzyeVE1pqi;K8J?>-#!mM5KxNwPD$zi@2da+ zlXXCVkkJ3_|KtP!t}ZbDWcmO5WB@=O9SA^%+5UGtCu{)V1s@0ytEcmln1GG|b7*39 zwP&yY`}My!{(q-7^ZJQ7XDC4Znev-}<)a7x4trxiSWM7@!tPr7ldD4phc-xCIky;> zwVvp(s*PHxRSGuF>o;tb@3S}wKcg1sV+s`NZd2aBDzK~PFcniiXV(Q4%JESKqoVmh4qdSI7UDw zygWPw+(4e-kS#8f2krIdP+bs|C=mAsS4h?$^-mdgCEupr#tk@m{dqZv@`eXt0V;wr z2jF?cBi!b89n>dw2@v+{%)oqH1x+%d^vPW4PrL`SlNtIV2xwj4`|!mz7K}6psGux# z8f7|$kYr;FR3JqXA+AF$K^9PMq7xF#!AYc_mxcgtSl9i5%y?_ymK$jzxE_%7qB|Ww ze0?_*N@~^-!^~hILlm*gl%Qvaww(l`o$9GqZ5;8ymLBdmYQyn0-=1l~6Uv6t~=SaLG9bd~O#djf`(a zwd7y__q`9<`X{o&+dZk2iSNbUSI92MhDJD0&_bP~O2KsIX1}iloC0yO4EAO0Aw%BV z@21A8#{+J+rC~Qa@#&U%r*|cJE(>XuJ;Dsu_n7-4cpa{5fK<>p&$=EBv_vI_J>6u#Gqx|LS23529807yMS-Kd( zoSe)&u-;J7Rfb1Sl4n3;wMbu)VNd#KcLQ<=!)-*s%-Bs$a_yqq+v$#hsPmP;Q%%{x zTTNNB_Iby0E7#SH@5yaI-Wt_m?i<2xm>ed?hj3<8GO58vnI)O9Vh2ne+%6@G|~KcOoC4}po8wSpzV z%dp3VWI9IOil6QYS*-8(`-ROt#Zqgg=6$CYpiO;0f*s?gf*s=0EpqC8I~{!|Jh#+T z=Z-WndHV<<8H&yTP_6ahod7UF^8bV>=D-}X*?SuBFv_R;nDgCqZl>cJM8bfc31XGt zFW=M?Tf~2O$e$WJeaWON0xNVKK?R9|$L8D@G^mKeT{dNSRajbq`?9zGv|O)93SMQ1 z5o`TOyd;jf_Sn{#lI*G-6GZ=`R=6}>XubG2bda^VR~y}w_JAL5u99_X2|$fu(zVNL z8h%`rV!;dIhW*G(>5z~t^sFPeR;gv0Q9B#EGFil(GT&u-Kv3CRrG@h>I9pB$Y$S>_{^6Wi!yHrh4+ zVIUpcv3DUjj| ze0TyVh;90Vy~_{0^|Bbrn@Roa(+hU`ib{!bi0+TD%#|16q%bwaM$s)i>*sCmdR8}b zgw1K$3M55C%kL6m7*d^K`P~^_99S%*IB(){={MQh(#gga5Ve|H@Q*n-FzPyRfqd<} zOT5bbZg|&2+R}9bUH0;DJmUU`Phlaz8yN71QTSP$5DsoxL5`p9rn;T#E8xY7#K>)IcN$)tBdFK@TsS=+ddAbv~D@i-bx} zBaO>7o3PDFj&Z2-qjYDHv|}vx)Sp|91IwvsBs~^CSyWe*-7A-YFq%Yg*tG2DE63Pvt>3++YL~nY9uDPBx1P{g=A9=9 zP64dj4!&iU5*L;%;f1PGfecCR9$*vyp()3I##yh2=nfyrj(jrZ6jpYG?2xaUlQM5( z>E_v;FA{jeGhM7|`ZENC>(zHW1%yM+F5@6%v?3?F43p}1!Iiy{OXL1Z^y$x$EHOYz zHQG$tAHr{q$kMy}`;n9D00ARhbhA$%@0GYiou4h3ksS@cl4 zPG;klJMsLe=w)UDaeFQv4Q)}%r$x#69KrGYhQRrq(@i3t4F0gM8@pzY*dDcLri9ux zVcq5|B_)Z2)F_xJniIxhYPA$LFH(GoUq`3dm3I?Fc;$8JBekS&rz5WecX7FO8UoM9 z+B@#faz;3)824{%&DmQ_NMCv&R`BGRPF`T5yY@c^u0{&MlE}V59;x9gJaiZ`Np+3l z<;nHfW*-K;-3gk#0~V(`jY>w}dVkl62XHv(?)WOL=8^*jk7!2j+o@(Xd7-Z(@wqAt z9nqW$I^z|d#&YgNd}?1MI5qUX5cUU~*?JKd8?o0)Dog6m8!*BHu4R(CyweP!@|)R~ z*&EL?s-6zu7~tc)<+jN{3`8)|_|s!R#61}UA~`u2XxZ%61;NJf&wp&R$&zN?>dFU1 z?&eGNoF;(J*XH;hx476OF)v{6kQxAt1}Cq^j|XSOgqgd=2P~7g{LfZB1tRf? z&)aFw=(&K~b}T&O@6G`^ai9X+o6#TZ05GKzfm8-56F=w+J@CTYiHzyv&=dGan9Rxo zqzl>V+Ll>YxAVFsy-*KPr5gTY zH(7Jt6{)z8vs<`vPsQO6K%^=oBJPgUT(+Pm+=u190VN8U#2 zwKlI@R_L0po$m?f1taj;gbsrSk_Dn~zwD%Q6`)&fs$&n$f1hd3c7XT1r74o1T=qNv zzDNP5KF`WVQXVgEZxsN>ag>CS z^WQru^@n*DI=-ygy@=^0YE_4@lWqo7rAvBP<12$H(IBUxC9u%3>_b zYZM=%oT~DKMd(`~mj!4n4>GhO-iondn}m}E++CDiE?~+S>M_N*n0*2c4VuP897=k# z5SmmIc`I9eg=?gE~^JK;u6zoLoN%3rmRab+!psgY`F%YpCGW} zi?6tL;2m|XwY}a+44Yv^QfL z$#x;Pfz)YtWI9xMv&4PE*|zyRr^@=Pbt7yXcocs6v^=l|@4q&imArt4fL9?;D6CG> zKEOZR+|W%a28X8}>N|A)NO~?elJ7>hdH%y^; zvoNPCyy!pOX4<^dtS`YF3&1z=?qk7x`m50d+Mwy=+j7wNEs_=jq46=TU!J#53Bp(k z<(47Kv509(7rC2$4SdRA-}EM8>t1qJAx=QVwMr!9KjR|5@91jFy+{p|f$u}MH*8(x zu7`yaE2D+-ud~c8Jyqzn10QERC<{e8&=t}^`x-}@6NBze49A1i=@i3)zht%ur5NxWu4)ihlh!)eKjp#SlzxsOA2>d*r7g4xWcFG<5uEK$}HG@iC>4I7qyCK`Z}r zX~{R80Sdi_YpGW!5T__SCew{SG>(CX<)X{6Py4V9!1`s{|8=)xOa@vi?49~%V5U~u z=_S$Z>~1vf%@6$62WrmzkTnRCT+^U8DdVQoZ)6!e$ulKc-vw6<72Q#UOVJLgTd1m8 z_TzTv_z>9FY3s6fL2EhsQSa|+l(bXiD#5JapH2(EVqdngZh~4~oL&Anx4xe0lIQCA z;dGgGOSq`lMPJU6pAjf*Je}cV&0+jT*sz-~-0L3-oK33x;Wk^e>o)Ci>VBTey0z6I zrjB7BH+rv*3Wk=f3n8Fxy_|1{`D|kF!0<1>@iO!*;nH0a8^2YDTHI};jDI8j<{3;| z)3qN;GnO7-xZo@_NIBcgCXHF;7Z>N}$jFNQ5RU&jXh$+$O)DhS22@S3yxowl4)s#N zumuje{?KqYt9e-twq$E#)82^KTfUm)Wj3`Gf~PN7UMM)-o}@Lsl3>oN^DEvywEVk~ z<{q=x{e^6U93&KQj4@Of>S5ikxOeJDi*f2FOjUD58lj<}j+mZ$^~b^WYu+|NqwUNJ zJr6Hc#4X{CH^2L9b21d)J#hJ6#NMJt`0)!Y>A4R)B0%}cr!CXpyr0wWm)mqh&y zT`y{n*jrcr&{{ekP=OaIg+;Px+WX&1^{%Bs!;}Ggv2PO@+;8U%{aSBk1C5tGR5Lyv zKf}g>22XFE6zu0=WID{?n@4u2o9g>?y5hV-hha(~ApT`y^>eamN9LaBnb(Vg6J4po zp;RRC=8&u=A*dPw&R_$ql=l-vqw%>2Wy$&PvWDMU-^w2}I4%Dm`)piwzLzMiHM2at zad%-7fkC2UsB&XzIjr(`T5`LAp{~0m8soxK_L>);O z3SL*Z#!Ea>=j}VhI5K1>ig1O7^dpjyqw^T28&hDqWMXJ$E}v}Ug4M}6nGJJNrtQ;v z38lir!yVr*HuvBhP5Tb#Odxh2Mr!dD;|Df)CzcXR0|XoZ8nb!A-|~t8Tx%z*3O^(e>Ip+VaVp4ol&q$=*!WvjV=o_gjk;At z^sdUku&B}GJ&K{9u5xU9B6pEU&CqKo*gweT;%0n0%?=P2@pvd0+EAWZF#+`RwxU0* z>ykC}g7zfg^7tLz=lHs-A(1aQp3>_*Y4fxRM4PR+CqMk2s%~6Xa6*EBsU!LCNRr#W3yOA7gTPp7+uhGJL;t#0 zh&-elV=o<5e+PY$1Q*{X`Q`n&jK+i2j?Rlu(S$hC!}>-Kcz9ZLy0HZEG2CsW+2yjJ z{Z{qwp9=_>(qC>6|J>i=lpu-8a(85cT`Py)K3L86?ZK(b_|a@xlNeRBn0&6rRr623&sh{X%`a{!1q|X%*(M5She? zX3kDbS}%^lEjh(5e|jOY{#76O1r5VP_Gn)km^yS?DwMnh-BaKjmE4uy1tsJLW8Li1 z(I|K0E=aJF50}isBuY;Q)s!}$K->GzHEnc9u%9}3pYEy}3AwyAr10#0qgimjVESWgm-vY-@8iEY^=Nn~iv}6NPjD-=`x8^WC750^SPLcy8(!aD+ zrEaSqQ2a_4`h;Ex7~stO*-CAe8|l3?F|7VS!w=ymc+YzuHet&p)Q^i*q*HVLiixrd_&%G_4tx+g-G{uth*EIh>^bIL zir*}fGH$mkdQwsOHC^>%p?IvhcAJSiE1!l+g$+S*kpj36$jC1{_tUlFc|i!;a>}8O z72DSkN;($?G0Gn8e`2e=3sCATE+}t?5?t+%nawt}d6L`AeEfTgJ&a?>02- z(gTe5$tYAyGFpRW$1$&Um-o z;lLAi!zlD<-B*TJe*yQMCoFFaxf6VN)UDRlNJ4RNW-ertKMoW!v{&1U_y#^`wqph; zjF4MvwG{ci@IH+1zg~NXnW3%&AKY<1%C-WSxwY0$r#+&`ypTT8g}!Mj7v7c}xaG{aa*cbYE$B*b2B1+8hys{Lh|N$tz1HgF753#>3Y(9w zw%H9Meq#U5Jz$>=G9_d5xUm1JT09@ib4@%2iF<=lxeeeK9OYY6l`x>Dlg*hPa+*kC z2FcAqi?fmZH!A%3jYX!;SJEIfuHwyo(wvybv4-Lffsz{8ov@0}9>1n^M-o-CP zUy~OHasg$CSzxx@^B>MoMPiWt`}1J%rT?or-Ee9$wrOL%wJ12COD>$UG6X7VG#>(c1kxRCshpf_M8^>2&wmfwY+SW$bb zV~>XBIp4m`Mr$WdQD)NV^BaXx{sT$qA;}4*4Y@hClC3Wvr7F#y$v<}$6QeXX_GXZm z-e^qU4ZJ)rjOkX>tc}(aYoMzP<-?N?cIWQg<`2b4uk`Cg2>Hk_)1Tj1ukl`2RwEMc zB{C%Lt%75Nklv;F>KD$xk#6CB?%2)|4y08|aW33queH#D<@Vsm_aO7>DFJ<={mh4tjU5q zmB;Bl=oRv3pZm4kgM4l| zvoOcE07iO+=A&}Y;&eCTN*fZzoo@IJOa zS}n6`D1&)~U+6h*+2YWnKO9mXv{SJ3Xr>^7OUbfye#Kw*^BV*G_xjchTlG-FQav+l zeSIY#oI1i}KtCe>O_bZqR`|2Nq2N7QT__}>JRRcmms(1hha8=fO&bxDwO04&KQ774 z^7S@2R1YhUw+L0anTeO^iB6&ZSbfu}hc3Q7?`Qg&g*Na=o$hINW9NI#DqI_xd!XXv6PN}NC)(o&72%Ym=W&d^hTFg-T1c+E6ownFVqQ__xjfs>B>-v=$ov+XJg{5p!L7lHiP+bD>hA@AIwwh(QmLP)WvHB z4Bv6_P=}iye_^`0WfkKW#oS0lh?gw zK^Un>&d(;-&$1K>{FlmU;d`&$c>jt_O#8ukCHd-*OBj#E;I2^{DG%0iH*qE`yHX6) zAUs*#s$LDfkhu=Mi#q-MLL6jsGjjhfIQqG0cEXv$Yevc3nqQ^U96x6*W8O`7|C$W! zZNs5aqD)=+)Qx}_XP_N&KlMQhVPUC5rd{WFNr*++QnU7shUIhMI%yt;rPZ3s>5%5E zc?l?0T--MsQJm*r=M92&6+PndlB)jsy3Z+QcG*k7GOkui37}GGhKC-MhX0V-Ak=rh zX&t9!=Y9a_W_MZr_eEJ1G-@zwRwCcB{sZ$k3L$TQ8&wtc?pp~g7}3r_kVY@ow%EYH zH=qcX;@Ab+r80kC7dd_C@fWu4G{b(T@we7$J#-|dP?Zr2?7PlHq#m}WP*ukz;VtiH zsVZrxfG%Ua(;1@sB!+EY=l5T=bz#^hzv$+k=?v(`T4m22cymry3J+c%enQG*uDmrE zrI7hJ>ovt;7B)!Z#gVy-$;T30X5P-`%&nwIl`toAY<)#P{DcjKbIFOGm+y!b)Z)^5 zd2F=za)t<>UZ%om{}2`8+R$=sWRS?u6!Wwv-X2IuS`FU}<`~-Uls{yvgsW=9zR$lM zeuYPG;dAr2qFPD;8T2v$?O$2nzPaC4(h7v>e&Xr0-{a>5*wjuXQ7%LHrz@`CYnkS? zxJUd^S6zU0U+9)Kl+Nj-Dt9~ONebBAzAX)*Cqqlv0FNU}Gc#n+Uy!PwFMo)we^pN} z0>%~|IyY$quG~!+P_`{oF()rWO$6(83+k5VEQ#MUo^f)Be!PMGG8X1eexhD&_QMya z0#HMgKYl0tl%@26D>Wp8?LFF{Y-mIJBk5}5*>oSJ!ky|%X}`Md(GrZcNkH@s1{9KD zS>zDJ#W!+*!)at{;R+#Y1{8_bN zy}d!vPfEouGhTl$INjYPbrqlwZ|0S)JSrnqO;I*3xZ`!SbXq5$d^H2P#R#T4+|x*N zEndox`}tzDGAw5Hbzrj(l8LI*9vgsASii0}TwwWQx^aZMMEcReJAwBLl zWqpIbuOr>?5}93Z_ArEa#Ie+@v(D#V0Umfj1>VLOaicS53c{Ad-1o=A42}KyPhggx z_&c5l+@Xpv(8Ui5fiMVxLK65;!J8W6P*y@ zrmO_ninl~RITwuZE-O_G3y9Q$0{3V{9^|IkeX!U0f{T+@(nF!NnykCPe&2nRcMQuf zbDDpsFQN}NP0XC6EFs+DXBkw7TtDtj3Tmv&$c6$w%zh=jw)?{fsp`IE<=@`%3m~!o$o*VW!(ZC zJy*$5kkyXQBn*0e1lxXOF*%6Pm#r=>an_hkav8KiX*cSA=G(ao-8yV91V1fV^>Zf5 zsFp*{un>veuD#B@-iKVuUQ87@&?S_%8Jm?I4a*hjgbM_gd-e|mpxGW-DJ$9Dl{XUL zUShv>4fO?@h;3reYpV^BA+?NM8K?5s)|alUydK&}jR)eYy17^d*X5hv0hp;)FaJmC zc?&1ex$)z>l8179snJ8a?`srX_mMXq6Zb?OjlX${GVaUt-ES60eFw|E-d_-l z>&_ST3|Y|fNab}+yv{CV0w2Ydb!G0CFNHk4F+A9e6W7b=YM9e8_xdtl{Q&165EF&8 z&h_^bw&ddM{Hr6V9$PWAmw1}P0;e_q#u_YyKhCGx!zL{4M1;?Qi!L@PaOZ# z`y18A`iAD6=$rk=VMk8%R$D%>ue6&sUh%2p)6(0L?}Ao#WHTSs$y%uH%G(}DR^F${ z-P#<;vSYLOBYw(-;=iX$W29|zK(U69ir)TqX(IUTblsqR>lV0ofc^9c8lX*A8Rj$5 z$X7&EL^>}{yF*m$IPWl_FixD@P$hzPrJS|F8Ta4ly5|bKz)SS_XE%1~68w}+2&W6{ zhT8`FpsE;SF_}uRV()NHu)IMJa3GwMnC^(0>_lB}R z>NH6+HwK$9^6hYuypfAYwGD*)Tm@{N?0G4ZA;Ny1p36m60y*@bv21|mZGKjU4iaME zF85lFxdH%7;=;@Qv-iiF-WG_5-A>06U%9}*H1$n{Dk`0e~zS&1@yMZMZN0p2>J)@xacqD@2~r zpr%3p&b5Z3L~GtT1IBgs)gccv8XJJKP89zfK_5GtAr!}_zDl}_0_JpigA_l1&~tN3 z-v7}TMM$?=(G(v3(bzYmQ13BhcwU?*xNpyIXCebC>47CQE4vG%Qf7I~%>%H?v=u6S z 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íUk;|+7;nsog_LbWm+?T(- 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 diff --git a/public/i18n/en.json b/public/i18n/en.json index a17008e7a..09fbec936 100644 --- a/public/i18n/en.json +++ b/public/i18n/en.json @@ -75,7 +75,7 @@ { "data": { "stringId": 304, - "text": "Total EGG burned since launch" + "text": "Total BISON burned since launch" } }, { @@ -123,7 +123,7 @@ { "data": { "stringId": 320, - "text": "Stake LP tokens to earn EGG" + "text": "Stake LP tokens to earn BISON" } }, { @@ -153,7 +153,7 @@ { "data": { "stringId": 334, - "text": "Every time you stake and unstake EGG tokens, the contract will automatically harvest EGG rewards for you!" + "text": "Every time you stake and unstake BISON tokens, the contract will automatically harvest BISON rewards for you!" } }, { @@ -243,7 +243,7 @@ { "data": { "stringId": 380, - "text": "1 EGG = 1 SYRUP" + "text": "1 BISON = 1 SYRUP" } }, { @@ -291,7 +291,7 @@ { "data": { "stringId": 400, - "text": "SYRUP holders proportionally split 25% of EGG block emissions each day (10 EGG per block), Rewards are distributed each block." + "text": "SYRUP holders proportionally split 25% of BISON block emissions each day (10 BISON per block), Rewards are distributed each block." } }, { @@ -351,13 +351,13 @@ { "data": { "stringId": 424, - "text": "%num% EGG" + "text": "%num% BISON" } }, { "data": { "stringId": 426, - "text": "Spend EGG to buy tickets, contributing to the lottery pot. Ticket purchases end approx. 30 minutes before lottery. Win prizes if 2, 3, or 4 of your ticket numbers match the winning numbers and their positions! Good luck!" + "text": "Spend BISON to buy tickets, contributing to the lottery pot. Ticket purchases end approx. 30 minutes before lottery. Win prizes if 2, 3, or 4 of your ticket numbers match the winning numbers and their positions! Good luck!" } }, { @@ -435,19 +435,19 @@ { "data": { "stringId": 454, - "text": "%num% EGG Available" + "text": "%num% BISON Available" } }, { "data": { "stringId": 456, - "text": "Your amount must be a multiple of 10 EGG" + "text": "Your amount must be a multiple of 10 BISON" } }, { "data": { "stringId": 458, - "text": "1 Ticket = 10 EGG" + "text": "1 Ticket = 10 BISON" } }, { @@ -495,7 +495,7 @@ { "data": { "stringId": 478, - "text": "Ticket purchases are final. Your EGG cannot be returned to you after buying tickets." + "text": "Ticket purchases are final. Your BISON cannot be returned to you after buying tickets." } }, { @@ -507,7 +507,7 @@ { "data": { "stringId": 482, - "text": "EGG prizes to be claimed" + "text": "BISON prizes to be claimed" } }, { @@ -543,13 +543,13 @@ { "data": { "stringId": 494, - "text": "Approve EGG" + "text": "Approve BISON" } }, { "data": { "stringId": 496, - "text": "SYRUP holders proportionally split 40% of EGG block emissions each day (10 EGG per block), Rewards are distributed each block." + "text": "SYRUP holders proportionally split 40% of BISON block emissions each day (10 BISON per block), Rewards are distributed each block." } }, { @@ -567,19 +567,19 @@ { "data": { "stringId": 504, - "text": "You\u2019ll pay for the new tokens using EGG-BNB LP tokens, which means you need to stake equal amounts of EGG and BNB in a liquidity pool to take part." + "text": "You\u2019ll pay for the new tokens using BISON-BNB LP tokens, which means you need to stake equal amounts of BISON and BNB in a liquidity pool to take part." } }, { "data": { "stringId": 506, - "text": "Get EGG-BNB LP >" + "text": "Get BISON-BNB LP >" } }, { "data": { "stringId": 508, - "text": "The project gets the BNB, Goose Finance burns the EGG." + "text": "The project gets the BNB, Bishares Finance burns the BISON." } }, { @@ -597,7 +597,7 @@ { "data": { "stringId": 514, - "text": "Launch your project with Goose Finance, Binance Smart Chain\u2019s most-used AMM project and liquidity provider, to bring your token directly to the most active and rapidly growing community on BSC." + "text": "Launch your project with Bishares Finance, Binance Smart Chain\u2019s most-used AMM project and liquidity provider, to bring your token directly to the most active and rapidly growing community on BSC." } }, { @@ -663,7 +663,7 @@ { "data": { "stringId": 540, - "text": "New EGG\/block" + "text": "New BISON\/block" } }, { @@ -675,19 +675,19 @@ { "data": { "stringId": 544, - "text": "EGG to Harvest" + "text": "BISON to Harvest" } }, { "data": { "stringId": 546, - "text": "EGG in Wallet" + "text": "BISON in Wallet" } }, { "data": { "stringId": 548, - "text": "Collecting EGG" + "text": "Collecting BISON" } }, { @@ -699,7 +699,7 @@ { "data": { "stringId": 552, - "text": "EGG to Collect" + "text": "BISON to Collect" } }, { @@ -753,7 +753,7 @@ { "data": { "stringId": 576, - "text": "Goose Finance" + "text": "Bishares Finance" } }, { @@ -765,7 +765,7 @@ { "data": { "stringId": 580, - "text": "Stake EGG to earn new tokens." + "text": "Stake BISON to earn new tokens." } }, { @@ -783,7 +783,7 @@ { "data": { "stringId": 586, - "text": "EGG to burn (USD)" + "text": "BISON to burn (USD)" } }, { @@ -795,7 +795,7 @@ { "data": { "stringId": 590, - "text": "\u2b50\ufe0f Every time you stake and unstake LP tokens, the contract will automatically harvest EGG rewards for you!" + "text": "\u2b50\ufe0f Every time you stake and unstake LP tokens, the contract will automatically harvest BISON rewards for you!" } }, { @@ -813,13 +813,13 @@ { "data": { "stringId": 596, - "text": "Buy EGG and BNB tokens" + "text": "Buy BISON and BNB tokens" } }, { "data": { "stringId": 598, - "text": "Get EGG-BNB LP tokens by adding EGG and BNB liquidity" + "text": "Get BISON-BNB LP tokens by adding BISON and BNB liquidity" } }, { @@ -831,7 +831,7 @@ { "data": { "stringId": 602, - "text": "While the sale is live, commit your EGG-LP tokens to buy the IFO tokens" + "text": "While the sale is live, commit your BISON-LP tokens to buy the IFO tokens" } }, { @@ -867,7 +867,7 @@ { "data": { "stringId": 614, - "text": "Trade in for EGG, or keep for your collection!" + "text": "Trade in for BISON, or keep for your collection!" } }, { @@ -909,7 +909,7 @@ { "data": { "stringId": 628, - "text": "When you trade in this NFT to receive EGG, you will lose access to it forever!" + "text": "When you trade in this NFT to receive BISON, you will lose access to it forever!" } }, { @@ -939,7 +939,7 @@ { "data": { "stringId": 638, - "text": "Winners can trade in their NFTs for a EGG value until the expiry date written below. If you don't trade in your NFT by then, don\u2019t worry: you\u2019ll still keep it in your wallet!" + "text": "Winners can trade in their NFTs for a BISON value until the expiry date written below. If you don't trade in your NFT by then, don\u2019t worry: you\u2019ll still keep it in your wallet!" } }, { @@ -981,7 +981,7 @@ { "data": { "stringId": 654, - "text": "Trade in for EGG" + "text": "Trade in for BISON" } }, { @@ -1107,7 +1107,7 @@ { "data": { "stringId": 696, - "text": "Stake LP tokens to earn EGG" + "text": "Stake LP tokens to earn BISON" } }, { @@ -1149,13 +1149,13 @@ { "data": { "stringId": 708, - "text": "The EGG Lottery" + "text": "The BISON Lottery" } }, { "data": { "stringId": 710, - "text": "Buy tickets with EGG" + "text": "Buy tickets with BISON" } }, { @@ -1209,7 +1209,7 @@ { "data": { "stringId": 10000, - "text": "Deposit Fee will be used to buyback EGG" + "text": "Deposit Fee will be used to buyback BISON" } }, { @@ -1221,7 +1221,7 @@ { "data": { "stringId": 10002, - "text": "Stake tokens to earn EGG" + "text": "Stake tokens to earn BISON" } }, { diff --git a/public/i18n/zh-CN.json b/public/i18n/zh-CN.json index a3cf265ae..b3aff1482 100644 --- a/public/i18n/zh-CN.json +++ b/public/i18n/zh-CN.json @@ -75,7 +75,7 @@ { "data": { "stringId": 304, - "text": "\u81ea\u53d1\u8d77\u4ee5\u6765\u7684 EGG \u603b\u711a\u6bc1\u91cf" + "text": "\u81ea\u53d1\u8d77\u4ee5\u6765\u7684 BISON \u603b\u711a\u6bc1\u91cf" } }, { @@ -123,13 +123,13 @@ { "data": { "stringId": 320, - "text": "\u8d28\u62bc LP \u4ee3\u5e01\u4ee5\u5806\u53e0 EGG" + "text": "\u8d28\u62bc LP \u4ee3\u5e01\u4ee5\u5806\u53e0 BISON" } }, { "data": { "stringId": 322, - "text": "\u8d28\u62bc EGG\uff0c\u83b7\u53d6 SYRUP\u3002" + "text": "\u8d28\u62bc BISON\uff0c\u83b7\u53d6 SYRUP\u3002" } }, { @@ -153,7 +153,7 @@ { "data": { "stringId": 334, - "text": "\u6bcf\u6b21\u60a8\u8d28\u62bc\u4e0e\u53d6\u6d88\u8d28\u62bc EGG \u4ee3\u5e01\u65f6\uff0c\u5408\u7ea6\u90fd\u4f1a\u81ea\u52a8\u4e3a\u60a8\u6536\u5272 EGG \u5956\u52b1\uff01" + "text": "\u6bcf\u6b21\u60a8\u8d28\u62bc\u4e0e\u53d6\u6d88\u8d28\u62bc BISON \u4ee3\u5e01\u65f6\uff0c\u5408\u7ea6\u90fd\u4f1a\u81ea\u52a8\u4e3a\u60a8\u6536\u5272 BISON \u5956\u52b1\uff01" } }, { @@ -219,7 +219,7 @@ { "data": { "stringId": 358, - "text": "EGG \u4ef7\u683c" + "text": "BISON \u4ef7\u683c" } }, { @@ -243,7 +243,7 @@ { "data": { "stringId": 380, - "text": "1 EGG = 1 SYRUP" + "text": "1 BISON = 1 SYRUP" } }, { @@ -291,7 +291,7 @@ { "data": { "stringId": 400, - "text": "SYRUP \u6301\u6709\u8005\u6bcf\u5929\u5c06\u6309\u6bd4\u4f8b\u5206\u4eab EGG \u533a\u5757\u5956\u52b1\u7684 25%\uff08\u6bcf\u4e2a\u533a\u5757 10 EGG\uff09\uff0c\u5956\u52b1\u6309\u533a\u5757\u5206\u53d1\u3002" + "text": "SYRUP \u6301\u6709\u8005\u6bcf\u5929\u5c06\u6309\u6bd4\u4f8b\u5206\u4eab BISON \u533a\u5757\u5956\u52b1\u7684 25%\uff08\u6bcf\u4e2a\u533a\u5757 10 BISON\uff09\uff0c\u5956\u52b1\u6309\u533a\u5757\u5206\u53d1\u3002" } }, { @@ -351,13 +351,13 @@ { "data": { "stringId": 424, - "text": "%num% EGG" + "text": "%num% BISON" } }, { "data": { "stringId": 426, - "text": "\u82b1\u8d39 EGG \u8d2d\u4e70\u5f69\u7968\uff0c\u4e3a\u5956\u6c60\u505a\u8d21\u732e\u3002\u5f69\u7968\u8d2d\u4e70\u5728\u5f00\u5956\u524d\u7ea6 30 \u5206\u949f\u7ed3\u675f\u3002\u5982\u679c\u60a8\u7684\u5f69\u7968\u4e2d\u4e86 2\u30013 \u6216 4 \u4e2a\u53f7\u7801\u4e14\u987a\u5e8f\u4e00\u81f4\uff0c\u5219\u4f1a\u8d62\u53d6\u5956\u91d1\uff01\u795d\u60a8\u597d\u8fd0\uff01" + "text": "\u82b1\u8d39 BISON \u8d2d\u4e70\u5f69\u7968\uff0c\u4e3a\u5956\u6c60\u505a\u8d21\u732e\u3002\u5f69\u7968\u8d2d\u4e70\u5728\u5f00\u5956\u524d\u7ea6 30 \u5206\u949f\u7ed3\u675f\u3002\u5982\u679c\u60a8\u7684\u5f69\u7968\u4e2d\u4e86 2\u30013 \u6216 4 \u4e2a\u53f7\u7801\u4e14\u987a\u5e8f\u4e00\u81f4\uff0c\u5219\u4f1a\u8d62\u53d6\u5956\u91d1\uff01\u795d\u60a8\u597d\u8fd0\uff01" } }, { @@ -435,25 +435,25 @@ { "data": { "stringId": 454, - "text": "%num% EGG \u53ef\u7528" + "text": "%num% BISON \u53ef\u7528" } }, { "data": { "stringId": 456, - "text": "\u60a8\u7684\u91d1\u989d\u5fc5\u987b\u7b49\u4e8e 10 EGG \u7684\u500d\u6570" + "text": "\u60a8\u7684\u91d1\u989d\u5fc5\u987b\u7b49\u4e8e 10 BISON \u7684\u500d\u6570" } }, { "data": { "stringId": 458, - "text": "1 \u5f20\u5f69\u7968 = 10 EGG" + "text": "1 \u5f20\u5f69\u7968 = 10 BISON" } }, { "data": { "stringId": 460, - "text": "\u60a8\u5c06\u82b1\u8d39\uff1a%num% EGG" + "text": "\u60a8\u5c06\u82b1\u8d39\uff1a%num% BISON" } }, { @@ -483,7 +483,7 @@ { "data": { "stringId": 470, - "text": "\u5728\u60a8\u82b1\u8d39 EGG \u8d2d\u4e70\u5f69\u7968\u540e\uff0c\u65e0\u6cd5\u5c06 EGG \u9000\u8fd8\u7ed9\u60a8\u3002" + "text": "\u5728\u60a8\u82b1\u8d39 BISON \u8d2d\u4e70\u5f69\u7968\u540e\uff0c\u65e0\u6cd5\u5c06 BISON \u9000\u8fd8\u7ed9\u60a8\u3002" } }, { @@ -507,7 +507,7 @@ { "data": { "stringId": 478, - "text": "\u5f69\u7968\u8d2d\u4e70\u4e3a\u6700\u7ec8\u72b6\u6001\u3002\u8d2d\u4e70\u5f69\u7968\u540e\uff0c\u65e0\u6cd5\u5c06 EGG \u9000\u8fd8\u7ed9\u60a8\u3002" + "text": "\u5f69\u7968\u8d2d\u4e70\u4e3a\u6700\u7ec8\u72b6\u6001\u3002\u8d2d\u4e70\u5f69\u7968\u540e\uff0c\u65e0\u6cd5\u5c06 BISON \u9000\u8fd8\u7ed9\u60a8\u3002" } }, { @@ -519,7 +519,7 @@ { "data": { "stringId": 482, - "text": "\u5f85\u9886\u53d6\u7684 EGG \u5956\u91d1" + "text": "\u5f85\u9886\u53d6\u7684 BISON \u5956\u91d1" } }, { @@ -555,13 +555,13 @@ { "data": { "stringId": 494, - "text": "\u6279\u51c6 EGG" + "text": "\u6279\u51c6 BISON" } }, { "data": { "stringId": 496, - "text": "SYRUP \u6301\u6709\u8005\u6bcf\u5929\u5c06\u6309\u6bd4\u4f8b\u5206\u4eab EGG \u533a\u5757\u5956\u52b1\u7684 40%\uff08\u6bcf\u4e2a\u533a\u5757 10 EGG\uff09\uff0c\u5956\u52b1\u6309\u533a\u5757\u5206\u53d1\u3002" + "text": "SYRUP \u6301\u6709\u8005\u6bcf\u5929\u5c06\u6309\u6bd4\u4f8b\u5206\u4eab BISON \u533a\u5757\u5956\u52b1\u7684 40%\uff08\u6bcf\u4e2a\u533a\u5757 10 BISON\uff09\uff0c\u5956\u52b1\u6309\u533a\u5757\u5206\u53d1\u3002" } }, { @@ -579,19 +579,19 @@ { "data": { "stringId": 504, - "text": "\u60a8\u5c06\u4f7f\u7528 EGG-BNB LP \u4ee3\u5e01\u6765\u652f\u4ed8\u65b0\u4ee3\u5e01\u7684\u8d39\u7528\uff0c\u8fd9\u610f\u5473\u7740\u60a8\u9700\u8981\u5728\u6d41\u52a8\u6027\u8d44\u91d1\u6c60\u4e2d\u8d28\u62bc\u7b49\u91cf\u7684 EGG \u548c BNB \u624d\u80fd\u53c2\u4e0e\u3002" + "text": "\u60a8\u5c06\u4f7f\u7528 BISON-BNB LP \u4ee3\u5e01\u6765\u652f\u4ed8\u65b0\u4ee3\u5e01\u7684\u8d39\u7528\uff0c\u8fd9\u610f\u5473\u7740\u60a8\u9700\u8981\u5728\u6d41\u52a8\u6027\u8d44\u91d1\u6c60\u4e2d\u8d28\u62bc\u7b49\u91cf\u7684 BISON \u548c BNB \u624d\u80fd\u53c2\u4e0e\u3002" } }, { "data": { "stringId": 506, - "text": "\u83b7\u53d6 EGG-BNB LP >" + "text": "\u83b7\u53d6 BISON-BNB LP >" } }, { "data": { "stringId": 508, - "text": "\u6b64\u9879\u76ee\u83b7\u5f97\u4e86 BNB\uff0cGoose Finance \u4f1a\u711a\u6bc1 EGG\u3002" + "text": "\u6b64\u9879\u76ee\u83b7\u5f97\u4e86 BNB\uff0cBishares Finance \u4f1a\u711a\u6bc1 BISON\u3002" } }, { @@ -609,7 +609,7 @@ { "data": { "stringId": 514, - "text": "\u901a\u8fc7 Binance Smart Chain \u4e0a\u6700\u5e38\u7528\u7684 AMM \u9879\u76ee\u548c\u6d41\u52a8\u6027\u4f9b\u5e94\u5546 Goose Finance \u53d1\u8d77\u60a8\u7684\u9879\u76ee\uff0c\u5c06\u60a8\u7684\u4ee3\u5e01\u76f4\u63a5\u5f15\u5165 BSC \u4e0a\u6700\u6d3b\u8dc3\u4e14\u5feb\u901f\u53d1\u5c55\u7684\u793e\u533a\u3002" + "text": "\u901a\u8fc7 Binance Smart Chain \u4e0a\u6700\u5e38\u7528\u7684 AMM \u9879\u76ee\u548c\u6d41\u52a8\u6027\u4f9b\u5e94\u5546 Bishares Finance \u53d1\u8d77\u60a8\u7684\u9879\u76ee\uff0c\u5c06\u60a8\u7684\u4ee3\u5e01\u76f4\u63a5\u5f15\u5165 BSC \u4e0a\u6700\u6d3b\u8dc3\u4e14\u5feb\u901f\u53d1\u5c55\u7684\u793e\u533a\u3002" } }, { @@ -657,7 +657,7 @@ { "data": { "stringId": 534, - "text": "EGG \u7edf\u8ba1\u6570\u636e" + "text": "BISON \u7edf\u8ba1\u6570\u636e" } }, { @@ -675,7 +675,7 @@ { "data": { "stringId": 540, - "text": "\u65b0 EGG\/\u533a\u5757" + "text": "\u65b0 BISON\/\u533a\u5757" } }, { @@ -687,19 +687,19 @@ { "data": { "stringId": 544, - "text": "\u5f85\u6536\u5272\u7684 EGG" + "text": "\u5f85\u6536\u5272\u7684 BISON" } }, { "data": { "stringId": 546, - "text": "\u94b1\u5305\u4e2d\u7684 EGG" + "text": "\u94b1\u5305\u4e2d\u7684 BISON" } }, { "data": { "stringId": 548, - "text": "\u6b63\u5728\u6536\u96c6 EGG" + "text": "\u6b63\u5728\u6536\u96c6 BISON" } }, { @@ -711,7 +711,7 @@ { "data": { "stringId": 552, - "text": "\u5f85\u6536\u96c6\u7684 EGG" + "text": "\u5f85\u6536\u96c6\u7684 BISON" } }, { @@ -765,7 +765,7 @@ { "data": { "stringId": 576, - "text": "Goose Finance" + "text": "Bishares Finance" } }, { @@ -777,7 +777,7 @@ { "data": { "stringId": 580, - "text": "\u8d28\u62bc EGG \u4ee5\u8d5a\u53d6\u65b0\u4ee3\u5e01\u3002" + "text": "\u8d28\u62bc BISON \u4ee5\u8d5a\u53d6\u65b0\u4ee3\u5e01\u3002" } }, { @@ -795,7 +795,7 @@ { "data": { "stringId": 586, - "text": "\u5c06\u711a\u6bc1\u7684 EGG (USD)" + "text": "\u5c06\u711a\u6bc1\u7684 BISON (USD)" } }, { @@ -807,7 +807,7 @@ { "data": { "stringId": 590, - "text": "\u2b50\ufe0f \u6bcf\u6b21\u60a8\u8d28\u62bc\u548c\u53d6\u6d88\u8d28\u62bc LP \u4ee3\u5e01\u65f6\uff0c\u5408\u7ea6\u90fd\u4f1a\u81ea\u52a8\u4e3a\u60a8\u6536\u5272 EGG \u5956\u52b1\uff01" + "text": "\u2b50\ufe0f \u6bcf\u6b21\u60a8\u8d28\u62bc\u548c\u53d6\u6d88\u8d28\u62bc LP \u4ee3\u5e01\u65f6\uff0c\u5408\u7ea6\u90fd\u4f1a\u81ea\u52a8\u4e3a\u60a8\u6536\u5272 BISON \u5956\u52b1\uff01" } }, { @@ -825,13 +825,13 @@ { "data": { "stringId": 596, - "text": "\u8d2d\u4e70 EGG \u548c BNB \u4ee3\u5e01" + "text": "\u8d2d\u4e70 BISON \u548c BNB \u4ee3\u5e01" } }, { "data": { "stringId": 598, - "text": "\u901a\u8fc7\u6dfb\u52a0 EGG \u548c BNB \u6d41\u52a8\u6027\u83b7\u53d6 EGG-BNB LP \u4ee3\u5e01" + "text": "\u901a\u8fc7\u6dfb\u52a0 BISON \u548c BNB \u6d41\u52a8\u6027\u83b7\u53d6 BISON-BNB LP \u4ee3\u5e01" } }, { @@ -843,7 +843,7 @@ { "data": { "stringId": 602, - "text": "\u5728\u9500\u552e\u8fc7\u7a0b\u4e2d\uff0c\u63d0\u4ea4\u60a8\u7684 EGG-LP \u4ee3\u5e01\u6765\u8d2d\u4e70 IFO \u4ee3\u5e01" + "text": "\u5728\u9500\u552e\u8fc7\u7a0b\u4e2d\uff0c\u63d0\u4ea4\u60a8\u7684 BISON-LP \u4ee3\u5e01\u6765\u8d2d\u4e70 IFO \u4ee3\u5e01" } }, { @@ -879,7 +879,7 @@ { "data": { "stringId": 614, - "text": "\u5151\u6362\u6210 EGG\uff0c\u6216\u8005\u4fdd\u7559\u4f5c\u4e3a\u60a8\u7684\u6536\u85cf\u54c1\uff01" + "text": "\u5151\u6362\u6210 BISON\uff0c\u6216\u8005\u4fdd\u7559\u4f5c\u4e3a\u60a8\u7684\u6536\u85cf\u54c1\uff01" } }, { @@ -921,7 +921,7 @@ { "data": { "stringId": 628, - "text": "\u5f53\u60a8\u5c06 NFT \u5151\u6362\u6210 EGG \u540e\uff0c\u60a8\u5c06\u6c38\u8fdc\u65e0\u6cd5\u8bbf\u95ee\u5b83\uff01" + "text": "\u5f53\u60a8\u5c06 NFT \u5151\u6362\u6210 BISON \u540e\uff0c\u60a8\u5c06\u6c38\u8fdc\u65e0\u6cd5\u8bbf\u95ee\u5b83\uff01" } }, { @@ -951,7 +951,7 @@ { "data": { "stringId": 638, - "text": "\u5728\u4e0b\u9762\u5217\u51fa\u7684\u5230\u671f\u65e5\u4e4b\u524d\uff0c\u83b7\u80dc\u8005\u53ef\u4ee5\u5c06\u5176 NFT \u5151\u6362\u6210 EGG \u4ef7\u503c\u3002\u5982\u679c\u60a8\u5c4a\u65f6\u672a\u5151\u6362\u60a8\u7684 NFT\uff0c\u8bf7\u4e0d\u8981\u62c5\u5fc3\uff1a\u60a8\u4ecd\u53ef\u4ee5\u5c06\u5176\u4fdd\u5b58\u5728\u94b1\u5305\u4e2d\uff01" + "text": "\u5728\u4e0b\u9762\u5217\u51fa\u7684\u5230\u671f\u65e5\u4e4b\u524d\uff0c\u83b7\u80dc\u8005\u53ef\u4ee5\u5c06\u5176 NFT \u5151\u6362\u6210 BISON \u4ef7\u503c\u3002\u5982\u679c\u60a8\u5c4a\u65f6\u672a\u5151\u6362\u60a8\u7684 NFT\uff0c\u8bf7\u4e0d\u8981\u62c5\u5fc3\uff1a\u60a8\u4ecd\u53ef\u4ee5\u5c06\u5176\u4fdd\u5b58\u5728\u94b1\u5305\u4e2d\uff01" } }, { @@ -993,7 +993,7 @@ { "data": { "stringId": 654, - "text": "\u5151\u6362\u6210 EGG" + "text": "\u5151\u6362\u6210 BISON" } }, { @@ -1119,7 +1119,7 @@ { "data": { "stringId": 696, - "text": "\u8d28\u62bc LP \u4ee3\u5e01\u4ee5\u8d5a\u53d6 EGG" + "text": "\u8d28\u62bc LP \u4ee3\u5e01\u4ee5\u8d5a\u53d6 BISON" } }, { @@ -1161,13 +1161,13 @@ { "data": { "stringId": 708, - "text": "EGG \u5f69\u7968" + "text": "BISON \u5f69\u7968" } }, { "data": { "stringId": 710, - "text": "\u4f7f\u7528 EGG \u8d2d\u4e70\u5f69\u7968" + "text": "\u4f7f\u7528 BISON \u8d2d\u4e70\u5f69\u7968" } }, { @@ -1209,7 +1209,7 @@ { "data": { "stringId": 10000, - "text": "质押费用将用于回购 EGG" + "text": "质押费用将用于回购 BISON" } }, { @@ -1221,7 +1221,7 @@ { "data": { "stringId": 10002, - "text": "质押代币以堆叠 EGG" + "text": "质押代币以堆叠 BISON" } }, { diff --git a/public/i18n/zh-TW.json b/public/i18n/zh-TW.json index f3cdcf791..b0065682e 100644 --- a/public/i18n/zh-TW.json +++ b/public/i18n/zh-TW.json @@ -75,7 +75,7 @@ { "data": { "stringId": 304, - "text": "\u81ea\u767c\u8d77\u8fc4\u4eca\uff0cEGG \u7684\u7e3d\u92b7\u6bc0\u91cf" + "text": "\u81ea\u767c\u8d77\u8fc4\u4eca\uff0cBISON \u7684\u7e3d\u92b7\u6bc0\u91cf" } }, { @@ -123,7 +123,7 @@ { "data": { "stringId": 320, - "text": "\u8cea\u62bc LP \u4ee3\u5e63\u4ee5\u5806\u758a EGG" + "text": "\u8cea\u62bc LP \u4ee3\u5e63\u4ee5\u5806\u758a BISON" } }, { @@ -153,7 +153,7 @@ { "data": { "stringId": 334, - "text": "\u6bcf\u7576\u60a8\u8cea\u62bc\u8207\u53d6\u56de EGG \u4ee3\u5e63\u6642\uff0c\u5408\u7d04\u90fd\u5c07\u81ea\u52d5\u70ba\u60a8\u6536\u5272 EGG \u734e\u52f5\uff01" + "text": "\u6bcf\u7576\u60a8\u8cea\u62bc\u8207\u53d6\u56de BISON \u4ee3\u5e63\u6642\uff0c\u5408\u7d04\u90fd\u5c07\u81ea\u52d5\u70ba\u60a8\u6536\u5272 BISON \u734e\u52f5\uff01" } }, { @@ -219,7 +219,7 @@ { "data": { "stringId": 358, - "text": "EGG \u50f9\u683c" + "text": "BISON \u50f9\u683c" } }, { @@ -243,7 +243,7 @@ { "data": { "stringId": 380, - "text": "1 EGG = 1 SYRUP" + "text": "1 BISON = 1 SYRUP" } }, { @@ -291,7 +291,7 @@ { "data": { "stringId": 400, - "text": "SYRUP \u6301\u6709\u8005\u5c07\u6309\u6bd4\u4f8b\u5206\u5f97\u6bcf\u5929 25% \u7684 EGG \u5340\u584a\u734e\u52f5 (\u6bcf\u5340\u584a 10 EGG)\uff0c\u734e\u52f5\u5c07\u65bc\u5404\u5340\u584a\u5206\u767c\u3002" + "text": "SYRUP \u6301\u6709\u8005\u5c07\u6309\u6bd4\u4f8b\u5206\u5f97\u6bcf\u5929 25% \u7684 BISON \u5340\u584a\u734e\u52f5 (\u6bcf\u5340\u584a 10 BISON)\uff0c\u734e\u52f5\u5c07\u65bc\u5404\u5340\u584a\u5206\u767c\u3002" } }, { @@ -351,13 +351,13 @@ { "data": { "stringId": 424, - "text": "%num% EGG" + "text": "%num% BISON" } }, { "data": { "stringId": 426, - "text": "\u82b1\u8cbb EGG \u4f86\u8cfc\u8cb7\u7968\u5238\uff0c\u70ba\u5f69\u5238\u734e\u6c60\u505a\u51fa\u8ca2\u737b\u3002\u7968\u5238\u8cfc\u8cb7\u5728\u958b\u734e\u524d\u7d04 30 \u5206\u9418\u7d50\u675f\u3002\u5982\u679c\u60a8\u7684\u5f69\u5238\u51fa\u73fe 2\u30013 \u6216 4 \u500b\u4e2d\u734e\u865f\u78bc\u4e14\u90e8\u4f4d\u76f8\u7b26\uff0c\u5c31\u80fd\u8d0f\u53d6\u734e\u91d1\uff01\u795d\u60a8\u597d\u904b\uff01" + "text": "\u82b1\u8cbb BISON \u4f86\u8cfc\u8cb7\u7968\u5238\uff0c\u70ba\u5f69\u5238\u734e\u6c60\u505a\u51fa\u8ca2\u737b\u3002\u7968\u5238\u8cfc\u8cb7\u5728\u958b\u734e\u524d\u7d04 30 \u5206\u9418\u7d50\u675f\u3002\u5982\u679c\u60a8\u7684\u5f69\u5238\u51fa\u73fe 2\u30013 \u6216 4 \u500b\u4e2d\u734e\u865f\u78bc\u4e14\u90e8\u4f4d\u76f8\u7b26\uff0c\u5c31\u80fd\u8d0f\u53d6\u734e\u91d1\uff01\u795d\u60a8\u597d\u904b\uff01" } }, { @@ -435,25 +435,25 @@ { "data": { "stringId": 454, - "text": "%num% EGG \u53ef\u7528" + "text": "%num% BISON \u53ef\u7528" } }, { "data": { "stringId": 456, - "text": "EGG \u7684\u6578\u91cf\u9700\u70ba 10 \u7684\u500d\u6578" + "text": "BISON \u7684\u6578\u91cf\u9700\u70ba 10 \u7684\u500d\u6578" } }, { "data": { "stringId": 458, - "text": "1 \u5f35\u7968\u5238 = 10 EGG" + "text": "1 \u5f35\u7968\u5238 = 10 BISON" } }, { "data": { "stringId": 460, - "text": "\u60a8\u5c07\u82b1\u8cbb\uff1a%num% EGG" + "text": "\u60a8\u5c07\u82b1\u8cbb\uff1a%num% BISON" } }, { @@ -483,7 +483,7 @@ { "data": { "stringId": 470, - "text": "EGG \u7d93\u60a8\u82b1\u8cbb\u65bc\u8cfc\u8cb7\u7968\u5238\u5f8c\uff0c\u5373\u7121\u6cd5\u518d\u9000\u9084\u7d66\u60a8\u3002" + "text": "BISON \u7d93\u60a8\u82b1\u8cbb\u65bc\u8cfc\u8cb7\u7968\u5238\u5f8c\uff0c\u5373\u7121\u6cd5\u518d\u9000\u9084\u7d66\u60a8\u3002" } }, { @@ -507,7 +507,7 @@ { "data": { "stringId": 478, - "text": "\u7968\u5238\u8cfc\u8cb7\u5373\u6700\u7d42\u72c0\u614b\u3002EGG \u7528\u65bc\u8cfc\u8cb7\u7968\u5238\u5f8c\uff0c\u5373\u7121\u6cd5\u518d\u9000\u9084\u7d66\u60a8\u3002" + "text": "\u7968\u5238\u8cfc\u8cb7\u5373\u6700\u7d42\u72c0\u614b\u3002BISON \u7528\u65bc\u8cfc\u8cb7\u7968\u5238\u5f8c\uff0c\u5373\u7121\u6cd5\u518d\u9000\u9084\u7d66\u60a8\u3002" } }, { @@ -519,7 +519,7 @@ { "data": { "stringId": 482, - "text": "\u5f85\u9818\u53d6\u7684 EGG \u734e\u91d1" + "text": "\u5f85\u9818\u53d6\u7684 BISON \u734e\u91d1" } }, { @@ -555,13 +555,13 @@ { "data": { "stringId": 494, - "text": "\u6279\u51c6 EGG" + "text": "\u6279\u51c6 BISON" } }, { "data": { "stringId": 496, - "text": "SYRUP \u6301\u6709\u8005\u5c07\u6309\u6bd4\u4f8b\u5206\u5f97\u6bcf\u5929 40% \u7684 EGG \u5340\u584a\u734e\u52f5 (\u6bcf\u5340\u584a 10 EGG)\uff0c\u734e\u52f5\u5c07\u65bc\u5404\u5340\u584a\u5206\u767c\u3002" + "text": "SYRUP \u6301\u6709\u8005\u5c07\u6309\u6bd4\u4f8b\u5206\u5f97\u6bcf\u5929 40% \u7684 BISON \u5340\u584a\u734e\u52f5 (\u6bcf\u5340\u584a 10 BISON)\uff0c\u734e\u52f5\u5c07\u65bc\u5404\u5340\u584a\u5206\u767c\u3002" } }, { @@ -579,19 +579,19 @@ { "data": { "stringId": 504, - "text": "\u60a8\u5c07\u4f7f\u7528 EGG-BNB LP \u4ee3\u5e63\u4f86\u652f\u4ed8\u65b0\u4ee3\u5e63\uff0c\u9019\u8868\u793a\u60a8\u9700\u8981\u5728\u6d41\u52d5\u6027\u8cc7\u91d1\u6c60\u4e2d\u8cea\u62bc\u7b49\u91cf\u7684 EGG \u548c BNB \u624d\u80fd\u53c3\u8207\u3002" + "text": "\u60a8\u5c07\u4f7f\u7528 BISON-BNB LP \u4ee3\u5e63\u4f86\u652f\u4ed8\u65b0\u4ee3\u5e63\uff0c\u9019\u8868\u793a\u60a8\u9700\u8981\u5728\u6d41\u52d5\u6027\u8cc7\u91d1\u6c60\u4e2d\u8cea\u62bc\u7b49\u91cf\u7684 BISON \u548c BNB \u624d\u80fd\u53c3\u8207\u3002" } }, { "data": { "stringId": 506, - "text": "\u53d6\u5f97 EGG-BNB LP >" + "text": "\u53d6\u5f97 BISON-BNB LP >" } }, { "data": { "stringId": 508, - "text": "\u5c08\u6848\u53d6\u5f97 BNB \u5f8c\uff0c\u800c Goose Finance \u92b7\u6bc0 EGG\u3002" + "text": "\u5c08\u6848\u53d6\u5f97 BNB \u5f8c\uff0c\u800c Bishares Finance \u92b7\u6bc0 BISON\u3002" } }, { @@ -609,7 +609,7 @@ { "data": { "stringId": 514, - "text": "\u900f\u904e\u5e63\u5b89\u667a\u80fd\u93c8\u4e0a\u6700\u5e38\u7528\u7684 AMM \u5c08\u6848\u548c\u6d41\u52d5\u6027\u63d0\u4f9b\u5546 Goose Finance \u4f86\u767c\u8d77\u60a8\u7684\u5c08\u6848\uff0c\u5c07\u60a8\u7684\u4ee3\u5e63\u76f4\u63a5\u5f15\u5165 BSC \u4e0a\u6700\u6d3b\u8e8d\u4e14\u767c\u5c55\u5feb\u901f\u7684\u793e\u7fa4\u3002" + "text": "\u900f\u904e\u5e63\u5b89\u667a\u80fd\u93c8\u4e0a\u6700\u5e38\u7528\u7684 AMM \u5c08\u6848\u548c\u6d41\u52d5\u6027\u63d0\u4f9b\u5546 Bishares Finance \u4f86\u767c\u8d77\u60a8\u7684\u5c08\u6848\uff0c\u5c07\u60a8\u7684\u4ee3\u5e63\u76f4\u63a5\u5f15\u5165 BSC \u4e0a\u6700\u6d3b\u8e8d\u4e14\u767c\u5c55\u5feb\u901f\u7684\u793e\u7fa4\u3002" } }, { @@ -675,7 +675,7 @@ { "data": { "stringId": 540, - "text": "\u65b0 EGG\/\u5340\u584a" + "text": "\u65b0 BISON\/\u5340\u584a" } }, { @@ -687,19 +687,19 @@ { "data": { "stringId": 544, - "text": "\u5f85\u6536\u5272\u7684 EGG" + "text": "\u5f85\u6536\u5272\u7684 BISON" } }, { "data": { "stringId": 546, - "text": "\u9322\u5305\u4e2d\u7684 EGG" + "text": "\u9322\u5305\u4e2d\u7684 BISON" } }, { "data": { "stringId": 548, - "text": "\u6b63\u5728\u6536\u96c6 EGG" + "text": "\u6b63\u5728\u6536\u96c6 BISON" } }, { @@ -711,7 +711,7 @@ { "data": { "stringId": 552, - "text": "\u5f85\u6536\u96c6\u7684 EGG" + "text": "\u5f85\u6536\u96c6\u7684 BISON" } }, { @@ -765,7 +765,7 @@ { "data": { "stringId": 576, - "text": "Goose Finance" + "text": "Bishares Finance" } }, { @@ -777,7 +777,7 @@ { "data": { "stringId": 580, - "text": "\u8cea\u62bc EGG \u4ee5\u8cfa\u53d6\u65b0\u4ee3\u5e63\u3002" + "text": "\u8cea\u62bc BISON \u4ee5\u8cfa\u53d6\u65b0\u4ee3\u5e63\u3002" } }, { @@ -795,7 +795,7 @@ { "data": { "stringId": 586, - "text": "\u5c07\u92b7\u6bc0\u7684 EGG (USD)" + "text": "\u5c07\u92b7\u6bc0\u7684 BISON (USD)" } }, { @@ -807,7 +807,7 @@ { "data": { "stringId": 590, - "text": "\u2b50\ufe0f \u6bcf\u7576\u60a8\u8cea\u62bc\u548c\u53d6\u56de LP \u4ee3\u5e63\u6642\uff0c\u5408\u7d04\u90fd\u6703\u81ea\u52d5\u70ba\u60a8\u6536\u5272 EGG \u734e\u52f5\uff01" + "text": "\u2b50\ufe0f \u6bcf\u7576\u60a8\u8cea\u62bc\u548c\u53d6\u56de LP \u4ee3\u5e63\u6642\uff0c\u5408\u7d04\u90fd\u6703\u81ea\u52d5\u70ba\u60a8\u6536\u5272 BISON \u734e\u52f5\uff01" } }, { @@ -825,13 +825,13 @@ { "data": { "stringId": 596, - "text": "\u8cfc\u8cb7 EGG \u548c BNB \u4ee3\u5e63" + "text": "\u8cfc\u8cb7 BISON \u548c BNB \u4ee3\u5e63" } }, { "data": { "stringId": 598, - "text": "\u589e\u52a0 EGG \u548c BNB \u6d41\u52d5\u6027\uff0c\u5f9e\u800c\u53d6\u5f97 EGG-BNB LP \u4ee3\u5e63" + "text": "\u589e\u52a0 BISON \u548c BNB \u6d41\u52d5\u6027\uff0c\u5f9e\u800c\u53d6\u5f97 BISON-BNB LP \u4ee3\u5e63" } }, { @@ -843,7 +843,7 @@ { "data": { "stringId": 602, - "text": "\u5728\u92b7\u552e\u904e\u7a0b\u4e2d\uff0c\u63d0\u4ea4\u60a8\u7684 EGG-LP \u4ee3\u5e63\u4f86\u8cfc\u8cb7 IFO \u4ee3\u5e63" + "text": "\u5728\u92b7\u552e\u904e\u7a0b\u4e2d\uff0c\u63d0\u4ea4\u60a8\u7684 BISON-LP \u4ee3\u5e63\u4f86\u8cfc\u8cb7 IFO \u4ee3\u5e63" } }, { @@ -879,7 +879,7 @@ { "data": { "stringId": 614, - "text": "\u7576\u5834\u4ea4\u6613\u6210 EGG\uff0c\u6216\u4f5c\u70ba\u6536\u85cf\u54c1\u800c\u4fdd\u7559\uff01" + "text": "\u7576\u5834\u4ea4\u6613\u6210 BISON\uff0c\u6216\u4f5c\u70ba\u6536\u85cf\u54c1\u800c\u4fdd\u7559\uff01" } }, { @@ -921,7 +921,7 @@ { "data": { "stringId": 628, - "text": "\u82e5\u60a8\u5c07 EGG \u7576\u5834\u4ea4\u6613\u6210 NFT \u4f86\u63a5\u6536\uff0c\u60a8\u4fbf\u6c38\u9060\u7121\u6cd5\u5b58\u53d6\u8a72 EGG\uff01" + "text": "\u82e5\u60a8\u5c07 BISON \u7576\u5834\u4ea4\u6613\u6210 NFT \u4f86\u63a5\u6536\uff0c\u60a8\u4fbf\u6c38\u9060\u7121\u6cd5\u5b58\u53d6\u8a72 BISON\uff01" } }, { @@ -951,7 +951,7 @@ { "data": { "stringId": 638, - "text": "\u7372\u52dd\u8005\u53ef\u4ee5\u5c07\u5176 NFT \u7576\u5834\u4ea4\u6613\u6210 EGG \u50f9\u503c\uff0c\u76f4\u5230\u4e0b\u8ff0\u7684\u5230\u671f\u65e5\u70ba\u6b62\u3002\u5982\u679c\u5230\u90a3\u6642\u60a8\u4ecd\u672a\u514c\u63db\u60a8\u7684 NFT\uff0c\u8acb\u4e0d\u8981\u64d4\u5fc3\uff0c\u60a8\u4ecd\u53ef\u4ee5\u5c07\u5176\u5132\u5b58\u5728\u9322\u5305\u4e2d\uff01" + "text": "\u7372\u52dd\u8005\u53ef\u4ee5\u5c07\u5176 NFT \u7576\u5834\u4ea4\u6613\u6210 BISON \u50f9\u503c\uff0c\u76f4\u5230\u4e0b\u8ff0\u7684\u5230\u671f\u65e5\u70ba\u6b62\u3002\u5982\u679c\u5230\u90a3\u6642\u60a8\u4ecd\u672a\u514c\u63db\u60a8\u7684 NFT\uff0c\u8acb\u4e0d\u8981\u64d4\u5fc3\uff0c\u60a8\u4ecd\u53ef\u4ee5\u5c07\u5176\u5132\u5b58\u5728\u9322\u5305\u4e2d\uff01" } }, { @@ -993,7 +993,7 @@ { "data": { "stringId": 654, - "text": "\u7576\u5834\u4ea4\u6613\u6210 EGG" + "text": "\u7576\u5834\u4ea4\u6613\u6210 BISON" } }, { @@ -1119,7 +1119,7 @@ { "data": { "stringId": 696, - "text": "\u8cea\u62bc LP \u4ee3\u5e63\u4ee5\u8cfa\u53d6 EGG" + "text": "\u8cea\u62bc LP \u4ee3\u5e63\u4ee5\u8cfa\u53d6 BISON" } }, { @@ -1161,13 +1161,13 @@ { "data": { "stringId": 708, - "text": "EGG \u5f69\u5238" + "text": "BISON \u5f69\u5238" } }, { "data": { "stringId": 710, - "text": "\u4f7f\u7528 EGG \u8cfc\u8cb7\u7968\u5238" + "text": "\u4f7f\u7528 BISON \u8cfc\u8cb7\u7968\u5238" } }, { @@ -1209,7 +1209,7 @@ { "data": { "stringId": 10000, - "text": "質押費用將用於回購 EGG" + "text": "質押費用將用於回購 BISON" } }, { @@ -1221,7 +1221,7 @@ { "data": { "stringId": 10002, - "text": "質押代幣以堆疊 EGG" + "text": "質押代幣以堆疊 BISON" } }, { diff --git a/public/images/farms/bison-bnb.png b/public/images/farms/bison-bnb.png new file mode 100644 index 0000000000000000000000000000000000000000..93b118bef3ccca25de1fadf29d87b371985a6373 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 0 HcmV?d00001 diff --git a/public/images/farms/bison-busd.png b/public/images/farms/bison-busd.png new file mode 100644 index 0000000000000000000000000000000000000000..93b118bef3ccca25de1fadf29d87b371985a6373 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 0 HcmV?d00001 diff --git a/public/images/farms/bison.png b/public/images/farms/bison.png new file mode 100644 index 0000000000000000000000000000000000000000..93b118bef3ccca25de1fadf29d87b371985a6373 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 0 HcmV?d00001 diff --git a/public/index.html b/public/index.html index bfb01964b..62535df66 100644 --- a/public/index.html +++ b/public/index.html @@ -12,20 +12,20 @@ - Goose Finance + Bishares Finance - + diff --git a/public/logo.png b/public/logo.png index 4e43cc020137ddfa218d3e271c0d6fcb500f5f59..93b118bef3ccca25de1fadf29d87b371985a6373 100644 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 23975 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 S^{5g60000 {

}> - + {/* - - + */} + diff --git a/src/components/Menu/config.ts b/src/components/Menu/config.ts index e705d91d9..0eaf67b53 100644 --- a/src/components/Menu/config.ts +++ b/src/components/Menu/config.ts @@ -87,7 +87,7 @@ const config: MenuEntry[] = [ }, { label: 'Partnerships/IFO', - icon: 'GooseIcon', + icon: 'BisharesIcon', href: 'https://docs.google.com/forms/d/e/1FAIpQLSe7ycrw8Dq4C5Vjc9WNlRtTxEhFDB1Ny6jlAByZ2Y6qBo7SKg/viewform?usp=sf_link', }, { diff --git a/src/config/constants/contracts.ts b/src/config/constants/contracts.ts index dba7d0e24..d3cebeef0 100644 --- a/src/config/constants/contracts.ts +++ b/src/config/constants/contracts.ts @@ -1,11 +1,11 @@ export default { cake: { 56: '0xF952Fc3ca7325Cc27D15885d37117676d25BfdA6', - 97: '', + 97: '0xc54966cB32Dc797b78877EB625F4B27DDc3B98CB', }, masterChef: { 56: '0xe70E9185F5ea7Ba3C5d63705784D8563017f2E57', - 97: '', + 97: '0x1090B93561b38bDC18D353a5c191628656c3E25C', }, wbnb: { 56: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', diff --git a/src/config/constants/farms.ts b/src/config/constants/farms.ts index d0717a880..088107fa5 100644 --- a/src/config/constants/farms.ts +++ b/src/config/constants/farms.ts @@ -5,28 +5,29 @@ const farms: FarmConfig[] = [ { pid: 0, risk: 5, - lpSymbol: 'EGG-BUSD LP', + lpSymbol: 'BISON', lpAddresses: { 97: '', - 56: '0x19e7cbecdd23a16dfa5573df54d98f7caae03019', + 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, - tokenSymbol: 'EGG', + tokenSymbol: 'BISON', tokenAddresses: { 97: '', 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, + isTokenOnly: true }, { pid: 1, risk: 5, - lpSymbol: 'EGG-BNB LP', + lpSymbol: 'BISON-BNB LP', lpAddresses: { 97: '', 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', }, - tokenSymbol: 'EGG', + tokenSymbol: 'BISON', tokenAddresses: { 97: '', 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', @@ -50,338 +51,6 @@ const farms: FarmConfig[] = [ quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, }, - { - pid: 3, - risk: 1, - lpSymbol: 'USDT-BUSD LP', - lpAddresses: { - 97: '', - 56: '0xc15fa3e22c912a276550f3e5fe3b0deb87b55acd', - }, - tokenSymbol: 'USDT', - tokenAddresses: { - 97: '', - 56: '0x55d398326f99059ff775485246999027b3197955', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 4, - risk: 2, - lpSymbol: 'BTCB-BNB LP', - lpAddresses: { - 97: '', - 56: '0x7561eee90e24f3b348e1087a005f78b4c8453524', - }, - tokenSymbol: 'BTCB', - tokenAddresses: { - 97: '', - 56: '0x7130d2a12b9bcbfae4f2634d864a1ee1ce3ead9c', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - }, - { - pid: 5, - risk: 2, - lpSymbol: 'ETH-BNB LP', - lpAddresses: { - 97: '', - 56: '0x70d8929d04b60af4fb9b58713ebcf18765ade422', - }, - tokenSymbol: 'ETH', - tokenAddresses: { - 97: '', - 56: '0x2170ed0880ac9a755fd29b2688956bd959f933f8', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - }, - { - pid: 6, - risk: 1, - lpSymbol: 'DAI-BUSD LP', - lpAddresses: { - 97: '', - 56: '0x3ab77e40340ab084c3e23be8e5a6f7afed9d41dc', - }, - tokenSymbol: 'DAI', - tokenAddresses: { - 97: '', - 56: '0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 7, - risk: 1, - lpSymbol: 'USDC-BUSD LP', - lpAddresses: { - 97: '', - 56: '0x680dd100e4b394bda26a59dd5c119a391e747d18', - }, - tokenSymbol: 'USDC', - tokenAddresses: { - 97: '', - 56: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 9, - risk: 3, - lpSymbol: 'DOT-BNB LP', - lpAddresses: { - 97: '', - 56: '0xbcd62661a6b1ded703585d3af7d7649ef4dcdb5c', - }, - tokenSymbol: 'DOT', - tokenAddresses: { - 97: '', - 56: '0x7083609fce4d1d8dc0c979aab8c869ea2c873402', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - }, - { - pid: 10, - risk: 4, - lpSymbol: 'CAKE-BUSD LP', - lpAddresses: { - 97: '', - 56: '0x0ed8e0a2d99643e1e65cca22ed4424090b8b7458', - }, - tokenSymbol: 'CAKE', - tokenAddresses: { - 97: '', - 56: '0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 11, - risk: 4, - lpSymbol: 'CAKE-BNB LP', - lpAddresses: { - 97: '', - 56: '0xa527a61703d82139f8a06bc30097cc9caa2df5a6', - }, - tokenSymbol: 'CAKE', - tokenAddresses: { - 97: '', - 56: '0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - }, - { - pid: 12, - risk: 5, - isTokenOnly: true, - lpSymbol: 'EGG', - lpAddresses: { - 97: '', - 56: '0x19e7cbecdd23a16dfa5573df54d98f7caae03019', // EGG-BUSD LP - }, - tokenSymbol: 'EGG', - tokenAddresses: { - 97: '', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 13, - risk: 1, - isTokenOnly: true, - lpSymbol: 'BUSD', - lpAddresses: { - 97: '', - 56: '0x19e7cbecdd23a16dfa5573df54d98f7caae03019', // EGG-BUSD LP (BUSD-BUSD will ignore) - }, - tokenSymbol: 'BUSD', - tokenAddresses: { - 97: '', - 56: '0xe9e7cea3dedca5984780bafc599bd69add087d56', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 14, - risk: 3, - isTokenOnly: true, - lpSymbol: 'WBNB', - lpAddresses: { - 97: '', - 56: '0x1b96b92314c44b159149f7e0303511fb2fc4774f', // BNB-BUSD LP - }, - tokenSymbol: 'WBNB', - tokenAddresses: { - 97: '', - 56: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 15, - risk: 1, - isTokenOnly: true, - lpSymbol: 'USDT', - lpAddresses: { - 97: '', - 56: '0xc15fa3e22c912a276550f3e5fe3b0deb87b55acd', // USDT-BUSD LP - }, - tokenSymbol: 'USDT', - tokenAddresses: { - 97: '', - 56: '0x55d398326f99059ff775485246999027b3197955', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 16, - risk: 2, - isTokenOnly: true, - lpSymbol: 'BTCB', - lpAddresses: { - 97: '', - 56: '0xb8875e207ee8096a929d543c9981c9586992eacb', // BTCB-BUSD LP - }, - tokenSymbol: 'BTCB', - tokenAddresses: { - 97: '', - 56: '0x7130d2a12b9bcbfae4f2634d864a1ee1ce3ead9c', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 17, - risk: 2, - isTokenOnly: true, - lpSymbol: 'ETH', - lpAddresses: { - 97: '', - 56: '0xd9a0d1f5e02de2403f68bb71a15f8847a854b494', // ETH-BUSD LP - }, - tokenSymbol: 'ETH', - tokenAddresses: { - 97: '', - 56: '0x2170ed0880ac9a755fd29b2688956bd959f933f8', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 18, - risk: 1, - isTokenOnly: true, - lpSymbol: 'DAI', - lpAddresses: { - 97: '', - 56: '0x3ab77e40340ab084c3e23be8e5a6f7afed9d41dc', // DAI-BUSD LP - }, - tokenSymbol: 'DAI', - tokenAddresses: { - 97: '', - 56: '0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 19, - risk: 1, - isTokenOnly: true, - lpSymbol: 'USDC', - lpAddresses: { - 97: '', - 56: '0x680dd100e4b394bda26a59dd5c119a391e747d18', // USDC-BUSD LP - }, - tokenSymbol: 'USDC', - tokenAddresses: { - 97: '', - 56: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 20, - risk: 3, - isTokenOnly: true, - lpSymbol: 'DOT', - lpAddresses: { - 97: '', - 56: '0x54c1ec2f543966953f2f7564692606ea7d5a184e', // DOT-BUSD LP - }, - tokenSymbol: 'DOT', - tokenAddresses: { - 97: '', - 56: '0x7083609fce4d1d8dc0c979aab8c869ea2c873402', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 21, - risk: 4, - isTokenOnly: true, - lpSymbol: 'CAKE', - lpAddresses: { - 97: '', - 56: '0x0ed8e0a2d99643e1e65cca22ed4424090b8b7458', // CAKE-BUSD LP - }, - tokenSymbol: 'CAKE', - tokenAddresses: { - 97: '', - 56: '0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 22, - risk: 3, - isTokenOnly: true, - lpSymbol: 'BSCX', - lpAddresses: { - 97: '', - 56: '0xa32a983a64ce21834221aa0ad1f1533907553136', // BSCX-BUSD LP - }, - tokenSymbol: 'BSCX', - tokenAddresses: { - 97: '', - 56: '0x5ac52ee5b2a633895292ff6d8a89bb9190451587', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 23, - risk: 3, - isTokenOnly: true, - lpSymbol: 'AUTO', - lpAddresses: { - 97: '', - 56: '0x4d0228ebeb39f6d2f29ba528e2d15fc9121ead56', // AUTO-BNB LP - }, - tokenSymbol: 'AUTO', - tokenAddresses: { - 97: '', - 56: '0xa184088a740c695e156f91f5cc086a06bb78b827', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - }, ] export default farms diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx index 9043d4630..f5ce535c6 100644 --- a/src/contexts/ThemeContext.tsx +++ b/src/contexts/ThemeContext.tsx @@ -21,7 +21,7 @@ const ThemeContextProvider = ({ children }) => { return ( - {children} + {children} ) } diff --git a/src/state/hooks.ts b/src/state/hooks.ts index e614020e5..9e5f50b7c 100644 --- a/src/state/hooks.ts +++ b/src/state/hooks.ts @@ -79,7 +79,7 @@ export const usePriceCakeBusd = (): BigNumber => { // const bnbPriceUSD = usePriceBnbBusd() // const farm = useFarmFromPid(pid) // return farm.tokenPriceVsQuote ? bnbPriceUSD.times(farm.tokenPriceVsQuote) : ZERO - const pid = 0; // EGG-BUSD LP + const pid = 0; // BISON-BUSD LP const farm = useFarmFromPid(pid); return farm.tokenPriceVsQuote ? new BigNumber(farm.tokenPriceVsQuote) : ZERO; } diff --git a/src/views/Farms/Farms.tsx b/src/views/Farms/Farms.tsx index 02d5118fc..d8eb020bf 100644 --- a/src/views/Farms/Farms.tsx +++ b/src/views/Farms/Farms.tsx @@ -40,9 +40,20 @@ const Farms: React.FC = (farmsProps) => { const [stakedOnly, setStakedOnly] = useState(false) - const activeFarms = farmsLP.filter((farm) => !!farm.isTokenOnly === !!tokenMode && farm.multiplier !== '0X') - const inactiveFarms = farmsLP.filter((farm) => !!farm.isTokenOnly === !!tokenMode && farm.multiplier === '0X') + // const activeFarms = farmsLP.filter( + // (farm) => !!farm.isTokenOnly === !!tokenMode && farm.multiplier !== '0X' && farm.lpSymbol !== 'BNB-BUSD LP', + // ) + // const inactiveFarms = farmsLP.filter( + // (farm) => !!farm.isTokenOnly === !!tokenMode && farm.multiplier === '0X' && farm.lpSymbol !== 'BNB-BUSD LP', + // ) + const activeFarms = farmsLP.filter( + (farm) => farm.multiplier !== '0X' && farm.lpSymbol !== 'BNB-BUSD LP', + ) + const inactiveFarms = farmsLP.filter( + (farm) => farm.multiplier === '0X' && farm.lpSymbol !== 'BNB-BUSD LP', + ) + const stakedOnlyFarms = activeFarms.filter( (farm) => farm.userData && new BigNumber(farm.userData.stakedBalance).isGreaterThan(0), ) @@ -94,13 +105,13 @@ const Farms: React.FC = (farmsProps) => { { tokenMode ? - TranslateString(10002, 'Stake tokens to earn EGG') + TranslateString(10002, 'Stake tokens to earn BISON') : - TranslateString(320, 'Stake LP tokens to earn EGG') + TranslateString(320, 'Stake LP tokens to earn BISON') } - {TranslateString(10000, 'Deposit Fee will be used to buyback EGG')} + {TranslateString(10000, 'Deposit Fee will be used to buyback BISON')}
@@ -114,7 +125,7 @@ const Farms: React.FC = (farmsProps) => {
- illustration + {/* illustration */} ) } diff --git a/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx b/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx index c511ef061..731d3feff 100644 --- a/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx +++ b/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx @@ -67,7 +67,7 @@ const ApyCalculatorModal: React.FC = ({ - {TranslateString(999, 'EGG per $1000')} + {TranslateString(999, 'BISON per $1000')} {/* 1 day row */} diff --git a/src/views/Farms/components/FarmCard/CardActionsContainer.tsx b/src/views/Farms/components/FarmCard/CardActionsContainer.tsx index 07816bc8f..a29b63794 100644 --- a/src/views/Farms/components/FarmCard/CardActionsContainer.tsx +++ b/src/views/Farms/components/FarmCard/CardActionsContainer.tsx @@ -69,7 +69,7 @@ const CardActions: React.FC = ({ farm, ethereum, account } {/* TODO: Is there a way to get a dynamic value here from useFarmFromSymbol? */} - EGG + BISON {TranslateString(999, 'Earned')} diff --git a/src/views/Farms/components/FarmCard/DetailsSection.tsx b/src/views/Farms/components/FarmCard/DetailsSection.tsx index c7b070522..f453581fb 100644 --- a/src/views/Farms/components/FarmCard/DetailsSection.tsx +++ b/src/views/Farms/components/FarmCard/DetailsSection.tsx @@ -54,9 +54,9 @@ const DetailsSection: React.FC = ({ {TranslateString(316, 'Stake')}: {lpLabel} diff --git a/src/views/Farms/components/FarmCard/FarmCard.tsx b/src/views/Farms/components/FarmCard/FarmCard.tsx index 5b87696c9..70a10e667 100644 --- a/src/views/Farms/components/FarmCard/FarmCard.tsx +++ b/src/views/Farms/components/FarmCard/FarmCard.tsx @@ -117,7 +117,7 @@ const FarmCard: React.FC = ({ farm, removed, cakePrice, bnbPrice, : '-' const lpLabel = farm.lpSymbol - const earnLabel = 'EGG' + const earnLabel = 'BISON' const farmAPY = farm.apy && farm.apy.times(new BigNumber(100)).toNumber().toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2, @@ -127,7 +127,7 @@ const FarmCard: React.FC = ({ farm, removed, cakePrice, bnbPrice, return ( - {farm.tokenSymbol === 'EGG' && } + {farm.tokenSymbol === 'BISON' && } { {TranslateString(698, 'Active')} - + {TranslateString(700, 'Inactive')} diff --git a/src/views/Home/Home.tsx b/src/views/Home/Home.tsx index 02bcf4ef2..cd04b2c65 100644 --- a/src/views/Home/Home.tsx +++ b/src/views/Home/Home.tsx @@ -60,7 +60,7 @@ const Home: React.FC = () => { - {TranslateString(576, 'Goose Finance')} + {TranslateString(576, 'Bishares Finance')} {TranslateString(578, 'Top 3 best DEFI app on Binance Smart Chain.')} diff --git a/src/views/Home/components/CakeStats.tsx b/src/views/Home/components/CakeStats.tsx index 33a8da30b..88cf9ee42 100644 --- a/src/views/Home/components/CakeStats.tsx +++ b/src/views/Home/components/CakeStats.tsx @@ -60,7 +60,7 @@ const CakeStats = () => { {cakeSupply && } - {TranslateString(540, 'New EGG/block')} + {TranslateString(540, 'New BISON/block')} {eggPerBlock} diff --git a/src/views/Home/components/FarmStakingCard.tsx b/src/views/Home/components/FarmStakingCard.tsx index 207d4e64a..5e0672458 100644 --- a/src/views/Home/components/FarmStakingCard.tsx +++ b/src/views/Home/components/FarmStakingCard.tsx @@ -73,12 +73,12 @@ const FarmedStakingCard = () => { - + - + @@ -91,7 +91,7 @@ const FarmedStakingCard = () => { fullWidth > {pendingTx - ? TranslateString(548, 'Collecting EGG') + ? TranslateString(548, 'Collecting BISON') : TranslateString(999, `Harvest all (${balancesWithValue.length})`)} ) : ( diff --git a/src/views/Home/components/TwitterCard.tsx b/src/views/Home/components/TwitterCard.tsx index bbf98af3a..b831a05a7 100644 --- a/src/views/Home/components/TwitterCard.tsx +++ b/src/views/Home/components/TwitterCard.tsx @@ -35,7 +35,7 @@ const TwitterCard = () => { Date: Thu, 19 Aug 2021 23:40:40 +0545 Subject: [PATCH 02/39] farm testnet --- .env.development | 5 + src/App.tsx | 4 +- src/config/abi/Multicall.json | 97 +++- src/config/abi/masterchef.json | 486 ++++++++++++------ src/config/constants/contracts.ts | 14 +- src/config/constants/farms.ts | 33 +- src/config/constants/nfts.ts | 4 +- src/hooks/useAllEarnings.ts | 2 +- src/hooks/useFarmsWithBalance.ts | 2 +- src/state/farms/fetchFarmUser.ts | 2 +- src/state/farms/fetchFarms.ts | 48 +- src/state/hooks.ts | 4 +- src/state/pools/fetchPoolsUser.ts | 2 +- src/state/types.ts | 2 +- src/views/Farms/Farms.tsx | 6 +- src/views/Home/components/CakeStats.tsx | 8 +- src/views/Nft/components/BurnNftModal.tsx | 4 +- src/views/Nft/components/ClaimNftModal.tsx | 4 +- .../Nft/components/NftGlobalNotification.tsx | 10 +- src/views/Nft/components/TransferNftModal.tsx | 4 +- src/views/Nft/contexts/NftProvider.tsx | 16 +- src/views/Nft/utils/contracts.ts | 6 +- 22 files changed, 521 insertions(+), 242 deletions(-) diff --git a/.env.development b/.env.development index cf497322e..2967c4ef4 100644 --- a/.env.development +++ b/.env.development @@ -9,3 +9,8 @@ REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced in each region, global REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" +# testnet +REACT_APP_CHAIN_ID = "97" +REACT_APP_NODE_1 = "https://data-seed-prebsc-1-s1.binance.org:8545/" +REACT_APP_NODE_2 = "https://data-seed-prebsc-2-s1.binance.org:8545/" +REACT_APP_NODE_3 = "https://data-seed-prebsc-1-s2.binance.org:8545/" diff --git a/src/App.tsx b/src/App.tsx index f1f53f621..530987213 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -7,7 +7,7 @@ import { useFetchPublicData } from 'state/hooks' import GlobalStyle from './style/Global' import Menu from './components/Menu' import PageLoader from './components/PageLoader' -import NftGlobalNotification from './views/Nft/components/NftGlobalNotification' +// import NftGlobalNotification from './views/Nft/components/NftGlobalNotification' // Route-based code splitting // Only pool is included in the main bundle because of it's the most visited page' @@ -75,7 +75,7 @@ const App: React.FC = () => { - + {/* */} ) } diff --git a/src/config/abi/Multicall.json b/src/config/abi/Multicall.json index 5eee4ce84..25ebd2914 100644 --- a/src/config/abi/Multicall.json +++ b/src/config/abi/Multicall.json @@ -1,18 +1,20 @@ [ { - "constant": true, "inputs": [ { "components": [ { + "internalType": "address", "name": "target", "type": "address" }, { + "internalType": "bytes", "name": "callData", "type": "bytes" } ], + "internalType": "struct Multicall.Call[]", "name": "calls", "type": "tuple[]" } @@ -20,22 +22,94 @@ "name": "aggregate", "outputs": [ { + "internalType": "uint256", "name": "blockNumber", "type": "uint256" }, { + "internalType": "bytes[]", "name": "returnData", "type": "bytes[]" } ], - "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "blockNumber", + "type": "uint256" + } + ], + "name": "getBlockHash", + "outputs": [ + { + "internalType": "bytes32", + "name": "blockHash", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getCurrentBlockCoinbase", + "outputs": [ + { + "internalType": "address", + "name": "coinbase", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getCurrentBlockDifficulty", + "outputs": [ + { + "internalType": "uint256", + "name": "difficulty", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getCurrentBlockGasLimit", + "outputs": [ + { + "internalType": "uint256", + "name": "gaslimit", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getCurrentBlockTimestamp", + "outputs": [ + { + "internalType": "uint256", + "name": "timestamp", + "type": "uint256" + } + ], "stateMutability": "view", "type": "function" }, { - "constant": true, "inputs": [ { + "internalType": "address", "name": "addr", "type": "address" } @@ -43,12 +117,25 @@ "name": "getEthBalance", "outputs": [ { + "internalType": "uint256", "name": "balance", "type": "uint256" } ], - "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getLastBlockHash", + "outputs": [ + { + "internalType": "bytes32", + "name": "blockHash", + "type": "bytes32" + } + ], "stateMutability": "view", "type": "function" } -] +] \ No newline at end of file diff --git a/src/config/abi/masterchef.json b/src/config/abi/masterchef.json index 889e86697..ccbf1224b 100644 --- a/src/config/abi/masterchef.json +++ b/src/config/abi/masterchef.json @@ -2,8 +2,8 @@ { "inputs": [ { - "internalType": "contract EggToken", - "name": "_egg", + "internalType": "address", + "name": "_alife", "type": "address" }, { @@ -18,7 +18,7 @@ }, { "internalType": "uint256", - "name": "_eggPerBlock", + "name": "_tokenPerBlock", "type": "uint256" }, { @@ -99,6 +99,63 @@ "name": "OwnershipTransferred", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "user", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newAddress", + "type": "address" + } + ], + "name": "SetDevAddress", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "user", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newAddress", + "type": "address" + } + ], + "name": "SetFeeAddress", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "user", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "goosePerBlock", + "type": "uint256" + } + ], + "name": "UpdateEmissionRate", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -135,68 +192,88 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { - "inputs": [], - "name": "devaddr", - "outputs": [ + "inputs": [ { - "internalType": "address", - "name": "", + "internalType": "uint256", + "name": "_allocPoint", + "type": "uint256" + }, + { + "internalType": "contract IBEP20", + "name": "_lpToken", "type": "address" + }, + { + "internalType": "uint16", + "name": "_depositFeeBP", + "type": "uint16" + }, + { + "internalType": "bool", + "name": "_withUpdate", + "type": "bool" + }, + { + "internalType": "uint256", + "name": "_mustHaveNft", + "type": "uint256" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "add", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" }, { "inputs": [], - "name": "egg", + "name": "alife", "outputs": [ { - "internalType": "contract EggToken", + "internalType": "contract AfterLife", "name": "", "type": "address" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { - "inputs": [], - "name": "eggPerBlock", - "outputs": [ + "inputs": [ { "internalType": "uint256", - "name": "", + "name": "_pid", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_amount", "type": "uint256" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "deposit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" }, { - "inputs": [], - "name": "feeAddress", - "outputs": [ + "inputs": [ { "internalType": "address", - "name": "", + "name": "_devaddr", "type": "address" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "dev", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" }, { "inputs": [], - "name": "owner", + "name": "devaddr", "outputs": [ { "internalType": "address", @@ -205,130 +282,178 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "uint256", - "name": "", + "name": "_pid", "type": "uint256" } ], - "name": "poolInfo", + "name": "emergencyWithdraw", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "feeAddress", "outputs": [ { - "internalType": "contract IBEP20", - "name": "lpToken", + "internalType": "address", + "name": "", "type": "address" - }, + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ { "internalType": "uint256", - "name": "allocPoint", + "name": "_from", "type": "uint256" }, { "internalType": "uint256", - "name": "lastRewardBlock", + "name": "_to", "type": "uint256" - }, + } + ], + "name": "getMultiplier", + "outputs": [ { "internalType": "uint256", - "name": "accEggPerShare", + "name": "", "type": "uint256" - }, - { - "internalType": "uint16", - "name": "depositFeeBP", - "type": "uint16" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], - "name": "renounceOwnership", + "name": "massUpdatePools", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "sender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "id", + "type": "uint256" + } + ], + "name": "mustHaveNft", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], - "name": "startBlock", + "name": "nft", "outputs": [ { - "internalType": "uint256", + "internalType": "contract NFT", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], - "name": "totalAllocPoint", + "name": "nftMinter1", "outputs": [ { - "internalType": "uint256", + "internalType": "contract NftFarm", "name": "", - "type": "uint256" + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "nftMinter2", + "outputs": [ + { + "internalType": "contract NftFarm", + "name": "", + "type": "address" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "newOwner", + "name": "_nft", + "type": "address" + }, + { + "internalType": "address", + "name": "_nftMinter1", + "type": "address" + }, + { + "internalType": "address", + "name": "_nftMinter2", "type": "address" } ], - "name": "transferOwnership", + "name": "nft_init", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - }, + "inputs": [], + "name": "owner", + "outputs": [ { "internalType": "address", "name": "", "type": "address" } ], - "name": "userInfo", - "outputs": [ + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ { "internalType": "uint256", - "name": "amount", + "name": "_pid", "type": "uint256" }, { - "internalType": "uint256", - "name": "rewardDebt", - "type": "uint256" + "internalType": "address", + "name": "_user", + "type": "address" } ], - "stateMutability": "view", - "type": "function", - "constant": true - }, - { - "inputs": [], - "name": "poolLength", + "name": "pendingReward", "outputs": [ { "internalType": "uint256", @@ -337,33 +462,68 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "uint256", - "name": "_allocPoint", + "name": "", "type": "uint256" - }, + } + ], + "name": "poolInfo", + "outputs": [ { "internalType": "contract IBEP20", - "name": "_lpToken", + "name": "lpToken", "type": "address" }, + { + "internalType": "uint256", + "name": "allocPoint", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "lastRewardBlock", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "accLifePerShare", + "type": "uint256" + }, { "internalType": "uint16", - "name": "_depositFeeBP", + "name": "depositFeeBP", "type": "uint16" }, { - "internalType": "bool", - "name": "_withUpdate", - "type": "bool" + "internalType": "uint256", + "name": "mustHaveNft", + "type": "uint256" } ], - "name": "add", + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "poolLength", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -399,27 +559,33 @@ { "inputs": [ { - "internalType": "uint256", - "name": "_from", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_to", - "type": "uint256" + "internalType": "address", + "name": "_feeAddress", + "type": "address" } ], - "name": "getMultiplier", - "outputs": [ + "name": "setFeeAddress", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "uint256", - "name": "", - "type": "uint256" + "internalType": "address", + "name": "_minter", + "type": "address" + }, + { + "internalType": "bool", + "name": "_status", + "type": "bool" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "setMinterStatus", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" }, { "inputs": [ @@ -429,12 +595,19 @@ "type": "uint256" }, { - "internalType": "address", - "name": "_user", - "type": "address" + "internalType": "uint256", + "name": "_mustHaveNft", + "type": "uint256" } ], - "name": "pendingEgg", + "name": "set_rarity", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "startBlock", "outputs": [ { "internalType": "uint256", @@ -443,43 +616,43 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], - "name": "massUpdatePools", - "outputs": [], - "stateMutability": "nonpayable", + "name": "tokenPerBlock", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "totalAllocPoint", + "outputs": [ { "internalType": "uint256", - "name": "_pid", + "name": "", "type": "uint256" } ], - "name": "updatePool", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { - "internalType": "uint256", - "name": "_pid", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_amount", - "type": "uint256" + "internalType": "address", + "name": "newOwner", + "type": "address" } ], - "name": "deposit", + "name": "transferOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -488,16 +661,11 @@ "inputs": [ { "internalType": "uint256", - "name": "_pid", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_amount", + "name": "_tokenPerBlock", "type": "uint256" } ], - "name": "withdraw", + "name": "updateEmissionRate", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -510,46 +678,54 @@ "type": "uint256" } ], - "name": "emergencyWithdraw", + "name": "updatePool", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, { "internalType": "address", - "name": "_devaddr", + "name": "", "type": "address" } ], - "name": "dev", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ + "name": "userInfo", + "outputs": [ { - "internalType": "address", - "name": "_feeAddress", - "type": "address" + "internalType": "uint256", + "name": "amount", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "rewardDebt", + "type": "uint256" } ], - "name": "setFeeAddress", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { "internalType": "uint256", - "name": "_eggPerBlock", + "name": "_pid", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_amount", "type": "uint256" } ], - "name": "updateEmissionRate", + "name": "withdraw", "outputs": [], "stateMutability": "nonpayable", "type": "function" diff --git a/src/config/constants/contracts.ts b/src/config/constants/contracts.ts index d3cebeef0..aec3eb87f 100644 --- a/src/config/constants/contracts.ts +++ b/src/config/constants/contracts.ts @@ -1,15 +1,15 @@ export default { cake: { - 56: '0xF952Fc3ca7325Cc27D15885d37117676d25BfdA6', - 97: '0xc54966cB32Dc797b78877EB625F4B27DDc3B98CB', + 56: '0x50f4220C82c9325dC99f729C3328FB5c338BEaae', + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', }, masterChef: { - 56: '0xe70E9185F5ea7Ba3C5d63705784D8563017f2E57', - 97: '0x1090B93561b38bDC18D353a5c191628656c3E25C', + 56: '0x4dC79Cb5330f8403fA2346C894EA0F19701cd7C9', + 97: '0x5eAdf1a622B441Fb53D2b04D2DBE08078c9b0Bc6', }, wbnb: { 56: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', - 97: '', + 97: '0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd', }, lottery: { 56: '', @@ -25,6 +25,6 @@ export default { }, busd: { 56: '0xe9e7cea3dedca5984780bafc599bd69add087d56', - 97: '', + 97: '0xeD24FC36d5Ee211Ea25A80239Fb8C4Cfd80f12Ee', }, -} +} \ No newline at end of file diff --git a/src/config/constants/farms.ts b/src/config/constants/farms.ts index 088107fa5..42500230d 100644 --- a/src/config/constants/farms.ts +++ b/src/config/constants/farms.ts @@ -2,17 +2,33 @@ import contracts from './contracts' import { FarmConfig, QuoteToken } from './types' const farms: FarmConfig[] = [ + { + pid: 2, + risk: 3, + lpSymbol: 'BISON-BUSD LP', + lpAddresses: { + 97: '0x8B7635d524d1eD9518F3Dc32980E13584BB175d8', + 56: '0x99ffD623a46362d61D5E0F9ABf9728A2A429acf5', + }, + tokenSymbol: 'VLAD', + tokenAddresses: { + 97: '0xa800D23CCc013d2cFF18665cCc4709d45D969841', + 56: '0x279d41f3f78fe5C1f0BA41aE963d6E545113C973', + }, + quoteTokenSymbol: QuoteToken.BUSD, + quoteTokenAdresses: contracts.busd, + }, { pid: 0, risk: 5, lpSymbol: 'BISON', lpAddresses: { - 97: '', + 97: '0xE2115e605a81dc6CB448f5111DE6bEf5B8a760DA', 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, tokenSymbol: 'BISON', tokenAddresses: { - 97: '', + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, quoteTokenSymbol: QuoteToken.BUSD, @@ -24,28 +40,29 @@ const farms: FarmConfig[] = [ risk: 5, lpSymbol: 'BISON-BNB LP', lpAddresses: { - 97: '', + 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', }, tokenSymbol: 'BISON', tokenAddresses: { - 97: '', + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, quoteTokenSymbol: QuoteToken.BNB, quoteTokenAdresses: contracts.wbnb, }, + { - pid: 2, + pid: 4, risk: 3, lpSymbol: 'BNB-BUSD LP', lpAddresses: { - 97: '', + 97: '0xa75c80e7Ca70505AAB6062cF15A2cFC71b6138C0', 56: '0x1b96b92314c44b159149f7e0303511fb2fc4774f', }, tokenSymbol: 'BNB', tokenAddresses: { - 97: '', + 97: '0xae13d989dac2f0debff460ac112a837c89baa7cd', 56: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', }, quoteTokenSymbol: QuoteToken.BUSD, @@ -53,4 +70,4 @@ const farms: FarmConfig[] = [ }, ] -export default farms +export default farms \ No newline at end of file diff --git a/src/config/constants/nfts.ts b/src/config/constants/nfts.ts index 8e237317a..a542d78ae 100644 --- a/src/config/constants/nfts.ts +++ b/src/config/constants/nfts.ts @@ -1,7 +1,7 @@ import { Nft } from './types' -export const RABBIT_MINTING_FARM_ADDRESS = '0x7c8b60d2b859a38c8B9b5B6CB4565485cb637c7a' -export const PANCAKE_RABBITS_ADDRESS = '0xDf7952B35f24aCF7fC0487D01c8d5690a60DBa07' +export const MINTING_FARM_ADDRESS = '0x556087eFC63E690c1963C26402Fe8EBaA66D11Db' +export const NFT_ADDRESS = '0xa81ab2d03b9e3a62bdbb837d417a5e221f754e14' const Nfts: Nft[] = [ { diff --git a/src/hooks/useAllEarnings.ts b/src/hooks/useAllEarnings.ts index 5373bca05..c4be07751 100644 --- a/src/hooks/useAllEarnings.ts +++ b/src/hooks/useAllEarnings.ts @@ -15,7 +15,7 @@ const useAllEarnings = () => { const fetchAllBalances = async () => { const calls = farmsConfig.map((farm) => ({ address: getMasterChefAddress(), - name: 'pendingEgg', + name: 'pendingReward', params: [farm.pid, account], })) diff --git a/src/hooks/useFarmsWithBalance.ts b/src/hooks/useFarmsWithBalance.ts index fee1733c1..bc45f29bf 100644 --- a/src/hooks/useFarmsWithBalance.ts +++ b/src/hooks/useFarmsWithBalance.ts @@ -21,7 +21,7 @@ const useFarmsWithBalance = () => { const fetchBalances = async () => { const calls = farmsConfig.map((farm) => ({ address: getMasterChefAddress(), - name: 'pendingEgg', + name: 'pendingReward', params: [farm.pid, account], })) diff --git a/src/state/farms/fetchFarmUser.ts b/src/state/farms/fetchFarmUser.ts index dfe813668..c3aafa652 100644 --- a/src/state/farms/fetchFarmUser.ts +++ b/src/state/farms/fetchFarmUser.ts @@ -63,7 +63,7 @@ export const fetchFarmUserEarnings = async (account: string) => { const calls = farmsConfig.map((farm) => { return { address: masterChefAdress, - name: 'pendingEgg', + name: 'pendingReward', params: [farm.pid, account], } }) diff --git a/src/state/farms/fetchFarms.ts b/src/state/farms/fetchFarms.ts index 113350248..07b1c8578 100644 --- a/src/state/farms/fetchFarms.ts +++ b/src/state/farms/fetchFarms.ts @@ -6,6 +6,7 @@ import { getMasterChefAddress } from 'utils/addressHelpers' import farmsConfig from 'config/constants/farms' import { QuoteToken } from '../../config/constants/types' +// const web3 = require('web3'); const CHAIN_ID = process.env.REACT_APP_CHAIN_ID const fetchFarms = async () => { @@ -48,27 +49,21 @@ const fetchFarms = async () => { }, ] - const [ - tokenBalanceLP, - quoteTokenBlanceLP, - lpTokenBalanceMC, - lpTotalSupply, - tokenDecimals, - quoteTokenDecimals - ] = await multicall(erc20, calls) + const [tokenBalanceLP, quoteTokenBlanceLP, lpTokenBalanceMC, lpTotalSupply, tokenDecimals, quoteTokenDecimals] = + await multicall(erc20, calls) - let tokenAmount; - let lpTotalInQuoteToken; - let tokenPriceVsQuote; - if(farmConfig.isTokenOnly){ - tokenAmount = new BigNumber(lpTokenBalanceMC).div(new BigNumber(10).pow(tokenDecimals)); - if(farmConfig.tokenSymbol === QuoteToken.BUSD && farmConfig.quoteTokenSymbol === QuoteToken.BUSD){ - tokenPriceVsQuote = new BigNumber(1); - }else{ - tokenPriceVsQuote = new BigNumber(quoteTokenBlanceLP).div(new BigNumber(tokenBalanceLP)); + let tokenAmount + let lpTotalInQuoteToken + let tokenPriceVsQuote + if (farmConfig.isTokenOnly) { + tokenAmount = new BigNumber(lpTokenBalanceMC).div(new BigNumber(10).pow(tokenDecimals)) + if (farmConfig.tokenSymbol === QuoteToken.BUSD && farmConfig.quoteTokenSymbol === QuoteToken.BUSD) { + tokenPriceVsQuote = new BigNumber(1) + } else { + tokenPriceVsQuote = new BigNumber(quoteTokenBlanceLP).div(new BigNumber(tokenBalanceLP)) } - lpTotalInQuoteToken = tokenAmount.times(tokenPriceVsQuote); - }else{ + lpTotalInQuoteToken = tokenAmount.times(tokenPriceVsQuote) + } else { // Ratio in % a LP tokens that are in staking, vs the total number in circulation const lpTokenRatio = new BigNumber(lpTokenBalanceMC).div(new BigNumber(lpTotalSupply)) @@ -84,14 +79,14 @@ const fetchFarms = async () => { .div(new BigNumber(10).pow(quoteTokenDecimals)) .times(lpTokenRatio) - if(tokenAmount.comparedTo(0) > 0){ - tokenPriceVsQuote = quoteTokenAmount.div(tokenAmount); - }else{ - tokenPriceVsQuote = new BigNumber(quoteTokenBlanceLP).div(new BigNumber(tokenBalanceLP)); + if (tokenAmount.comparedTo(0) > 0) { + tokenPriceVsQuote = quoteTokenAmount.div(tokenAmount) + } else { + tokenPriceVsQuote = new BigNumber(quoteTokenBlanceLP).div(new BigNumber(tokenBalanceLP)) } } - const [info, totalAllocPoint, eggPerBlock] = await multicall(masterchefABI, [ + const [info, totalAllocPoint, tokenPerBlock] = await multicall(masterchefABI, [ { address: getMasterChefAddress(), name: 'poolInfo', @@ -103,13 +98,12 @@ const fetchFarms = async () => { }, { address: getMasterChefAddress(), - name: 'eggPerBlock', + name: 'tokenPerBlock', }, ]) const allocPoint = new BigNumber(info.allocPoint._hex) const poolWeight = allocPoint.div(new BigNumber(totalAllocPoint)) - return { ...farmConfig, tokenAmount: tokenAmount.toJSON(), @@ -119,7 +113,7 @@ const fetchFarms = async () => { poolWeight: poolWeight.toNumber(), multiplier: `${allocPoint.div(100).toString()}X`, depositFeeBP: info.depositFeeBP, - eggPerBlock: new BigNumber(eggPerBlock).toNumber(), + tokenPerBlock: new BigNumber(tokenPerBlock).toNumber(), } }), ) diff --git a/src/state/hooks.ts b/src/state/hooks.ts index 9e5f50b7c..9bf288109 100644 --- a/src/state/hooks.ts +++ b/src/state/hooks.ts @@ -69,7 +69,7 @@ export const usePoolFromPid = (sousId): Pool => { // Prices export const usePriceBnbBusd = (): BigNumber => { - const pid = 2 // BUSD-BNB LP + const pid = 4 // BUSD-BNB LP const farm = useFarmFromPid(pid) return farm.tokenPriceVsQuote ? new BigNumber(farm.tokenPriceVsQuote) : ZERO } @@ -79,7 +79,7 @@ export const usePriceCakeBusd = (): BigNumber => { // const bnbPriceUSD = usePriceBnbBusd() // const farm = useFarmFromPid(pid) // return farm.tokenPriceVsQuote ? bnbPriceUSD.times(farm.tokenPriceVsQuote) : ZERO - const pid = 0; // BISON-BUSD LP + const pid = 2; // BISON-BUSD LP const farm = useFarmFromPid(pid); return farm.tokenPriceVsQuote ? new BigNumber(farm.tokenPriceVsQuote) : ZERO; } diff --git a/src/state/pools/fetchPoolsUser.ts b/src/state/pools/fetchPoolsUser.ts index 0ef670ade..b4cbbff72 100644 --- a/src/state/pools/fetchPoolsUser.ts +++ b/src/state/pools/fetchPoolsUser.ts @@ -93,7 +93,7 @@ export const fetchUserPendingRewards = async (account) => { ) // Cake / Cake pool - const pendingReward = await masterChefContract.methods.pendingEgg('0', account).call() + const pendingReward = await masterChefContract.methods.pendingReward('0', account).call() return { ...pendingRewards, 0: new BigNumber(pendingReward).toJSON() } } diff --git a/src/state/types.ts b/src/state/types.ts index fcced15e0..e09086c2a 100644 --- a/src/state/types.ts +++ b/src/state/types.ts @@ -8,7 +8,7 @@ export interface Farm extends FarmConfig { tokenPriceVsQuote?: BigNumber poolWeight?: number depositFeeBP?: number - eggPerBlock?: number + tokenPerBlock?: number userData?: { allowance: BigNumber tokenBalance: BigNumber diff --git a/src/views/Farms/Farms.tsx b/src/views/Farms/Farms.tsx index d8eb020bf..b3a4e39f0 100644 --- a/src/views/Farms/Farms.tsx +++ b/src/views/Farms/Farms.tsx @@ -48,10 +48,10 @@ const Farms: React.FC = (farmsProps) => { // ) const activeFarms = farmsLP.filter( - (farm) => farm.multiplier !== '0X' && farm.lpSymbol !== 'BNB-BUSD LP', + (farm) => farm.multiplier !== '0X' && farm.lpSymbol !== 'BNB-BUSD LP' && farm.lpSymbol !== 'BISON-BUSD LP', ) const inactiveFarms = farmsLP.filter( - (farm) => farm.multiplier === '0X' && farm.lpSymbol !== 'BNB-BUSD LP', + (farm) => farm.multiplier === '0X' && farm.lpSymbol !== 'BNB-BUSD LP' && farm.lpSymbol !== 'BISON-BUSD LP', ) const stakedOnlyFarms = activeFarms.filter( @@ -68,7 +68,7 @@ const Farms: React.FC = (farmsProps) => { // if (!farm.tokenAmount || !farm.lpTotalInQuoteToken || !farm.lpTotalInQuoteToken) { // return farm // } - const cakeRewardPerBlock = new BigNumber(farm.eggPerBlock || 1).times(new BigNumber(farm.poolWeight)) .div(new BigNumber(10).pow(18)) + const cakeRewardPerBlock = new BigNumber(farm.tokenPerBlock || 1).times(new BigNumber(farm.poolWeight)) .div(new BigNumber(10).pow(18)) const cakeRewardPerYear = cakeRewardPerBlock.times(BLOCKS_PER_YEAR) let apy = cakePrice.times(cakeRewardPerYear); diff --git a/src/views/Home/components/CakeStats.tsx b/src/views/Home/components/CakeStats.tsx index 88cf9ee42..b106a5ac0 100644 --- a/src/views/Home/components/CakeStats.tsx +++ b/src/views/Home/components/CakeStats.tsx @@ -32,9 +32,9 @@ const CakeStats = () => { const cakeSupply = getBalanceNumber(circSupply); const marketCap = eggPrice.times(circSupply); - let eggPerBlock = 0; - if(farms && farms[0] && farms[0].eggPerBlock){ - eggPerBlock = new BigNumber(farms[0].eggPerBlock).div(new BigNumber(10).pow(18)).toNumber(); + let tokenPerBlock = 0; + if(farms && farms[0] && farms[0].tokenPerBlock){ + tokenPerBlock = new BigNumber(farms[0].tokenPerBlock).div(new BigNumber(10).pow(18)).toNumber(); } return ( @@ -61,7 +61,7 @@ const CakeStats = () => { {TranslateString(540, 'New BISON/block')} - {eggPerBlock} + {tokenPerBlock} diff --git a/src/views/Nft/components/BurnNftModal.tsx b/src/views/Nft/components/BurnNftModal.tsx index da6bcf89e..c64b8e6d1 100644 --- a/src/views/Nft/components/BurnNftModal.tsx +++ b/src/views/Nft/components/BurnNftModal.tsx @@ -4,7 +4,7 @@ import { useWallet } from '@binance-chain/bsc-use-wallet' import { Button, Checkbox, Modal, Text } from '@pancakeswap-libs/uikit' import useI18n from 'hooks/useI18n' import { Nft } from 'config/constants/types' -import { RABBIT_MINTING_FARM_ADDRESS } from 'config/constants/nfts' +import { MINTING_FARM_ADDRESS } from 'config/constants/nfts' import { useRabbitMintingFarm } from 'hooks/useContract' import InfoRow from './InfoRow' @@ -35,7 +35,7 @@ const BurnNftModal: React.FC = ({ nft, tokenIds, onSuccess, o const [accepted, setAccepted] = useState(false) const TranslateString = useI18n() const { account } = useWallet() - const rabbitMintingContract = useRabbitMintingFarm(RABBIT_MINTING_FARM_ADDRESS) + const rabbitMintingContract = useRabbitMintingFarm(MINTING_FARM_ADDRESS) const handleConfirm = async () => { try { diff --git a/src/views/Nft/components/ClaimNftModal.tsx b/src/views/Nft/components/ClaimNftModal.tsx index 813f8b99c..1f12e9b38 100644 --- a/src/views/Nft/components/ClaimNftModal.tsx +++ b/src/views/Nft/components/ClaimNftModal.tsx @@ -3,7 +3,7 @@ import styled from 'styled-components' import { useWallet } from '@binance-chain/bsc-use-wallet' import { Button, Modal, Text } from '@pancakeswap-libs/uikit' import { getBalanceNumber } from 'utils/formatBalance' -import { RABBIT_MINTING_FARM_ADDRESS } from 'config/constants/nfts' +import { MINTING_FARM_ADDRESS } from 'config/constants/nfts' import { getCakeAddress } from 'utils/addressHelpers' import { Nft } from 'config/constants/types' import useTokenBalance from 'hooks/useTokenBalance' @@ -36,7 +36,7 @@ const ClaimNftModal: React.FC = ({ nft, onSuccess, onDismiss const [error, setError] = useState(null) const TranslateString = useI18n() const { account } = useWallet() - const rabbitMintingContract = useRabbitMintingFarm(RABBIT_MINTING_FARM_ADDRESS) + const rabbitMintingContract = useRabbitMintingFarm(MINTING_FARM_ADDRESS) const cakeBalance = useTokenBalance(getCakeAddress()) const cakeInWallet = getBalanceNumber(cakeBalance) diff --git a/src/views/Nft/components/NftGlobalNotification.tsx b/src/views/Nft/components/NftGlobalNotification.tsx index 81acecfed..20ac1bfc2 100644 --- a/src/views/Nft/components/NftGlobalNotification.tsx +++ b/src/views/Nft/components/NftGlobalNotification.tsx @@ -5,7 +5,7 @@ import { Button, Heading, Modal, useModal } from '@pancakeswap-libs/uikit' import useI18n from 'hooks/useI18n' import { useWallet } from '@binance-chain/bsc-use-wallet' import rabbitmintingfarm from 'config/abi/rabbitmintingfarm.json' -import { RABBIT_MINTING_FARM_ADDRESS } from 'config/constants/nfts' +import { MINTING_FARM_ADDRESS } from 'config/constants/nfts' import multicall from 'utils/multicall' interface NftYouWonModalProps { @@ -55,10 +55,10 @@ const NftGlobalNotification = () => { const [totalSupplyDistributedArr, currentDistributedSupplyArr, canClaimArr, hasClaimedArr] = await multicall( rabbitmintingfarm, [ - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'totalSupplyDistributed' }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'currentDistributedSupply' }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'canClaim', params: [account] }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'hasClaimed', params: [account] }, + { address: MINTING_FARM_ADDRESS, name: 'totalSupplyDistributed' }, + { address: MINTING_FARM_ADDRESS, name: 'currentDistributedSupply' }, + { address: MINTING_FARM_ADDRESS, name: 'canClaim', params: [account] }, + { address: MINTING_FARM_ADDRESS, name: 'hasClaimed', params: [account] }, ], ) diff --git a/src/views/Nft/components/TransferNftModal.tsx b/src/views/Nft/components/TransferNftModal.tsx index 909ddad7b..6f2832d42 100644 --- a/src/views/Nft/components/TransferNftModal.tsx +++ b/src/views/Nft/components/TransferNftModal.tsx @@ -3,7 +3,7 @@ import styled from 'styled-components' import Web3 from 'web3' import { useWallet } from '@binance-chain/bsc-use-wallet' import { Button, Input, Modal, Text } from '@pancakeswap-libs/uikit' -import { PANCAKE_RABBITS_ADDRESS } from 'config/constants/nfts' +import { NFT_ADDRESS } from 'config/constants/nfts' import { Nft } from 'config/constants/types' import useI18n from 'hooks/useI18n' import { usePancakeRabbits } from 'hooks/useContract' @@ -43,7 +43,7 @@ const TransferNftModal: React.FC = ({ nft, tokenIds, onSu const [error, setError] = useState(null) const TranslateString = useI18n() const { account } = useWallet() - const pancakeRabbitsContract = usePancakeRabbits(PANCAKE_RABBITS_ADDRESS) + const pancakeRabbitsContract = usePancakeRabbits(NFT_ADDRESS) const handleConfirm = async () => { try { diff --git a/src/views/Nft/contexts/NftProvider.tsx b/src/views/Nft/contexts/NftProvider.tsx index 9af916f3a..2b2d9beac 100644 --- a/src/views/Nft/contexts/NftProvider.tsx +++ b/src/views/Nft/contexts/NftProvider.tsx @@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js' import { useWallet } from '@binance-chain/bsc-use-wallet' import useBlock from 'hooks/useBlock' import rabbitmintingfarm from 'config/abi/rabbitmintingfarm.json' -import { RABBIT_MINTING_FARM_ADDRESS } from 'config/constants/nfts' +import { MINTING_FARM_ADDRESS } from 'config/constants/nfts' import multicall from 'utils/multicall' import { getPancakeRabbitContract } from '../utils/contracts' @@ -66,11 +66,11 @@ const NftProvider: React.FC = ({ children }) => { totalSupplyDistributedArr, currentDistributedSupplyArr, ] = await multicall(rabbitmintingfarm, [ - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'startBlockNumber' }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'endBlockNumber' }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'countBunniesBurnt' }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'totalSupplyDistributed' }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'currentDistributedSupply' }, + { address: MINTING_FARM_ADDRESS, name: 'startBlockNumber' }, + { address: MINTING_FARM_ADDRESS, name: 'endBlockNumber' }, + { address: MINTING_FARM_ADDRESS, name: 'countBunniesBurnt' }, + { address: MINTING_FARM_ADDRESS, name: 'totalSupplyDistributed' }, + { address: MINTING_FARM_ADDRESS, name: 'currentDistributedSupply' }, ]) // TODO: Figure out why these are coming back as arrays @@ -103,8 +103,8 @@ const NftProvider: React.FC = ({ children }) => { try { const pancakeRabbitsContract = getPancakeRabbitContract() const [canClaimArr, hasClaimedArr] = await multicall(rabbitmintingfarm, [ - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'canClaim', params: [account] }, - { address: RABBIT_MINTING_FARM_ADDRESS, name: 'hasClaimed', params: [account] }, + { address: MINTING_FARM_ADDRESS, name: 'canClaim', params: [account] }, + { address: MINTING_FARM_ADDRESS, name: 'hasClaimed', params: [account] }, ]) const balanceOf = await pancakeRabbitsContract.methods.balanceOf(account).call() const [canClaim]: [boolean] = canClaimArr diff --git a/src/views/Nft/utils/contracts.ts b/src/views/Nft/utils/contracts.ts index 69e2f72ba..de0d7eb74 100644 --- a/src/views/Nft/utils/contracts.ts +++ b/src/views/Nft/utils/contracts.ts @@ -3,18 +3,18 @@ import { getContract } from 'utils/web3' import { ContractOptions } from 'web3-eth-contract' import rabbitmintingfarm from 'config/abi/rabbitmintingfarm.json' import pancakeRabbits from 'config/abi/pancakeRabbits.json' -import { RABBIT_MINTING_FARM_ADDRESS, PANCAKE_RABBITS_ADDRESS } from 'config/constants/nfts' +import { MINTING_FARM_ADDRESS, NFT_ADDRESS } from 'config/constants/nfts' // TODO: Figure out how to add current account to contracts to write methods can be used export const getRabbitMintingContract = (contractOptions?: ContractOptions) => { const rabbitMintingFarmAbi = (rabbitmintingfarm as unknown) as AbiItem - return getContract(rabbitMintingFarmAbi, RABBIT_MINTING_FARM_ADDRESS, contractOptions) + return getContract(rabbitMintingFarmAbi, MINTING_FARM_ADDRESS, contractOptions) } export const getPancakeRabbitContract = (contractOptions?: ContractOptions) => { const pancakeRabbitsAbi = (pancakeRabbits as unknown) as AbiItem - return getContract(pancakeRabbitsAbi, PANCAKE_RABBITS_ADDRESS, contractOptions) + return getContract(pancakeRabbitsAbi, NFT_ADDRESS, contractOptions) } export default getRabbitMintingContract From 629b0167f80ff750f0ff49b6e9de0109bb56fea5 Mon Sep 17 00:00:00 2001 From: shrijana Date: Thu, 19 Aug 2021 23:49:43 +0545 Subject: [PATCH 03/39] update env files --- .env.development | 6 +++--- .env.production | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.env.development b/.env.development index 2967c4ef4..83dbebfaa 100644 --- a/.env.development +++ b/.env.development @@ -1,13 +1,13 @@ REACT_APP_CHAIN_ID = "56" # 10+ nodes balanced, US/EU -REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" +# REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced, US/EU -REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" +# REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced in each region, global -REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" +# REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" # testnet REACT_APP_CHAIN_ID = "97" diff --git a/.env.production b/.env.production index cf497322e..83dbebfaa 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,16 @@ REACT_APP_CHAIN_ID = "56" # 10+ nodes balanced, US/EU -REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" +# REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced, US/EU -REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" +# REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced in each region, global -REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" +# REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" +# testnet +REACT_APP_CHAIN_ID = "97" +REACT_APP_NODE_1 = "https://data-seed-prebsc-1-s1.binance.org:8545/" +REACT_APP_NODE_2 = "https://data-seed-prebsc-2-s1.binance.org:8545/" +REACT_APP_NODE_3 = "https://data-seed-prebsc-1-s2.binance.org:8545/" From 32861f04eb2ddc53a0848b52c688ab3cebb7b6c4 Mon Sep 17 00:00:00 2001 From: shrijana Date: Thu, 19 Aug 2021 23:52:42 +0545 Subject: [PATCH 04/39] update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0fabed7fb..e2e091279 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { + "build": "react-scripts build", "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "react-scripts start", "build-mainnet": "react-scripts build && rm -rf ../bishares-mainnet/* && mv ./build/* ../bishares-mainnet/ && mv ../mainnet/CNAME-MAINNET ../bishares-mainnet/CNAME", From bda8bb0a25d5110dee51e587a65ca8d11054942d Mon Sep 17 00:00:00 2001 From: shrijana Date: Fri, 20 Aug 2021 14:53:57 +0545 Subject: [PATCH 05/39] update logo --- package.json | 4 +-- public/404.html | 40 +++++++++++++++++++++++++ public/images/egg/LogoTextNewWhite.png | Bin 22510 -> 21081 bytes public/index.html | 27 ++++++++++++++++- src/contexts/ThemeContext.tsx | 2 +- 5 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 public/404.html diff --git a/package.json b/package.json index e2e091279..f74d01088 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "build": "react-scripts build", "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "react-scripts start", - "build-mainnet": "react-scripts build && rm -rf ../bishares-mainnet/* && mv ./build/* ../bishares-mainnet/ && mv ../mainnet/CNAME-MAINNET ../bishares-mainnet/CNAME", - "build-testnet": "react-scripts build && rm -rf ../bishares-testnet/* && mv ./build/* ../bishares-testnet/ && mv ../testnet/CNAME-TESTNET ../bishares-testnet/CNAME", + "build-mainnet": "react-scripts build && rm -rf ../farms-mainnet/* && mv ./build/* ../farms-mainnet/", + "build-testnet": "react-scripts build && rm -rf ../farms-testnet/* && mv ./build/* ../farms-testnet/", "test": "react-scripts test", "eject": "react-scripts eject", "lint": "eslint 'src/**/*.{js,jsx,ts,tsx}'", diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..83555440a --- /dev/null +++ b/public/404.html @@ -0,0 +1,40 @@ + + + + + Bishares Finance + + + + + diff --git a/public/images/egg/LogoTextNewWhite.png b/public/images/egg/LogoTextNewWhite.png index 056daef98787e2f3846511d3866c1a3508f59a7e..e502188d51e8ddbf1f2440600481a3ba4913851f 100644 GIT binary patch literal 21081 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%0A60<;i7tkU4G-*g!V?Gw{}f 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 diff --git a/public/index.html b/public/index.html index 62535df66..2c36163c4 100644 --- a/public/index.html +++ b/public/index.html @@ -19,7 +19,7 @@ /> - + + + + +
diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx index f5ce535c6..c359c5a05 100644 --- a/src/contexts/ThemeContext.tsx +++ b/src/contexts/ThemeContext.tsx @@ -21,7 +21,7 @@ const ThemeContextProvider = ({ children }) => { return ( - {children} + {children} ) } From 8a81e20af918e60099e6f8fbcde688254dc7d38b Mon Sep 17 00:00:00 2001 From: shrijana Date: Sat, 21 Aug 2021 15:56:24 +0545 Subject: [PATCH 06/39] seperate ape and pcs link --- src/config/constants/farms.ts | 86 +++++++++++++++---- src/config/constants/types.ts | 1 + src/contexts/ThemeContext.tsx | 2 +- .../Farms/components/FarmCard/ApyButton.tsx | 3 + .../FarmCard/ApyCalculatorModal.tsx | 15 +++- .../components/FarmCard/DetailsSection.tsx | 30 +++++-- .../Farms/components/FarmCard/FarmCard.tsx | 4 +- 7 files changed, 111 insertions(+), 30 deletions(-) diff --git a/src/config/constants/farms.ts b/src/config/constants/farms.ts index 42500230d..0b00a5bdd 100644 --- a/src/config/constants/farms.ts +++ b/src/config/constants/farms.ts @@ -3,27 +3,29 @@ import { FarmConfig, QuoteToken } from './types' const farms: FarmConfig[] = [ { - pid: 2, - risk: 3, - lpSymbol: 'BISON-BUSD LP', + pid: 0, + risk: 5, + lpSymbol: 'BISON LP', lpAddresses: { - 97: '0x8B7635d524d1eD9518F3Dc32980E13584BB175d8', - 56: '0x99ffD623a46362d61D5E0F9ABf9728A2A429acf5', + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, - tokenSymbol: 'VLAD', + tokenSymbol: 'BISON', tokenAddresses: { - 97: '0xa800D23CCc013d2cFF18665cCc4709d45D969841', - 56: '0x279d41f3f78fe5C1f0BA41aE963d6E545113C973', + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, + isTokenOnly: true, + factory: 'ape' }, { - pid: 0, - risk: 5, - lpSymbol: 'BISON', + pid: 3, + risk: 3, + lpSymbol: 'BISON-BNB LP', lpAddresses: { - 97: '0xE2115e605a81dc6CB448f5111DE6bEf5B8a760DA', + 97: '0x5BAa840959A291e274FF3C523Cd0eb85659a2360', 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', }, tokenSymbol: 'BISON', @@ -33,14 +35,14 @@ const farms: FarmConfig[] = [ }, quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, - isTokenOnly: true + factory: 'pcs' }, { - pid: 1, + pid: 0, risk: 5, lpSymbol: 'BISON-BNB LP', lpAddresses: { - 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', + 97: '0xd48952C7Ff5346d6753f3547B9606769538845B8', 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', }, tokenSymbol: 'BISON', @@ -50,8 +52,24 @@ const farms: FarmConfig[] = [ }, quoteTokenSymbol: QuoteToken.BNB, quoteTokenAdresses: contracts.wbnb, + factory: 'ape' + }, + { + pid: 2, + risk: 3, + lpSymbol: 'BISON-BUSD LP', + lpAddresses: { + 97: '0x1Ab63eDAc9BDfb697E1118BAD44366bb4CeC6c88', + 56: '0x99ffD623a46362d61D5E0F9ABf9728A2A429acf5', + }, + tokenSymbol: 'BISON', + tokenAddresses: { + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + 56: '0x279d41f3f78fe5C1f0BA41aE963d6E545113C973', + }, + quoteTokenSymbol: QuoteToken.BUSD, + quoteTokenAdresses: contracts.busd, }, - { pid: 4, risk: 3, @@ -62,12 +80,46 @@ const farms: FarmConfig[] = [ }, tokenSymbol: 'BNB', tokenAddresses: { - 97: '0xae13d989dac2f0debff460ac112a837c89baa7cd', + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', 56: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', }, quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, }, + { + pid: 5, + risk: 5, + lpSymbol: 'biApe-BNB LP', + lpAddresses: { + 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', + 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', + }, + tokenSymbol: 'BISON', + tokenAddresses: { + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', + }, + quoteTokenSymbol: QuoteToken.BNB, + quoteTokenAdresses: contracts.wbnb, + factory: 'ape' + }, + { + pid: 6, + risk: 5, + lpSymbol: 'biT10-BNB LP', + lpAddresses: { + 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', + 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', + }, + tokenSymbol: 'BISON', + tokenAddresses: { + 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', + }, + quoteTokenSymbol: QuoteToken.BNB, + quoteTokenAdresses: contracts.wbnb, + factory: 'ape' + }, ] export default farms \ No newline at end of file diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index 380b7b2a2..21e84f5ad 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -51,6 +51,7 @@ export interface FarmConfig { isTokenOnly?: boolean isCommunity?: boolean risk: number + factory?: string dual?: { rewardPerBlock: number earnLabel: string diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx index c359c5a05..f5ce535c6 100644 --- a/src/contexts/ThemeContext.tsx +++ b/src/contexts/ThemeContext.tsx @@ -21,7 +21,7 @@ const ThemeContextProvider = ({ children }) => { return ( - {children} + {children} ) } diff --git a/src/views/Farms/components/FarmCard/ApyButton.tsx b/src/views/Farms/components/FarmCard/ApyButton.tsx index dd9562a01..4d27d1c58 100644 --- a/src/views/Farms/components/FarmCard/ApyButton.tsx +++ b/src/views/Farms/components/FarmCard/ApyButton.tsx @@ -11,6 +11,7 @@ export interface ApyButtonProps { quoteTokenAdresses?: Address quoteTokenSymbol?: string tokenAddresses: Address + factory: string } const ApyButton: React.FC = ({ @@ -20,6 +21,7 @@ const ApyButton: React.FC = ({ tokenAddresses, cakePrice, apy, + factory }) => { const [onPresentApyModal] = useModal( = ({ tokenAddresses={tokenAddresses} cakePrice={cakePrice} apy={apy} + factory={factory} />, ) diff --git a/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx b/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx index 731d3feff..1dbd4c478 100644 --- a/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx +++ b/src/views/Farms/components/FarmCard/ApyCalculatorModal.tsx @@ -15,6 +15,7 @@ interface ApyCalculatorModalProps { quoteTokenAdresses?: Address quoteTokenSymbol?: string tokenAddresses: Address + factory: string } const Grid = styled.div` @@ -41,6 +42,7 @@ const ApyCalculatorModal: React.FC = ({ tokenAddresses, cakePrice, apy, + factory, }) => { const TranslateString = useI18n() const liquidityUrlPathParts = getLiquidityUrlPathParts({ quoteTokenAdresses, quoteTokenSymbol, tokenAddresses }) @@ -126,9 +128,16 @@ const ApyCalculatorModal: React.FC = ({ )} - - {TranslateString(999, 'Get')} {lpLabel} - + { factory === 'pcs' && + + {TranslateString(999, 'Get')} {lpLabel} + + } + { factory === 'ape' && + + {TranslateString(999, 'Get')} {lpLabel} + + } ) diff --git a/src/views/Farms/components/FarmCard/DetailsSection.tsx b/src/views/Farms/components/FarmCard/DetailsSection.tsx index f453581fb..f1a13d2b0 100644 --- a/src/views/Farms/components/FarmCard/DetailsSection.tsx +++ b/src/views/Farms/components/FarmCard/DetailsSection.tsx @@ -14,6 +14,7 @@ export interface ExpandableSectionProps { quoteTokenAdresses?: Address quoteTokenSymbol?: string tokenAddresses: Address + factory?: string } const Wrapper = styled.div` @@ -44,6 +45,7 @@ const DetailsSection: React.FC = ({ quoteTokenAdresses, quoteTokenSymbol, tokenAddresses, + factory }) => { const TranslateString = useI18n() const liquidityUrlPathParts = getLiquidityUrlPathParts({ quoteTokenAdresses, quoteTokenSymbol, tokenAddresses }) @@ -52,14 +54,26 @@ const DetailsSection: React.FC = ({ {TranslateString(316, 'Stake')}: - - {lpLabel} - + { factory === 'pcs' && + + {lpLabel} + + } + { factory === 'ape' && + + {lpLabel} + + } {!removed && ( diff --git a/src/views/Farms/components/FarmCard/FarmCard.tsx b/src/views/Farms/components/FarmCard/FarmCard.tsx index 70a10e667..93fba9275 100644 --- a/src/views/Farms/components/FarmCard/FarmCard.tsx +++ b/src/views/Farms/components/FarmCard/FarmCard.tsx @@ -127,7 +127,7 @@ const FarmCard: React.FC = ({ farm, removed, cakePrice, bnbPrice, return ( - {farm.tokenSymbol === 'BISON' && } + {farm.tokenSymbol === 'BISON'} = ({ farm, removed, cakePrice, bnbPrice, tokenAddresses={tokenAddresses} cakePrice={cakePrice} apy={farm.apy} + factory={farm.factory} /> {farmAPY}% @@ -187,6 +188,7 @@ const FarmCard: React.FC = ({ farm, removed, cakePrice, bnbPrice, quoteTokenAdresses={quoteTokenAdresses} quoteTokenSymbol={quoteTokenSymbol} tokenAddresses={tokenAddresses} + factory={farm.factory} /> From 0428ced6faa332611968693888a2d0d4ada10383 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sat, 21 Aug 2021 18:31:15 +0545 Subject: [PATCH 07/39] change to pool --- public/images/tokens/BISON.png | Bin 0 -> 7435 bytes src/App.tsx | 8 +- src/config/abi/cake.json | 320 ++++++------ src/config/abi/masterchef.json | 167 +----- src/config/abi/sousChef.json | 233 ++++++--- src/config/abi/syrup.json | 485 +++++++----------- src/config/constants/contracts.ts | 4 +- src/config/constants/pools.ts | 55 +- src/config/constants/types.ts | 6 +- src/hooks/useAllEarnings.ts | 2 +- src/hooks/useFarmsWithBalance.ts | 2 +- src/hooks/useUnstake.ts | 2 +- src/state/farms/fetchFarms.ts | 6 +- src/state/pools/fetchPoolsUser.ts | 2 +- src/state/types.ts | 4 +- src/utils/apr.js | 39 ++ src/views/Farms/Farms.tsx | 2 +- src/views/Home/components/CakeStats.tsx | 8 +- src/views/Pools/Syrup.tsx | 17 +- .../Pools/components/PoolTabButtons/index.tsx | 2 +- 20 files changed, 635 insertions(+), 729 deletions(-) create mode 100644 public/images/tokens/BISON.png create mode 100644 src/utils/apr.js diff --git a/public/images/tokens/BISON.png b/public/images/tokens/BISON.png new file mode 100644 index 0000000000000000000000000000000000000000..93b118bef3ccca25de1fadf29d87b371985a6373 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 0 HcmV?d00001 diff --git a/src/App.tsx b/src/App.tsx index 530987213..41bcb140a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,7 +14,7 @@ import PageLoader from './components/PageLoader' const Home = lazy(() => import('./views/Home')) const Farms = lazy(() => import('./views/Farms')) // const Lottery = lazy(() => import('./views/Lottery')) -// const Pools = lazy(() => import('./views/Pools')) +const Pools = lazy(() => import('./views/Pools')) // const Ifos = lazy(() => import('./views/Ifos')) const NotFound = lazy(() => import('./views/NotFound')) // const Nft = lazy(() => import('./views/Nft')) @@ -46,11 +46,11 @@ const App: React.FC = () => { */} - + - + {/* - + */} {/* */} {/* */} {/* */} diff --git a/src/config/abi/cake.json b/src/config/abi/cake.json index dd3166ae5..d1522f4a9 100644 --- a/src/config/abi/cake.json +++ b/src/config/abi/cake.json @@ -129,8 +129,7 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], @@ -143,8 +142,7 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ @@ -168,8 +166,7 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ @@ -212,8 +209,7 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ @@ -242,8 +238,7 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], @@ -256,8 +251,7 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ @@ -284,100 +278,97 @@ "type": "function" }, { - "inputs": [], - "name": "getOwner", - "outputs": [ + "inputs": [ { "internalType": "address", - "name": "", + "name": "delegatee", "type": "address" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "delegate", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "spender", + "name": "delegatee", "type": "address" }, { "internalType": "uint256", - "name": "addedValue", + "name": "nonce", "type": "uint256" - } - ], - "name": "increaseAllowance", - "outputs": [ + }, { - "internalType": "bool", - "name": "", - "type": "bool" + "internalType": "uint256", + "name": "expiry", + "type": "uint256" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" } ], + "name": "delegateBySig", + "outputs": [], "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [], - "name": "name", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function", - "constant": true - }, { "inputs": [ { "internalType": "address", - "name": "", + "name": "delegator", "type": "address" } ], - "name": "nonces", + "name": "delegates", "outputs": [ { - "internalType": "uint256", + "internalType": "address", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "", + "name": "account", "type": "address" } ], - "name": "numCheckpoints", + "name": "getCurrentVotes", "outputs": [ { - "internalType": "uint32", + "internalType": "uint256", "name": "", - "type": "uint32" + "type": "uint256" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], - "name": "owner", + "name": "getOwner", "outputs": [ { "internalType": "address", @@ -386,33 +377,22 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [], - "name": "symbol", - "outputs": [ + "inputs": [ { - "internalType": "string", - "name": "", - "type": "string" + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "uint256", + "name": "blockNumber", + "type": "uint256" } ], - "stateMutability": "view", - "type": "function", - "constant": true - }, - { - "inputs": [], - "name": "totalSupply", + "name": "getPriorVotes", "outputs": [ { "internalType": "uint256", @@ -421,23 +401,22 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "recipient", + "name": "spender", "type": "address" }, { "internalType": "uint256", - "name": "amount", + "name": "addedValue", "type": "uint256" } ], - "name": "transfer", + "name": "increaseAllowance", "outputs": [ { "internalType": "bool", @@ -452,21 +431,29 @@ "inputs": [ { "internalType": "address", - "name": "sender", + "name": "_to", "type": "address" }, { - "internalType": "address", - "name": "recipient", - "type": "address" - }, + "internalType": "uint256", + "name": "_amount", + "type": "uint256" + } + ], + "name": "mint", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { "internalType": "uint256", "name": "amount", "type": "uint256" } ], - "name": "transferFrom", + "name": "mint", "outputs": [ { "internalType": "bool", @@ -478,123 +465,123 @@ "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "name", + "outputs": [ { - "internalType": "address", - "name": "newOwner", - "type": "address" + "internalType": "string", + "name": "", + "type": "string" } ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "_to", + "name": "", "type": "address" - }, + } + ], + "name": "nonces", + "outputs": [ { "internalType": "uint256", - "name": "_amount", + "name": "", "type": "uint256" } ], - "name": "mint", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { - "internalType": "uint256", - "name": "amount", - "type": "uint256" + "internalType": "address", + "name": "", + "type": "address" } ], - "name": "mint", + "name": "numCheckpoints", "outputs": [ { - "internalType": "bool", + "internalType": "uint32", "name": "", - "type": "bool" + "type": "uint32" } ], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "owner", + "outputs": [ { "internalType": "address", - "name": "delegator", + "name": "", "type": "address" } ], - "name": "delegates", + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "renounceOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "symbol", "outputs": [ { - "internalType": "address", + "internalType": "string", "name": "", - "type": "address" + "type": "string" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "totalSupply", + "outputs": [ { - "internalType": "address", - "name": "delegatee", - "type": "address" + "internalType": "uint256", + "name": "", + "type": "uint256" } ], - "name": "delegate", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "delegatee", + "name": "recipient", "type": "address" }, { "internalType": "uint256", - "name": "nonce", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "expiry", + "name": "amount", "type": "uint256" - }, - { - "internalType": "uint8", - "name": "v", - "type": "uint8" - }, - { - "internalType": "bytes32", - "name": "r", - "type": "bytes32" - }, + } + ], + "name": "transfer", + "outputs": [ { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" + "internalType": "bool", + "name": "", + "type": "bool" } ], - "name": "delegateBySig", - "outputs": [], "stateMutability": "nonpayable", "type": "function" }, @@ -602,45 +589,42 @@ "inputs": [ { "internalType": "address", - "name": "account", + "name": "sender", + "type": "address" + }, + { + "internalType": "address", + "name": "recipient", "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" } ], - "name": "getCurrentVotes", + "name": "transferFrom", "outputs": [ { - "internalType": "uint256", + "internalType": "bool", "name": "", - "type": "uint256" + "type": "bool" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "stateMutability": "nonpayable", + "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "account", + "name": "newOwner", "type": "address" - }, - { - "internalType": "uint256", - "name": "blockNumber", - "type": "uint256" - } - ], - "name": "getPriorVotes", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "transferOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" } ] \ No newline at end of file diff --git a/src/config/abi/masterchef.json b/src/config/abi/masterchef.json index ccbf1224b..35932a861 100644 --- a/src/config/abi/masterchef.json +++ b/src/config/abi/masterchef.json @@ -2,8 +2,8 @@ { "inputs": [ { - "internalType": "address", - "name": "_alife", + "internalType": "contract LifeToken", + "name": "_life", "type": "address" }, { @@ -18,7 +18,7 @@ }, { "internalType": "uint256", - "name": "_tokenPerBlock", + "name": "_lifePerBlock", "type": "uint256" }, { @@ -215,11 +215,6 @@ "internalType": "bool", "name": "_withUpdate", "type": "bool" - }, - { - "internalType": "uint256", - "name": "_mustHaveNft", - "type": "uint256" } ], "name": "add", @@ -227,19 +222,6 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [], - "name": "alife", - "outputs": [ - { - "internalType": "contract AfterLife", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [ { @@ -336,30 +318,12 @@ }, { "inputs": [], - "name": "massUpdatePools", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "id", - "type": "uint256" - } - ], - "name": "mustHaveNft", + "name": "life", "outputs": [ { - "internalType": "bool", + "internalType": "contract LifeToken", "name": "", - "type": "bool" + "type": "address" } ], "stateMutability": "view", @@ -367,12 +331,12 @@ }, { "inputs": [], - "name": "nft", + "name": "lifePerBlock", "outputs": [ { - "internalType": "contract NFT", + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "stateMutability": "view", @@ -380,23 +344,17 @@ }, { "inputs": [], - "name": "nftMinter1", - "outputs": [ - { - "internalType": "contract NftFarm", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", + "name": "massUpdatePools", + "outputs": [], + "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], - "name": "nftMinter2", + "name": "owner", "outputs": [ { - "internalType": "contract NftFarm", + "internalType": "address", "name": "", "type": "address" } @@ -407,34 +365,22 @@ { "inputs": [ { - "internalType": "address", - "name": "_nft", - "type": "address" - }, - { - "internalType": "address", - "name": "_nftMinter1", - "type": "address" + "internalType": "uint256", + "name": "_pid", + "type": "uint256" }, { "internalType": "address", - "name": "_nftMinter2", + "name": "_user", "type": "address" } ], - "name": "nft_init", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "owner", + "name": "pendingLife", "outputs": [ { - "internalType": "address", + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "stateMutability": "view", @@ -443,22 +389,17 @@ { "inputs": [ { - "internalType": "uint256", - "name": "_pid", - "type": "uint256" - }, - { - "internalType": "address", - "name": "_user", + "internalType": "contract IBEP20", + "name": "", "type": "address" } ], - "name": "pendingReward", + "name": "poolExistence", "outputs": [ { - "internalType": "uint256", + "internalType": "bool", "name": "", - "type": "uint256" + "type": "bool" } ], "stateMutability": "view", @@ -498,11 +439,6 @@ "internalType": "uint16", "name": "depositFeeBP", "type": "uint16" - }, - { - "internalType": "uint256", - "name": "mustHaveNft", - "type": "uint256" } ], "stateMutability": "view", @@ -569,42 +505,6 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [ - { - "internalType": "address", - "name": "_minter", - "type": "address" - }, - { - "internalType": "bool", - "name": "_status", - "type": "bool" - } - ], - "name": "setMinterStatus", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_pid", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_mustHaveNft", - "type": "uint256" - } - ], - "name": "set_rarity", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, { "inputs": [], "name": "startBlock", @@ -618,19 +518,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [], - "name": "tokenPerBlock", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "totalAllocPoint", @@ -661,7 +548,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_tokenPerBlock", + "name": "_lifePerBlock", "type": "uint256" } ], diff --git a/src/config/abi/sousChef.json b/src/config/abi/sousChef.json index 407670c5b..e600f7436 100644 --- a/src/config/abi/sousChef.json +++ b/src/config/abi/sousChef.json @@ -6,6 +6,11 @@ "name": "_syrup", "type": "address" }, + { + "internalType": "contract IBEP20", + "name": "_rewardToken", + "type": "address" + }, { "internalType": "uint256", "name": "_rewardPerBlock", @@ -18,7 +23,7 @@ }, { "internalType": "uint256", - "name": "_endBlock", + "name": "_bonusEndBlock", "type": "uint256" } ], @@ -63,6 +68,25 @@ "name": "EmergencyWithdraw", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -93,45 +117,55 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { - "inputs": [], - "name": "poolInfo", - "outputs": [ + "inputs": [ { "internalType": "uint256", - "name": "lastRewardBlock", + "name": "_amount", "type": "uint256" - }, + } + ], + "name": "deposit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { "internalType": "uint256", - "name": "accRewardPerShare", + "name": "_amount", "type": "uint256" } ], - "stateMutability": "view", - "type": "function", - "constant": true + "name": "emergencyRewardWithdraw", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" }, { "inputs": [], - "name": "rewardPerBlock", - "outputs": [ + "name": "emergencyWithdraw", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { "internalType": "uint256", - "name": "", + "name": "_from", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_to", "type": "uint256" } ], - "stateMutability": "view", - "type": "function", - "constant": true - }, - { - "inputs": [], - "name": "startBlock", + "name": "getMultiplier", "outputs": [ { "internalType": "uint256", @@ -140,62 +174,91 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], - "name": "syrup", + "name": "massUpdatePools", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "owner", "outputs": [ { - "internalType": "contract IBEP20", + "internalType": "address", "name": "", "type": "address" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "", + "name": "_user", "type": "address" } ], - "name": "userInfo", + "name": "pendingReward", "outputs": [ { "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "rewardDebt", + "name": "", "type": "uint256" } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [ { "internalType": "uint256", - "name": "_from", + "name": "", "type": "uint256" + } + ], + "name": "poolInfo", + "outputs": [ + { + "internalType": "contract IBEP20", + "name": "lpToken", + "type": "address" }, { "internalType": "uint256", - "name": "_to", + "name": "allocPoint", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "lastRewardBlock", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "accCakePerShare", "type": "uint256" } ], - "name": "getMultiplier", + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "renounceOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "rewardPerBlock", "outputs": [ { "internalType": "uint256", @@ -204,18 +267,24 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "rewardToken", + "outputs": [ { - "internalType": "address", - "name": "_user", + "internalType": "contract IBEP20", + "name": "", "type": "address" } ], - "name": "pendingReward", + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "startBlock", "outputs": [ { "internalType": "uint256", @@ -224,12 +293,43 @@ } ], "stateMutability": "view", - "type": "function", - "constant": true + "type": "function" }, { "inputs": [], - "name": "updatePool", + "name": "syrup", + "outputs": [ + { + "internalType": "contract IBEP20", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "totalAllocPoint", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -238,31 +338,48 @@ "inputs": [ { "internalType": "uint256", - "name": "_amount", + "name": "_pid", "type": "uint256" } ], - "name": "deposit", + "name": "updatePool", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "userInfo", + "outputs": [ { "internalType": "uint256", - "name": "_amount", + "name": "amount", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "rewardDebt", "type": "uint256" } ], - "name": "withdraw", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "inputs": [], - "name": "emergencyWithdraw", + "inputs": [ + { + "internalType": "uint256", + "name": "_amount", + "type": "uint256" + } + ], + "name": "withdraw", "outputs": [], "stateMutability": "nonpayable", "type": "function" diff --git a/src/config/abi/syrup.json b/src/config/abi/syrup.json index b64a9a582..d529b0103 100644 --- a/src/config/abi/syrup.json +++ b/src/config/abi/syrup.json @@ -2,8 +2,13 @@ { "inputs": [ { - "internalType": "contract CakeToken", - "name": "_cake", + "internalType": "address", + "name": "_rewardsToken", + "type": "address" + }, + { + "internalType": "address", + "name": "_stakingToken", "type": "address" } ], @@ -16,48 +21,62 @@ { "indexed": true, "internalType": "address", - "name": "owner", + "name": "previousOwner", "type": "address" }, { "indexed": true, "internalType": "address", - "name": "spender", + "name": "newOwner", "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" } ], - "name": "Approval", + "name": "OwnershipTransferred", "type": "event" }, { "anonymous": false, "inputs": [ { - "indexed": true, + "indexed": false, "internalType": "address", - "name": "delegator", + "name": "account", "type": "address" - }, + } + ], + "name": "Paused", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ { - "indexed": true, + "indexed": false, "internalType": "address", - "name": "fromDelegate", + "name": "token", "type": "address" }, { - "indexed": true, - "internalType": "address", - "name": "toDelegate", - "type": "address" + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Recovered", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "reward", + "type": "uint256" } ], - "name": "DelegateChanged", + "name": "RewardAdded", "type": "event" }, { @@ -66,23 +85,30 @@ { "indexed": true, "internalType": "address", - "name": "delegate", + "name": "user", "type": "address" }, { "indexed": false, "internalType": "uint256", - "name": "previousBalance", + "name": "reward", "type": "uint256" - }, + } + ], + "name": "RewardPaid", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ { "indexed": false, "internalType": "uint256", - "name": "newBalance", + "name": "newDuration", "type": "uint256" } ], - "name": "DelegateVotesChanged", + "name": "RewardsDurationUpdated", "type": "event" }, { @@ -91,52 +117,59 @@ { "indexed": true, "internalType": "address", - "name": "previousOwner", + "name": "user", "type": "address" }, { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" } ], - "name": "OwnershipTransferred", + "name": "Staked", "type": "event" }, { "anonymous": false, "inputs": [ { - "indexed": true, + "indexed": false, "internalType": "address", - "name": "from", + "name": "account", "type": "address" - }, + } + ], + "name": "Unpaused", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ { "indexed": true, "internalType": "address", - "name": "to", + "name": "user", "type": "address" }, { "indexed": false, "internalType": "uint256", - "name": "value", + "name": "amount", "type": "uint256" } ], - "name": "Transfer", + "name": "Withdrawn", "type": "event" }, { "inputs": [], - "name": "DELEGATION_TYPEHASH", + "name": "_totalRewardSupply", "outputs": [ { - "internalType": "bytes32", + "internalType": "uint256", "name": "", - "type": "bytes32" + "type": "uint256" } ], "stateMutability": "view", @@ -144,12 +177,12 @@ }, { "inputs": [], - "name": "DOMAIN_TYPEHASH", + "name": "_totalSupply", "outputs": [ { - "internalType": "bytes32", + "internalType": "uint256", "name": "", - "type": "bytes32" + "type": "uint256" } ], "stateMutability": "view", @@ -159,16 +192,11 @@ "inputs": [ { "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "internalType": "address", - "name": "spender", + "name": "account", "type": "address" } ], - "name": "allowance", + "name": "balanceOf", "outputs": [ { "internalType": "uint256", @@ -181,25 +209,14 @@ }, { "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, { "internalType": "uint256", - "name": "amount", + "name": "_amount", "type": "uint256" } ], - "name": "approve", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], + "name": "deposit", + "outputs": [], "stateMutability": "nonpayable", "type": "function" }, @@ -211,7 +228,7 @@ "type": "address" } ], - "name": "balanceOf", + "name": "earned", "outputs": [ { "internalType": "uint256", @@ -223,31 +240,20 @@ "type": "function" }, { - "inputs": [ - { - "internalType": "address", - "name": "_from", - "type": "address" - }, - { - "internalType": "uint256", - "name": "_amount", - "type": "uint256" - } - ], - "name": "burn", + "inputs": [], + "name": "exit", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], - "name": "cake", + "name": "geUnlockTime", "outputs": [ { - "internalType": "contract CakeToken", + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "stateMutability": "view", @@ -256,27 +262,24 @@ { "inputs": [ { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint32", - "name": "", - "type": "uint32" + "internalType": "uint256", + "name": "time", + "type": "uint256" } ], - "name": "checkpoints", + "name": "lock", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "owner", "outputs": [ { - "internalType": "uint32", - "name": "fromBlock", - "type": "uint32" - }, - { - "internalType": "uint256", - "name": "votes", - "type": "uint256" + "internalType": "address", + "name": "", + "type": "address" } ], "stateMutability": "view", @@ -284,31 +287,33 @@ }, { "inputs": [], - "name": "decimals", + "name": "paused", "outputs": [ { - "internalType": "uint8", + "internalType": "bool", "name": "", - "type": "uint8" + "type": "bool" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, + "inputs": [], + "name": "poolEndingBlock", + "outputs": [ { "internalType": "uint256", - "name": "subtractedValue", + "name": "", "type": "uint256" } ], - "name": "decreaseAllowance", + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "poolStarted", "outputs": [ { "internalType": "bool", @@ -316,88 +321,45 @@ "type": "bool" } ], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "poolStartingBlock", + "outputs": [ { - "internalType": "address", - "name": "delegatee", - "type": "address" + "internalType": "uint256", + "name": "", + "type": "uint256" } ], - "name": "delegate", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "inputs": [ - { - "internalType": "address", - "name": "delegatee", - "type": "address" - }, - { - "internalType": "uint256", - "name": "nonce", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "expiry", - "type": "uint256" - }, - { - "internalType": "uint8", - "name": "v", - "type": "uint8" - }, - { - "internalType": "bytes32", - "name": "r", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" - } - ], - "name": "delegateBySig", + "inputs": [], + "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [ - { - "internalType": "address", - "name": "delegator", - "type": "address" - } - ], - "name": "delegates", + "inputs": [], + "name": "rewardPerBlock", "outputs": [ { - "internalType": "address", + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "getCurrentVotes", + "inputs": [], + "name": "rewardPerToken", "outputs": [ { "internalType": "uint256", @@ -410,31 +372,27 @@ }, { "inputs": [], - "name": "getOwner", + "name": "rewardPerTokenStored", "outputs": [ { - "internalType": "address", + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "internalType": "uint256", - "name": "blockNumber", - "type": "uint256" - } - ], - "name": "getPriorVotes", + "inputs": [], + "name": "rewardWithdraw", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "rewardableBlocks", "outputs": [ { "internalType": "uint256", @@ -447,73 +405,50 @@ }, { "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, { "internalType": "uint256", - "name": "addedValue", + "name": "timepoint", "type": "uint256" } ], - "name": "increaseAllowance", + "name": "rewardableBlocksAfterTimepoint", "outputs": [ { - "internalType": "bool", + "internalType": "uint256", "name": "", - "type": "bool" + "type": "uint256" } ], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { "internalType": "address", - "name": "_to", + "name": "", "type": "address" - }, - { - "internalType": "uint256", - "name": "_amount", - "type": "uint256" } ], - "name": "mint", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "mint", + "name": "rewards", "outputs": [ { - "internalType": "bool", + "internalType": "uint256", "name": "", - "type": "bool" + "type": "uint256" } ], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [], - "name": "name", + "name": "rewardsToken", "outputs": [ { - "internalType": "string", + "internalType": "contract IERC20", "name": "", - "type": "string" + "type": "address" } ], "stateMutability": "view", @@ -527,7 +462,7 @@ "type": "address" } ], - "name": "nonces", + "name": "stakedAt", "outputs": [ { "internalType": "uint256", @@ -538,31 +473,12 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "numCheckpoints", - "outputs": [ - { - "internalType": "uint32", - "name": "", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], - "name": "owner", + "name": "stakingToken", "outputs": [ { - "internalType": "address", + "internalType": "contract IERC20", "name": "", "type": "address" } @@ -570,39 +486,38 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, { "inputs": [ { - "internalType": "address", - "name": "_to", - "type": "address" + "internalType": "uint256", + "name": "_reward", + "type": "uint256" }, { "internalType": "uint256", - "name": "_amount", + "name": "_poolExpiryTime", "type": "uint256" } ], - "name": "safeCakeTransfer", + "name": "startPool", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [], - "name": "symbol", + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "totalStakedBlock", "outputs": [ { - "internalType": "string", + "internalType": "uint256", "name": "", - "type": "string" + "type": "uint256" } ], "stateMutability": "view", @@ -625,23 +540,19 @@ "inputs": [ { "internalType": "address", - "name": "recipient", + "name": "newOwner", "type": "address" - }, - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" } ], + "name": "transferOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "unlock", + "outputs": [], "stateMutability": "nonpayable", "type": "function" }, @@ -649,40 +560,30 @@ "inputs": [ { "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "address", - "name": "recipient", + "name": "", "type": "address" - }, - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" } ], - "name": "transferFrom", + "name": "userRewardPerBlockPaid", "outputs": [ { - "internalType": "bool", + "internalType": "uint256", "name": "", - "type": "bool" + "type": "uint256" } ], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { "inputs": [ { - "internalType": "address", - "name": "newOwner", - "type": "address" + "internalType": "uint256", + "name": "_amount", + "type": "uint256" } ], - "name": "transferOwnership", + "name": "withdraw", "outputs": [], "stateMutability": "nonpayable", "type": "function" diff --git a/src/config/constants/contracts.ts b/src/config/constants/contracts.ts index aec3eb87f..cd09c0a40 100644 --- a/src/config/constants/contracts.ts +++ b/src/config/constants/contracts.ts @@ -4,8 +4,8 @@ export default { 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', }, masterChef: { - 56: '0x4dC79Cb5330f8403fA2346C894EA0F19701cd7C9', - 97: '0x5eAdf1a622B441Fb53D2b04D2DBE08078c9b0Bc6', + 56: '0x67905ff1Ada0C11720E7298840206E5bdB8d3646', + 97: '0xE37Aa693d2Ab77721E11e55bfBC723cf4457b78E', }, wbnb: { 56: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 246770af0..4b4d24d27 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -1,40 +1,27 @@ import { PoolConfig, QuoteToken, PoolCategory } from './types' +import contracts from './contracts' const pools: PoolConfig[] = [ - // { - // sousId: 0, - // tokenName: 'CAKE', - // stakingTokenName: QuoteToken.CAKE, - // stakingTokenAddress: '0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82', - // contractAddress: { - // 97: '0xd3af5fe61dbaf8f73149bfcfa9fb653ff096029a', - // 56: '0x73feaa1eE314F8c655E354234017bE2193C9E24E', - // }, - // poolCategory: PoolCategory.CORE, - // projectLink: 'https://pancakeswap.finance/', - // harvest: true, - // tokenPerBlock: '10', - // sortOrder: 1, - // isFinished: false, - // tokenDecimals: 18, - // }, - // { - // sousId: 1, - // tokenName: 'TWT', - // stakingTokenName: QuoteToken.SYRUP, - // stakingTokenAddress: '0x009cF7bC57584b7998236eff51b98A168DceA9B0', - // contractAddress: { - // 97: '0xAfd61Dc94f11A70Ae110dC0E0F2061Af5633061A', - // 56: '0xAfd61Dc94f11A70Ae110dC0E0F2061Af5633061A', - // }, - // poolCategory: PoolCategory.CORE, - // projectLink: 'https://trustwallet.com/', - // harvest: true, - // tokenPerBlock: '20', - // sortOrder: 999, - // isFinished: true, - // tokenDecimals: 18, - // }, + { + sousId: 1, + tokenName: 'BISON', + stakingTokenName: QuoteToken.BISON, + earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + stakingTokenAddress: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + contractAddress: { + 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', + 56: '0x00', + }, + poolCategory: PoolCategory.COMMUNITY, + projectLink: 'https://bishares.finance/', + harvest: true, + lifePerBlock: '0.000459896', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, + }, ] export default pools diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index 21e84f5ad..61212b85f 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -26,6 +26,7 @@ export enum QuoteToken { 'BUSD' = 'BUSD', 'TWT' = 'TWT', 'UST' = 'UST', + 'BISON' = 'BISON', } export enum PoolCategory { @@ -64,16 +65,19 @@ export interface PoolConfig { image?: string tokenName: string stakingTokenName: QuoteToken + earningToken?: string stakingLimit?: number stakingTokenAddress?: string contractAddress: Address poolCategory: PoolCategory projectLink: string - tokenPerBlock: string + lifePerBlock: string sortOrder?: number harvest?: boolean isFinished?: boolean tokenDecimals: number + quoteTokenSymbol: string + quoteTokenAdresses: { 56: string; 97: string } } export type Nft = { diff --git a/src/hooks/useAllEarnings.ts b/src/hooks/useAllEarnings.ts index c4be07751..e8ca16315 100644 --- a/src/hooks/useAllEarnings.ts +++ b/src/hooks/useAllEarnings.ts @@ -15,7 +15,7 @@ const useAllEarnings = () => { const fetchAllBalances = async () => { const calls = farmsConfig.map((farm) => ({ address: getMasterChefAddress(), - name: 'pendingReward', + name: 'pendingLife', params: [farm.pid, account], })) diff --git a/src/hooks/useFarmsWithBalance.ts b/src/hooks/useFarmsWithBalance.ts index bc45f29bf..e235d154d 100644 --- a/src/hooks/useFarmsWithBalance.ts +++ b/src/hooks/useFarmsWithBalance.ts @@ -21,7 +21,7 @@ const useFarmsWithBalance = () => { const fetchBalances = async () => { const calls = farmsConfig.map((farm) => ({ address: getMasterChefAddress(), - name: 'pendingReward', + name: 'pendingLife', params: [farm.pid, account], })) diff --git a/src/hooks/useUnstake.ts b/src/hooks/useUnstake.ts index 34f02d422..1f32de06e 100644 --- a/src/hooks/useUnstake.ts +++ b/src/hooks/useUnstake.ts @@ -27,7 +27,7 @@ const useUnstake = (pid: number) => { return { onUnstake: handleUnstake } } -const SYRUPIDS = [5, 6, 3, 1, 22, 23] +const SYRUPIDS = [1] export const useSousUnstake = (sousId) => { const dispatch = useDispatch() diff --git a/src/state/farms/fetchFarms.ts b/src/state/farms/fetchFarms.ts index 07b1c8578..907b6cff2 100644 --- a/src/state/farms/fetchFarms.ts +++ b/src/state/farms/fetchFarms.ts @@ -86,7 +86,7 @@ const fetchFarms = async () => { } } - const [info, totalAllocPoint, tokenPerBlock] = await multicall(masterchefABI, [ + const [info, totalAllocPoint, lifePerBlock] = await multicall(masterchefABI, [ { address: getMasterChefAddress(), name: 'poolInfo', @@ -98,7 +98,7 @@ const fetchFarms = async () => { }, { address: getMasterChefAddress(), - name: 'tokenPerBlock', + name: 'lifePerBlock', }, ]) @@ -113,7 +113,7 @@ const fetchFarms = async () => { poolWeight: poolWeight.toNumber(), multiplier: `${allocPoint.div(100).toString()}X`, depositFeeBP: info.depositFeeBP, - tokenPerBlock: new BigNumber(tokenPerBlock).toNumber(), + lifePerBlock: new BigNumber(lifePerBlock).toNumber(), } }), ) diff --git a/src/state/pools/fetchPoolsUser.ts b/src/state/pools/fetchPoolsUser.ts index b4cbbff72..c718fb070 100644 --- a/src/state/pools/fetchPoolsUser.ts +++ b/src/state/pools/fetchPoolsUser.ts @@ -93,7 +93,7 @@ export const fetchUserPendingRewards = async (account) => { ) // Cake / Cake pool - const pendingReward = await masterChefContract.methods.pendingReward('0', account).call() + const pendingReward = await masterChefContract.methods.pendingLife('0', account).call() return { ...pendingRewards, 0: new BigNumber(pendingReward).toJSON() } } diff --git a/src/state/types.ts b/src/state/types.ts index e09086c2a..dc245ca49 100644 --- a/src/state/types.ts +++ b/src/state/types.ts @@ -8,8 +8,8 @@ export interface Farm extends FarmConfig { tokenPriceVsQuote?: BigNumber poolWeight?: number depositFeeBP?: number - tokenPerBlock?: number - userData?: { + lifePerBlock?: number + userData?: { allowance: BigNumber tokenBalance: BigNumber stakedBalance: BigNumber diff --git a/src/utils/apr.js b/src/utils/apr.js new file mode 100644 index 000000000..45586f304 --- /dev/null +++ b/src/utils/apr.js @@ -0,0 +1,39 @@ +import BigNumber from 'bignumber.js' +import { BLOCKS_PER_YEAR, CAKE_PER_BLOCK } from 'config' + +/** + * Get the APR value in % + * @param stakingTokenPrice Token price in the same quote currency + * @param rewardTokenPrice Token price in the same quote currency + * @param totalStaked Total amount of stakingToken in the pool + * @param lifePerBlock Amount of new cake allocated to the pool for each new block + * @returns Null if the APR is NaN or infinite. + */ +export const getPoolApr = (stakingTokenPrice, rewardTokenPrice, totalStaked, lifePerBlock) => { + const totalRewardPricePerYear = new BigNumber(rewardTokenPrice).times(lifePerBlock).times(BLOCKS_PER_YEAR) + const totalStakingTokenInPool = new BigNumber(stakingTokenPrice).times(totalStaked) + const apr = totalRewardPricePerYear.div(totalStakingTokenInPool).times(100) + return apr.isNaN() || !apr.isFinite() ? null : apr.toNumber() +} + +/** + * Get farm APR value in % + * @param poolWeight allocationPoint / totalAllocationPoint + * @param cakePriceUsd Cake price in USD + * @param poolLiquidityUsd Total pool liquidity in USD + * @returns + */ +export const getFarmApr = (poolWeight, cakePriceUsd, poolLiquidityUsd) => { + const yearlyCakeRewardAllocation = CAKE_PER_BLOCK.times(BLOCKS_PER_YEAR).times(poolWeight) + const apr = yearlyCakeRewardAllocation.times(cakePriceUsd).div(poolLiquidityUsd).times(100) + return apr.isNaN() || !apr.isFinite() ? null : apr.toNumber() +} + +export const getLPprice = async () => { + const response = await fetch('https://api.pancakeswap.info/api/v2/pairs') + const data = await response.json() + + return data.data +} + +export default null diff --git a/src/views/Farms/Farms.tsx b/src/views/Farms/Farms.tsx index b3a4e39f0..0ea392449 100644 --- a/src/views/Farms/Farms.tsx +++ b/src/views/Farms/Farms.tsx @@ -68,7 +68,7 @@ const Farms: React.FC = (farmsProps) => { // if (!farm.tokenAmount || !farm.lpTotalInQuoteToken || !farm.lpTotalInQuoteToken) { // return farm // } - const cakeRewardPerBlock = new BigNumber(farm.tokenPerBlock || 1).times(new BigNumber(farm.poolWeight)) .div(new BigNumber(10).pow(18)) + const cakeRewardPerBlock = new BigNumber(farm.lifePerBlock || 1).times(new BigNumber(farm.poolWeight)) .div(new BigNumber(10).pow(18)) const cakeRewardPerYear = cakeRewardPerBlock.times(BLOCKS_PER_YEAR) let apy = cakePrice.times(cakeRewardPerYear); diff --git a/src/views/Home/components/CakeStats.tsx b/src/views/Home/components/CakeStats.tsx index b106a5ac0..8b6bdd5fe 100644 --- a/src/views/Home/components/CakeStats.tsx +++ b/src/views/Home/components/CakeStats.tsx @@ -32,9 +32,9 @@ const CakeStats = () => { const cakeSupply = getBalanceNumber(circSupply); const marketCap = eggPrice.times(circSupply); - let tokenPerBlock = 0; - if(farms && farms[0] && farms[0].tokenPerBlock){ - tokenPerBlock = new BigNumber(farms[0].tokenPerBlock).div(new BigNumber(10).pow(18)).toNumber(); + let lifePerBlock = 0; + if(farms && farms[0] && farms[0].lifePerBlock){ + lifePerBlock = new BigNumber(farms[0].lifePerBlock).div(new BigNumber(10).pow(18)).toNumber(); } return ( @@ -61,7 +61,7 @@ const CakeStats = () => { {TranslateString(540, 'New BISON/block')} - {tokenPerBlock} + {lifePerBlock} diff --git a/src/views/Pools/Syrup.tsx b/src/views/Pools/Syrup.tsx index f96dbd20f..bcb9b2ebb 100644 --- a/src/views/Pools/Syrup.tsx +++ b/src/views/Pools/Syrup.tsx @@ -52,7 +52,7 @@ const Farm: React.FC = () => { rewardTokenFarm?.quoteTokenSymbol, ) - const totalRewardPricePerYear = rewardTokenPriceInBNB.times(pool.tokenPerBlock).times(BLOCKS_PER_YEAR) + const totalRewardPricePerYear = rewardTokenPriceInBNB.times(pool.lifePerBlock).times(BLOCKS_PER_YEAR) const totalStakingTokenInPool = stakingTokenPriceInBNB.times(getBalanceNumber(pool.totalStaked)) const apy = totalRewardPricePerYear.div(totalStakingTokenInPool).times(100) @@ -67,19 +67,6 @@ const Farm: React.FC = () => { return ( - -
- - {TranslateString(282, 'SYRUP Pool')} - -
    -
  • {TranslateString(580, 'Stake CAKE to earn new tokens.')}
    • -
  • {TranslateString(404, 'You can unstake at any time.')}
    • -
  • {TranslateString(406, 'Rewards are calculated per block.')}
    • -
-
- SYRUP POOL icon - @@ -88,7 +75,7 @@ const Farm: React.FC = () => { {orderBy(openPools, ['sortOrder']).map((pool) => ( ))} - + {/* */} diff --git a/src/views/Pools/components/PoolTabButtons/index.tsx b/src/views/Pools/components/PoolTabButtons/index.tsx index 7f215e1a0..0287714b3 100644 --- a/src/views/Pools/components/PoolTabButtons/index.tsx +++ b/src/views/Pools/components/PoolTabButtons/index.tsx @@ -14,7 +14,7 @@ const PoolTabButtons = () => { {TranslateString(999, 'Active')} - + {TranslateString(999, 'Inactive')} From 9dc3fdc4ac20a340d8f040e2672756e7753e4966 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sat, 21 Aug 2021 19:19:04 +0545 Subject: [PATCH 08/39] syrup apy --- public/images/egg/9.png | Bin 10998 -> 7435 bytes public/images/egg/logo.png | Bin 44005 -> 7435 bytes src/App.tsx | 8 +- src/Providers.tsx | 2 +- src/components/Tags.tsx | 6 +- src/config/constants/pools.ts | 2 +- src/config/constants/types.ts | 2 +- src/hooks/useContract.ts | 6 + src/state/actions.ts | 1 + src/state/bison/index.ts | 74 +++++ src/state/farms/fetchFarms.ts | 10 +- src/state/hooks.ts | 95 ++++-- src/state/index.ts | 15 +- src/state/prices/index.ts | 43 +++ src/state/types.ts | 40 +++ src/utils/apr.js | 6 +- src/views/Pools/Syrup.tsx | 53 ++-- src/views/Pools/components/CardFooter.tsx | 12 +- src/views/Pools/components/PoolCard.tsx | 3 +- src/views/Pools/components/PoolCardLP.tsx | 344 ++++++++++++++++++++++ src/views/Trade/IFrame.tsx | 28 +- 21 files changed, 679 insertions(+), 71 deletions(-) create mode 100644 src/state/bison/index.ts create mode 100644 src/state/prices/index.ts create mode 100644 src/views/Pools/components/PoolCardLP.tsx diff --git a/public/images/egg/9.png b/public/images/egg/9.png index 298e45d5140a639ff0a2d90837df424301dbc063..93b118bef3ccca25de1fadf29d87b371985a6373 100644 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 10998 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 diff --git a/public/images/egg/logo.png b/public/images/egg/logo.png index 48a2f8a19698ece3b57a970fa63e6c382f271658..93b118bef3ccca25de1fadf29d87b371985a6373 100644 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 44005 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 import('./views/Home')) -const Farms = lazy(() => import('./views/Farms')) +// const Farms = lazy(() => import('./views/Farms')) // const Lottery = lazy(() => import('./views/Lottery')) const Pools = lazy(() => import('./views/Pools')) // const Ifos = lazy(() => import('./views/Ifos')) @@ -35,6 +35,10 @@ const App: React.FC = () => { useFetchPublicData() + useFetchPriceData() + + useFetchTotalSupplyData() + return ( diff --git a/src/Providers.tsx b/src/Providers.tsx index e04f1e5bf..9e7e706c7 100644 --- a/src/Providers.tsx +++ b/src/Providers.tsx @@ -12,7 +12,7 @@ import store from 'state' const Providers: React.FC = ({ children }) => { const rpcUrl = getRpcUrl() - const chainId = parseInt(process.env.REACT_APP_CHAIN_ID); + const chainId = parseInt(process.env.REACT_APP_CHAIN_ID) return ( diff --git a/src/components/Tags.tsx b/src/components/Tags.tsx index 1a66ae288..008b0bcd2 100644 --- a/src/components/Tags.tsx +++ b/src/components/Tags.tsx @@ -14,19 +14,19 @@ const RiskTag = ({ risk }) => ( ) const CoreTag = () => ( - }> + }> Core ) const CommunityTag = () => ( - }> + }> Community ) const BinanceTag = () => ( - }> + }> Binance ) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 4b4d24d27..d13a30817 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -15,7 +15,7 @@ const pools: PoolConfig[] = [ poolCategory: PoolCategory.COMMUNITY, projectLink: 'https://bishares.finance/', harvest: true, - lifePerBlock: '0.000459896', + tokenPerBlock: '0.000459896', sortOrder: 1, isFinished: false, tokenDecimals: 18, diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index 61212b85f..e0d09586c 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -71,7 +71,7 @@ export interface PoolConfig { contractAddress: Address poolCategory: PoolCategory projectLink: string - lifePerBlock: string + tokenPerBlock: string sortOrder?: number harvest?: boolean isFinished?: boolean diff --git a/src/hooks/useContract.ts b/src/hooks/useContract.ts index be9f18703..d31938a7d 100644 --- a/src/hooks/useContract.ts +++ b/src/hooks/useContract.ts @@ -14,6 +14,7 @@ import lotteryTicket from 'config/abi/lotteryNft.json' import masterChef from 'config/abi/masterchef.json' import sousChef from 'config/abi/sousChef.json' import sousChefBnb from 'config/abi/sousChefBnb.json' +import univ2lp from 'config/abi/uni_v2_lp.json' const useContract = (abi: AbiItem, address: string, contractOptions?: ContractOptions) => { const web3 = useWeb3() @@ -69,6 +70,11 @@ export const useMasterchef = () => { return useContract(abi, getMasterChefAddress()) } +export const useLP = (address: string) => { + const lpAbi = (univ2lp as unknown) as AbiItem + return useContract(lpAbi, address) +} + export const useSousChef = (id) => { const config = poolsConfig.find((pool) => pool.sousId === id) const rawAbi = config.poolCategory === PoolCategory.BINANCE ? sousChefBnb : sousChef diff --git a/src/state/actions.ts b/src/state/actions.ts index d2a0a0cb6..43608d913 100644 --- a/src/state/actions.ts +++ b/src/state/actions.ts @@ -1,4 +1,5 @@ export { fetchFarmsPublicDataAsync, fetchFarmUserDataAsync } from './farms' +export { fetchPriceDataAsync, fetchTotalSupplyDataAsync } from './bison' export { fetchPoolsPublicDataAsync, fetchPoolsUserDataAsync, diff --git a/src/state/bison/index.ts b/src/state/bison/index.ts new file mode 100644 index 000000000..a2441dfbb --- /dev/null +++ b/src/state/bison/index.ts @@ -0,0 +1,74 @@ +/* eslint-disable no-param-reassign */ +import { createSlice } from '@reduxjs/toolkit' +import { BisonState } from '../types' + +const initialState: BisonState = { data: { price: 0, totalSupply: 0 } } + +export const bisonSlice = createSlice({ + name: 'Bison', + initialState, + reducers: { + setPriceData: (state, action) => { + const priceData = action.payload + return { data: { ...state.data, price: priceData } } + }, + setTotalSupplyData: (state, action) => { + const totalSupplyData = action.payload + return { data: { ...state.data, totalSupply: totalSupplyData } } + }, + }, +}) + +// Actions +export const { setPriceData, setTotalSupplyData } = bisonSlice.actions + +// Thunks +export const fetchPriceDataAsync = () => async (dispatch) => { + let BISONValue = 0 + await fetch( + 'https://api.bishares.finance/price-bnbpool.php?key=236547643&pool=0xe0e3f3698ba35487e5285fdfd31a5b8d8f564d8b&token=0x9eab0a93b0cd5d904493694f041bdcedb97b88c6&decimals=18', + ) + .then((res) => res.json()) + .then( + (result) => { + if (result.status === true) { + BISONValue = result.data + } else { + BISONValue = 0 + } + }, + (error) => { + BISONValue = 0 + }, + ) + .catch(() => { + BISONValue = 0 + }) + dispatch(setPriceData(BISONValue)) +} + +export const fetchTotalSupplyDataAsync = () => async (dispatch) => { + let totalSupplyValue = 0 + await fetch( + 'https://api.bscscan.com/api?module=stats&action=tokenCsupply&contractaddress=0x9eab0a93b0cd5d904493694f041bdcedb97b88c6&apikey=5E61V2DWBJANXNURC6Q991F828E6W5KX1P&decimals=18', + ) + .then((res) => res.json()) + .then( + (result) => { + if (result.status === '1') { + totalSupplyValue = result.result / 10 ** 18 + } else { + totalSupplyValue = 0 + } + }, + (error) => { + totalSupplyValue = 0 + }, + ) + .catch(() => { + totalSupplyValue = 0 + }) + dispatch(setTotalSupplyData(totalSupplyValue)) +} + +export default bisonSlice.reducer diff --git a/src/state/farms/fetchFarms.ts b/src/state/farms/fetchFarms.ts index 907b6cff2..5ad86d8af 100644 --- a/src/state/farms/fetchFarms.ts +++ b/src/state/farms/fetchFarms.ts @@ -49,8 +49,14 @@ const fetchFarms = async () => { }, ] - const [tokenBalanceLP, quoteTokenBlanceLP, lpTokenBalanceMC, lpTotalSupply, tokenDecimals, quoteTokenDecimals] = - await multicall(erc20, calls) + const [ + tokenBalanceLP, + quoteTokenBlanceLP, + lpTokenBalanceMC, + lpTotalSupply, + tokenDecimals, + quoteTokenDecimals, + ] = await multicall(erc20, calls) let tokenAmount let lpTotalInQuoteToken diff --git a/src/state/hooks.ts b/src/state/hooks.ts index 9bf288109..5bf63740c 100644 --- a/src/state/hooks.ts +++ b/src/state/hooks.ts @@ -2,9 +2,17 @@ import BigNumber from 'bignumber.js' import { useEffect, useMemo } from 'react' import { useSelector, useDispatch } from 'react-redux' import useRefresh from 'hooks/useRefresh' -import { fetchFarmsPublicDataAsync, fetchPoolsPublicDataAsync, fetchPoolsUserDataAsync } from './actions' -import { State, Farm, Pool } from './types' +import { useAppDispatch } from 'state' +import { + fetchFarmsPublicDataAsync, + fetchPoolsPublicDataAsync, + fetchPoolsUserDataAsync, + fetchPriceDataAsync, + fetchTotalSupplyDataAsync, +} from './actions' +import { State, Farm, Pool, PriceState } from './types' import { QuoteToken } from '../config/constants/types' +import { fetchPrices } from './prices' const ZERO = new BigNumber(0) @@ -13,7 +21,25 @@ export const useFetchPublicData = () => { const { slowRefresh } = useRefresh() useEffect(() => { dispatch(fetchFarmsPublicDataAsync()) - // dispatch(fetchPoolsPublicDataAsync()) + dispatch(fetchPoolsPublicDataAsync()) + }, [dispatch, slowRefresh]) +} + +// For Price +export const useFetchPriceData = () => { + const dispatch = useDispatch() + const { slowRefresh } = useRefresh() + useEffect(() => { + dispatch(fetchPriceDataAsync()) + }, [dispatch, slowRefresh]) +} + +// For Total Supply +export const useFetchTotalSupplyData = () => { + const dispatch = useDispatch() + const { slowRefresh } = useRefresh() + useEffect(() => { + dispatch(fetchTotalSupplyDataAsync()) }, [dispatch, slowRefresh]) } @@ -45,7 +71,6 @@ export const useFarmUser = (pid) => { } } - // Pools export const usePools = (account): Pool[] => { @@ -69,11 +94,35 @@ export const usePoolFromPid = (sousId): Pool => { // Prices export const usePriceBnbBusd = (): BigNumber => { - const pid = 4 // BUSD-BNB LP + const pid = 2 // BUSD-BNB LP const farm = useFarmFromPid(pid) return farm.tokenPriceVsQuote ? new BigNumber(farm.tokenPriceVsQuote) : ZERO } +export const useFetchPriceList = () => { + const { slowRefresh } = useRefresh() + const dispatch = useAppDispatch() + + useEffect(() => { + dispatch(fetchPrices()) + }, [dispatch, slowRefresh]) +} + +export const useGetApiPrices = () => { + const prices: PriceState['data'] = useSelector((state: State) => state.prices.data) + return prices +} + +export const useGetApiPrice = (address: string) => { + const prices = useGetApiPrices() + + if (!prices) { + return null + } + + return prices[address.toLowerCase()] +} + export const usePriceCakeBusd = (): BigNumber => { // const pid = 1 // CAKE-BNB LP // const bnbPriceUSD = usePriceBnbBusd() @@ -84,24 +133,34 @@ export const usePriceCakeBusd = (): BigNumber => { return farm.tokenPriceVsQuote ? new BigNumber(farm.tokenPriceVsQuote) : ZERO; } +export const useBISONPrice = (): BigNumber => { + const { price } = useSelector((state: State) => state.bison.data) + return price ? new BigNumber(price) : ZERO +} + +export const useTotalSupplyPrice = (): BigNumber => { + const { totalSupply } = useSelector((state: State) => state.bison.data) + return totalSupply ? new BigNumber(totalSupply) : ZERO +} + export const useTotalValue = (): BigNumber => { - const farms = useFarms(); - const bnbPrice = usePriceBnbBusd(); - const cakePrice = usePriceCakeBusd(); - let value = new BigNumber(0); + const farms = useFarms() + const bnbPrice = usePriceBnbBusd() + const cakePrice = usePriceCakeBusd() + let value = new BigNumber(0) for (let i = 0; i < farms.length; i++) { const farm = farms[i] if (farm.lpTotalInQuoteToken) { - let val; + let val if (farm.quoteTokenSymbol === QuoteToken.BNB) { - val = (bnbPrice.times(farm.lpTotalInQuoteToken)); - }else if (farm.quoteTokenSymbol === QuoteToken.CAKE) { - val = (cakePrice.times(farm.lpTotalInQuoteToken)); - }else{ - val = (farm.lpTotalInQuoteToken); + val = bnbPrice.times(farm.lpTotalInQuoteToken) + } else if (farm.quoteTokenSymbol === QuoteToken.CAKE) { + val = cakePrice.times(farm.lpTotalInQuoteToken) + } else { + val = farm.lpTotalInQuoteToken } - value = value.plus(val); + value = value.plus(val) } } - return value; -} \ No newline at end of file + return value +} diff --git a/src/state/index.ts b/src/state/index.ts index 612a4c6c2..c04fee09d 100644 --- a/src/state/index.ts +++ b/src/state/index.ts @@ -1,11 +1,24 @@ import { configureStore } from '@reduxjs/toolkit' +import { useDispatch } from 'react-redux' import farmsReducer from './farms' import poolsReducer from './pools' +import pricesReducer from './prices' +import bisonReducer from './bison' -export default configureStore({ +const store = configureStore({ devTools: process.env.NODE_ENV !== 'production', reducer: { farms: farmsReducer, pools: poolsReducer, + bison: bisonReducer, + prices: pricesReducer, }, }) + +/** + * @see https://redux-toolkit.js.org/usage/usage-with-typescript#getting-the-dispatch-type + */ +export type AppDispatch = typeof store.dispatch +export const useAppDispatch = () => useDispatch() + +export default store diff --git a/src/state/prices/index.ts b/src/state/prices/index.ts new file mode 100644 index 000000000..418a60550 --- /dev/null +++ b/src/state/prices/index.ts @@ -0,0 +1,43 @@ +/* eslint-disable no-param-reassign */ +import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit' +import { PriceApiResponse, PriceApiThunk, PriceState } from 'state/types' + +const initialState: PriceState = { + isLoading: false, + lastUpdated: null, + data: null, +} + +// Thunks +export const fetchPrices = createAsyncThunk('prices/fetch', async () => { + const response = await fetch('https://api.pancakeswap.info/api/v2/tokens') + const data = (await response.json()) as PriceApiResponse + // Return normalized token names + return { + updated_at: data.updated_at, + data: Object.keys(data.data).reduce((accum, token) => { + return { + ...accum, + [token.toLowerCase()]: parseFloat(data.data[token].price), + } + }, {}), + } +}) + +export const pricesSlice = createSlice({ + name: 'prices', + initialState, + reducers: {}, + extraReducers: (builder) => { + builder.addCase(fetchPrices.pending, (state) => { + state.isLoading = true + }) + builder.addCase(fetchPrices.fulfilled, (state, action: PayloadAction) => { + state.isLoading = false + state.lastUpdated = action.payload.updated_at + state.data = action.payload.data + }) + }, +}) + +export default pricesSlice.reducer diff --git a/src/state/types.ts b/src/state/types.ts index dc245ca49..3df636bfc 100644 --- a/src/state/types.ts +++ b/src/state/types.ts @@ -34,14 +34,54 @@ export interface Pool extends PoolConfig { export interface FarmsState { data: Farm[] } +export interface BisonState { + data: {} +} export interface PoolsState { data: Pool[] } +// API Price State +export interface PriceApiList { + /* eslint-disable camelcase */ + [key: string]: { + name: string + symbol: string + price: string + price_BNB: string + } +} + +export interface PriceApiListThunk { + /* eslint-disable camelcase */ + [key: string]: number +} + +export interface PriceApiResponse { + /* eslint-disable camelcase */ + updated_at: string + data: PriceApiList +} + +export interface PriceApiThunk { + /* eslint-disable camelcase */ + updated_at: string + data: PriceApiListThunk +} + +export interface PriceState { + isLoading: boolean + lastUpdated: string + data: PriceApiListThunk +} + // Global state +// Global state export interface State { farms: FarmsState pools: PoolsState + prices: PriceState + bison: BisonState } diff --git a/src/utils/apr.js b/src/utils/apr.js index 45586f304..ba7fc7f5f 100644 --- a/src/utils/apr.js +++ b/src/utils/apr.js @@ -6,11 +6,11 @@ import { BLOCKS_PER_YEAR, CAKE_PER_BLOCK } from 'config' * @param stakingTokenPrice Token price in the same quote currency * @param rewardTokenPrice Token price in the same quote currency * @param totalStaked Total amount of stakingToken in the pool - * @param lifePerBlock Amount of new cake allocated to the pool for each new block + * @param tokenPerBlock Amount of new cake allocated to the pool for each new block * @returns Null if the APR is NaN or infinite. */ -export const getPoolApr = (stakingTokenPrice, rewardTokenPrice, totalStaked, lifePerBlock) => { - const totalRewardPricePerYear = new BigNumber(rewardTokenPrice).times(lifePerBlock).times(BLOCKS_PER_YEAR) +export const getPoolApr = (stakingTokenPrice, rewardTokenPrice, totalStaked, tokenPerBlock) => { + const totalRewardPricePerYear = new BigNumber(rewardTokenPrice).times(tokenPerBlock).times(BLOCKS_PER_YEAR) const totalStakingTokenInPool = new BigNumber(stakingTokenPrice).times(totalStaked) const apr = totalRewardPricePerYear.div(totalStakingTokenInPool).times(100) return apr.isNaN() || !apr.isFinite() ? null : apr.toNumber() diff --git a/src/views/Pools/Syrup.tsx b/src/views/Pools/Syrup.tsx index bcb9b2ebb..aebc15311 100644 --- a/src/views/Pools/Syrup.tsx +++ b/src/views/Pools/Syrup.tsx @@ -16,9 +16,11 @@ import FlexLayout from 'components/layout/Flex' import Page from 'components/layout/Page' import Coming from './components/Coming' import PoolCard from './components/PoolCard' +import PoolCardLP from './components/PoolCardLP' import PoolTabButtons from './components/PoolTabButtons' import Divider from './components/Divider' +const CHAIN_ID = process.env.REACT_APP_CHAIN_ID const Farm: React.FC = () => { const { path } = useRouteMatch() const TranslateString = useI18n() @@ -41,19 +43,22 @@ const Farm: React.FC = () => { const poolsWithApy = pools.map((pool) => { const isBnbPool = pool.poolCategory === PoolCategory.BINANCE - const rewardTokenFarm = farms.find((f) => f.tokenSymbol === pool.tokenName) - const stakingTokenFarm = farms.find((s) => s.tokenSymbol === pool.stakingTokenName) + // const rewardTokenFarm = farms.find((f) => f.tokenSymbol === pool.quoteTokenSymbol) + // const stakingTokenFarm = farms.find((s) => s.tokenAddresses[CHAIN_ID] === pool.quoteTokenAdresses[CHAIN_ID]) // /!\ Assume that the farm quote price is BNB - const stakingTokenPriceInBNB = isBnbPool ? new BigNumber(1) : new BigNumber(stakingTokenFarm?.tokenPriceVsQuote) - const rewardTokenPriceInBNB = priceToBnb( - pool.tokenName, - rewardTokenFarm?.tokenPriceVsQuote, - rewardTokenFarm?.quoteTokenSymbol, - ) + // const stakingTokenPriceInBNB = isBnbPool ? new BigNumber(1) : new BigNumber(stakingTokenFarm?.tokenPriceVsQuote) + // const rewardTokenPriceInBNB = priceToBnb( + // pool.tokenName, + // rewardTokenFarm?.tokenPriceVsQuote, + // rewardTokenFarm?.quoteTokenSymbol, + // ) - const totalRewardPricePerYear = rewardTokenPriceInBNB.times(pool.lifePerBlock).times(BLOCKS_PER_YEAR) - const totalStakingTokenInPool = stakingTokenPriceInBNB.times(getBalanceNumber(pool.totalStaked)) + const rewardTokenPrice = new BigNumber(1) + const stakingTokenPrice = new BigNumber(1) + + const totalRewardPricePerYear = rewardTokenPrice.times(pool.tokenPerBlock).times(BLOCKS_PER_YEAR) + const totalStakingTokenInPool = stakingTokenPrice.times(getBalanceNumber(pool.totalStaked)) const apy = totalRewardPricePerYear.div(totalStakingTokenInPool).times(100) return { @@ -67,21 +72,31 @@ const Farm: React.FC = () => { return ( + +
+ + {TranslateString(282, 'Earn BISON')} + +
+ - <> - {orderBy(openPools, ['sortOrder']).map((pool) => ( - - ))} - {/* */} - + {orderBy(openPools, ['sortOrder']).map((pool) => { + if (pool.earningToken === pool.stakingTokenAddress) { + return + } + return + })} - {orderBy(finishedPools, ['sortOrder']).map((pool) => ( - - ))} + {orderBy(finishedPools, ['sortOrder']).map((pool) => { + if (pool.earningToken === pool.stakingTokenAddress) { + return + } + return + })} diff --git a/src/views/Pools/components/CardFooter.tsx b/src/views/Pools/components/CardFooter.tsx index db8d98bd5..a7bcb7d74 100644 --- a/src/views/Pools/components/CardFooter.tsx +++ b/src/views/Pools/components/CardFooter.tsx @@ -21,6 +21,7 @@ interface Props { isFinished: boolean blocksUntilStart: number poolCategory: PoolCategory + stakingTokenName: string } const StyledFooter = styled.div<{ isFinished: boolean }>` @@ -79,6 +80,7 @@ const CardFooter: React.FC = ({ isFinished, blocksUntilStart, poolCategory, + stakingTokenName, }) => { const [isOpen, setIsOpen] = useState(false) const TranslateString = useI18n() @@ -105,23 +107,23 @@ const CardFooter: React.FC = ({ 🥞{' '} - {TranslateString(408, 'Total')} + Total {stakingTokenName} Staked - {blocksUntilStart > 0 && ( + {/* {blocksUntilStart > 0 && ( - )} - {blocksUntilStart === 0 && blocksRemaining > 0 && ( + )} */} + {blocksRemaining > 0 && ( - + diff --git a/src/views/Pools/components/PoolCard.tsx b/src/views/Pools/components/PoolCard.tsx index 9f75fc753..af0d5b98a 100644 --- a/src/views/Pools/components/PoolCard.tsx +++ b/src/views/Pools/components/PoolCard.tsx @@ -181,7 +181,7 @@ const PoolCard: React.FC = ({ pool }) => { ))} -
{TranslateString(736, 'APR')}:
+
{TranslateString(736, 'APY')}:
{isFinished || isOldSyrup || !apy || apy?.isNaN() || !apy?.isFinite() ? ( '-' ) : ( @@ -205,6 +205,7 @@ const PoolCard: React.FC = ({ pool }) => { isFinished={isFinished} blocksUntilStart={blocksUntilStart} poolCategory={poolCategory} + stakingTokenName={stakingTokenName} /> ) diff --git a/src/views/Pools/components/PoolCardLP.tsx b/src/views/Pools/components/PoolCardLP.tsx new file mode 100644 index 000000000..382934a42 --- /dev/null +++ b/src/views/Pools/components/PoolCardLP.tsx @@ -0,0 +1,344 @@ +import BigNumber from 'bignumber.js' +import React, { useCallback, useState } from 'react' +import styled from 'styled-components' +import { Button, IconButton, useModal, AddIcon, Image } from '@pancakeswap-libs/uikit' +import { useWallet } from '@binance-chain/bsc-use-wallet' +import UnlockButton from 'components/UnlockButton' +import Label from 'components/Label' +import { useERC20, useLP } from 'hooks/useContract' +import { useSousApprove } from 'hooks/useApprove' +import useI18n from 'hooks/useI18n' +import { useSousStake } from 'hooks/useStake' +import { useSousUnstake } from 'hooks/useUnstake' +import useBlock from 'hooks/useBlock' +import { getBalanceNumber } from 'utils/formatBalance' +import { useSousHarvest } from 'hooks/useHarvest' +import Balance from 'components/Balance' +import { QuoteToken, PoolCategory } from 'config/constants/types' +import { Pool } from 'state/types' +import { useGetApiPrice, useFarms, usePriceBnbBusd, useBISONPrice } from 'state/hooks' +import { getPoolApr, getLPprice } from 'utils/apr' +import DepositModal from './DepositModal' +import WithdrawModal from './WithdrawModal' +import CompoundModal from './CompoundModal' +import CardTitle from './CardTitle' +import Card from './Card' +import OldSyrupTitle from './OldSyrupTitle' +import HarvestButton from './HarvestButton' +import CardFooter from './CardFooter' + +interface HarvestProps { + pool: Pool +} + +const PoolCard: React.FC = ({ pool }) => { + const { + sousId, + image, + tokenName, + stakingTokenName, + stakingTokenAddress, + projectLink, + harvest, + tokenDecimals, + poolCategory, + totalStaked, + startBlock, + endBlock, + isFinished, + userData, + stakingLimit, + tokenPerBlock, + } = pool + // Pools using native BNB behave differently than pools using a token + const isBnbPool = poolCategory === PoolCategory.BINANCE + const TranslateString = useI18n() + const stakingTokenContract = useERC20(stakingTokenAddress) + const lpTokenContract = useLP(stakingTokenAddress) + + const [apy, setAPY] = useState(new BigNumber(0)) + + const [liquidity, setLiquidity] = useState(new BigNumber(0)) + const [totalSupply, setTotalSupply] = useState(new BigNumber(0)) + + const [reserve0, setReserve0] = useState(new BigNumber(0)) + const [reserve1, setReserve1] = useState(new BigNumber(0)) + + const [token0, setToken0] = useState() + const [token1, setToken1] = useState() + + const { account } = useWallet() + const block = useBlock() + const { onApprove } = useSousApprove(stakingTokenContract, sousId) + const { onStake } = useSousStake(sousId, isBnbPool) + const { onUnstake } = useSousUnstake(sousId) + const { onReward } = useSousHarvest(sousId, isBnbPool) + const farms = useFarms() + + // APR + // const rewardTokenPrice = useGetApiPrice(pool.earningToken ? pool.earningToken : '') + + // const token0price = useGetApiPrice(token0 !== undefined ? token0 : '') + // const token1price = useGetApiPrice(token1 !== undefined ? token1 : '') + + const token0price = useBISONPrice() + const token1price = usePriceBnbBusd() + const rewardTokenPrice = useBISONPrice() + + const [requestedApproval, setRequestedApproval] = useState(false) + const [pendingTx, setPendingTx] = useState(false) + + const allowance = new BigNumber(userData?.allowance || 0) + const stakingTokenBalance = new BigNumber(userData?.stakingTokenBalance || 0) + const stakedBalance = new BigNumber(userData?.stakedBalance || 0) + const earnings = new BigNumber(userData?.pendingReward || 0) + + const blocksUntilStart = Math.max(startBlock - block, 0) + const blocksRemaining = Math.max(endBlock - block, 0) + const isOldSyrup = stakingTokenName === QuoteToken.SYRUP + const accountHasStakedBalance = stakedBalance?.toNumber() > 0 + const needsApproval = !accountHasStakedBalance && !allowance.toNumber() && !isBnbPool + const isCardActive = isFinished && accountHasStakedBalance + + const convertedLimit = new BigNumber(stakingLimit).multipliedBy(new BigNumber(10).pow(tokenDecimals)) + const [onPresentDeposit] = useModal( + , + ) + + const [onPresentCompound] = useModal( + , + ) + + const [onPresentWithdraw] = useModal( + , + ) + + const handleApprove = useCallback(async () => { + try { + setRequestedApproval(true) + const txHash = await onApprove() + // user rejected tx or didn't go thru + if (!txHash) { + setRequestedApproval(false) + } + } catch (e) { + console.error(e) + } + }, [onApprove, setRequestedApproval]) + + React.useEffect(() => { + if (stakingTokenAddress !== undefined) { + lpTokenContract.methods + .token0() + .call() + .then((res0) => { + setToken0(res0) + lpTokenContract.methods + .token1() + .call() + .then((res1) => { + setToken1(res1) + lpTokenContract.methods + .totalSupply() + .call() + .then((res2) => { + setTotalSupply(new BigNumber(res2)) + lpTokenContract.methods + .getReserves() + .call() + .then((reserves) => { + setReserve0(new BigNumber(getBalanceNumber(reserves._reserve0))) + setReserve1(new BigNumber(getBalanceNumber(reserves._reserve1))) + }) + }) + }) + }) + } + }, [lpTokenContract, stakingTokenAddress]) + + React.useEffect(() => { + if (token0 !== undefined && token1 !== undefined && reserve0 !== undefined && reserve1 !== undefined) { + const pair = (token0 !== undefined ? token0 : '').concat('_').concat(token1) + getLPprice().then((data) => { + // setLiquidity(new BigNumber(data[pair].liquidity)) + + // console.log('pairData:', data[pair]) + + // console.log('reserve0:', reserve0.toString()) + // console.log('reserve1:', reserve1.toString()) + + const baseValue = new BigNumber(token0price).times(reserve0) + const quoteValue = new BigNumber(token1price).times(reserve1) + + const totalValue = baseValue.plus(quoteValue) + const lpTokenPrice = totalValue.div(getBalanceNumber(totalSupply)).times(token0price) + + // console.log('totalSupply:', getBalanceNumber(totalSupply).toString()) + // console.log('token0price:', token0price.toString()) + // console.log('token1price:', token1price.toString()) + + // console.log('baseValue:', baseValue.toString()) + // console.log('quoteValue:', quoteValue.toString()) + // console.log('totalValue:', totalValue.toString()) + // console.log('lpTokenPrice:', lpTokenPrice.toString()) + + const apr = getPoolApr( + lpTokenPrice, + rewardTokenPrice, + getBalanceNumber(pool.totalStaked, pool.tokenDecimals), + parseFloat(pool.tokenPerBlock), + ) + setAPY(new BigNumber(apr)) + // console.log('APR:', apr) + }) + } + }, [token0, token1, token0price, token1price, totalSupply, pool, rewardTokenPrice, reserve0, reserve1]) + + return ( + + {isFinished && sousId !== 0 && } +
+ + {isOldSyrup && '[OLD]'} {tokenName} {TranslateString(348, 'Pool')} + +
+
+ {tokenName} +
+ {account && harvest && !isOldSyrup && ( + { + setPendingTx(true) + await onReward() + setPendingTx(false) + }} + /> + )} +
+ {!isOldSyrup ? ( + + + {sousId === 0 && account && harvest && ( + + )} + + ) : ( + + )} +
+ + + ) +} + +const PoolFinishedSash = styled.div` + background-image: url('/images/pool-finished-sash.svg'); + background-position: top right; + background-repeat: not-repeat; + height: 135px; + position: absolute; + right: -24px; + top: -24px; + width: 135px; +` + +const StyledCardActions = styled.div` + display: flex; + justify-content: center; + margin: 16px 0; + width: 100%; + box-sizing: border-box; +` + +const BalanceAndCompound = styled.div` + display: flex; + align-items: center; + justify-content: space-between; + flex-direction: row; +` + +const StyledActionSpacer = styled.div` + height: ${(props) => props.theme.spacing[4]}px; + width: ${(props) => props.theme.spacing[4]}px; +` + +const StyledDetails = styled.div` + display: flex; + font-size: 14px; +` + +export default PoolCard diff --git a/src/views/Trade/IFrame.tsx b/src/views/Trade/IFrame.tsx index 02fd6ef94..25257cb09 100644 --- a/src/views/Trade/IFrame.tsx +++ b/src/views/Trade/IFrame.tsx @@ -10,26 +10,26 @@ interface IFrameProps { const IFrame: React.FC = (props) => { const { url, title } = props - const iframeRef = useRef(null); - const { isDark } = useContext(ThemeContext); + const iframeRef = useRef(null) + const { isDark } = useContext(ThemeContext) const { selectedLanguage } = useContext(LanguageContext) - const sendSettings = e =>{ + const sendSettings = (e) => { const payload = { isDark, - selectedLanguage + selectedLanguage, } iframeRef.current.sendMessage(payload) - }; + } return ( - + ) } -export default IFrame \ No newline at end of file +export default IFrame From 11a32a1935443ec88f4edd2737a7f88940a5b640 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sat, 21 Aug 2021 20:06:12 +0545 Subject: [PATCH 09/39] update pool LP --- src/views/Pools/components/PoolCardLP.tsx | 50 +++++++---------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/src/views/Pools/components/PoolCardLP.tsx b/src/views/Pools/components/PoolCardLP.tsx index 382934a42..ee32151e3 100644 --- a/src/views/Pools/components/PoolCardLP.tsx +++ b/src/views/Pools/components/PoolCardLP.tsx @@ -56,7 +56,6 @@ const PoolCard: React.FC = ({ pool }) => { const stakingTokenContract = useERC20(stakingTokenAddress) const lpTokenContract = useLP(stakingTokenAddress) - const [apy, setAPY] = useState(new BigNumber(0)) const [liquidity, setLiquidity] = useState(new BigNumber(0)) const [totalSupply, setTotalSupply] = useState(new BigNumber(0)) @@ -160,43 +159,24 @@ const PoolCard: React.FC = ({ pool }) => { } }, [lpTokenContract, stakingTokenAddress]) - React.useEffect(() => { - if (token0 !== undefined && token1 !== undefined && reserve0 !== undefined && reserve1 !== undefined) { - const pair = (token0 !== undefined ? token0 : '').concat('_').concat(token1) - getLPprice().then((data) => { - // setLiquidity(new BigNumber(data[pair].liquidity)) - - // console.log('pairData:', data[pair]) - - // console.log('reserve0:', reserve0.toString()) - // console.log('reserve1:', reserve1.toString()) + const getApr = useCallback(() => { + const baseValue = new BigNumber(token0price).times(reserve0) + const quoteValue = new BigNumber(token1price).times(reserve1) - const baseValue = new BigNumber(token0price).times(reserve0) - const quoteValue = new BigNumber(token1price).times(reserve1) + const totalValue = baseValue.plus(quoteValue) + const lpTokenPrice = totalValue.div(getBalanceNumber(totalSupply)).times(token0price) - const totalValue = baseValue.plus(quoteValue) - const lpTokenPrice = totalValue.div(getBalanceNumber(totalSupply)).times(token0price) + const apr = getPoolApr( + lpTokenPrice, + rewardTokenPrice, + getBalanceNumber(pool.totalStaked, pool.tokenDecimals), + parseFloat(pool.tokenPerBlock), + ) + return new BigNumber(apr); + +}, [pool.tokenDecimals, pool.tokenPerBlock, pool.totalStaked, reserve0, reserve1, rewardTokenPrice, token0price, token1price, totalSupply]) - // console.log('totalSupply:', getBalanceNumber(totalSupply).toString()) - // console.log('token0price:', token0price.toString()) - // console.log('token1price:', token1price.toString()) - - // console.log('baseValue:', baseValue.toString()) - // console.log('quoteValue:', quoteValue.toString()) - // console.log('totalValue:', totalValue.toString()) - // console.log('lpTokenPrice:', lpTokenPrice.toString()) - - const apr = getPoolApr( - lpTokenPrice, - rewardTokenPrice, - getBalanceNumber(pool.totalStaked, pool.tokenDecimals), - parseFloat(pool.tokenPerBlock), - ) - setAPY(new BigNumber(apr)) - // console.log('APR:', apr) - }) - } - }, [token0, token1, token0price, token1price, totalSupply, pool, rewardTokenPrice, reserve0, reserve1]) +const apy = getApr(); return ( Date: Sat, 21 Aug 2021 21:19:27 +0545 Subject: [PATCH 10/39] add pool --- public/images/tokens/BISON-BNB.png | Bin 0 -> 7435 bytes src/config/constants/pools.ts | 20 ++++++++++++++++++++ src/config/constants/types.ts | 1 + src/state/bison/index.ts | 2 +- src/state/hooks.ts | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 public/images/tokens/BISON-BNB.png diff --git a/public/images/tokens/BISON-BNB.png b/public/images/tokens/BISON-BNB.png new file mode 100644 index 0000000000000000000000000000000000000000..93b118bef3ccca25de1fadf29d87b371985a6373 GIT binary patch literal 7435 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 JPDHLkV1j(t9A5wc literal 0 HcmV?d00001 diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index d13a30817..25dbab58e 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -22,6 +22,26 @@ const pools: PoolConfig[] = [ quoteTokenSymbol: QuoteToken.BISON, quoteTokenAdresses: contracts.cake, }, + { + sousId: 2, + tokenName: 'BISON-BNB', + stakingTokenName: QuoteToken.BISONBNB, + earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', + contractAddress: { + 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', + 56: '0x00', + }, + poolCategory: PoolCategory.COMMUNITY, + projectLink: 'https://bishares.finance/', + harvest: true, + tokenPerBlock: '0.000459896', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, + }, ] export default pools diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index e0d09586c..e1465a31c 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -27,6 +27,7 @@ export enum QuoteToken { 'TWT' = 'TWT', 'UST' = 'UST', 'BISON' = 'BISON', + 'BISONBNB' = 'BISON-BNB', } export enum PoolCategory { diff --git a/src/state/bison/index.ts b/src/state/bison/index.ts index a2441dfbb..9d67f4189 100644 --- a/src/state/bison/index.ts +++ b/src/state/bison/index.ts @@ -26,7 +26,7 @@ export const { setPriceData, setTotalSupplyData } = bisonSlice.actions export const fetchPriceDataAsync = () => async (dispatch) => { let BISONValue = 0 await fetch( - 'https://api.bishares.finance/price-bnbpool.php?key=236547643&pool=0xe0e3f3698ba35487e5285fdfd31a5b8d8f564d8b&token=0x9eab0a93b0cd5d904493694f041bdcedb97b88c6&decimals=18', + 'https://api.stosentertainment.com/price-bnbpool.php?key=236547643&pool=0xe0e3f3698ba35487e5285fdfd31a5b8d8f564d8b&token=0x9eab0a93b0cd5d904493694f041bdcedb97b88c6&decimals=18', ) .then((res) => res.json()) .then( diff --git a/src/state/hooks.ts b/src/state/hooks.ts index 5bf63740c..b4a0ba81f 100644 --- a/src/state/hooks.ts +++ b/src/state/hooks.ts @@ -20,7 +20,7 @@ export const useFetchPublicData = () => { const dispatch = useDispatch() const { slowRefresh } = useRefresh() useEffect(() => { - dispatch(fetchFarmsPublicDataAsync()) + // dispatch(fetchFarmsPublicDataAsync()) dispatch(fetchPoolsPublicDataAsync()) }, [dispatch, slowRefresh]) } From fb3a030dfbc703afc86ce18936470a1d29618e66 Mon Sep 17 00:00:00 2001 From: Manish Basnet Date: Sat, 21 Aug 2021 22:43:23 +0545 Subject: [PATCH 11/39] static value added --- src/config/constants/pools.ts | 39 + src/state/bison/index.ts | 2 +- src/state/hooks.ts | 6 +- src/state/types.ts | 2 +- yarn.lock | 5734 +++++++++++++++++---------------- 5 files changed, 3073 insertions(+), 2710 deletions(-) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 25dbab58e..6f52cf569 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -41,7 +41,46 @@ const pools: PoolConfig[] = [ tokenDecimals: 18, quoteTokenSymbol: QuoteToken.BISON, quoteTokenAdresses: contracts.cake, + },{ + sousId: 3, + tokenName: 'BISON', + stakingTokenName: QuoteToken.BISON, + earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + stakingTokenAddress: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + contractAddress: { + 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', + 56: '0x00', + }, + poolCategory: PoolCategory.COMMUNITY, + projectLink: 'https://bishares.finance/', + harvest: true, + tokenPerBlock: '0.000459896', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, }, + { + sousId: 4, + tokenName: 'BISON-BNB', + stakingTokenName: QuoteToken.BISONBNB, + earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', + contractAddress: { + 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', + 56: '0x00', + }, + poolCategory: PoolCategory.COMMUNITY, + projectLink: 'https://bishares.finance/', + harvest: true, + tokenPerBlock: '0.000459896', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, + } ] export default pools diff --git a/src/state/bison/index.ts b/src/state/bison/index.ts index 9d67f4189..1e778d92d 100644 --- a/src/state/bison/index.ts +++ b/src/state/bison/index.ts @@ -32,7 +32,7 @@ export const fetchPriceDataAsync = () => async (dispatch) => { .then( (result) => { if (result.status === true) { - BISONValue = result.data + BISONValue = 4 } else { BISONValue = 0 } diff --git a/src/state/hooks.ts b/src/state/hooks.ts index b4a0ba81f..637354c93 100644 --- a/src/state/hooks.ts +++ b/src/state/hooks.ts @@ -1,6 +1,6 @@ import BigNumber from 'bignumber.js' import { useEffect, useMemo } from 'react' -import { useSelector, useDispatch } from 'react-redux' +import { useSelector, useDispatch, RootStateOrAny } from 'react-redux' import useRefresh from 'hooks/useRefresh' import { useAppDispatch } from 'state' import { @@ -134,12 +134,12 @@ export const usePriceCakeBusd = (): BigNumber => { } export const useBISONPrice = (): BigNumber => { - const { price } = useSelector((state: State) => state.bison.data) + const { price } = useSelector((state: RootStateOrAny) => state.bison.data); return price ? new BigNumber(price) : ZERO } export const useTotalSupplyPrice = (): BigNumber => { - const { totalSupply } = useSelector((state: State) => state.bison.data) + const { totalSupply } = useSelector((state: RootStateOrAny) => state.bison.data) return totalSupply ? new BigNumber(totalSupply) : ZERO } diff --git a/src/state/types.ts b/src/state/types.ts index 3df636bfc..d658d5a0d 100644 --- a/src/state/types.ts +++ b/src/state/types.ts @@ -35,7 +35,7 @@ export interface FarmsState { data: Farm[] } export interface BisonState { - data: {} + data: any } export interface PoolsState { diff --git a/yarn.lock b/yarn.lock index 36cc6e24d..31dcefd1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,17 +18,24 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11", "@babel/code-frame@^7.5.5": +"@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" - integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.5.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== + dependencies: + "@babel/highlight" "^7.14.5" + +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" + integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== "@babel/core@7.12.3": version "7.12.3" @@ -52,253 +59,267 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4", "@babel/core@^7.9.0": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" - integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.10" +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8" + integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" + "@babel/helper-module-transforms" "^7.15.0" + "@babel/helpers" "^7.14.8" + "@babel/parser" "^7.15.0" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" convert-source-map "^1.7.0" debug "^4.1.0" - gensync "^1.0.0-beta.1" + gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" - semver "^5.4.1" + semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" - integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== +"@babel/generator@^7.12.1", "@babel/generator@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" + integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== dependencies: - "@babel/types" "^7.12.11" + "@babel/types" "^7.15.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" - integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== +"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61" + integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.14.5" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" - integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191" + integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w== dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-explode-assignable-expression" "^7.14.5" + "@babel/types" "^7.14.5" -"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" - integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== +"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" + integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== dependencies: - "@babel/compat-data" "^7.12.5" - "@babel/helper-validator-option" "^7.12.1" - browserslist "^4.14.5" - semver "^5.5.0" + "@babel/compat-data" "^7.15.0" + "@babel/helper-validator-option" "^7.14.5" + browserslist "^4.16.6" + semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" - integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== +"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7" + integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.15.0" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" + "@babel/helper-split-export-declaration" "^7.14.5" -"@babel/helper-create-regexp-features-plugin@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f" - integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ== +"@babel/helper-create-regexp-features-plugin@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4" + integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.14.5" regexpu-core "^4.7.1" -"@babel/helper-define-map@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" - integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== - dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.5" - lodash "^4.17.19" - -"@babel/helper-explode-assignable-expression@^7.10.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" - integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" - integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== - dependencies: - "@babel/helper-get-function-arity" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/types" "^7.12.11" - -"@babel/helper-get-function-arity@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" - integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== - dependencies: - "@babel/types" "^7.12.10" - -"@babel/helper-hoist-variables@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" - integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" - integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== - dependencies: - "@babel/types" "^7.12.7" - -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== - dependencies: - "@babel/types" "^7.12.5" - -"@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - lodash "^4.17.19" - -"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" - integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== - dependencies: - "@babel/types" "^7.12.10" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-remap-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" - integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-wrap-function" "^7.10.4" - "@babel/types" "^7.12.1" - -"@babel/helper-replace-supers@^7.12.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" - integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.7" - "@babel/helper-optimise-call-expression" "^7.12.10" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.11" - -"@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" - integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" - integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== +"@babel/helper-define-polyfill-provider@^0.2.2": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6" + integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew== dependencies: - "@babel/types" "^7.12.11" - -"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - -"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" - integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== - -"@babel/helper-wrap-function@^7.10.4": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" - integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow== + "@babel/helper-compilation-targets" "^7.13.0" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/traverse" "^7.13.0" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + +"@babel/helper-explode-assignable-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645" + integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== + "@babel/types" "^7.14.5" + +"@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/types" "^7.14.5" + +"@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-member-expression-to-functions@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" + integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== + dependencies: + "@babel/types" "^7.15.0" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" + integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" + integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" + "@babel/helper-simple-access" "^7.14.8" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.9" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" + +"@babel/helper-optimise-call-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" + integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-remap-async-to-generator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6" + integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-wrap-function" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" + integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.15.0" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" + +"@babel/helper-simple-access@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" + integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== + dependencies: + "@babel/types" "^7.14.8" + +"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4" + integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== + +"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helper-wrap-function@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff" + integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ== + dependencies: + "@babel/helper-function-name" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" + integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== + dependencies: + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" - integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" + integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== -"@babel/plugin-proposal-async-generator-functions@^7.12.1": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" - integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e" + integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" - "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" + "@babel/plugin-proposal-optional-chaining" "^7.14.5" + +"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" + integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.14.5" + "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@7.12.1", "@babel/plugin-proposal-class-properties@^7.12.1": +"@babel/plugin-proposal-class-properties@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== @@ -306,6 +327,23 @@ "@babel/helper-create-class-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e" + integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-proposal-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681" + integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-proposal-decorators@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f" @@ -315,39 +353,39 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-decorators" "^7.12.1" -"@babel/plugin-proposal-dynamic-import@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" - integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ== +"@babel/plugin-proposal-dynamic-import@^7.12.1", "@babel/plugin-proposal-dynamic-import@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c" + integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" - integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw== +"@babel/plugin-proposal-export-namespace-from@^7.12.1", "@babel/plugin-proposal-export-namespace-from@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76" + integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" - integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== +"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb" + integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" - integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA== +"@babel/plugin-proposal-logical-assignment-operators@^7.12.1", "@babel/plugin-proposal-logical-assignment-operators@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738" + integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": +"@babel/plugin-proposal-nullish-coalescing-operator@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== @@ -355,6 +393,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6" + integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-proposal-numeric-separator@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6" @@ -363,30 +409,32 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" - integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== +"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18" + integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" - integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== +"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363" + integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/compat-data" "^7.14.7" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.14.5" -"@babel/plugin-proposal-optional-catch-binding@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" - integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== +"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c" + integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining@7.12.1": version "7.12.1" @@ -397,30 +445,40 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" - integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== +"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603" + integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" - integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== +"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d" + integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" - integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== +"@babel/plugin-proposal-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636" + integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + +"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8" + integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -436,21 +494,28 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" - integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== +"@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-decorators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd" - integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20" + integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-dynamic-import@^7.8.0": +"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== @@ -465,11 +530,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz#a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd" - integrity sha512-1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.14.5.tgz#2ff654999497d7d7d142493260005263731da180" + integrity sha512-9WK5ZwKCdWHxVuU13XNT6X73FGmutAXeor5lGFq6qhOFtMFUF4jkbijuyUdZZlpYq6E2hZeZf/u3959X9wsv0Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -485,12 +550,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" - integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg== +"@babel/plugin-syntax-jsx@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201" + integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -534,100 +599,106 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" - integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== +"@babel/plugin-syntax-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5" - integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA== +"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" - integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== +"@babel/plugin-syntax-typescript@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" + integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" - integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== +"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a" + integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A== dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-block-scoped-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" - integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== +"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67" + integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.14.5" -"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.12.11": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" - integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== +"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4" + integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-classes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" - integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== +"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" + integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-define-map" "^7.10.4" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" + integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" - integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== +"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f" + integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-destructuring@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" - integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== +"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576" + integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" - integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== +"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a" + integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-duplicate-keys@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" - integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== +"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954" + integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-exponentiation-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" - integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== +"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493" + integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-flow-strip-types@7.12.1": version "7.12.1" @@ -637,176 +708,183 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-flow" "^7.12.1" -"@babel/plugin-transform-for-of@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" - integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== +"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb" + integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-function-name@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" - integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== +"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2" + integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" - integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== +"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78" + integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-member-expression-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" - integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== +"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7" + integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-modules-amd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" - integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== +"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7" + integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" - integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== +"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281" + integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-module-transforms" "^7.15.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-simple-access" "^7.14.8" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" - integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== +"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29" + integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA== dependencies: - "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" - integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== +"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0" + integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" - integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" + integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-create-regexp-features-plugin" "^7.14.5" -"@babel/plugin-transform-new-target@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" - integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== +"@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8" + integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-object-super@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" - integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== +"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45" + integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" -"@babel/plugin-transform-parameters@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" - integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3" + integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" - integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== +"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34" + integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-react-constant-elements@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz#4471f0851feec3231cc9aaa0dccde39947c1ac1e" - integrity sha512-KOHd0tIRLoER+J+8f9DblZDa1fLGPwaaN1DI1TVHuQFOpjHV22C3CUB3obeC4fexHY9nx+fH0hQNvLFFfA1mxA== +"@babel/plugin-transform-react-constant-elements@^7.12.1": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz#41790d856f7c5cec82d2bcf5d0e5064d682522ed" + integrity sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-react-display-name@7.12.1", "@babel/plugin-transform-react-display-name@^7.12.1": +"@babel/plugin-transform-react-display-name@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d" integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-development@^7.12.1", "@babel/plugin-transform-react-jsx-development@^7.12.7": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7" - integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg== +"@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@^7.14.5": + version "7.15.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz#6aaac6099f1fcf6589d35ae6be1b6e10c8c602b9" + integrity sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-react-jsx-development@^7.12.1", "@babel/plugin-transform-react-jsx-development@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz#1a6c73e2f7ed2c42eebc3d2ad60b0c7494fcb9af" + integrity sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ== dependencies: - "@babel/plugin-transform-react-jsx" "^7.12.12" + "@babel/plugin-transform-react-jsx" "^7.14.5" "@babel/plugin-transform-react-jsx-self@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" - integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.9.tgz#33041e665453391eb6ee54a2ecf3ba1d46bd30f4" + integrity sha512-Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-jsx-source@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b" - integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.5.tgz#79f728e60e6dbd31a2b860b0bf6c9765918acf1d" + integrity sha512-1TpSDnD9XR/rQ2tzunBVPThF5poaYT9GqP+of8fAtguYuI/dm2RkrMBDemsxtY0XBzvW7nXjYM0hRyKX9QYj7Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e" - integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw== +"@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.14.5": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c" + integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.10" - "@babel/helper-module-imports" "^7.12.5" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-jsx" "^7.12.1" - "@babel/types" "^7.12.12" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-jsx" "^7.14.5" + "@babel/types" "^7.14.9" -"@babel/plugin-transform-react-pure-annotations@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" - integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== +"@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz#18de612b84021e3a9802cbc212c9d9f46d0d11fc" + integrity sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-regenerator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" - integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== +"@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f" + integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" - integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== +"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304" + integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@7.12.1": version "7.12.1" @@ -819,73 +897,76 @@ semver "^5.5.1" "@babel/plugin-transform-runtime@^7.5.5": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562" - integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA== - dependencies: - "@babel/helper-module-imports" "^7.12.5" - "@babel/helper-plugin-utils" "^7.10.4" - semver "^5.5.1" + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3" + integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + babel-plugin-polyfill-corejs2 "^0.2.2" + babel-plugin-polyfill-corejs3 "^0.2.2" + babel-plugin-polyfill-regenerator "^0.2.2" + semver "^6.3.0" -"@babel/plugin-transform-shorthand-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" - integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== +"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58" + integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" - integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== +"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.14.6": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144" + integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" -"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" - integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== +"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9" + integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-template-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" - integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== +"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93" + integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" - integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== +"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4" + integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-typescript@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4" - integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e" + integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-typescript" "^7.12.1" + "@babel/helper-create-class-features-plugin" "^7.15.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-typescript" "^7.14.5" -"@babel/plugin-transform-unicode-escapes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" - integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== +"@babel/plugin-transform-unicode-escapes@^7.12.1", "@babel/plugin-transform-unicode-escapes@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b" + integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-unicode-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" - integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== +"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e" + integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@7.12.1": version "7.12.1" @@ -959,79 +1040,86 @@ core-js-compat "^3.6.2" semver "^5.5.0" -"@babel/preset-env@^7.8.4", "@babel/preset-env@^7.9.5": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" - integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== - dependencies: - "@babel/compat-data" "^7.12.7" - "@babel/helper-compilation-targets" "^7.12.5" - "@babel/helper-module-imports" "^7.12.5" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.11" - "@babel/plugin-proposal-async-generator-functions" "^7.12.1" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-dynamic-import" "^7.12.1" - "@babel/plugin-proposal-export-namespace-from" "^7.12.1" - "@babel/plugin-proposal-json-strings" "^7.12.1" - "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.7" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" - "@babel/plugin-syntax-async-generators" "^7.8.0" - "@babel/plugin-syntax-class-properties" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.0" +"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464" + integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q== + dependencies: + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" + "@babel/plugin-proposal-async-generator-functions" "^7.14.9" + "@babel/plugin-proposal-class-properties" "^7.14.5" + "@babel/plugin-proposal-class-static-block" "^7.14.5" + "@babel/plugin-proposal-dynamic-import" "^7.14.5" + "@babel/plugin-proposal-export-namespace-from" "^7.14.5" + "@babel/plugin-proposal-json-strings" "^7.14.5" + "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" + "@babel/plugin-proposal-numeric-separator" "^7.14.5" + "@babel/plugin-proposal-object-rest-spread" "^7.14.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.14.5" + "@babel/plugin-proposal-optional-chaining" "^7.14.5" + "@babel/plugin-proposal-private-methods" "^7.14.5" + "@babel/plugin-proposal-private-property-in-object" "^7.14.5" + "@babel/plugin-proposal-unicode-property-regex" "^7.14.5" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" - "@babel/plugin-syntax-top-level-await" "^7.12.1" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-async-to-generator" "^7.12.1" - "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.11" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-computed-properties" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-dotall-regex" "^7.12.1" - "@babel/plugin-transform-duplicate-keys" "^7.12.1" - "@babel/plugin-transform-exponentiation-operator" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-function-name" "^7.12.1" - "@babel/plugin-transform-literals" "^7.12.1" - "@babel/plugin-transform-member-expression-literals" "^7.12.1" - "@babel/plugin-transform-modules-amd" "^7.12.1" - "@babel/plugin-transform-modules-commonjs" "^7.12.1" - "@babel/plugin-transform-modules-systemjs" "^7.12.1" - "@babel/plugin-transform-modules-umd" "^7.12.1" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1" - "@babel/plugin-transform-new-target" "^7.12.1" - "@babel/plugin-transform-object-super" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-property-literals" "^7.12.1" - "@babel/plugin-transform-regenerator" "^7.12.1" - "@babel/plugin-transform-reserved-words" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.7" - "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.10" - "@babel/plugin-transform-unicode-escapes" "^7.12.1" - "@babel/plugin-transform-unicode-regex" "^7.12.1" - "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.11" - core-js-compat "^3.8.0" - semver "^5.5.0" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-transform-arrow-functions" "^7.14.5" + "@babel/plugin-transform-async-to-generator" "^7.14.5" + "@babel/plugin-transform-block-scoped-functions" "^7.14.5" + "@babel/plugin-transform-block-scoping" "^7.14.5" + "@babel/plugin-transform-classes" "^7.14.9" + "@babel/plugin-transform-computed-properties" "^7.14.5" + "@babel/plugin-transform-destructuring" "^7.14.7" + "@babel/plugin-transform-dotall-regex" "^7.14.5" + "@babel/plugin-transform-duplicate-keys" "^7.14.5" + "@babel/plugin-transform-exponentiation-operator" "^7.14.5" + "@babel/plugin-transform-for-of" "^7.14.5" + "@babel/plugin-transform-function-name" "^7.14.5" + "@babel/plugin-transform-literals" "^7.14.5" + "@babel/plugin-transform-member-expression-literals" "^7.14.5" + "@babel/plugin-transform-modules-amd" "^7.14.5" + "@babel/plugin-transform-modules-commonjs" "^7.15.0" + "@babel/plugin-transform-modules-systemjs" "^7.14.5" + "@babel/plugin-transform-modules-umd" "^7.14.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" + "@babel/plugin-transform-new-target" "^7.14.5" + "@babel/plugin-transform-object-super" "^7.14.5" + "@babel/plugin-transform-parameters" "^7.14.5" + "@babel/plugin-transform-property-literals" "^7.14.5" + "@babel/plugin-transform-regenerator" "^7.14.5" + "@babel/plugin-transform-reserved-words" "^7.14.5" + "@babel/plugin-transform-shorthand-properties" "^7.14.5" + "@babel/plugin-transform-spread" "^7.14.6" + "@babel/plugin-transform-sticky-regex" "^7.14.5" + "@babel/plugin-transform-template-literals" "^7.14.5" + "@babel/plugin-transform-typeof-symbol" "^7.14.5" + "@babel/plugin-transform-unicode-escapes" "^7.14.5" + "@babel/plugin-transform-unicode-regex" "^7.14.5" + "@babel/preset-modules" "^0.1.4" + "@babel/types" "^7.15.0" + babel-plugin-polyfill-corejs2 "^0.2.2" + babel-plugin-polyfill-corejs3 "^0.2.2" + babel-plugin-polyfill-regenerator "^0.2.2" + core-js-compat "^3.16.0" + semver "^6.3.0" -"@babel/preset-modules@^0.1.3": +"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== @@ -1055,16 +1143,17 @@ "@babel/plugin-transform-react-jsx-source" "^7.12.1" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" -"@babel/preset-react@^7.9.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9" - integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ== +"@babel/preset-react@^7.12.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c" + integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-react-display-name" "^7.12.1" - "@babel/plugin-transform-react-jsx" "^7.12.10" - "@babel/plugin-transform-react-jsx-development" "^7.12.7" - "@babel/plugin-transform-react-pure-annotations" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-transform-react-display-name" "^7.14.5" + "@babel/plugin-transform-react-jsx" "^7.14.5" + "@babel/plugin-transform-react-jsx-development" "^7.14.5" + "@babel/plugin-transform-react-pure-annotations" "^7.14.5" "@babel/preset-typescript@7.12.1": version "7.12.1" @@ -1075,11 +1164,11 @@ "@babel/plugin-transform-typescript" "^7.12.1" "@babel/runtime-corejs3@^7.10.2": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4" - integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d" + integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A== dependencies: - core-js-pure "^3.0.0" + core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" "@babel/runtime@7.12.1": @@ -1096,44 +1185,43 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" - integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" + integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" - integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== - dependencies: - "@babel/code-frame" "^7.12.11" - "@babel/generator" "^7.12.11" - "@babel/helper-function-name" "^7.12.11" - "@babel/helper-split-export-declaration" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/types" "^7.12.12" +"@babel/template@^7.10.4", "@babel/template@^7.14.5", "@babel/template@^7.3.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" + integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.15.0" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" - integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" + integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1319,11 +1407,11 @@ integrity sha512-VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ== "@crowdin/crowdin-api-client@^1.10.1": - version "1.10.1" - resolved "https://registry.yarnpkg.com/@crowdin/crowdin-api-client/-/crowdin-api-client-1.10.1.tgz#ba3a076dab164a78ffde10af2e48ab3be2fe3fce" - integrity sha512-9evXMN74D6UdGdn9tFk2CAmfCGTZew6UN30xE1FVgwBVSr6U82bxJTtFD9JTnPe2BcqIE1MEMJ8EfK+jw11Z9w== + version "1.11.3" + resolved "https://registry.yarnpkg.com/@crowdin/crowdin-api-client/-/crowdin-api-client-1.11.3.tgz#ba513d2e92456bd53f50a3b685a5d61bd2111c64" + integrity sha512-JhT55F1u5pfZTiwTCnGyR5IxccQD5e4Y5SPWcalq8uYUMOz4jdorDKCH0j0NQXnLSvSdD+PdWAnK403FlDrZJQ== dependencies: - axios "^0.19.0" + axios "^0.21.1" "@csstools/convert-colors@^1.4.0": version "1.4.0" @@ -1357,22 +1445,37 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@eslint/eslintrc@^0.2.2": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" - integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.19" minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@ethereumjs/common@^2.3.0", "@ethereumjs/common@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.4.0.tgz#2d67f6e6ba22246c5c89104e6b9a119fb3039766" + integrity sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w== + dependencies: + crc-32 "^1.2.0" + ethereumjs-util "^7.1.0" + +"@ethereumjs/tx@^3.2.1": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378" + integrity sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA== + dependencies: + "@ethereumjs/common" "^2.4.0" + ethereumjs-util "^7.1.0" + "@ethersproject/abi@5.0.7": version "5.0.7" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" @@ -1389,178 +1492,180 @@ "@ethersproject/strings" "^5.0.4" "@ethersproject/abi@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.9.tgz#738c1c557e56d8f395a5a27caef9b0449bc85a10" - integrity sha512-ily2OufA2DTrxkiHQw5GqbkMSnNKuwZBqKsajtT0ERhZy1r9w2CpW1bmtRMIGzaqQxCdn/GEoFogexk72cBBZQ== - dependencies: - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/hash" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/strings" "^5.0.4" - -"@ethersproject/abstract-provider@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.7.tgz#04ee3bfe43323384e7fecf6c774975b8dec4bdc9" - integrity sha512-NF16JGn6M0zZP5ZS8KtDL2Rh7yHxZbUjBIHLNHMm/0X0BephhjUWy8jqs/Zks6kDJRzNthgmPVy41Ec0RYWPYA== - dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/networks" "^5.0.3" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/transactions" "^5.0.5" - "@ethersproject/web" "^5.0.6" - -"@ethersproject/abstract-signer@^5.0.6": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.9.tgz#238ddc06031aeb9dfceee2add965292d7dd1acbf" - integrity sha512-CM5UNmXQaA03MyYARFDDRjHWBxujO41tVle7glf5kHcQsDDULgqSVpkliLJMtPzZjOKFeCVZBHybTZDEZg5zzg== + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.4.0.tgz#a6d63bdb3672f738398846d4279fa6b6c9818242" + integrity sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw== + dependencies: + "@ethersproject/address" "^5.4.0" + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/constants" "^5.4.0" + "@ethersproject/hash" "^5.4.0" + "@ethersproject/keccak256" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/properties" "^5.4.0" + "@ethersproject/strings" "^5.4.0" + +"@ethersproject/abstract-provider@^5.4.0": + version "5.4.1" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.4.1.tgz#e404309a29f771bd4d28dbafadcaa184668c2a6e" + integrity sha512-3EedfKI3LVpjSKgAxoUaI+gB27frKsxzm+r21w9G60Ugk+3wVLQwhi1LsEJAKNV7WoZc8CIpNrATlL1QFABjtQ== + dependencies: + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/networks" "^5.4.0" + "@ethersproject/properties" "^5.4.0" + "@ethersproject/transactions" "^5.4.0" + "@ethersproject/web" "^5.4.0" + +"@ethersproject/abstract-signer@^5.4.0": + version "5.4.1" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.1.tgz#e4e9abcf4dd4f1ba0db7dff9746a5f78f355ea81" + integrity sha512-SkkFL5HVq1k4/25dM+NWP9MILgohJCgGv5xT5AcRruGz4ILpfHeBtO/y6j+Z3UN/PAjDeb4P7E51Yh8wcGNLGA== dependencies: - "@ethersproject/abstract-provider" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" + "@ethersproject/abstract-provider" "^5.4.0" + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/properties" "^5.4.0" -"@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.5": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.8.tgz#0c551659144a5a7643c6bea337149d410825298f" - integrity sha512-V87DHiZMZR6hmFYmoGaHex0D53UEbZpW75uj8AqPbjYUmi65RB4N2LPRcJXuWuN2R0Y2CxkvW6ArijWychr5FA== - dependencies: - "@ethersproject/bignumber" "^5.0.10" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/rlp" "^5.0.3" - -"@ethersproject/base64@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.6.tgz#26311ebf29ea3d0b9c300ccf3e1fdc44b7481516" - integrity sha512-HwrGn8YMiUf7bcdVvB4NJ+eWT0BtEFpDtrYxVXEbR7p/XBSJjwiR7DEggIiRvxbualMKg+EZijQWJ3az2li0uw== +"@ethersproject/address@^5.0.4", "@ethersproject/address@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.4.0.tgz#ba2d00a0f8c4c0854933b963b9a3a9f6eb4a37a3" + integrity sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q== dependencies: - "@ethersproject/bytes" "^5.0.4" + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/keccak256" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/rlp" "^5.4.0" -"@ethersproject/bignumber@^5.0.10", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.0.8": - version "5.0.12" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.12.tgz#fe4a78667d7cb01790f75131147e82d6ea7e7cba" - integrity sha512-mbFZjwthx6vFlHG9owXP/C5QkNvsA+xHpDCkPPPdG2n1dS9AmZAL5DI0InNLid60rQWL3MXpEl19tFmtL7Q9jw== +"@ethersproject/base64@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.4.0.tgz#7252bf65295954c9048c7ca5f43e5c86441b2a9a" + integrity sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ== dependencies: - "@ethersproject/bytes" "^5.0.8" - "@ethersproject/logger" "^5.0.5" - bn.js "^4.4.0" + "@ethersproject/bytes" "^5.4.0" -"@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.8.tgz#cf1246a6a386086e590063a4602b1ffb6cc43db1" - integrity sha512-O+sJNVGzzuy51g+EMK8BegomqNIg+C2RO6vOt0XP6ac4o4saiq69FnjlsrNslaiMFVO7qcEHBsWJ9hx1tj1lMw== +"@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.4.0": + version "5.4.1" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.4.1.tgz#64399d3b9ae80aa83d483e550ba57ea062c1042d" + integrity sha512-fJhdxqoQNuDOk6epfM7yD6J8Pol4NUCy1vkaGAkuujZm0+lNow//MKu1hLhRiYV4BsOHyBv5/lsTjF+7hWwhJg== dependencies: - "@ethersproject/logger" "^5.0.5" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + bn.js "^4.11.9" -"@ethersproject/constants@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.7.tgz#44ff979e5781b17c8c6901266896c3ee745f4e7e" - integrity sha512-cbQK1UpE4hamB52Eg6DLhJoXeQ1plSzekh5Ujir1xdREdwdsZPPXKczkrWqBBR0KyywJZHN/o/hj0w8j7scSGg== +"@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.4.0.tgz#56fa32ce3bf67153756dbaefda921d1d4774404e" + integrity sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA== dependencies: - "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/logger" "^5.4.0" -"@ethersproject/hash@^5.0.4": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.9.tgz#81252a848185b584aa600db4a1a68cad9229a4d4" - integrity sha512-e8/i2ZDeGSgCxXT0vocL54+pMbw5oX5fNjb2E3bAIvdkh5kH29M7zz1jHu1QDZnptIuvCZepIbhUH8lxKE2/SQ== - dependencies: - "@ethersproject/abstract-signer" "^5.0.6" - "@ethersproject/address" "^5.0.5" - "@ethersproject/bignumber" "^5.0.8" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.4" - "@ethersproject/strings" "^5.0.4" +"@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.4.0.tgz#ee0bdcb30bf1b532d2353c977bf2ef1ee117958a" + integrity sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q== + dependencies: + "@ethersproject/bignumber" "^5.4.0" -"@ethersproject/keccak256@^5.0.0-beta.130", "@ethersproject/keccak256@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.6.tgz#5b5ba715ef1be86efde5c271f896fa0daf0e1efe" - integrity sha512-eJ4Id/i2rwrf5JXEA7a12bG1phuxjj47mPZgDUbttuNBodhSuZF2nEO5QdpaRjmlphQ8Kt9PNqY/z7lhtJptZg== +"@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.4.0.tgz#d18a8e927e828e22860a011f39e429d388344ae0" + integrity sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA== + dependencies: + "@ethersproject/abstract-signer" "^5.4.0" + "@ethersproject/address" "^5.4.0" + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/keccak256" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/properties" "^5.4.0" + "@ethersproject/strings" "^5.4.0" + +"@ethersproject/keccak256@^5.0.0-beta.130", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.4.0.tgz#7143b8eea4976080241d2bd92e3b1f1bf7025318" + integrity sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A== dependencies: - "@ethersproject/bytes" "^5.0.4" + "@ethersproject/bytes" "^5.4.0" js-sha3 "0.5.7" -"@ethersproject/logger@^5.0.5": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.8.tgz#135c1903d35c878265f3cbf2b287042c4c20d5d4" - integrity sha512-SkJCTaVTnaZ3/ieLF5pVftxGEFX56pTH+f2Slrpv7cU0TNpUZNib84QQdukd++sWUp/S7j5t5NW+WegbXd4U/A== - -"@ethersproject/networks@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.6.tgz#4d6586bbebfde1c027504ebf6dfb783b29c3803a" - integrity sha512-2Cg1N5109zzFOBfkyuPj+FfF7ioqAsRffmybJ2lrsiB5skphIAE72XNSCs4fqktlf+rwSh/5o/UXRjXxvSktZw== - dependencies: - "@ethersproject/logger" "^5.0.5" +"@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.0.tgz#f39adadf62ad610c420bcd156fd41270e91b3ca9" + integrity sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ== -"@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.4": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.6.tgz#44d82aaa294816fd63333e7def42426cf0e87b3b" - integrity sha512-a9DUMizYhJ0TbtuDkO9iYlb2CDlpSKqGPDr+amvlZhRspQ6jbl5Eq8jfu4SCcGlcfaTbguJmqGnyOGn1EFt6xA== +"@ethersproject/networks@^5.4.0": + version "5.4.2" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.2.tgz#2247d977626e97e2c3b8ee73cd2457babde0ce35" + integrity sha512-eekOhvJyBnuibfJnhtK46b8HimBc5+4gqpvd1/H9LEl7Q7/qhsIhM81dI9Fcnjpk3jB1aTy6bj0hz3cifhNeYw== dependencies: - "@ethersproject/logger" "^5.0.5" + "@ethersproject/logger" "^5.4.0" -"@ethersproject/rlp@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.6.tgz#29f9097348a3c330811997433b7df89ab51cd644" - integrity sha512-M223MTaydfmQSsvqAl0FJZDYFlSqt6cgbhnssLDwqCKYegAHE16vrFyo+eiOapYlt32XAIJm0BXlqSunULzZuQ== +"@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.4.0.tgz#38ba20539b44dcc5d5f80c45ad902017dcdbefe7" + integrity sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" + "@ethersproject/logger" "^5.4.0" -"@ethersproject/signing-key@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.7.tgz#d03bfc5f565efb962bafebf8e6965e70d1c46d31" - integrity sha512-JYndnhFPKH0daPcIjyhi+GMcw3srIHkQ40hGRe6DA0CdGrpMfgyfSYDQ2D8HL2lgR+Xm4SHfEB0qba6+sCyrvg== +"@ethersproject/rlp@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.4.0.tgz#de61afda5ff979454e76d3b3310a6c32ad060931" + integrity sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - elliptic "6.5.3" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/logger" "^5.4.0" -"@ethersproject/strings@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.7.tgz#8dc68f794c9e2901f3b75e53b2afbcb6b6c15037" - integrity sha512-a+6T80LvmXGMOOWQTZHtGGQEg1z4v8rm8oX70KNs55YtPXI/5J3LBbVf5pyqCKSlmiBw5IaepPvs5XGalRUSZQ== +"@ethersproject/signing-key@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.4.0.tgz#2f05120984e81cf89a3d5f6dec5c68ee0894fbec" + integrity sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/logger" "^5.0.5" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/properties" "^5.4.0" + bn.js "^4.11.9" + elliptic "6.5.4" + hash.js "1.1.7" -"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.5": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.8.tgz#3b4d7041e13b957a9c4f131e0aea9dae7b6f5a23" - integrity sha512-i7NtOXVzUe+YSU6QufzlRrI2WzHaTmULAKHJv4duIZMLqzehCBXGA9lTpFgFdqGYcQJ7vOtNFC2BB2mSjmuXqg== +"@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.4.0.tgz#fb12270132dd84b02906a8d895ae7e7fa3d07d9a" + integrity sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA== dependencies: - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/rlp" "^5.0.3" - "@ethersproject/signing-key" "^5.0.4" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/constants" "^5.4.0" + "@ethersproject/logger" "^5.4.0" -"@ethersproject/web@^5.0.6": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.11.tgz#d47da612b958b4439e415782a53c8f8461522d68" - integrity sha512-x03ihbPoN1S8Gsh9WSwxkYxUIumLi02ZEKJku1C43sxBfe+mdprWyvujzYlpuoRNfWRgNhdRDKMP8JbG6MwNGA== +"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.4.0.tgz#a159d035179334bd92f340ce0f77e83e9e1522e0" + integrity sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ== + dependencies: + "@ethersproject/address" "^5.4.0" + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/constants" "^5.4.0" + "@ethersproject/keccak256" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/properties" "^5.4.0" + "@ethersproject/rlp" "^5.4.0" + "@ethersproject/signing-key" "^5.4.0" + +"@ethersproject/web@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.4.0.tgz#49fac173b96992334ed36a175538ba07a7413d1f" + integrity sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og== dependencies: - "@ethersproject/base64" "^5.0.3" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/strings" "^5.0.4" + "@ethersproject/base64" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/logger" "^5.4.0" + "@ethersproject/properties" "^5.4.0" + "@ethersproject/strings" "^5.4.0" "@hapi/address@2.x.x": version "2.1.4" @@ -1594,6 +1699,20 @@ dependencies: "@hapi/hoek" "^8.3.0" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" + integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1606,9 +1725,9 @@ resolve-from "^5.0.0" "@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/console@^26.6.2": version "26.6.2" @@ -1781,38 +1900,54 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@metamask/safe-event-emitter@^2.0.0": +"@metamask/obs-store@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@metamask/obs-store/-/obs-store-7.0.0.tgz#6cae5f28306bb3e83a381bc9ae22682316095bd3" + integrity sha512-Tr61Uu9CGXkCg5CZwOYRMQERd+y6fbtrtLd/PzDTPHO5UJpmSbU+7MPcQK7d1DwZCOCeCIvhmZSUCvYliC8uGw== + dependencies: + "@metamask/safe-event-emitter" "^2.0.0" + through2 "^2.0.3" + +"@metamask/post-message-stream@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-4.0.0.tgz#72f120e562346ca86ccc9b3684023ad44265f0df" + integrity sha512-r0JcoWXNuHycProx8ClxiIElJY/GVb/0/WWXTMsZu7qDejLo52VNXlwfydCdVjbMXeoT2nK1Yt3d5gjmHy5BWw== + dependencies: + readable-stream "2.3.3" + +"@metamask/safe-event-emitter@2.0.0", "@metamask/safe-event-emitter@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== -"@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: - "@nodelib/fs.stat" "2.0.4" + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.4" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" "@npmcli/move-file@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" - integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== dependencies: mkdirp "^1.0.4" + rimraf "^3.0.2" "@pancakeswap-libs/eslint-config-pancake@1.0.0": version "1.0.0" @@ -1830,7 +1965,7 @@ "@pancakeswap-libs/uikit@bisharesindexfund/bishares-uikit": version "0.10.2" - resolved "https://codeload.github.com/bisharesindexfund/bishares-uikit/tar.gz/4a665ca7b735e1fc9e22191b98912308a6001bbd" + resolved "https://codeload.github.com/bisharesindexfund/bishares-uikit/tar.gz/fbdc51d8c83326e7dfd3e70f239ea6372be11002" dependencies: "@types/lodash" "^4.14.162" "@types/styled-system" "^5.1.10" @@ -1838,30 +1973,10 @@ react-transition-group "^4.4.1" styled-system "^5.1.5" -"@pancakeswap-libs/uikit@goosedefi/goose-uikit": - version "0.10.2" - resolved "https://codeload.github.com/goosedefi/goose-uikit/tar.gz/068e017bb0f927c566a43596fb555a5818e13154" - dependencies: - "@types/lodash" "^4.14.162" - "@types/styled-system" "^5.1.10" - lodash "^4.17.20" - react-transition-group "^4.4.1" - styled-system "^5.1.5" - -"@pedrouid/iso-crypto@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@pedrouid/iso-crypto/-/iso-crypto-1.0.0.tgz#cf06b40ef3da3d7ca7363bd7a521ed59fa2fd13d" - integrity sha512-gSz/81Cz2n9p1RHalxN8STtOHg6Dqa+l2Phz36GptpneAcAwOzPmty7FSg58htF4u9V44vEXsc7L8V9ze9j4Xg== - dependencies: - aes-js "^3.1.2" - enc-utils "^3.0.0" - hash.js "^1.1.7" - randombytes "^2.1.0" - -"@pmmmwh/react-refresh-webpack-plugin@0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.2.tgz#1f9741e0bde9790a0e13272082ed7272a083620d" - integrity sha512-Loc4UDGutcZ+Bd56hBInkm6JyjyCwWy4t2wcDXzN8EDPANgVRj0VP8Nxn0Zq2pc+WKauZwEivQgbDGg4xZO20A== +"@pmmmwh/react-refresh-webpack-plugin@0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766" + integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ== dependencies: ansi-html "^0.0.7" error-stack-parser "^2.0.6" @@ -1909,12 +2024,12 @@ pocket-js-core "0.0.3" "@reduxjs/toolkit@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.5.0.tgz#1025c1ccb224d1fc06d8d98a61f6717d57e6d477" - integrity sha512-E/FUraRx+8guw9Hlg/Ja8jI/hwCrmIKed8Annt9YsZw3BQp+F24t5I5b2OWR6pkEHY4hn1BgP08FrTZFRKsdaQ== + version "1.6.1" + resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.6.1.tgz#7bc83b47352a663bf28db01e79d17ba54b98ade9" + integrity sha512-pa3nqclCJaZPAyBhruQtiRwtTjottRrVJqziVZcWzI73i6L3miLTtUyWfauwv08HWtiXLx1xGyGt+yLFfW/d0A== dependencies: - immer "^8.0.0" - redux "^4.0.0" + immer "^9.0.1" + redux "^4.1.0" redux-thunk "^2.3.0" reselect "^4.0.0" @@ -1930,9 +2045,9 @@ resolve "^1.14.2" "@rollup/plugin-replace@^2.3.1": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.4.tgz#7dd84c17755d62b509577f2db37eb524d7ca88ca" - integrity sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ== + version "2.4.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" + integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg== dependencies: "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" @@ -1952,9 +2067,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sinonjs/commons@^1.7.0": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" - integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -2117,7 +2232,7 @@ "@svgr/babel-plugin-transform-react-native-svg" "^5.4.0" "@svgr/babel-plugin-transform-svg-component" "^5.5.0" -"@svgr/core@^5.4.0": +"@svgr/core@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz#82e826b8715d71083120fe8f2492ec7d7874a579" integrity sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ== @@ -2133,7 +2248,7 @@ dependencies: "@babel/types" "^7.12.6" -"@svgr/plugin-jsx@^5.4.0", "@svgr/plugin-jsx@^5.5.0": +"@svgr/plugin-jsx@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz#1aa8cd798a1db7173ac043466d7b52236b369000" integrity sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA== @@ -2143,7 +2258,7 @@ "@svgr/hast-util-to-babel-ast" "^5.5.0" svg-parser "^2.0.2" -"@svgr/plugin-svgo@^5.4.0": +"@svgr/plugin-svgo@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz#02da55d85320549324e201c7b2e53bf431fcc246" integrity sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ== @@ -2152,18 +2267,18 @@ deepmerge "^4.2.2" svgo "^1.2.2" -"@svgr/webpack@5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.4.0.tgz#b68bc86e29cf007292b96ced65f80971175632e0" - integrity sha512-LjepnS/BSAvelnOnnzr6Gg0GcpLmnZ9ThGFK5WJtm1xOqdBE/1IACZU7MMdVzjyUkfFqGz87eRE4hFaSLiUwYg== - dependencies: - "@babel/core" "^7.9.0" - "@babel/plugin-transform-react-constant-elements" "^7.9.0" - "@babel/preset-env" "^7.9.5" - "@babel/preset-react" "^7.9.4" - "@svgr/core" "^5.4.0" - "@svgr/plugin-jsx" "^5.4.0" - "@svgr/plugin-svgo" "^5.4.0" +"@svgr/webpack@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.5.0.tgz#aae858ee579f5fa8ce6c3166ef56c6a1b381b640" + integrity sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g== + dependencies: + "@babel/core" "^7.12.3" + "@babel/plugin-transform-react-constant-elements" "^7.12.1" + "@babel/preset-env" "^7.12.1" + "@babel/preset-react" "^7.12.5" + "@svgr/core" "^5.5.0" + "@svgr/plugin-jsx" "^5.5.0" + "@svgr/plugin-svgo" "^5.5.0" loader-utils "^2.0.0" "@szmarczak/http-timer@^1.1.2": @@ -2173,79 +2288,81 @@ dependencies: defer-to-connect "^1.0.1" -"@toruslabs/eccrypto@^1.1.5": - version "1.1.5" - resolved "https://registry.yarnpkg.com/@toruslabs/eccrypto/-/eccrypto-1.1.5.tgz#c4b9319e02e913fecd90f3f2b98ae2699e7d498e" - integrity sha512-7sSAQ9M6b9wzxpIE98yi8zPh3wgdYiVBxvMvCOCb4c65UDOT6lpZyH30qP2fX30PaI+I2Ra+FwjfCCUuJegxfQ== +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@toruslabs/eccrypto@^1.1.7": + version "1.1.7" + resolved "https://registry.yarnpkg.com/@toruslabs/eccrypto/-/eccrypto-1.1.7.tgz#962954d6416f56ca2ba9bb9948cd08bd3b8cd0c4" + integrity sha512-zU4GnrH21yDY179fgp5Ovi4YjLdHy3WXM3QHCHAomYNxa03eAw2lxNR2bZ7kb698yk40s4WMrbnauukgabXH4Q== dependencies: - acorn "^7.4.0" - elliptic "^6.5.3" + acorn "^8.4.1" + elliptic "^6.5.4" es6-promise "^4.2.8" - nan "^2.14.1" + nan "^2.14.2" optionalDependencies: secp256k1 "^3.8.0" -"@toruslabs/fetch-node-details@^2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@toruslabs/fetch-node-details/-/fetch-node-details-2.3.3.tgz#bfe98e8067cc7a05a7503b08a7cb1d4d0c9e5c84" - integrity sha512-dYiaolDqkGVrVQKfJt1WDAiUGl99nSoNHHYRR37/TQdDonYVDKpQ8Em/j4z8RkMbRfgYYRKtbKaXdQTGA6VieQ== +"@toruslabs/fetch-node-details@^2.7.0": + version "2.7.1" + resolved "https://registry.yarnpkg.com/@toruslabs/fetch-node-details/-/fetch-node-details-2.7.1.tgz#d234ac8cb232c51f1cc120f3370159ce9bc3d4d2" + integrity sha512-6TfTmApe2OoUyST5s1arTH0dGuh6ONvykuEBjT25nO64Qgwu7eJNVMnH+DDH5Kl9PyboEa74ofGqv54l7oHsuA== dependencies: - web3-eth-contract "^1.3.0" - web3-utils "^1.3.0" + web3-eth-contract "^1.5.2" + web3-utils "^1.5.2" -"@toruslabs/http-helpers@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@toruslabs/http-helpers/-/http-helpers-1.3.5.tgz#b278e9e3d5872fc1df4955c864627c8d005c2278" - integrity sha512-Bg9AE3lPaPCv9OQAFusQlCE5TxxJCuT3R9ilGMhDiOfWQdtdW0f+cfzoRSQGA1I/lq0V217MNvWeJNLejLdsSA== +"@toruslabs/http-helpers@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@toruslabs/http-helpers/-/http-helpers-1.4.0.tgz#6d2d4129d1126876b0616b7dffec3f4b339739b5" + integrity sha512-lPRhTWeChQunds2CGV70xvaoFMMebZAqZLpTYZjUJfziumQjT12w9HWLIzlRfGFVKoYUsUiZLpGHl0JEwHCcqg== dependencies: deepmerge "^4.2.2" "@toruslabs/torus-embed@^1.8.0": - version "1.9.3" - resolved "https://registry.yarnpkg.com/@toruslabs/torus-embed/-/torus-embed-1.9.3.tgz#3472c464fd30a4e5c8c718efc7887560d18a0d13" - integrity sha512-iYK3l2glE1vI7kpkb0Jw3H/TkAmcKrrkjwuzLCVTIoYpUznnqAKo9s8Z9WG6ZknKK0A0WWKpt5PXEVdphOAjxA== + version "1.12.2" + resolved "https://registry.yarnpkg.com/@toruslabs/torus-embed/-/torus-embed-1.12.2.tgz#36081ea1547f4f7ffe411cb134a6c21b18c6616c" + integrity sha512-KmLCCX/WziXgrwHcQUMLVwku3V0ymjMRUicEN0Bv5dQY1hj7RnDEHpI7tizWs4iZfFJwhQXLMuRRf7L/O04U/w== dependencies: "@chaitanyapotti/random-id" "^1.0.3" - "@toruslabs/fetch-node-details" "^2.3.3" - "@toruslabs/http-helpers" "^1.3.5" - "@toruslabs/torus.js" "^2.2.10" + "@metamask/obs-store" "^7.0.0" + "@metamask/post-message-stream" "^4.0.0" + "@metamask/safe-event-emitter" "^2.0.0" + "@toruslabs/fetch-node-details" "^2.7.0" + "@toruslabs/http-helpers" "^1.4.0" + "@toruslabs/torus.js" "^2.4.3" create-hash "^1.2.0" deepmerge "^4.2.2" - eth-rpc-errors "^4.0.2" + end-of-stream "^1.4.4" + eth-rpc-errors "^4.0.3" fast-deep-equal "^3.1.3" is-stream "^2.0.0" json-rpc-engine "^6.1.0" json-rpc-middleware-stream "^3.0.0" loglevel "^1.7.1" - obj-multiplex "^1.0.0" - obs-store "^4.0.3" - post-message-stream "^3.0.0" + once "^1.4.0" pump "^3.0.0" - safe-event-emitter "^1.0.1" + readable-stream "^3.6.0" -"@toruslabs/torus.js@^2.2.10": - version "2.2.13" - resolved "https://registry.yarnpkg.com/@toruslabs/torus.js/-/torus.js-2.2.13.tgz#8f28f941ba5930748384090938e421077fb37692" - integrity sha512-HNo8POfPvVBeoXyOe+VmbM7+XStLolBjjDuGqKJUPEiIivE+AfDT59svfxAWzGzEme+FLJYHj8C1MTtyk6lh9Q== +"@toruslabs/torus.js@^2.4.3": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@toruslabs/torus.js/-/torus.js-2.4.4.tgz#937cbf158c786a4ce3f273d4df55168bc47198a0" + integrity sha512-3bRzGUzQMR2qfpG3om6A9oUma6u9i/Cxi4M3pTea2X0yedOvyO9FPz8IWRbEihJawmZgF2NKmDLPDICm87vLqg== dependencies: - "@toruslabs/eccrypto" "^1.1.5" - "@toruslabs/http-helpers" "^1.3.5" - bn.js "^5.1.3" - elliptic "^6.5.3" + "@toruslabs/eccrypto" "^1.1.7" + "@toruslabs/http-helpers" "^1.4.0" + bn.js "^5.2.0" + elliptic "^6.5.4" json-stable-stringify "^1.0.1" loglevel "^1.7.1" memory-cache "^0.2.0" - web3-utils "^1.3.1" - -"@types/anymatch@*": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" - integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== + web3-utils "^1.5.2" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.12" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" - integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + version "7.1.15" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024" + integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -2254,24 +2371,24 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + version "7.6.3" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" + integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" - integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== dependencies: "@babel/types" "^7.3.0" @@ -2282,23 +2399,30 @@ dependencies: "@types/node" "*" +"@types/bn.js@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.0.tgz#32c5d271503a12653c62cf4d2b45e6eab8cebc68" + integrity sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA== + dependencies: + "@types/node" "*" + "@types/cookie@^0.3.3": version "0.3.3" resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803" integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow== -"@types/eslint@^7.2.4": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== +"@types/eslint@^7.2.6": + version "7.28.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" + integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*": - version "0.0.45" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884" - integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g== + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== "@types/estree@0.0.39": version "0.0.39" @@ -2306,26 +2430,26 @@ integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== "@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + version "7.1.4" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" + integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== dependencies: "@types/minimatch" "*" "@types/node" "*" "@types/graceful-fs@^4.1.2": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753" - integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg== + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== dependencies: "@types/node" "*" "@types/history@*": - version "4.7.8" - resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934" - integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA== + version "4.7.9" + resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.9.tgz#1cfb6d60ef3822c589f18e70f8b12f9a28ce8724" + integrity sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ== -"@types/hoist-non-react-statics@*": +"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0": version "3.3.1" resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== @@ -2334,9 +2458,9 @@ hoist-non-react-statics "^3.3.0" "@types/html-minifier-terser@^5.0.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" - integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" + integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" @@ -2351,59 +2475,54 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" "@types/jest@^26.0.19": - version "26.0.19" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790" - integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ== + version "26.0.24" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" + integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" - integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/lodash@^4.14.162": - version "4.14.167" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.167.tgz#ce7d78553e3c886d4ea643c37ec7edc20f16765e" - integrity sha512-w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw== + version "4.14.172" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" + integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== "@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minimist@^1.2.0": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" - integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "14.14.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" - integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== + version "16.7.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz#c6b9198178da504dfca1fd0be9b2e1002f1586f0" + integrity sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A== "@types/node@^12.12.6": - version "12.19.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.12.tgz#04793c2afa4ce833a9972e4c476432e30f9df47b" - integrity sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw== + version "12.20.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.20.tgz#ce3d6c13c15c5e622a85efcd3a1cb2d9c7fa43a6" + integrity sha512-kqmxiJg4AT7rsSPIhO6eoBIx9mNwwpeH42yjtgQh6X2ANSpLpvToMXv+LMFdfxpwG1FZXZ41OGZMiUAtbBLEvg== "@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2418,50 +2537,61 @@ "@types/node" "*" "@types/prettier@^2.0.0": - version "2.1.6" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03" - integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3" + integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog== "@types/prop-types@*": - version "15.7.3" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== "@types/q@^1.5.1": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" - integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== "@types/react-dom@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.0.tgz#b3b691eb956c4b3401777ee67b900cb28415d95a" - integrity sha512-lUqY7OlkF/RbNtD5nIq7ot8NquXrdFrjSOR6+w9a9RFQevGi1oZO1dcJbXMeONAPKtZ2UrZOEJ5UOCVsxbLk/g== + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add" + integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg== + dependencies: + "@types/react" "*" + +"@types/react-redux@^7.1.16": + version "7.1.18" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04" + integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ== dependencies: + "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" "@types/react-router-dom@^5.1.5": - version "5.1.7" - resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.7.tgz#a126d9ea76079ffbbdb0d9225073eb5797ab7271" - integrity sha512-D5mHD6TbdV/DNHYsnwBTv+y73ei+mMjrkGrla86HthE4/PVvL1J94Bu3qABU+COXzpL23T1EZapVVpwHuBXiUg== + version "5.1.8" + resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.8.tgz#bf3e1c8149b3d62eaa206d58599de82df0241192" + integrity sha512-03xHyncBzG0PmDmf8pf3rehtjY0NpUj7TIN46FrT5n1ZWHPZvXz32gUyNboJ+xsL8cpg8bQVLcllptcQHvocrw== dependencies: "@types/history" "*" "@types/react" "*" "@types/react-router" "*" "@types/react-router@*": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.9.tgz#92a5558f22243d45f90e7699812c342bd98ba41e" - integrity sha512-US6C0rq2Wt/7uje1roqO0R++Sr0jqplKaBChDY5sNg5k7GC/79YFK0ZsLEdemqUjW05wq1Y/9YYEUgfNZ8TlvA== + version "5.1.16" + resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.16.tgz#f3ba045fb96634e38b21531c482f9aeb37608a99" + integrity sha512-8d7nR/fNSqlTFGHti0R3F9WwIertOaaA1UEB8/jr5l5mDMOs4CidEgvvYMw4ivqrBK+vtVLxyTj2P+Pr/dtgzg== dependencies: "@types/history" "*" "@types/react" "*" "@types/react@*", "@types/react@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8" - integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw== + version "17.0.19" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.19.tgz#8f2a85e8180a43b57966b237d26a29481dacc991" + integrity sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A== dependencies: "@types/prop-types" "*" + "@types/scheduler" "*" csstype "^3.0.2" "@types/resolve@0.0.8": @@ -2471,10 +2601,15 @@ dependencies: "@types/node" "*" +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "@types/secp256k1@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.1.tgz#fb3aa61a1848ad97d7425ff9dcba784549fca5a4" - integrity sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog== + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" + integrity sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w== dependencies: "@types/node" "*" @@ -2484,95 +2619,95 @@ integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== "@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/styled-components@^5.1.7": - version "5.1.7" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.7.tgz#3cd10b088c1cb1acde2e4b166b3e8275a3083710" - integrity sha512-BJzPhFygYspyefAGFZTZ/8lCEY4Tk+Iqktvnko3xmJf9LrLqs3+grxPeU3O0zLl6yjbYBopD0/VikbHgXDbJtA== + version "5.1.12" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.12.tgz#1a3679942746adecd1e736bfc47aea2c938a7d9a" + integrity sha512-sTjc0+gMl08JvOHchQKgEGbbiSexSvWg5khUNSH4kosb7Tl4782AtfWMkAhQmeXMg2vIn6PthGVHFW+U/Dpihg== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" csstype "^3.0.2" "@types/styled-system@^5.1.10": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@types/styled-system/-/styled-system-5.1.10.tgz#dcf5690dd837ca49b8de1f23cb99d510c7f4ecb3" - integrity sha512-OmVjC9OzyUckAgdavJBc+t5oCJrNXTlzWl9vo2x47leqpX1REq2qJC49SEtzbu1OnWSzcD68Uq3Aj8TeX+Kvtg== + version "5.1.13" + resolved "https://registry.yarnpkg.com/@types/styled-system/-/styled-system-5.1.13.tgz#9ad667534d3bd75720dd7778c94c783449cb5c14" + integrity sha512-RtpV6zXnnMQNcxKjC06BUM4MUER5o9uZ6b7xAc2OzhWxSsmQ3jXyW8ohuXdEJRKypEe0EqAzbSGx2Im0NXfdKA== dependencies: csstype "^3.0.2" -"@types/tapable@*", "@types/tapable@^1.0.5": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" - integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA== +"@types/tapable@^1", "@types/tapable@^1.0.5": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" + integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== "@types/uglify-js@*": - version "3.11.1" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.1.tgz#97ff30e61a0aa6876c270b5f538737e2d6ab8ceb" - integrity sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q== + version "3.13.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" + integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ== dependencies: source-map "^0.6.1" "@types/webpack-sources@*": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" - integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" + integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.25" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4" - integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ== + version "4.41.30" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc" + integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA== dependencies: - "@types/anymatch" "*" "@types/node" "*" - "@types/tapable" "*" + "@types/tapable" "^1" "@types/uglify-js" "*" "@types/webpack-sources" "*" + anymatch "^3.0.0" source-map "^0.6.0" "@types/yargs-parser@*": - version "20.2.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" - integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== + version "20.2.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" + integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^15.0.0": - version "15.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74" - integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw== + version "15.0.14" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" + integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== dependencies: "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.5.0", "@typescript-eslint/eslint-plugin@^4.7.0": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz#00d1b23b40b58031e6d7c04a5bc6c1a30a2e834a" - integrity sha512-wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q== + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz#f54dc0a32b8f61c6024ab8755da05363b733838d" + integrity sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg== dependencies: - "@typescript-eslint/experimental-utils" "4.12.0" - "@typescript-eslint/scope-manager" "4.12.0" - debug "^4.1.1" + "@typescript-eslint/experimental-utils" "4.29.2" + "@typescript-eslint/scope-manager" "4.29.2" + debug "^4.3.1" functional-red-black-tree "^1.0.1" - regexpp "^3.0.0" - semver "^7.3.2" - tsutils "^3.17.1" - -"@typescript-eslint/experimental-utils@4.12.0", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz#372838e76db76c9a56959217b768a19f7129546b" - integrity sha512-MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.12.0" - "@typescript-eslint/types" "4.12.0" - "@typescript-eslint/typescript-estree" "4.12.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@4.29.2", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz#5f67fb5c5757ef2cb3be64817468ba35c9d4e3b7" + integrity sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/typescript-estree" "4.29.2" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" "@typescript-eslint/experimental-utils@^3.10.1": version "3.10.1" @@ -2586,32 +2721,32 @@ eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.5.0", "@typescript-eslint/parser@^4.7.0": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.12.0.tgz#e1cf30436e4f916c31fcc962158917bd9e9d460a" - integrity sha512-9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ== + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.2.tgz#1c7744f4c27aeb74610c955d3dce9250e95c370a" + integrity sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g== dependencies: - "@typescript-eslint/scope-manager" "4.12.0" - "@typescript-eslint/types" "4.12.0" - "@typescript-eslint/typescript-estree" "4.12.0" - debug "^4.1.1" + "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/typescript-estree" "4.29.2" + debug "^4.3.1" -"@typescript-eslint/scope-manager@4.12.0": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz#beeb8beca895a07b10c593185a5612f1085ef279" - integrity sha512-QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg== +"@typescript-eslint/scope-manager@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz#442b0f029d981fa402942715b1718ac7fcd5aa1b" + integrity sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA== dependencies: - "@typescript-eslint/types" "4.12.0" - "@typescript-eslint/visitor-keys" "4.12.0" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/visitor-keys" "4.29.2" "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/types@4.12.0": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5" - integrity sha512-N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g== +"@typescript-eslint/types@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" + integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== "@typescript-eslint/typescript-estree@3.10.1": version "3.10.1" @@ -2627,19 +2762,18 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.12.0": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz#3963418c850f564bdab3882ae23795d115d6d32e" - integrity sha512-gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w== +"@typescript-eslint/typescript-estree@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz#a0ea8b98b274adbb2577100ba545ddf8bf7dc219" + integrity sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg== dependencies: - "@typescript-eslint/types" "4.12.0" - "@typescript-eslint/visitor-keys" "4.12.0" - debug "^4.1.1" - globby "^11.0.1" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/visitor-keys" "4.29.2" + debug "^4.3.1" + globby "^11.0.3" is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" + semver "^7.3.5" + tsutils "^3.21.0" "@typescript-eslint/visitor-keys@3.10.1": version "3.10.1" @@ -2648,109 +2782,184 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@typescript-eslint/visitor-keys@4.12.0": - version "4.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz#a470a79be6958075fa91c725371a83baf428a67a" - integrity sha512-hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw== +"@typescript-eslint/visitor-keys@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz#d2da7341f3519486f50655159f4e5ecdcb2cd1df" + integrity sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag== dependencies: - "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" -"@walletconnect/client@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.3.3.tgz#0e1fa9cd85445b94a2061c58f4357d3b78313677" - integrity sha512-aHwsX2lvdEhb2OutHr0cKKRNMOAhaE/Xejbk6stbUozeh0MKAWwhVW5g16xd+wX07Mictq4JFQrg3dSsabRJlg== +"@walletconnect/browser-utils@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.6.2.tgz#f86312d712f43e9a3688b58eea16fd792c840702" + integrity sha512-8+Yc9iXe2VD7C5I2iZjXKBvzTqDBse7yC9PrCWFJdUYW2rInk7BSqw/9NFhBk41sPonm2dklzwaMJApoW7V5bw== dependencies: - "@walletconnect/core" "^1.3.3" - "@walletconnect/iso-crypto" "^1.3.3" - "@walletconnect/types" "^1.3.3" - "@walletconnect/utils" "^1.3.3" + "@walletconnect/safe-json" "1.0.0" + "@walletconnect/types" "^1.6.2" + "@walletconnect/window-getters" "1.0.0" + "@walletconnect/window-metadata" "1.0.0" + detect-browser "5.2.0" -"@walletconnect/core@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.3.3.tgz#989b335b89cd6b1ab4a91490bd36d2681b5ee0e1" - integrity sha512-4w+2n23f3q8joOqucbjVxaHTxzQH++TeT3gkTxVYYnd47k8AYwR8yBdPapsu11lU+xEy6c5YQ+IR2KXdDfF/Ng== +"@walletconnect/client@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.6.2.tgz#bbb2511ee44311c8a82d63382c2d30204a05ae7d" + integrity sha512-ETeYAczgES2jlo5FuZyAfJmrRX38S7uy48zy89C7Rr4P0ZUy4fHXpnHGy0k7vI1tgikQXXQ0dv7DoLOST3V3Fg== dependencies: - "@walletconnect/socket-transport" "^1.3.3" - "@walletconnect/types" "^1.3.3" - "@walletconnect/utils" "^1.3.3" + "@walletconnect/core" "^1.6.2" + "@walletconnect/iso-crypto" "^1.6.2" + "@walletconnect/types" "^1.6.2" + "@walletconnect/utils" "^1.6.2" -"@walletconnect/http-connection@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.3.3.tgz#fa050d9e90dfb7f6e195e6d8347f556252fc2bae" - integrity sha512-rMsINC//guDK15kZvRJV91RYNQo/zJdh0oxPRQUy3Gcn99EcLQjugOuZhSInALKUo9L+4llYlTuDPqye4dzNpg== +"@walletconnect/core@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.6.2.tgz#5ac59d7c882fd8a95f3286346667e9b6c558a448" + integrity sha512-XQLcHXVA2SWFnwQz6y8AAhRV2P2q7qoWfhz9vV1ZJgKJ3i8mi9Dp9zZsYRKDl+T5bRpGpdxv/PZ3JpQvr1IDgQ== + dependencies: + "@walletconnect/socket-transport" "^1.6.2" + "@walletconnect/types" "^1.6.2" + "@walletconnect/utils" "^1.6.2" + +"@walletconnect/crypto@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/crypto/-/crypto-1.0.1.tgz#d4c1b1cd5dd1be88fe9a82dfc54cadbbb3f9d325" + integrity sha512-IgUReNrycIFxkGgq8YT9HsosCkhutakWD9Q411PR0aJfxpEa/VKJeaLRtoz6DvJpztWStwhIHnAbBoOVR72a6g== + dependencies: + "@walletconnect/encoding" "^1.0.0" + "@walletconnect/environment" "^1.0.0" + "@walletconnect/randombytes" "^1.0.1" + aes-js "^3.1.2" + hash.js "^1.1.7" + +"@walletconnect/encoding@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/encoding/-/encoding-1.0.0.tgz#e24190cb5e803526f9dfd7191fb0e4dc53c6d864" + integrity sha512-4nkJFnS0QF5JdieG/3VPD1/iEWkLSZ14EBInLZ00RWxmC6EMZrzAeHNAWIgm+xP3NK0lqz+7lEsmWGtcl5gYnQ== + dependencies: + is-typedarray "1.0.0" + typedarray-to-buffer "3.1.5" + +"@walletconnect/environment@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034" + integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ== + +"@walletconnect/http-connection@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.6.2.tgz#ca27e38a1347708fcbde54790ac78ac833d485a2" + integrity sha512-9M7CfqtyrqdQ87+ZTXVMoXfcLh1P295wZ9sQHy0DQR1MQZZ5DKWvDwm58Xb1hDV088imKe0JNKKRX0Ux6ZhmUQ== dependencies: - "@walletconnect/types" "^1.3.3" - "@walletconnect/utils" "^1.3.3" + "@walletconnect/types" "^1.6.2" + "@walletconnect/utils" "^1.6.2" eventemitter3 "4.0.7" xhr2-cookies "1.1.0" -"@walletconnect/iso-crypto@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.3.3.tgz#37e912daea116cd72ec0a8a0b58702bcfb2c6f79" - integrity sha512-aJOP9L5DeihEWYCteD/jCN0cMNeJoikhuvQqiysmlj/++gQoNyusimzMcreVfOsEDSjfFbEamzIgzFKvwkIzOA== +"@walletconnect/iso-crypto@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.6.2.tgz#39cfc1143e29805d3137ac3402f981d4200dc505" + integrity sha512-hznvNn3FojyRNrA5QWfkK5kyzlVbeE8gFZ7hETtSPpt24xjPi0WYo9yPxMJuMBXw2hbwSRVPkxjR354D4miZmQ== dependencies: - "@pedrouid/iso-crypto" "^1.0.0" - "@walletconnect/types" "^1.3.3" - "@walletconnect/utils" "^1.3.3" + "@walletconnect/crypto" "^1.0.1" + "@walletconnect/types" "^1.6.2" + "@walletconnect/utils" "^1.6.2" -"@walletconnect/mobile-registry@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.3.3.tgz#da577f149a206545427af7a252dfb05ebabf890a" - integrity sha512-f69CzEEB4a2EXrBNet9Nco7ofkZzU1BM5V5wSkKhREVCstrkYGwA3QcCZCwgsiLwyFsP91U8CN/jPi8UdfcDHg== +"@walletconnect/jsonrpc-types@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.0.tgz#fa75ad5e8f106a2e33287b1e6833e22ed0225055" + integrity sha512-11QXNq5H1PKZk7bP8SxgmCw3HRaDuPOVE+wObqEvmhc7OWYUZqfuaaMb+OXGRSOHL3sbC+XHfdeCxFTMXSFyng== + dependencies: + keyvaluestorage-interface "^1.0.0" -"@walletconnect/qrcode-modal@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.3.3.tgz#d4f57bab4ebbf5a6bfaab1375e82daaebfa08f97" - integrity sha512-9sZsaSzONtB122ebhWBdzA3UH2so5JltharpJQL0e2KnFGMGRnKIaVaiAAF9SVXX9DJzaDo0gQDyTWg9auFaDg== +"@walletconnect/jsonrpc-utils@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.0.tgz#1a2f668d606e8f0b6e7d8fdebae86001bd037a3f" + integrity sha512-qUHbKUK6sHeHn67qtHZoLoYk5hS6x1arTPjKDRkY93/6Fx+ZmNIpdm1owX3l6aYueyegJ7mz43FpvYHUqJ8xcw== + dependencies: + "@walletconnect/environment" "^1.0.0" + "@walletconnect/jsonrpc-types" "^1.0.0" + +"@walletconnect/mobile-registry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5" + integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw== + +"@walletconnect/qrcode-modal@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.6.2.tgz#a5e8c5c19c177322cd22dba462ae9253df06057e" + integrity sha512-+d1SsUvLzFUWY60X+OKumejzQj1BYkZGPdIHNlm2sjsDhsGTMrID7fVL+FlHq/I63bT/9Bsv08dt7FeG7y+p/Q== dependencies: - "@walletconnect/mobile-registry" "^1.3.3" - "@walletconnect/types" "^1.3.3" - "@walletconnect/utils" "^1.3.3" + "@walletconnect/browser-utils" "^1.6.2" + "@walletconnect/mobile-registry" "^1.4.0" + "@walletconnect/types" "^1.6.2" + copy-to-clipboard "^3.3.1" preact "10.4.1" qrcode "1.4.4" -"@walletconnect/socket-transport@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.3.3.tgz#38980da540b508e537f4550fe20bbef7c586a2b6" - integrity sha512-MOWMktb5Bxx+aPaNL1N1pbtxRgZTpA3ybtkiwRtmcA3wu8nZN5Eq6/NI9JO5iqXhF6ZbaVjQPGDfoBcAnIgZTA== +"@walletconnect/randombytes@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/randombytes/-/randombytes-1.0.1.tgz#87f0f02d9206704ce1c9e23f07d3b28898c48385" + integrity sha512-YJTyq69i0PtxVg7osEpKfvjTaWuAsR49QEcqGKZRKVQWMbGXBZ65fovemK/SRgtiFRv0V8PwsrlKSheqzfPNcg== dependencies: - "@walletconnect/types" "^1.3.3" - ws "7.3.0" + "@walletconnect/encoding" "^1.0.0" + "@walletconnect/environment" "^1.0.0" + randombytes "^2.1.0" -"@walletconnect/types@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.3.3.tgz#54d298265a4433ac09ccf7ae94a21f05219834ce" - integrity sha512-Un0b13G2IUI8nAA03a1berWwUgjRAOCrhHSbt27x9gCTsV88yh/kvhDfeanMF4QuAQwl+a5DuM0F+DnEuhtJ3w== +"@walletconnect/safe-json@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2" + integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg== -"@walletconnect/utils@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.3.3.tgz#9f818ae92df151e220188339b266cc990ab605a3" - integrity sha512-cZBZBcjkfIAoaw+aDLmlBi2CR54NKTq+8+FiQGtgEJXeKi5UkXXCZsDUhtGqUrjrvJKfuyEq6QYCQ4m8hIPzaA== +"@walletconnect/socket-transport@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.6.2.tgz#0667abc12cfe619199ee9ce84efd58c2827b1df4" + integrity sha512-G07Iqt2WkkqS8Q5M+ERNjeUV1A2MEBpiYOn6H9xmv7dkoXWQbTxd4qJbIgP3jAcVX0yYyLaf/gSFWFg7tpp8dw== + dependencies: + "@walletconnect/types" "^1.6.2" + "@walletconnect/utils" "^1.6.2" + ws "7.5.3" + +"@walletconnect/types@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.6.2.tgz#81b0a7dfa3b5cab9240530667e19439663e99d6f" + integrity sha512-21jvvnUcbdcH6cSe/8B/KoeU+foNbvNsBOYY3AWW0LMuD/N5CnGZHGYcbEq0R0z7Gj4lp9IFvDIBLM7WaG1IiQ== + +"@walletconnect/utils@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.6.2.tgz#b8313dcb09ed8edb5d55bd332caec590a8684955" + integrity sha512-/J5xO0qzGYw/gwpIYZ72ml0TASGClRJ/siFG+5QDghXvRgQKYiQKPq7nBDbtcUd3pjbuGKTOeTLm01S4urGvTQ== dependencies: - "@walletconnect/types" "^1.3.3" + "@walletconnect/browser-utils" "^1.6.2" + "@walletconnect/encoding" "^1.0.0" + "@walletconnect/jsonrpc-utils" "^1.0.0" + "@walletconnect/types" "^1.6.2" bn.js "4.11.8" - detect-browser "5.1.0" - enc-utils "3.0.0" js-sha3 "0.8.0" query-string "6.13.5" - rpc-payload-id "1.0.0" - safe-json-utils "1.0.0" - window-getters "1.0.0" - window-metadata "1.0.0" -"@walletconnect/web3-provider@^1.2.0-alpha.0": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.3.3.tgz#2a87501371a5f9426a7aa6cccc57726e91dfd0d9" - integrity sha512-VELW7x9zU24YWFrpzo4Fki++LMvfY5Q4l13eQyAfJfF1MXoGpQL+w1rbFWRJpND6t7GVBj25c42C8MZwIGv9zg== - dependencies: - "@walletconnect/client" "^1.3.3" - "@walletconnect/http-connection" "^1.3.3" - "@walletconnect/qrcode-modal" "^1.3.3" - "@walletconnect/types" "^1.3.3" - "@walletconnect/utils" "^1.3.3" +"@walletconnect/web3-provider@^1.5.0": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.6.2.tgz#d91f4c6dc33800502b785d3cebe37fe0b6cb61a9" + integrity sha512-dDxPPmRoPQoyHfDD3Z3gQ0cRfpm0z1kp5zmK2F6Bp1JYYuDvTsm9edw7QB8E3y7LD0BFvpsP+pC8a1xCT4L5Vw== + dependencies: + "@walletconnect/client" "^1.6.2" + "@walletconnect/http-connection" "^1.6.2" + "@walletconnect/qrcode-modal" "^1.6.2" + "@walletconnect/types" "^1.6.2" + "@walletconnect/utils" "^1.6.2" web3-provider-engine "16.0.1" +"@walletconnect/window-getters@1.0.0", "@walletconnect/window-getters@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.0.tgz#1053224f77e725dfd611c83931b5f6c98c32bfc8" + integrity sha512-xB0SQsLaleIYIkSsl43vm8EwETpBzJ2gnzk7e0wMF3ktqiTGS6TFHxcprMl5R44KKh4tCcHCJwolMCaDSwtAaA== + +"@walletconnect/window-metadata@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.0.tgz#93b1cc685e6b9b202f29c26be550fde97800c4e5" + integrity sha512-9eFvmJxIKCC3YWOL97SgRkKhlyGXkrHwamfechmqszbypFspaSk+t2jQXAEU7YClHF6Qjw5eYOmy1//zFi9/GA== + dependencies: + "@walletconnect/window-getters" "^1.0.0" + "@web3-react/abstract-connector@^6.0.7": version "6.0.7" resolved "https://registry.yarnpkg.com/@web3-react/abstract-connector/-/abstract-connector-6.0.7.tgz#401b3c045f1e0fab04256311be49d5144e9badc6" @@ -2759,18 +2968,18 @@ "@web3-react/types" "^6.0.7" "@web3-react/authereum-connector@^6.1.1": - version "6.1.6" - resolved "https://registry.yarnpkg.com/@web3-react/authereum-connector/-/authereum-connector-6.1.6.tgz#2aefc653578d880238719418e0b1818347f4a18e" - integrity sha512-SeU7PSSkN5MHEnYiveVwctuniXSbBKqm4dl0HUSUK/L+Kzs5lAcSYE0Iyu9Ke7RpSQJ6qe1SxbcAMguyQVOeKQ== + version "6.2.0" + resolved "https://registry.yarnpkg.com/@web3-react/authereum-connector/-/authereum-connector-6.2.0.tgz#d3e7379e4d6fc52add4bdd8dfdce1a2747ac23f0" + integrity sha512-we4DJwUrGbDd1gJ+cPMEGXq9+fsIEleJkFc+S+NEKyDoHoNGrPX8h4QqKRS3rgi6oCliPbtSPIf7g9DBjDFDTA== dependencies: "@web3-react/abstract-connector" "^6.0.7" "@web3-react/types" "^6.0.7" - authereum "^0.0.4-beta.157" + authereum "^0.1.14" "@web3-react/core@^6.1.1": - version "6.1.1" - resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-6.1.1.tgz#06c853890723f600b387b738a4b71ef41d5cccb7" - integrity sha512-HKXOgPNCmFvrVsed+aW/HlVhwzs8t3b+nzg3BoxgJQo/5yLiJXSumHRBdUrPxhBQiHkHRZiVPAvzf/8JMnm74Q== + version "6.1.9" + resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-6.1.9.tgz#5f5daa0545a8ea07770a699580ced552583afc97" + integrity sha512-P877DslsbAkWIlMANpWiK7pCvNwlz0kJC0EGckuVh0wlA23J4UnFxq6xyOaxkxaDCu14rA/tAO0NbwjcXTQgSA== dependencies: "@ethersproject/keccak256" "^5.0.0-beta.130" "@web3-react/abstract-connector" "^6.0.7" @@ -2808,9 +3017,9 @@ tiny-warning "^1.0.3" "@web3-react/portis-connector@^6.1.1": - version "6.1.6" - resolved "https://registry.yarnpkg.com/@web3-react/portis-connector/-/portis-connector-6.1.6.tgz#e98847864c05a35e06e593e3aea0358749aae162" - integrity sha512-c9qyPoGVG+wLKcIJGzVTDP6oZ/Wn+EbE2cVjeCDTR2opzOO6kJoG7SOZMLXIX1F9v/N6bB8NI6XWlDjROK8zMw== + version "6.1.9" + resolved "https://registry.yarnpkg.com/@web3-react/portis-connector/-/portis-connector-6.1.9.tgz#33216ce320d2c6d6e75d0c42c6e977b7a157ad4a" + integrity sha512-dYP1b6a1Y91t9xEu1NrlGvLwuAqYEuVfAerZtVkVf3JZ3O5TiQyVt7O7KWPPg4WsqQ8JEqOrZcE/2bmozP47mA== dependencies: "@portis/web3" "^2.0.0-beta.54" "@web3-react/abstract-connector" "^6.0.7" @@ -2818,9 +3027,9 @@ tiny-invariant "^1.0.6" "@web3-react/squarelink-connector@^6.1.1": - version "6.1.6" - resolved "https://registry.yarnpkg.com/@web3-react/squarelink-connector/-/squarelink-connector-6.1.6.tgz#26d496a0c4551220115f36e5c29a5b38c80675fa" - integrity sha512-OD/WhpgbuQvEy8WhSmniw1VQUUcqobS/kv/eDDEX2rN7w+o8Ip78lPX52eEux9HRQXUslkP/y1DCKRz+USWhGA== + version "6.1.9" + resolved "https://registry.yarnpkg.com/@web3-react/squarelink-connector/-/squarelink-connector-6.1.9.tgz#e0d29ff7163a02bb7f92b878f153fd8838311087" + integrity sha512-HhhlKmB5twOh2ECPlbx7f/J+wFssU5b04nTj40QuXMNvphMD93nqLplgTgGHzFjeFIzZpnFLN5XbDiJeGApMYA== dependencies: "@web3-react/abstract-connector" "^6.0.7" "@web3-react/types" "^6.0.7" @@ -2828,9 +3037,9 @@ tiny-invariant "^1.0.6" "@web3-react/torus-connector@^6.1.1": - version "6.1.7" - resolved "https://registry.yarnpkg.com/@web3-react/torus-connector/-/torus-connector-6.1.7.tgz#5ce7829a5669efdaa2e39abe2989a490b87dad1a" - integrity sha512-zuirHlkcUuwkAyhCz1zBHbxiQ3627Zvw/MJyXGFVX5BSr9ywulFzEi2f+DOyDMMBZAxtSPs3VHB4xMTetUCkOg== + version "6.1.9" + resolved "https://registry.yarnpkg.com/@web3-react/torus-connector/-/torus-connector-6.1.9.tgz#5a3b7c262b145c293c74a56f457ee932930e6da8" + integrity sha512-HOEGbs1XMWncUs/KKBf+8OQaWHxlI3vXRMpXU7UJF404WvawgklEK5yljmFBA0YjwFUwanx0uL36HRYgijVfwA== dependencies: "@toruslabs/torus-embed" "^1.8.0" "@web3-react/abstract-connector" "^6.0.7" @@ -2842,23 +3051,23 @@ integrity sha512-ofGmfDhxmNT1/P/MgVa8IKSkCStFiyvXe+U5tyZurKdrtTDFU+wJ/LxClPDtFerWpczNFPUSrKcuhfPX1sI6+A== "@web3-react/walletconnect-connector@^6.1.4": - version "6.1.6" - resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-connector/-/walletconnect-connector-6.1.6.tgz#8c216b2e38db94c60afac8453be31d31019205b7" - integrity sha512-subMnG0/SmP7bg5ZGxX6z32GjlSFspc7AO+A2pUrifP5My/837sp900uhBxLl5ex2SMe/rDgor+7jUstAkmH8g== + version "6.2.4" + resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-connector/-/walletconnect-connector-6.2.4.tgz#0a128699fc93ddac885935f4aeca32925f6285f0" + integrity sha512-IEVjCXrlcfVa6ggUBEyKtLRaLQuZGtT2lGuzOFtdbJJkN84u1++pzzeDrcsVhKAoS5wq33zyJT9baEbG1Aed8g== dependencies: - "@walletconnect/web3-provider" "^1.2.0-alpha.0" + "@walletconnect/web3-provider" "^1.5.0" "@web3-react/abstract-connector" "^6.0.7" "@web3-react/types" "^6.0.7" tiny-invariant "^1.0.6" "@web3-react/walletlink-connector@^6.1.1": - version "6.1.6" - resolved "https://registry.yarnpkg.com/@web3-react/walletlink-connector/-/walletlink-connector-6.1.6.tgz#1db2672ac1d19917c6f8755fcc1050a9d8292f52" - integrity sha512-uWpz9ARqAKYw0ss2CYoQDrlvj5Koo4RoeTLns+ZoZPeMqCIcgDZvlkpWCkPNSs9eSP2PtbqWEzhm0vag7hCCBw== + version "6.2.3" + resolved "https://registry.yarnpkg.com/@web3-react/walletlink-connector/-/walletlink-connector-6.2.3.tgz#d6c2c3a1b8b7e05147845ee61fa19de13db82e19" + integrity sha512-vJsXyC2NWpVrlnfgwsssDuFo3P/xCoKOjvkEjbQyQEig2aucPijwuxc58BG/YzDx4FyeeyzpnkDMLfcXFuI1pg== dependencies: "@web3-react/abstract-connector" "^6.0.7" "@web3-react/types" "^6.0.7" - walletlink "^2.0.2" + walletlink "^2.1.6" "@webassemblyjs/ast@1.9.0": version "1.9.0" @@ -3023,7 +3232,7 @@ JSONStream@^1.0.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.3: +abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -3059,9 +3268,9 @@ acorn-globals@^6.0.0: acorn-walk "^7.1.1" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" @@ -3078,6 +3287,11 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +acorn@^8.2.4, acorn@^8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== + address@1.1.2, address@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -3101,6 +3315,13 @@ aes-js@^3.1.2: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a" integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ== +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -3129,10 +3350,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2" - integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ== +ajv@^8.0.1: + version "8.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571" + integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -3155,11 +3376,11 @@ ansi-colors@^4.1.1: integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-escapes@^4.2.1, ansi-escapes@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-html@0.0.7, ansi-html@^0.0.7: version "0.0.7" @@ -3208,10 +3429,10 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@^3.0.3, anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== +anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -3256,11 +3477,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" @@ -3281,15 +3497,15 @@ array-ify@^1.0.0: resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= -array-includes@^3.1.1, array-includes@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" - integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== +array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" + integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - get-intrinsic "^1.0.1" + es-abstract "^1.18.0-next.2" + get-intrinsic "^1.1.1" is-string "^1.0.5" array-union@^1.0.1: @@ -3314,7 +3530,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.3: +array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== @@ -3323,7 +3539,7 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.18.0-next.1" -array.prototype.flatmap@^1.2.3: +array.prototype.flatmap@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== @@ -3410,6 +3626,13 @@ async-limiter@^1.0.0, async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== +async-mutex@^0.2.6: + version "0.2.6" + resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.2.6.tgz#0d7a3deb978bc2b984d5908a2038e1ae2e54ff40" + integrity sha512-Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw== + dependencies: + tslib "^2.0.0" + async@0.9.x: version "0.9.2" resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" @@ -3447,10 +3670,10 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -authereum@^0.0.4-beta.157: - version "0.0.4-beta.201" - resolved "https://registry.yarnpkg.com/authereum/-/authereum-0.0.4-beta.201.tgz#ea380efc6d231dc4222dc20cd9395b02318dd0c3" - integrity sha512-9zyS2nDsO5nW/8dD8SbGUbZLX76O5Zrx6Zq4aZG+Waa3Vsn3Bj82tn8HLPdECmd5heSOmaSEi5TNsS/sGBSiGw== +authereum@^0.1.14: + version "0.1.14" + resolved "https://registry.yarnpkg.com/authereum/-/authereum-0.1.14.tgz#5655e543b296d899136e350d09f9cfe4c12fbc38" + integrity sha512-o1lsXXGg+oYDAEutZ8Ak1Qn2Dnk+qSyQ2ZokyLHRSYGJj6HpEHaSlQA6W3VTHD5r68Q+W0JD/BN9hDSF2xyshQ== dependencies: async "3.2.0" bn.js "5.1.2" @@ -3480,17 +3703,10 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" -available-typed-arrays@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" - integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== - dependencies: - array-filter "^1.0.0" - -await-semaphore@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/await-semaphore/-/await-semaphore-0.1.3.tgz#2b88018cc8c28e06167ae1cdff02504f1f9688d3" - integrity sha512-d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q== +available-typed-arrays@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9" + integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA== aws-sign2@~0.7.0: version "0.7.0" @@ -3503,9 +3719,9 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axe-core@^4.0.2: - version "4.1.1" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.1.tgz#70a7855888e287f7add66002211a423937063eaf" - integrity sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ== + version "4.3.2" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7" + integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg== axios@^0.18.0: version "0.18.1" @@ -3515,12 +3731,12 @@ axios@^0.18.0: follow-redirects "1.5.10" is-buffer "^2.0.2" -axios@^0.19.0: - version "0.19.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" - integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: - follow-redirects "1.5.10" + follow-redirects "^1.10.0" axobject-query@^2.2.0: version "2.2.0" @@ -3788,10 +4004,34 @@ babel-plugin-named-asset-import@^0.3.7: resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd" integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw== -"babel-plugin-styled-components@>= 1": - version "1.12.0" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9" - integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA== +babel-plugin-polyfill-corejs2@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327" + integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ== + dependencies: + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.2.2" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" + integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.2.2" + core-js-compat "^3.14.0" + +babel-plugin-polyfill-regenerator@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077" + integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.2.2" + +"babel-plugin-styled-components@>= 1.12.0": + version "1.13.2" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz#ebe0e6deff51d7f93fceda1819e9b96aeb88278d" + integrity sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-module-imports" "^7.0.0" @@ -4220,9 +4460,9 @@ backoff@^2.5.0: precond "0.2" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base-x@^3.0.2, base-x@^3.0.8: version "3.0.8" @@ -4287,9 +4527,9 @@ binary-extensions@^1.0.0: integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== binary-extensions@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" - integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bind-decorator@^1.0.11: version "1.0.11" @@ -4311,9 +4551,9 @@ bip66@^1.1.5: safe-buffer "^5.0.1" blakejs@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5" - integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U= + version "1.1.1" + resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.1.tgz#bf313053978b2cd4c444a48795710be05c785702" + integrity sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg== bluebird@^3.5.0, bluebird@^3.5.5: version "3.7.2" @@ -4336,14 +4576,14 @@ bn.js@5.1.2: integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0, bn.js@^4.8.0: - version "4.11.9" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" - integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" - integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== +bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== body-parser@1.19.0, body-parser@^1.16.0: version "1.19.0" @@ -4409,7 +4649,7 @@ braces@^3.0.1, braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= @@ -4498,16 +4738,16 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.6.2, browserslist@^4.6.4: - version "4.16.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b" - integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.6.2, browserslist@^4.6.4: + version "4.16.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" + integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ== dependencies: - caniuse-lite "^1.0.30001165" - colorette "^1.2.1" - electron-to-chromium "^1.3.621" + caniuse-lite "^1.0.30001251" + colorette "^1.3.0" + electron-to-chromium "^1.3.811" escalade "^3.1.1" - node-releases "^1.1.67" + node-releases "^1.1.75" bs58@^4.0.0: version "4.0.1" @@ -4556,9 +4796,9 @@ buffer-fill@^1.0.0: integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= buffer-from@^1.0.0, buffer-from@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-indexof@^1.0.0: version "1.1.1" @@ -4592,6 +4832,14 @@ buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: base64-js "^1.3.1" ieee754 "^1.1.13" +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + bufferutil@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b" @@ -4641,9 +4889,9 @@ cacache@^12.0.2: y18n "^4.0.0" cacache@^15.0.5: - version "15.0.5" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" - integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== + version "15.2.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" + integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw== dependencies: "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" @@ -4659,7 +4907,7 @@ cacache@^15.0.5: p-map "^4.0.0" promise-inflight "^1.0.1" rimraf "^3.0.2" - ssri "^8.0.0" + ssri "^8.0.1" tar "^6.0.2" unique-filename "^1.1.1" @@ -4691,13 +4939,13 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -call-bind@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" - integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" - get-intrinsic "^1.0.0" + get-intrinsic "^1.0.2" caller-callsite@^2.0.0: version "2.0.0" @@ -4779,10 +5027,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001165: - version "1.0.30001173" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz#3c47bbe3cd6d7a9eda7f50ac016d158005569f56" - integrity sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001251: + version "1.0.30001251" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" + integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== capture-exit@^2.0.0: version "2.0.0" @@ -4810,7 +5058,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0: +chalk@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -4829,6 +5077,14 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -4889,21 +5145,21 @@ chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.4.1: - version "3.4.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" - integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.2" -chownr@^1.1.1: +chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -4914,11 +5170,9 @@ chownr@^2.0.0: integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^2.0.0: version "2.0.0" @@ -5003,15 +5257,6 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - clone-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" @@ -5056,7 +5301,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -5080,28 +5325,28 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6" - integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw== +color-string@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" + integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" color@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" - integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== dependencies: - color-convert "^1.9.1" - color-string "^1.5.4" + color-convert "^1.9.3" + color-string "^1.6.0" -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -5208,11 +5453,6 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= -contains-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= - content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -5243,28 +5483,28 @@ conventional-changelog-angular@^5.0.0: q "^1.5.1" conventional-changelog-conventionalcommits@^4.3.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.5.0.tgz#a02e0b06d11d342fdc0f00c91d78265ed0bc0a62" - integrity sha512-buge9xDvjjOxJlyxUnar/+6i/aVEVGA7EEh4OafBCXPlLUQPGbRUBhBUveWRxzvR8TEjhKEP4BdepnpG2FSZXw== + version "4.6.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz#7fc17211dbca160acf24687bd2fdd5fd767750eb" + integrity sha512-sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A== dependencies: compare-func "^2.0.0" lodash "^4.17.15" q "^1.5.1" conventional-commits-parser@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz#9e261b139ca4b7b29bcebbc54460da36894004ca" - integrity sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz#ba44f0b3b6588da2ee9fd8da508ebff50d116ce2" + integrity sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA== dependencies: JSONStream "^1.0.4" is-text-path "^1.0.1" lodash "^4.17.15" meow "^8.0.0" - split2 "^2.0.0" + split2 "^3.0.0" through2 "^4.0.0" trim-off-newlines "^1.0.0" -convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -5276,6 +5516,13 @@ convert-source-map@^0.3.3: resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190" integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA= +convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -5313,18 +5560,25 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.6.2, core-js-compat@^3.8.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.2.tgz#3717f51f6c3d2ebba8cbf27619b57160029d1d4c" - integrity sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ== +copy-to-clipboard@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae" + integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw== + dependencies: + toggle-selection "^1.0.6" + +core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2: + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.2.tgz#442ef1d933ca6fc80859bd5a1db7a3ba716aaf56" + integrity sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.7" semver "7.0.0" -core-js-pure@^3.0.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.2.tgz#286f885c0dac1cdcd6d78397392abc25ddeca225" - integrity sha512-v6zfIQqL/pzTVAbZvYUozsxNfxcFb6Ks3ZfEbuneJl3FW9Jb8F6vLWB6f+qTmAu72msUdyb84V8d/yBFf7FNnw== +core-js-pure@^3.16.0: + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.2.tgz#0ef4b79cabafb251ea86eb7d139b42bd98c533e8" + integrity sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw== core-js@^2.4.0, core-js@^2.5.0: version "2.6.12" @@ -5332,9 +5586,9 @@ core-js@^2.4.0, core-js@^2.5.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.6.1, core-js@^3.6.5: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044" - integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A== + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4" + integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -5386,6 +5640,14 @@ countup.js@^1.9.3: resolved "https://registry.yarnpkg.com/countup.js/-/countup.js-1.9.3.tgz#ce3e50cd7160441e478f07da31895edcc0f1c9dd" integrity sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0= +crc-32@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== + dependencies: + exit-on-epipe "~1.0.1" + printj "~1.1.0" + create-ecdh@^4.0.0: version "4.0.4" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" @@ -5418,11 +5680,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: sha.js "^2.4.8" cross-fetch@^2.1.0, cross-fetch@^2.1.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.3.tgz#e8a0b3c54598136e037f8650f8e823ccdfac198e" - integrity sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw== + version "2.2.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.5.tgz#afaf5729f3b6c78d89c9296115c9f142541a5705" + integrity sha512-xqYAhQb4NhCJSRym03dwxpP1bYXpK3y7UN83Bo2WFi3x1Zmzn0SL/6xGoPr+gpt4WmNrgCCX3HPysvOwFOW36w== dependencies: - node-fetch "2.1.2" + node-fetch "2.6.1" whatwg-fetch "2.0.4" cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2: @@ -5530,7 +5792,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^2.0.0, css-select@^2.0.2: +css-select@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== @@ -5540,6 +5802,17 @@ css-select@^2.0.0, css-select@^2.0.2: domutils "^1.7.0" nth-check "^1.0.2" +css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + dependencies: + boolbase "^1.0.0" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" + css-to-react-native@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" @@ -5558,9 +5831,9 @@ css-tree@1.0.0-alpha.37: source-map "^0.6.1" css-tree@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5" - integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ== + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== dependencies: mdn-data "2.0.14" source-map "^0.6.1" @@ -5570,6 +5843,11 @@ css-what@^3.2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== +css-what@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" + integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== + css@^2.0.0: version "2.2.4" resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" @@ -5595,10 +5873,10 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" - integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA== +cssnano-preset-default@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" + integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== dependencies: css-declaration-sorter "^4.0.1" cssnano-util-raw-cache "^4.0.1" @@ -5628,7 +5906,7 @@ cssnano-preset-default@^4.0.7: postcss-ordered-values "^4.1.2" postcss-reduce-initial "^4.0.3" postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.2" + postcss-svgo "^4.0.3" postcss-unique-selectors "^4.0.1" cssnano-util-get-arguments@^4.0.0: @@ -5654,12 +5932,12 @@ cssnano-util-same-parent@^4.0.0: integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== cssnano@^4.1.10: - version "4.1.10" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" - integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== + version "4.1.11" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" + integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== dependencies: cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.7" + cssnano-preset-default "^4.0.8" is-resolvable "^1.0.0" postcss "^7.0.0" @@ -5680,7 +5958,7 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.2.0: +cssstyle@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== @@ -5688,9 +5966,9 @@ cssstyle@^2.2.0: cssom "~0.3.6" csstype@^3.0.2: - version "3.0.5" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8" - integrity sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== currently-unhandled@^0.4.1: version "0.4.1" @@ -5713,9 +5991,9 @@ d@1, d@^1.0.1: type "^1.0.1" damerau-levenshtein@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" - integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== + version "1.0.7" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d" + integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw== dargs@^7.0.0: version "7.0.0" @@ -5745,6 +6023,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + debug@=3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -5752,20 +6037,13 @@ debug@=3.1.0: dependencies: ms "2.0.0" -debug@^3.1.1, debug@^3.2.5: +debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - decamelize-keys@^1.0.0, decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" @@ -5779,10 +6057,10 @@ decamelize@^1.1.0, decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: - version "10.2.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" - integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decode-uri-component@^0.2.0: version "0.2.0" @@ -5913,10 +6191,10 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-browser@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz#0c51c66b747ad8f98a6832bf3026a5a23a7850ff" - integrity sha512-WKa9p+/MNwmTiS+V2AS6eGxic+807qvnV3hC+4z2GTY+F42h1n8AynVTMMc4EJBC32qMs6yjOTpeDEQQt/AVqQ== +detect-browser@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97" + integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA== detect-indent@^4.0.0: version "4.0.0" @@ -5931,9 +6209,9 @@ detect-newline@^3.0.0: integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" - integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== detect-port-alt@1.1.6: version "1.1.6" @@ -5958,9 +6236,9 @@ diffie-hellman@^5.0.0: randombytes "^2.0.0" dijkstrajs@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b" - integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs= + version "1.0.2" + resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257" + integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg== dir-glob@^3.0.1: version "3.0.1" @@ -5975,9 +6253,9 @@ dns-equal@^1.0.0: integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" - integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg== + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== dependencies: ip "^1.1.0" safe-buffer "^5.0.1" @@ -5989,14 +6267,6 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -doctrine@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -6011,7 +6281,7 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-converter@^0.2: +dom-converter@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== @@ -6019,9 +6289,9 @@ dom-converter@^0.2: utila "~0.4" dom-helpers@^5.0.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b" - integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ== + version "5.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== dependencies: "@babel/runtime" "^7.8.7" csstype "^3.0.2" @@ -6034,6 +6304,15 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" @@ -6044,15 +6323,15 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@1, domelementtype@^1.3.1: +domelementtype@1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" - integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== domexception@^2.0.1: version "2.0.1" @@ -6061,14 +6340,14 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== +domhandler@^4.0.0, domhandler@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" + integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== dependencies: - domelementtype "1" + domelementtype "^2.2.0" -domutils@^1.5.1, domutils@^1.7.0: +domutils@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== @@ -6076,6 +6355,15 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" +domutils@^2.5.2, domutils@^2.6.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442" + integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -6156,16 +6444,16 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== ejs@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" - integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.621: - version "1.3.634" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz#82ea400f520f739c4f6ff00c1f7524827a917d25" - integrity sha512-QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.811: + version "1.3.814" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz#418fad80c3276a46103ca72a21a8290620d83c4a" + integrity sha512-0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw== elliptic@6.5.2: version "6.5.2" @@ -6180,18 +6468,18 @@ elliptic@6.5.2: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" - integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== +elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" + bn.js "^4.11.9" + brorand "^1.1.0" hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" emittery@^0.7.1: version "0.7.2" @@ -6209,9 +6497,9 @@ emoji-regex@^8.0.0: integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== emoji-regex@^9.0.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz#a26da8e832b16a9753309f25e35e3c0efb9a066a" - integrity sha512-DNc3KFPK18bPdElMJnf/Pkv5TXhxFU3YFDEuGLDRtPmV4rkmCjBkCSEp22u6rBHdSN9Vlp/GK7k98prmE1Jgug== + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== emojis-list@^2.0.0: version "2.1.0" @@ -6223,14 +6511,6 @@ emojis-list@^3.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -enc-utils@3.0.0, enc-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/enc-utils/-/enc-utils-3.0.0.tgz#65935d2d6a867fa0ae995f05f3a2f055ce764dcf" - integrity sha512-e57t/Z2HzWOLwOp7DZcV0VMEY8t7ptWwsxyp6kM2b2zrk6JqIpXxzkruHAMiBsy5wg9jp/183GdiRXCvBtzsYg== - dependencies: - is-typedarray "1.0.0" - typedarray-to-buffer "3.1.5" - encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -6243,7 +6523,7 @@ encoding@^0.1.11: dependencies: iconv-lite "^0.6.2" -end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.0: +end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -6251,9 +6531,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.0: once "^1.4.0" enhanced-resolve@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" - integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" + integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" @@ -6266,15 +6546,10 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" -entities@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - entities@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: version "0.1.8" @@ -6283,7 +6558,7 @@ errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: dependencies: prr "~1.0.1" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -6297,40 +6572,28 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: - version "1.17.7" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" - integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== +es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5: + version "1.18.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" + integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== dependencies: + call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + get-intrinsic "^1.1.1" has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.2.2" - is-regex "^1.1.1" - object-inspect "^1.8.0" - object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" - -es-abstract@^1.18.0-next.1: - version "1.18.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" - integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.2.2" - is-negative-zero "^2.0.0" - is-regex "^1.1.1" - object-inspect "^1.8.0" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.3" + is-negative-zero "^2.0.1" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.11.0" object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -6392,13 +6655,18 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.14.1: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: @@ -6436,53 +6704,55 @@ eslint-config-react-app@^6.0.0: dependencies: confusing-browser-globals "^1.0.10" -eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" -eslint-module-utils@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" - integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== +eslint-module-utils@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" + integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== dependencies: - debug "^2.6.9" + debug "^3.2.7" pkg-dir "^2.0.0" eslint-plugin-flowtype@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.2.0.tgz#a4bef5dc18f9b2bdb41569a4ab05d73805a3d261" - integrity sha512-z7ULdTxuhlRJcEe1MVljePXricuPOrsWfScRXFhNzVD5dmTHWjIF57AxD0e7AbEoLSbjSsaA5S+hCg43WvpXJQ== + version "5.9.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.9.0.tgz#8d2d81d3d79bb53470ed62b97409b31684757e30" + integrity sha512-aBUVPA5Wt0XyuV3Wg8flfVqYJR6yR2nRLuyPwoTjCg5VTk4G1X1zQpInr39tUGgRxqrA+d+B9GYK4+/d1i0Rfw== dependencies: lodash "^4.17.15" string-natural-compare "^3.0.1" eslint-plugin-import@^2.22.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" - integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== + version "2.24.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz#64aba8b567a1ba9921d5465586e86c491b8e2135" + integrity sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ== dependencies: - array-includes "^3.1.1" - array.prototype.flat "^1.2.3" - contains-path "^0.1.0" + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.0" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.6.2" + find-up "^2.0.0" has "^1.0.3" + is-core-module "^2.6.0" minimatch "^3.0.4" - object.values "^1.1.1" - read-pkg-up "^2.0.0" - resolve "^1.17.0" - tsconfig-paths "^3.9.0" + object.values "^1.1.4" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.10.1" eslint-plugin-jest@^24.1.0: - version "24.1.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.3.tgz#fa3db864f06c5623ff43485ca6c0e8fc5fe8ba0c" - integrity sha512-dNGGjzuEzCE3d5EPZQ/QGtmlMotqnYWD/QpCZ1UuZlrMAdhG5rldh0N0haCvhGnUkSeuORS5VNROwF9Hrgn3Lg== + version "24.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262" + integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" @@ -6509,26 +6779,27 @@ eslint-plugin-react-hooks@^4.0.0, eslint-plugin-react-hooks@^4.2.0: integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== eslint-plugin-react@^7.21.5: - version "7.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" - integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== + version "7.24.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4" + integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q== dependencies: - array-includes "^3.1.1" - array.prototype.flatmap "^1.2.3" + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" doctrine "^2.1.0" has "^1.0.3" jsx-ast-utils "^2.4.1 || ^3.0.0" - object.entries "^1.1.2" - object.fromentries "^2.0.2" - object.values "^1.1.1" + minimatch "^3.0.4" + object.entries "^1.1.4" + object.fromentries "^2.0.4" + object.values "^1.1.4" prop-types "^15.7.2" - resolve "^1.18.1" - string.prototype.matchall "^4.0.2" + resolve "^2.0.0-next.3" + string.prototype.matchall "^4.0.5" eslint-plugin-testing-library@^3.9.2: - version "3.10.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.1.tgz#4dd02306d601c3238fdabf1d1dbc5f2a8e85d531" - integrity sha512-nQIFe2muIFv2oR2zIuXE4vTbcFNx8hZKRzgHZqJg8rfopIWwoTwtlbCCNELT/jXzVe1uZF68ALGYoDXjLczKiQ== + version "3.10.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.2.tgz#609ec2b0369da7cf2e6d9edff5da153cc31d87bd" + integrity sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA== dependencies: "@typescript-eslint/experimental-utils" "^3.10.1" @@ -6555,50 +6826,61 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-webpack-plugin@^2.1.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.4.1.tgz#9353ec46a31d29558734a38a05eb14c5760a7144" - integrity sha512-cj8iPWZKuAiVD8MMgTSunyMCAvxQxp5mxoPHZl1UMGkApFXaXJHdCFcCR+oZEJbBNhReNa5SjESIn34uqUbBtg== +eslint-webpack-plugin@^2.5.2: + version "2.5.4" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.4.tgz#473b84932f1a8e2c2b8e66a402d0497bf440b986" + integrity sha512-7rYh0m76KyKSDE+B+2PUQrlNS4HJ51t3WKpkJg6vo2jFMbEPTG99cBV0Dm7LXSHucN4WGCG65wQcRiTFrj7iWw== dependencies: - "@types/eslint" "^7.2.4" + "@types/eslint" "^7.2.6" arrify "^2.0.1" jest-worker "^26.6.2" micromatch "^4.0.2" + normalize-path "^3.0.0" schema-utils "^3.0.0" eslint@^7.11.0, eslint@^7.16.0: - version "7.17.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0" - integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ== + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.2.2" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" - esquery "^1.2.0" + esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" + glob-parent "^5.1.2" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -6606,7 +6888,7 @@ eslint@^7.11.0, eslint@^7.16.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.19" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -6615,7 +6897,7 @@ eslint@^7.11.0, eslint@^7.16.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^6.0.4" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -6633,10 +6915,10 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" @@ -6647,7 +6929,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -6677,7 +6959,7 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -eth-block-tracker@^4.2.0, eth-block-tracker@^4.4.1, eth-block-tracker@^4.4.2: +eth-block-tracker@4.4.3, eth-block-tracker@^4.2.0, eth-block-tracker@^4.4.1, eth-block-tracker@^4.4.2: version "4.4.3" resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz#766a0a0eb4a52c867a28328e9ae21353812cf626" integrity sha512-A8tG4Z4iNg4mw5tP1Vung9N9IjgMNqpiMoJ/FouSFwNCGHv2X0mmOYwtQOJzki6XN7r7Tyo01S29p7b224I4jw== @@ -6704,17 +6986,17 @@ eth-json-rpc-errors@^1.0.1: dependencies: fast-safe-stringify "^2.0.6" -eth-json-rpc-filters@^4.0.2, eth-json-rpc-filters@^4.1.1, eth-json-rpc-filters@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.1.tgz#82204a13c99927dbf42cbb3962846650c6281f33" - integrity sha512-tPfohezq8mSmwa47xvq6PGzBDLZ0njWJMB1J+OPuv+n+1WkWDlf3l3tqJXpq96RxhrzK2q7wiweRS5aGIzpq4Q== +eth-json-rpc-filters@4.2.2, eth-json-rpc-filters@^4.0.2, eth-json-rpc-filters@^4.1.1, eth-json-rpc-filters@^4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d" + integrity sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw== dependencies: - await-semaphore "^0.1.3" + "@metamask/safe-event-emitter" "^2.0.0" + async-mutex "^0.2.6" eth-json-rpc-middleware "^6.0.0" eth-query "^2.1.2" - json-rpc-engine "^5.3.0" - lodash.flatmap "^4.5.0" - safe-event-emitter "^1.0.1" + json-rpc-engine "^6.1.0" + pify "^5.0.0" eth-json-rpc-infura@^3.1.0: version "3.2.1" @@ -6871,6 +7153,13 @@ eth-query@^2.0.2, eth-query@^2.1.0, eth-query@^2.1.2: json-rpc-random-id "^1.0.0" xtend "^4.0.1" +eth-rpc-errors@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.2.tgz#11bc164e25237a679061ac05b7da7537b673d3b7" + integrity sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ== + dependencies: + fast-safe-stringify "^2.0.6" + eth-rpc-errors@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz#d7b22653c70dbf9defd4ef490fd08fe70608ca10" @@ -6878,10 +7167,10 @@ eth-rpc-errors@^3.0.0: dependencies: fast-safe-stringify "^2.0.6" -eth-rpc-errors@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.2.tgz#11bc164e25237a679061ac05b7da7537b673d3b7" - integrity sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ== +eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a" + integrity sha512-Z3ymjopaoft7JDoxZcEb3pwdGh7yiYMhOwm2doUt6ASXlMavpNlK6Cre0+IMl2VSGyEU9rkiperQhp5iRxn5Pg== dependencies: fast-safe-stringify "^2.0.6" @@ -6922,9 +7211,9 @@ eth-tx-summary@^3.1.2: through2 "^2.0.3" ethereum-bloom-filters@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz#b7b80735e385dbb7f944ce6b4533e24511306060" - integrity sha512-cDcJJSJ9GMAcURiAWO3DxIEhTL/uWqlQnvgKpuYQzYPrt/izuGU+1ntQmHt0IRq6ADoSYHFnB+aCEFIldjhkMQ== + version "1.0.10" + resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.10.tgz#3ca07f4aed698e75bd134584850260246a5fed8a" + integrity sha512-rxJ5OFN3RwjQxDcFP2Z5+Q9ho4eIdEmSc2ht0fCu8Se9nbXjZ7/031uXoUYJ87KHCOdVeiUuwSnoS7hmYAGVHA== dependencies: js-sha3 "^0.8.0" @@ -7009,7 +7298,7 @@ ethereumjs-abi@0.6.5: "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": version "0.6.8" - resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#1ce6a1d64235fabe2aaf827fd606def55693508f" + resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0" dependencies: bn.js "^4.11.8" ethereumjs-util "^6.0.0" @@ -7045,7 +7334,7 @@ ethereumjs-block@~2.2.0: ethereumjs-util "^5.0.0" merkle-patricia-tree "^2.1.2" -ethereumjs-common@^1.1.0, ethereumjs-common@^1.3.2, ethereumjs-common@^1.5.0: +ethereumjs-common@^1.1.0, ethereumjs-common@^1.5.0: version "1.5.2" resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz#2065dbe9214e850f2e955a80e650cb6999066979" integrity sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA== @@ -7116,6 +7405,18 @@ ethereumjs-util@^6.0.0: ethjs-util "0.1.6" rlp "^2.2.3" +ethereumjs-util@^7.0.10, ethereumjs-util@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz#e2b43a30bfcdbcb432a4eb42bd5f2393209b3fd5" + integrity sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw== + dependencies: + "@types/bn.js" "^5.1.0" + bn.js "^5.1.2" + create-hash "^1.1.2" + ethereum-cryptography "^0.1.3" + ethjs-util "0.1.6" + rlp "^2.2.4" + ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4, ethereumjs-vm@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz#76243ed8de031b408793ac33907fb3407fe400c6" @@ -7180,14 +7481,14 @@ eventemitter3@4.0.7, eventemitter3@^4.0.0: integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" - integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== dependencies: original "^1.0.0" @@ -7200,9 +7501,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: safe-buffer "^5.1.1" exec-sh@^0.3.2: - version "0.3.4" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" - integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^1.0.0: version "1.0.0" @@ -7232,6 +7533,11 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -7362,16 +7668,15 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.1.1: - version "3.2.4" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" - integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" @@ -7384,28 +7689,21 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fast-safe-stringify@^2.0.6: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" - integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== + version "2.0.8" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f" + integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag== fastq@^1.6.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" - integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== + version "1.12.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794" + integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg== dependencies: reusify "^1.0.4" -faye-websocket@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= - dependencies: - websocket-driver ">=0.5.1" - -faye-websocket@~0.11.1: - version "0.11.3" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" - integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== +faye-websocket@^0.11.3: + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== dependencies: websocket-driver ">=0.5.1" @@ -7428,10 +7726,10 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== -file-entry-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" - integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" @@ -7449,9 +7747,9 @@ file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" - integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== dependencies: minimatch "^3.0.4" @@ -7538,12 +7836,12 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-versions@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" - integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww== +find-versions@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" + integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== dependencies: - semver-regex "^2.0.0" + semver-regex "^3.1.2" flat-cache@^3.0.4: version "3.0.4" @@ -7554,9 +7852,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" - integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== flatten@^1.0.2: version "1.0.3" @@ -7578,10 +7876,10 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -follow-redirects@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" - integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== +follow-redirects@^1.0.0, follow-redirects@^1.10.0: + version "1.14.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.2.tgz#cecb825047c00f5e66b142f90fed4f515dec789b" + integrity sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA== for-each@~0.3.3: version "0.3.3" @@ -7618,6 +7916,15 @@ fork-ts-checker-webpack-plugin@4.1.6: tapable "^1.0.0" worker-rpc "^0.1.0" +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -7634,10 +7941,10 @@ fortmatic@^1.0.0: dependencies: "@babel/runtime" "7.3.4" -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fragment-cache@^0.2.1: version "0.2.1" @@ -7687,16 +7994,16 @@ fs-extra@^8.1.0: universalify "^0.1.0" fs-extra@^9.0.0, fs-extra@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^1.0.0" + universalify "^2.0.0" -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -7733,17 +8040,12 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@^2.1.2, fsevents@^2.1.3: - version "2.2.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.2.tgz#ae94eddce6e1cbc4fd0bd2d43080c5406abd5d6b" - integrity sha512-xJEn9cTLpaYpLA/ACD3wjQRA7unhS0b7veAzx6F8cVhi8yjwjAPzHsVibMIAWwwMVHixe6WqoFXlc36FsNM80w== - -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== +fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== -function-bind@^1.1.1, function-bind@~1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== @@ -7753,7 +8055,7 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= -gensync@^1.0.0-beta.1: +gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== @@ -7763,10 +8065,10 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.0, get-intrinsic@^1.0.1, get-intrinsic@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" - integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -7824,12 +8126,12 @@ getpass@^0.1.1: assert-plus "^1.0.0" git-raw-commits@^2.0.0: - version "2.0.9" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.9.tgz#5cbc707a615cb77b71e687f8a1ee54af46208b22" - integrity sha512-hSpNpxprVno7IOd4PZ93RQ+gNdzPAIrW0x8av6JQDJGV4k1mR9fE01dl8sEqi2P7aKmmwiGUn1BCPuf16Ae0Qw== + version "2.0.10" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.10.tgz#e2255ed9563b1c9c3ea6bd05806410290297bbc1" + integrity sha512-sHhX5lsbG9SOO6yXdlwgEMQ/ljIn7qMpAbJZCGfXX2fq5T8M5SrDnpYk9/4HswTildcIqatsWa91vty6VhWSaQ== dependencies: dargs "^7.0.0" - lodash.template "^4.0.2" + lodash "^4.17.15" meow "^8.0.0" split2 "^3.0.0" through2 "^4.0.0" @@ -7842,17 +8144,17 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.7: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -7897,19 +8199,19 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== +globals@^13.6.0, globals@^13.9.0: + version "13.11.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" + integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== dependencies: - type-fest "^0.8.1" + type-fest "^0.20.2" globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -globby@11.0.1, globby@^11.0.1: +globby@11.0.1: version "11.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== @@ -7921,6 +8223,18 @@ globby@11.0.1, globby@^11.0.1: merge2 "^1.3.0" slash "^3.0.0" +globby@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -7970,9 +8284,9 @@ got@^7.1.0: url-to-options "^1.0.1" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== growly@^1.3.0: version "1.3.0" @@ -8018,9 +8332,9 @@ hard-rejection@^2.1.0: integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== harmony-reflect@^1.4.6: - version "1.6.1" - resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9" - integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA== + version "1.6.2" + resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" + integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g== has-ansi@^2.0.0: version "2.0.0" @@ -8029,6 +8343,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -8044,10 +8363,10 @@ has-symbol-support-x@^1.4.1: resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== -has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== has-to-string-tag-x@^1.2.0: version "1.4.1" @@ -8056,6 +8375,13 @@ has-to-string-tag-x@^1.2.0: dependencies: has-symbol-support-x "^1.4.1" +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -8111,7 +8437,7 @@ hash.js@1.1.3: inherits "^2.0.3" minimalistic-assert "^1.0.0" -hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: +hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== @@ -8141,7 +8467,7 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^1.0.1" -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.0, hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -8171,14 +8497,14 @@ hoopy@^0.1.4: integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^3.0.6: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== dependencies: lru-cache "^6.0.0" @@ -8202,11 +8528,6 @@ hsla-regex@^1.0.0: resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= -html-comment-regex@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== - html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -8252,17 +8573,15 @@ html-webpack-plugin@4.5.0: tapable "^1.1.3" util.promisify "1.0.0" -htmlparser2@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== +htmlparser2@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" http-cache-semantics@^4.0.0: version "4.1.0" @@ -8316,6 +8635,15 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -8349,23 +8677,31 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== husky@^4.3.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.6.tgz#ebd9dd8b9324aa851f1587318db4cccb7665a13c" - integrity sha512-o6UjVI8xtlWRL5395iWq9LKDyp/9TE7XMOTvIpEVzW638UcGxTmV5cfel6fsk/jbZSTlvfGVJf2svFtybcIZag== + version "4.3.8" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" + integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== dependencies: chalk "^4.0.0" ci-info "^2.0.0" compare-versions "^3.6.0" cosmiconfig "^7.0.0" - find-versions "^3.2.0" + find-versions "^4.0.0" opencollective-postinstall "^2.0.2" - pkg-dir "^4.2.0" + pkg-dir "^5.0.0" please-upgrade-node "^3.2.0" slash "^3.0.0" which-pm-runs "^1.0.0" @@ -8378,9 +8714,9 @@ iconv-lite@0.4.24: safer-buffer ">= 2.1.2 < 3" iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" @@ -8405,7 +8741,7 @@ idna-uts46-hx@^2.3.1: dependencies: punycode "2.1.0" -ieee754@^1.1.13, ieee754@^1.1.4: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -8424,9 +8760,9 @@ iframe-resizer-react@^1.1.0: warning "^4.0.3" iframe-resizer@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.3.1.tgz#7aca964ac02ba1fd2b8099b8ef30bc9a1f4f72ca" - integrity sha512-PkoTPNF6EYhTbDjogdKu7JVgKqRwwNBXMeywZaQyzEYM3BNltA8O9fIIrtUkmj+8VZGckXpwtXsWsaQ5lrhd0w== + version "4.3.2" + resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.3.2.tgz#42dd88345d18b9e377b6044dddb98c664ab0ce6b" + integrity sha512-gOWo2hmdPjMQsQ+zTKbses08mDfDEMh4NneGQNP4qwePYujY1lguqP6gnbeJkf154gojWlBhIltlgnMfYjGHWA== ignore@^4.0.6: version "4.0.6" @@ -8443,15 +8779,15 @@ immediate@^3.2.3: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== -immer@7.0.9: - version "7.0.9" - resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.9.tgz#28e7552c21d39dd76feccd2b800b7bc86ee4a62e" - integrity sha512-Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A== +immer@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656" + integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA== -immer@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.0.tgz#08763549ba9dd7d5e2eb4bec504a8315bd9440c2" - integrity sha512-jm87NNBAIG4fHwouilCHIecFXp5rMGkiFrAuhVO685UnMAlOneEAnOyzPt8OnP47TC11q/E7vpzZe0WvwepFTg== +immer@^9.0.1: + version "9.0.5" + resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec" + integrity sha512-2WuIehr2y4lmYz9gaQzetPR2ECniCifk4ORaQbU3g5EalLt+0IVTosEPJ5BoYl/75ky2mivzdRzV8wWgQGOSYQ== import-cwd@^2.0.0: version "2.1.0" @@ -8560,14 +8896,14 @@ internal-ip@^4.3.0: default-gateway "^4.2.0" ipaddr.js "^1.9.0" -internal-slot@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: - es-abstract "^1.17.0-next.1" + get-intrinsic "^1.1.0" has "^1.0.3" - side-channel "^1.0.2" + side-channel "^1.0.4" invariant@^2.2.2: version "2.2.4" @@ -8616,11 +8952,12 @@ is-accessor-descriptor@^1.0.0: kind-of "^6.0.0" is-arguments@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" - integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -8632,6 +8969,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" @@ -8646,6 +8990,14 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-buffer@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" @@ -8661,10 +9013,10 @@ is-buffer@^2.0.2: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-ci@^2.0.0: version "2.0.0" @@ -8685,10 +9037,10 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.0.0, is-core-module@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== +is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== dependencies: has "^1.0.3" @@ -8707,9 +9059,11 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -8735,9 +9089,9 @@ is-directory@^0.3.1: integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -8787,9 +9141,11 @@ is-generator-fn@^2.0.0: integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== is-generator-function@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b" - integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ== + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" is-glob@^3.1.0: version "3.1.0" @@ -8815,11 +9171,18 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= -is-negative-zero@^2.0.0: +is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== +is-number-object@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -8878,24 +9241,18 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= - -is-regex@^1.0.4, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== - dependencies: - has-symbols "^1.0.1" +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" - integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== +is-regex@^1.0.4, is-regex@^1.1.3, is-regex@~1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: - has "^1.0.3" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-regexp@^1.0.0: version "1.0.0" @@ -8923,28 +9280,23 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - -is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-svg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" - integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ== +is-string@^1.0.5, is-string@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== dependencies: - html-comment-regex "^1.1.0" + has-tostringtag "^1.0.0" -is-symbol@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-text-path@^1.0.1: version "1.0.1" @@ -8953,16 +9305,16 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" -is-typed-array@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.4.tgz#1f66f34a283a3c94a4335434661ca53fff801120" - integrity sha512-ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA== +is-typed-array@^1.1.3, is-typed-array@^1.1.6: + version "1.1.7" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.7.tgz#881ddc660b13cb8423b2090fa88c0fe37a83eb2f" + integrity sha512-VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA== dependencies: - available-typed-arrays "^1.0.2" - call-bind "^1.0.0" - es-abstract "^1.18.0-next.1" + available-typed-arrays "^1.0.4" + call-bind "^1.0.2" + es-abstract "^1.18.5" foreach "^2.0.5" - has-symbols "^1.0.1" + has-tostringtag "^1.0.0" is-typedarray@1.0.0, is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -9517,6 +9869,11 @@ jest@26.6.0: import-local "^3.0.2" jest-cli "^26.6.0" +js-sha256@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966" + integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA== + js-sha3@0.5.7, js-sha3@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" @@ -9546,9 +9903,9 @@ js-yaml@^3.13.1: esprima "^4.0.0" jsbi@^3.1.1: - version "3.1.4" - resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz#9654dd02207a66a4911b4e4bb74265bc2cbc9dd0" - integrity sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg== + version "3.1.6" + resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.6.tgz#572431b0ff4b9c0f5f4b41e214dba76a734e676b" + integrity sha512-CGjq13y28FrBA5mAU+rsfHaVKEF9jrw3PhzZpIzTeMiPsT0XRDAS6E7QS8/ZTmFQUtl2MDJsxKQoYJzAhF7B1w== jsbn@~0.1.0: version "0.1.1" @@ -9556,35 +9913,36 @@ jsbn@~0.1.0: integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" - integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: - abab "^2.0.3" - acorn "^7.1.1" + abab "^2.0.5" + acorn "^8.2.4" acorn-globals "^6.0.0" cssom "^0.4.4" - cssstyle "^2.2.0" + cssstyle "^2.3.0" data-urls "^2.0.0" - decimal.js "^10.2.0" + decimal.js "^10.2.1" domexception "^2.0.1" - escodegen "^1.14.1" + escodegen "^2.0.0" + form-data "^3.0.0" html-encoding-sniffer "^2.0.1" - is-potential-custom-element-name "^1.0.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" nwsapi "^2.2.0" - parse5 "5.1.1" - request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" + parse5 "6.0.1" + saxes "^5.0.1" symbol-tree "^3.2.4" - tough-cookie "^3.0.1" + tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" + whatwg-url "^8.5.0" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^1.3.0: @@ -9617,6 +9975,14 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== +json-rpc-engine@6.1.0, json-rpc-engine@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393" + integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ== + dependencies: + "@metamask/safe-event-emitter" "^2.0.0" + eth-rpc-errors "^4.0.2" + json-rpc-engine@^3.4.0, json-rpc-engine@^3.6.0: version "3.8.0" resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz#9d4ff447241792e1d0a232f6ef927302bb0c62a9" @@ -9637,14 +10003,6 @@ json-rpc-engine@^5.1.3, json-rpc-engine@^5.3.0: eth-rpc-errors "^3.0.0" safe-event-emitter "^1.0.1" -json-rpc-engine@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393" - integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ== - dependencies: - "@metamask/safe-event-emitter" "^2.0.0" - eth-rpc-errors "^4.0.2" - json-rpc-error@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/json-rpc-error/-/json-rpc-error-2.0.0.tgz#a7af9c202838b5e905c7250e547f1aff77258a02" @@ -9697,7 +10055,7 @@ json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.2: +json3@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -9714,10 +10072,10 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== +json5@^2.1.2, json5@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" @@ -9766,9 +10124,9 @@ jsprim@^1.2.2: object.assign "^4.1.2" keccak256@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/keccak256/-/keccak256-1.0.2.tgz#ee0d38c2d5fb817f39d37c3fef842cab0164a067" - integrity sha512-f2EncSgmHmmQOkgxZ+/f2VaWTNkFL6f39VIrpoX+p8cEXJVyyCs/3h9GNz/ViHgwchxvv7oG5mjT2Tk4ZqInag== + version "1.0.3" + resolved "https://registry.yarnpkg.com/keccak256/-/keccak256-1.0.3.tgz#0a9c0383a9cda753a7351811cf69eaa607043366" + integrity sha512-EkF/4twuPm1V/gn75nejOUrKfDUJn87RMLzDWosXF3pXuOvesiSgX35GcmbqzdImCASEkE/WaklWGWSa+Ha5bQ== dependencies: bn.js "^4.11.8" keccak "^3.0.1" @@ -9784,12 +10142,13 @@ keccak@^1.0.2: safe-buffer "^5.1.0" keccak@^3.0.0, keccak@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" - integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== + version "3.0.2" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" + integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" + readable-stream "^3.6.0" keyv@^3.0.0: version "3.1.0" @@ -9798,6 +10157,11 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" +keyvaluestorage-interface@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/keyvaluestorage-interface/-/keyvaluestorage-interface-1.0.0.tgz#13ebdf71f5284ad54be94bd1ad9ed79adad515ff" + integrity sha512-8t6Q3TclQ4uZynJY9IGr2+SsIGwK9JHcO6ootkHCGA0CrQCRy+VkouYNO2xicET6b9al7QKzpebNow+gkpCL8g== + killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -9832,6 +10196,11 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== +klona@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" + integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== + language-subtag-registry@~0.3.2: version "0.3.21" resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a" @@ -9928,16 +10297,6 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -10020,22 +10379,27 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= -lodash.flatmap@^4.5.0: +lodash.clonedeep@^4.5.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" - integrity sha1-74y/QI9uSCaGYzRTBcaswLd4cC4= + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.template@^4.0.2, lodash.template@^4.5.0: +lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== @@ -10050,15 +10414,20 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== loglevel@^1.6.8, loglevel@^1.7.1: version "1.7.1" @@ -10161,9 +10530,9 @@ map-obj@^2.0.0: integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk= map-obj@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5" - integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g== + version "4.2.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7" + integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ== map-visit@^1.0.0: version "1.0.0" @@ -10245,9 +10614,9 @@ meow@^5.0.0: yargs-parser "^10.0.0" meow@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.0.tgz#0fcaa267e35e4d58584b8205923df6021ddcc7ba" - integrity sha512-fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA== + version "8.1.2" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" + integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== dependencies: "@types/minimist" "^1.2.0" camelcase-keys "^6.2.2" @@ -10319,13 +10688,13 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== +micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" miller-rabin@^4.0.0: version "4.0.1" @@ -10335,17 +10704,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.45.0, "mime-db@>= 1.43.0 < 2": - version "1.45.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" - integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== +mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.28" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" - integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== dependencies: - mime-db "1.45.0" + mime-db "1.49.0" mime@1.6.0: version "1.6.0" @@ -10353,9 +10722,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.7" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" - integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== mimic-fn@^2.1.0: version "2.1.0" @@ -10457,7 +10826,7 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -10472,7 +10841,7 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -10523,7 +10892,7 @@ mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -10531,9 +10900,9 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: minimist "^1.2.5" mock-fs@^4.1.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.13.0.tgz#31c02263673ec3789f90eb7b6963676aa407a598" - integrity sha512-DD0vOdofJdoaRNtnWcrXe6RQbpHkPPmtqGq14uRX0F8ZKJ5nv89CVTYl/BZdppDxBDaV0hl75htg3abpEWlPZA== + version "4.14.0" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18" + integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw== moment@^2.10.2: version "2.29.1" @@ -10625,20 +10994,20 @@ multihashes@^0.4.15, multihashes@~0.4.15: multibase "^0.7.0" varint "^5.0.0" -nan@^2.12.1, nan@^2.14.0, nan@^2.14.1, nan@^2.2.1: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nan@^2.12.1, nan@^2.14.0, nan@^2.14.2, nan@^2.2.1: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== nano-json-stream-parser@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18= -nanoid@^3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== +nanoid@^3.1.23: + version "3.1.25" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" + integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== nanomatch@^1.2.9: version "1.2.13" @@ -10674,7 +11043,7 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.5.0, neo-async@^2.6.1: +neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -10702,12 +11071,7 @@ node-addon-api@^2.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== -node-fetch@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5" - integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U= - -node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@2.6.1, node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -10770,9 +11134,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -10781,10 +11145,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.61, node-releases@^1.1.67: - version "1.1.69" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" - integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== +node-releases@^1.1.61, node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== normalize-hex@0.0.2: version "0.0.2" @@ -10804,13 +11168,13 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package- validate-npm-package-license "^3.0.1" normalize-package-data@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a" - integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" + integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== dependencies: - hosted-git-info "^3.0.6" - resolve "^1.17.0" - semver "^7.3.2" + hosted-git-info "^4.0.1" + is-core-module "^2.5.0" + semver "^7.3.4" validate-npm-package-license "^3.0.1" normalize-path@^2.1.1: @@ -10846,9 +11210,9 @@ normalize-url@^3.0.0: integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== npm-run-path@^2.0.0: version "2.0.2" @@ -10871,6 +11235,13 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" +nth-check@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" + integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== + dependencies: + boolbase "^1.0.0" + num2fraction@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" @@ -10894,15 +11265,6 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -obj-multiplex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/obj-multiplex/-/obj-multiplex-1.0.0.tgz#2f2ae6bfd4ae11befe742ea9ea5b36636eabffc1" - integrity sha1-Lyrmv9SuEb7+dC6p6ls2Y26r/8E= - dependencies: - end-of-stream "^1.4.0" - once "^1.4.0" - readable-stream "^2.3.3" - object-assign@^4, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -10917,22 +11279,17 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.8.0, object-inspect@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" - integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== - -object-inspect@~1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" - integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== +object-inspect@^1.11.0, object-inspect@^1.9.0, object-inspect@~1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== object-is@^1.0.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068" - integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg== + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" object-keys@^1.0.12, object-keys@^1.1.1: @@ -10952,7 +11309,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: +object.assign@^4.1.0, object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== @@ -10962,34 +11319,33 @@ object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.0, object.entries@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" - integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== +object.entries@^1.1.0, object.entries@^1.1.2, object.entries@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" + integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has "^1.0.3" + es-abstract "^1.18.2" -object.fromentries@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072" - integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw== +object.fromentries@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" + integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + es-abstract "^1.18.0-next.2" has "^1.0.3" object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544" - integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng== + version "2.1.2" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" + integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + es-abstract "^1.18.0-next.2" object.pick@^1.3.0: version "1.3.0" @@ -10998,15 +11354,14 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731" - integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag== +object.values@^1.1.0, object.values@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has "^1.0.3" + es-abstract "^1.18.2" oboe@2.1.4: version "2.1.4" @@ -11022,16 +11377,6 @@ oboe@2.1.5: dependencies: http-https "^1.0.0" -obs-store@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/obs-store/-/obs-store-4.0.3.tgz#b632ec7814baa604fae084a4c97e87c0b7a6d14c" - integrity sha512-+mm13kCRDv6IcvUDKTw0LIy5+dQhIktYaR/RwwZUFzOTi/fjMaNBnk42Adb94qZqJ00qWkjhQSZH7MXlKnTi8A== - dependencies: - readable-stream "^2.2.2" - safe-event-emitter "^1.0.1" - through2 "^2.0.3" - xtend "^4.0.1" - obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -11063,10 +11408,10 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -open@^7.0.2, open@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" - integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== +open@^7.0.2, open@^7.3.1: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -11283,16 +11628,9 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5: safe-buffer "^5.1.1" parse-headers@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515" - integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA== - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - dependencies: - error-ex "^1.2.0" + version "2.0.4" + resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.4.tgz#9eaf2d02bed2d1eff494331ce3df36d7924760bf" + integrity sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw== parse-json@^4.0.0: version "4.0.0" @@ -11303,19 +11641,19 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" @@ -11376,9 +11714,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@0.1.7: version "0.1.7" @@ -11392,13 +11730,6 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -11412,9 +11743,9 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pbkdf2@^3.0.17, pbkdf2@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" - integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -11437,10 +11768,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== pify@4.0.1, pify@^4.0.1: version "4.0.1" @@ -11457,6 +11788,11 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= +pify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" + integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -11497,6 +11833,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +pkg-dir@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== + dependencies: + find-up "^5.0.0" + pkg-up@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" @@ -11504,6 +11847,13 @@ pkg-up@3.1.0: dependencies: find-up "^3.0.0" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -11544,13 +11894,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -post-message-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/post-message-stream/-/post-message-stream-3.0.0.tgz#90d9f54bd209e6b6f5d74795b87588205b547048" - integrity sha1-kNn1S9IJ5rb110eVuHWIIFtUcEg= - dependencies: - readable-stream "^2.1.4" - postcss-attribute-case-insensitive@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880" @@ -11755,11 +12098,10 @@ postcss-image-set-function@^3.0.1: postcss-values-parser "^2.0.0" postcss-initial@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d" - integrity sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53" + integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg== dependencies: - lodash.template "^4.5.0" postcss "^7.0.2" postcss-lab-function@^2.0.1: @@ -12148,21 +12490,18 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" - integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== dependencies: cssesc "^3.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" util-deprecate "^1.0.2" -postcss-svgo@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" - integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== +postcss-svgo@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" + integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== dependencies: - is-svg "^3.0.0" postcss "^7.0.0" postcss-value-parser "^3.0.0" svgo "^1.0.0" @@ -12195,42 +12534,33 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: indexes-of "^1.0.1" uniq "^1.0.1" -postcss@7.0.21: - version "7.0.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17" - integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.35" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" - integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== +postcss@7.0.36, postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.36" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" + integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== dependencies: chalk "^2.4.2" source-map "^0.6.1" supports-color "^6.1.0" postcss@^8.1.0: - version "8.2.2" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.2.tgz#60613b62297005084fd21024a68637798864fe26" - integrity sha512-HM1NDNWLgglJPQQMNwvLxgH2KcrKZklKLi/xXYIOaqQB57p/pDWEJNS83PVICYsn1Dg/9C26TiejNr422/ePaQ== + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== dependencies: - colorette "^1.2.1" - nanoid "^3.1.20" - source-map "^0.6.1" + colorette "^1.2.2" + nanoid "^3.1.23" + source-map-js "^0.6.2" preact@10.4.1: version "10.4.1" resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431" integrity sha512-WKrRpCSwL2t3tpOOGhf2WfTpcmbpxaWtDbdJdKdjd0aEiTkvOmS4NBkG6kzlaAHI9AkQ3iVqbFWM3Ei7mZ4o1Q== -preact@^10.3.3: - version "10.5.9" - resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.9.tgz#8caba9288b4db1d593be2317467f8735e43cda0b" - integrity sha512-X4m+4VMVINl/JFQKALOCwa3p8vhMAhBvle0hJ/W44w/WWfNb2TA7RNicDV3K2dNVs57f61GviEnVLiwN+fxiIg== +preact@^10.5.9: + version "10.5.14" + resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.14.tgz#0b14a2eefba3c10a57116b90d1a65f5f00cd2701" + integrity sha512-KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ== precond@0.2: version "0.2.3" @@ -12258,14 +12588,14 @@ prepend-http@^2.0.0: integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= prettier@^2.1.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + version "2.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" + integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== pretty-bytes@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e" - integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA== + version "5.6.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" + integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== pretty-error@^2.1.1: version "2.1.2" @@ -12285,11 +12615,21 @@ pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" +printj@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== + private@^0.1.6, private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -12325,7 +12665,7 @@ promise@^8.1.0: dependencies: asap "~2.0.6" -prompts@2.4.0, prompts@^2.0.1: +prompts@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== @@ -12333,6 +12673,14 @@ prompts@2.4.0, prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" +prompts@^2.0.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" @@ -12343,11 +12691,11 @@ prop-types@^15.6.2, prop-types@^15.7.2: react-is "^16.8.1" proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: - forwarded "~0.1.2" + forwarded "0.2.0" ipaddr.js "1.9.1" prr@~1.0.1: @@ -12355,7 +12703,7 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -12476,16 +12824,26 @@ querystring-es3@^0.2.0: resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= +querystring@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" + integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== + querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" @@ -12551,26 +12909,26 @@ react-app-polyfill@^2.0.0: whatwg-fetch "^3.4.1" react-chartjs-2@^2.11.1: - version "2.11.1" - resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-2.11.1.tgz#a78d0df05fc8bc8ffcd4c4ab5b89a25dd2ca3278" - integrity sha512-G7cNq/n2Bkh/v4vcI+GKx7Q1xwZexKYhOSj2HmrFXlvNeaURWXun6KlOUpEQwi1cv9Tgs4H3kGywDWMrX2kxfA== + version "2.11.2" + resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz#156c0d2618600561efc23bef278bd48a335cadb6" + integrity sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw== dependencies: lodash "^4.17.19" prop-types "^15.7.2" react-countup@^4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/react-countup/-/react-countup-4.3.3.tgz#143a8d854d47290b73d6915eac20a12d839153c2" - integrity sha512-pWnxpwdPNRyJFha/YKKbyc4RLAw8PzmULdgCziGIgw6vxhT1VdccrvQgj38HBSoM2qF/MoLmn4M2klvDWVIdaw== + version "4.4.0" + resolved "https://registry.yarnpkg.com/react-countup/-/react-countup-4.4.0.tgz#ca5c0a971c442a06a7bc52f3921ad2e66ba65990" + integrity sha512-PSSpvRT5FCjCVh3NzPpz/SgeG8b9LnpfCSO1TEMK8K/GhmxI+s8D/KbxGCFsmmeq+Y0cnf2KepUHssPfH/7iyw== dependencies: countup.js "^1.9.3" prop-types "^15.7.2" warning "^4.0.3" -react-dev-utils@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.1.tgz#30106c2055acfd6b047d2dc478a85c356e66fe45" - integrity sha512-rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA== +react-dev-utils@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a" + integrity sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A== dependencies: "@babel/code-frame" "7.10.4" address "1.1.2" @@ -12585,31 +12943,31 @@ react-dev-utils@^11.0.1: global-modules "2.0.0" globby "11.0.1" gzip-size "5.1.1" - immer "7.0.9" + immer "8.0.1" is-root "2.1.0" loader-utils "2.0.0" open "^7.0.2" pkg-up "3.1.0" prompts "2.4.0" - react-error-overlay "^6.0.8" + react-error-overlay "^6.0.9" recursive-readdir "2.2.2" shell-quote "1.7.2" strip-ansi "6.0.0" text-table "0.2.0" react-dom@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" - integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - scheduler "^0.20.1" + scheduler "^0.20.2" -react-error-overlay@^6.0.8: - version "6.0.8" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz#474ed11d04fc6bda3af643447d85e9127ed6b5de" - integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw== +react-error-overlay@^6.0.9: + version "6.0.9" + resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" + integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew== react-feather@^2.0.8: version "2.0.9" @@ -12624,16 +12982,17 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-redux@^7.2.2: - version "7.2.2" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz#03862e803a30b6b9ef8582dadcc810947f74b736" - integrity sha512-8+CQ1EvIVFkYL/vu6Olo7JFLWop1qRUeb46sGtIMDCSpgwPQq8fPLpirIB0iTqFe9XYEFPHssdX8/UwN6pAkEA== + version "7.2.4" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225" + integrity sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA== dependencies: "@babel/runtime" "^7.12.1" + "@types/react-redux" "^7.1.16" hoist-non-react-statics "^3.3.2" loose-envify "^1.4.0" prop-types "^15.7.2" @@ -12674,13 +13033,13 @@ react-router@5.2.0: tiny-warning "^1.0.0" react-scripts@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-4.0.1.tgz#34974c0f4cfdf1655906c95df6a04d80db8b88f0" - integrity sha512-NnniMSC/wjwhcJAyPJCWtxx6CWONqgvGgV9+QXj1bwoW/JI++YF1eEf3Upf/mQ9KmP57IBdjzWs1XvnPq7qMTQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-4.0.3.tgz#b1cafed7c3fa603e7628ba0f187787964cb5d345" + integrity sha512-S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A== dependencies: "@babel/core" "7.12.3" - "@pmmmwh/react-refresh-webpack-plugin" "0.4.2" - "@svgr/webpack" "5.4.0" + "@pmmmwh/react-refresh-webpack-plugin" "0.4.3" + "@svgr/webpack" "5.5.0" "@typescript-eslint/eslint-plugin" "^4.5.0" "@typescript-eslint/parser" "^4.5.0" babel-eslint "^10.1.0" @@ -12703,7 +13062,7 @@ react-scripts@^4.0.1: eslint-plugin-react "^7.21.5" eslint-plugin-react-hooks "^4.2.0" eslint-plugin-testing-library "^3.9.2" - eslint-webpack-plugin "^2.1.0" + eslint-webpack-plugin "^2.5.2" file-loader "6.1.1" fs-extra "^9.0.1" html-webpack-plugin "4.5.0" @@ -12722,27 +13081,27 @@ react-scripts@^4.0.1: postcss-safe-parser "5.0.2" prompts "2.4.0" react-app-polyfill "^2.0.0" - react-dev-utils "^11.0.1" + react-dev-utils "^11.0.3" react-refresh "^0.8.3" resolve "1.18.1" resolve-url-loader "^3.1.2" - sass-loader "8.0.2" + sass-loader "^10.0.5" semver "7.3.2" style-loader "1.3.0" terser-webpack-plugin "4.2.3" ts-pnp "1.2.0" url-loader "4.1.1" webpack "4.44.2" - webpack-dev-server "3.11.0" + webpack-dev-server "3.11.1" webpack-manifest-plugin "2.2.0" workbox-webpack-plugin "5.1.4" optionalDependencies: fsevents "^2.1.3" react-transition-group@^4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" - integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== dependencies: "@babel/runtime" "^7.5.5" dom-helpers "^5.0.1" @@ -12750,28 +13109,20 @@ react-transition-group@^4.4.1: prop-types "^15.6.2" react-twitter-widgets@^1.9.5: - version "1.9.5" - resolved "https://registry.yarnpkg.com/react-twitter-widgets/-/react-twitter-widgets-1.9.5.tgz#3c05c0e6f54e79b175dd5e88b8870411e15c5790" - integrity sha512-C12GZzY0i7HsaQHOvfVswAJ0fj94VnC7freDK3Zb72tGEnLDwWDKApZ0yKoO4ywNqa/fcDNCU7JN9FUbQLO5VA== + version "1.10.0" + resolved "https://registry.yarnpkg.com/react-twitter-widgets/-/react-twitter-widgets-1.10.0.tgz#f5395c25b954631b5a2532cdb48005f7db61d370" + integrity sha512-K7MAREhkKJxrhoiNWricKs1O++NyElnVpcplLzZ67gDrmeIsD3E4TUzlt0/nTZAHPOPPc86V4kEd4KIg4de7cQ== dependencies: loadjs "^4.2.0" react@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" @@ -12787,16 +13138,7 @@ read-pkg-up@^7.0.1: dependencies: find-up "^4.1.0" read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" + type-fest "^0.8.1" read-pkg@^3.0.0: version "3.0.0" @@ -12817,7 +13159,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -12830,7 +13172,20 @@ read-pkg@^5.2.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0: +readable-stream@2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" + integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + safe-buffer "~5.1.1" + string_decoder "~1.0.3" + util-deprecate "~1.0.1" + +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.5.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -12868,10 +13223,10 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -12903,13 +13258,12 @@ redux-thunk@^2.3.0: resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== -redux@^4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" - integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== +redux@^4.0.0, redux@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47" + integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw== dependencies: - loose-envify "^1.4.0" - symbol-observable "^1.2.0" + "@babel/runtime" "^7.9.2" regenerate-unicode-properties@^8.2.0: version "8.2.0" @@ -12934,9 +13288,9 @@ regenerator-runtime@^0.12.0: integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-transform@^0.10.0: version "0.10.1" @@ -12967,18 +13321,18 @@ regex-parser@^2.2.11: resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" -regexpp@^3.0.0, regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== +regexpp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^2.0.0: version "2.0.0" @@ -13019,9 +13373,9 @@ regjsparser@^0.1.4: jsesc "~0.5.0" regjsparser@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" - integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== + version "0.6.9" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" + integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== dependencies: jsesc "~0.5.0" @@ -13036,20 +13390,20 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= renderkid@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5" - integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ== + version "2.0.7" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609" + integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ== dependencies: - css-select "^2.0.2" - dom-converter "^0.2" - htmlparser2 "^3.10.1" - lodash "^4.17.20" - strip-ansi "^3.0.0" + css-select "^4.1.3" + dom-converter "^0.2.0" + htmlparser2 "^6.1.0" + lodash "^4.17.21" + strip-ansi "^3.0.1" repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.6.1: version "1.6.1" @@ -13063,23 +13417,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request-promise-core@1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" - integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== - dependencies: - lodash "^4.17.19" - -request-promise-native@^1.0.8: - version "1.0.9" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" - integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== - dependencies: - request-promise-core "1.1.4" - stealthy-require "^1.1.1" - tough-cookie "^2.3.3" - -request@^2.79.0, request@^2.85.0, request@^2.88.2: +request@^2.79.0, request@^2.85.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -13172,9 +13510,9 @@ resolve-pathname@^3.0.0: integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== resolve-url-loader@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz#235e2c28e22e3e432ba7a5d4e305c59a58edfc08" - integrity sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.4.tgz#3c16caebe0b9faea9c7cc252fa49d2353c412320" + integrity sha512-D3sQ04o0eeQEySLrcz4DsX3saHfsr8/N6tfhblxgZKXxMT2Louargg12oGNfoTRLV09GXhVUe5/qgA5vdgNigg== dependencies: adjust-sourcemap-loader "3.0.0" camelcase "5.3.1" @@ -13182,7 +13520,7 @@ resolve-url-loader@^3.1.2: convert-source-map "1.7.0" es6-iterator "2.0.3" loader-utils "1.2.3" - postcss "7.0.21" + postcss "7.0.36" rework "1.0.1" rework-visit "1.0.0" source-map "0.6.1" @@ -13200,19 +13538,20 @@ resolve@1.18.1: is-core-module "^2.0.0" path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1: - version "1.19.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" - integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1, resolve@~1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: - is-core-module "^2.1.0" + is-core-module "^2.2.0" path-parse "^1.0.6" -resolve@~1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== dependencies: + is-core-module "^2.2.0" path-parse "^1.0.6" responselike@^1.0.2: @@ -13296,7 +13635,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rlp@^2.0.0, rlp@^2.2.3: +rlp@^2.0.0, rlp@^2.2.3, rlp@^2.2.4: version "2.2.6" resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.6.tgz#c80ba6266ac7a483ef1e69e8e2f056656de2fb2c" integrity sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg== @@ -13338,20 +13677,17 @@ rollup@^1.31.1: "@types/node" "*" acorn "^7.1.0" -rpc-payload-id@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/rpc-payload-id/-/rpc-payload-id-1.0.0.tgz#ecd5cd33fa25a280ff9fc45d4ea8e3333ccb564d" - integrity sha512-Nd8ZfqqVtoPqpqz69pGHn+83XKlyGOAkj33MdoNfwnFW+jMWyLYvZsG6rqziu/KECb7hfrdeNa6J9oi0KQUH2w== - rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== run-parallel@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" - integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" @@ -13365,10 +13701,10 @@ rustbn.js@~0.2.0: resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca" integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA== -rxjs@^6.5.4: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" - integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== +rxjs@^6.6.3: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" @@ -13377,7 +13713,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -13389,11 +13725,6 @@ safe-event-emitter@^1.0.1: dependencies: events "^3.0.0" -safe-json-utils@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-json-utils/-/safe-json-utils-1.0.0.tgz#8b1d68b13cff2ac6a5b68e6c9651cf7f8bb56d9b" - integrity sha512-n0hJm6BgX8wk3G+AS8MOQnfcA8dfE6ZMUfwkHUNx69YxPlU3HDaZTHXWto35Z+C4mOjK1odlT95WutkGC+0Idw== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -13426,33 +13757,33 @@ sanitize.css@^10.0.0: resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz#b5cb2547e96d8629a60947544665243b1dc3657a" integrity sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg== -sass-loader@8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d" - integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ== +sass-loader@^10.0.5: + version "10.2.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz#3d64c1590f911013b3fa48a0b22a83d5e1494716" + integrity sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw== dependencies: - clone-deep "^4.0.1" - loader-utils "^1.2.3" - neo-async "^2.6.1" - schema-utils "^2.6.1" - semver "^6.3.0" + klona "^2.0.4" + loader-utils "^2.0.0" + neo-async "^2.6.2" + schema-utils "^3.0.0" + semver "^7.3.2" sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.0: +saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== dependencies: xmlchars "^2.2.0" -scheduler@^0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" - integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -13466,7 +13797,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: +schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -13476,11 +13807,11 @@ schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7 ajv-keywords "^3.5.2" schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -13522,10 +13853,10 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^1.10.7: - version "1.10.8" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" - integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== +selfsigned@^1.10.8: + version "1.10.11" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" + integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== dependencies: node-forge "^0.10.0" @@ -13539,10 +13870,10 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -semver-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" - integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== +semver-regex@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807" + integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA== "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" @@ -13559,15 +13890,15 @@ semver@7.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== -semver@^6.0.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -13691,13 +14022,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" @@ -13737,7 +14061,7 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== -side-channel@^1.0.2, side-channel@^1.0.3: +side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== @@ -13826,26 +14150,26 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -sockjs-client@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" - integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== +sockjs-client@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6" + integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ== dependencies: - debug "^3.2.5" + debug "^3.2.6" eventsource "^1.0.7" - faye-websocket "~0.11.1" - inherits "^2.0.3" - json3 "^3.3.2" - url-parse "^1.4.3" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.5.1" -sockjs@0.3.20: - version "0.3.20" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" - integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== +sockjs@^0.3.21: + version "0.3.21" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== dependencies: - faye-websocket "^0.10.0" + faye-websocket "^0.11.3" uuid "^3.4.0" - websocket-driver "0.6.5" + websocket-driver "^0.7.4" sort-keys@^1.0.0: version "1.1.2" @@ -13860,9 +14184,9 @@ source-list-map@^2.0.0: integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-explorer@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.1.tgz#35ca7ba3574f0002ac347343f1894e04860c827f" - integrity sha512-sg60PIva7pOkvTqbLRGOB3Cp84I1pial0J6tUNs/bNGIz+0+WNw37oLXEDFHTDJhFh24rto8rESv4wCB7w9HVQ== + version "2.5.2" + resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.2.tgz#857cab5dd9d1d7175e9c5c2739dc9ccfb99f2dc5" + integrity sha512-gBwOyCcHPHcdLbgw6Y6kgoH1uLKL6hN3zz0xJcNI2lpnElZliIlmSYAjUVwAWnc7+HscoTyh1ScR7ITtFuEnxg== dependencies: btoa "^1.2.1" chalk "^4.1.0" @@ -13872,10 +14196,15 @@ source-map-explorer@^2.5.1: glob "^7.1.6" gzip-size "^6.0.0" lodash "^4.17.20" - open "^7.3.0" + open "^7.3.1" source-map "^0.7.3" temp "^0.9.4" - yargs "^16.1.1" + yargs "^16.2.0" + +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" @@ -13904,9 +14233,9 @@ source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.1 source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" @@ -13950,9 +14279,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== spdy-transport@^3.0.0: version "3.0.0" @@ -13989,13 +14318,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split2@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" - integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== - dependencies: - through2 "^2.0.2" - split2@^3.0.0: version "3.2.2" resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" @@ -14060,16 +14382,16 @@ sshpk@^1.7.0: tweetnacl "~0.14.0" ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" -ssri@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" - integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== +ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: minipass "^3.1.1" @@ -14103,11 +14425,6 @@ static-extend@^0.1.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -stealthy-require@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= - store@2.0.12: version "2.0.12" resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593" @@ -14121,6 +14438,14 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" +stream-browserify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" + integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA== + dependencies: + inherits "~2.0.4" + readable-stream "^3.5.0" + stream-each@^1.1.0: version "1.2.3" resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" @@ -14156,9 +14481,9 @@ strict-uri-encode@^2.0.0: integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY= string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" @@ -14178,50 +14503,51 @@ string-width@^3.0.0, string-width@^3.1.0: strip-ansi "^5.1.0" string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.matchall@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a" - integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw== +string.prototype.matchall@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da" + integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has-symbols "^1.0.1" - internal-slot "^1.0.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.3" - -string.prototype.trim@~1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz#d23a22fde01c1e6571a7fadcb9be11decd8061a7" - integrity sha512-16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg== + es-abstract "^1.18.2" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + +string.prototype.trim@~1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd" + integrity sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + es-abstract "^1.18.0-next.2" -string.prototype.trimend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" - integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" -string.prototype.trimstart@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" - integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" string_decoder@^1.0.0, string_decoder@^1.1.1: @@ -14236,6 +14562,13 @@ string_decoder@~0.10.x: resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= +string_decoder@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + dependencies: + safe-buffer "~5.1.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -14334,16 +14667,16 @@ style-loader@1.3.0: schema-utils "^2.7.0" styled-components@^5.1.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.1.tgz#6ed7fad2dc233825f64c719ffbdedd84ad79101a" - integrity sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.0.tgz#e47c3d3e9ddfff539f118a3dd0fd4f8f4fb25727" + integrity sha512-bPJKwZCHjJPf/hwTJl6TbkSZg/3evha+XPEizrZUGb535jLImwDUdjTNxXqjjaASt2M4qO4AVfoHJNe3XB/tpQ== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/traverse" "^7.4.5" "@emotion/is-prop-valid" "^0.8.8" "@emotion/stylis" "^0.8.4" "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1" + babel-plugin-styled-components ">= 1.12.0" css-to-react-native "^3.0.0" hoist-non-react-statics "^3.0.0" shallowequal "^1.1.0" @@ -14404,9 +14737,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -14452,25 +14785,22 @@ swarm-js@^0.1.40: tar "^4.0.2" xhr-request "^1.0.1" -symbol-observable@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" @@ -14478,43 +14808,43 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tape@^4.6.3: - version "4.13.3" - resolved "https://registry.yarnpkg.com/tape/-/tape-4.13.3.tgz#51b3d91c83668c7a45b1a594b607dee0a0b46278" - integrity sha512-0/Y20PwRIUkQcTCSi4AASs+OANZZwqPKaipGCEwp10dQMipVvSZwUUCi01Y/OklIGyHKFhIcjock+DKnBfLAFw== + version "4.14.0" + resolved "https://registry.yarnpkg.com/tape/-/tape-4.14.0.tgz#e4d46097e129817175b90925f2385f6b1bcfa826" + integrity sha512-z0+WrUUJuG6wIdWrl4W3rTte2CR26G6qcPOj3w1hfRdcmhF3kHBhOBW9VHsPVAkz08ZmGzp7phVpDupbLzrYKQ== dependencies: + call-bind "~1.0.2" deep-equal "~1.1.1" defined "~1.0.0" dotignore "~0.1.2" for-each "~0.3.3" - function-bind "~1.1.1" - glob "~7.1.6" + glob "~7.1.7" has "~1.0.3" inherits "~2.0.4" - is-regex "~1.0.5" + is-regex "~1.1.3" minimist "~1.2.5" - object-inspect "~1.7.0" - resolve "~1.17.0" + object-inspect "~1.11.0" + resolve "~1.20.0" resumer "~0.0.0" - string.prototype.trim "~1.2.1" + string.prototype.trim "~1.2.4" through "~2.3.8" tar@^4.0.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" tar@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" - integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== + version "6.1.10" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz#8a320a74475fba54398fa136cd9883aa8ad11175" + integrity sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -14593,9 +14923,9 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3: source-map-support "~0.5.12" terser@^5.3.4: - version "5.5.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" - integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== + version "5.7.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784" + integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -14625,7 +14955,7 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -through2@^2.0.0, through2@^2.0.2, through2@^2.0.3: +through2@^2.0.0, through2@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -14741,32 +15071,37 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +toggle-selection@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" + integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI= + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -tough-cookie@^2.3.3, tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.1.2" -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== dependencies: - ip-regex "^2.1.0" psl "^1.1.28" punycode "^2.1.1" -tr46@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" - integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== dependencies: punycode "^2.1.1" @@ -14776,9 +15111,9 @@ trim-newlines@^2.0.0: integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= trim-newlines@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30" - integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== trim-off-newlines@^1.0.0: version "1.0.1" @@ -14800,13 +15135,12 @@ ts-pnp@1.2.0, ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== -tsconfig-paths@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" - integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== +tsconfig-paths@^3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" + integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^2.2.0" minimist "^1.2.0" strip-bom "^3.0.0" @@ -14815,15 +15149,15 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" - integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== +tslib@^2.0.0, tslib@^2.0.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tsutils@^3.17.1: - version "3.18.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.18.0.tgz#38add50a28ec97e988cb43c5b32e55d1ff4a222a" - integrity sha512-D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA== +tsutils@^3.17.1, tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" @@ -14873,16 +15207,21 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.18.0: version "0.18.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -14912,9 +15251,9 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== + version "2.5.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d" + integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw== typedarray-to-buffer@3.1.5, typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -14929,15 +15268,25 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" - integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + underscore@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" @@ -15015,16 +15364,11 @@ universal-cookie@^4.0.4: "@types/cookie" "^0.3.3" cookie "^0.4.0" -universalify@^0.1.0: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -15054,9 +15398,9 @@ upath@^1.1.1, upath@^1.1.2, upath@^1.2.0: integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" - integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" @@ -15088,10 +15432,10 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3: - version "1.4.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" - integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== +url-parse@^1.4.3, url-parse@^1.5.1: + version "1.5.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" + integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -15120,9 +15464,9 @@ use@^3.1.0: integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== utf-8-validate@^5.0.2: - version "5.0.4" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz#72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8" - integrity sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q== + version "5.0.5" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.5.tgz#dd32c2e82c72002dc9f02eb67ba6761f43456ca1" + integrity sha512-+pnxRYsS/axEpkrrEpzYfNZGXp0IjC/9RIxwM5gntY4Koi8SHmUGSfxfWqxZdRxrtaoVstuOzUp/rbs3JSPELQ== dependencies: node-gyp-build "^4.2.0" @@ -15168,10 +15512,10 @@ util@^0.11.0: dependencies: inherits "2.0.3" -util@^0.12.0: - version "0.12.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" - integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== +util@^0.12.0, util@^0.12.4: + version "0.12.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" + integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== dependencies: inherits "^2.0.3" is-arguments "^1.0.4" @@ -15223,14 +15567,14 @@ uuidv4@6.0.6: uuid "7.0.2" v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -15299,16 +15643,26 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" -walletlink@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.0.2.tgz#8640e42d3df49b4661019287ab9789e94b72db98" - integrity sha512-4MIctCHAjcPHSQUHpHuU9leUAvYqRF+/4kCq7x9AngZQ2Jd74dbpC8dfZ55uOwW8TXc7z9XYeSyzRrGHbv5ZXg== +walletlink@^2.1.6: + version "2.1.8" + resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.1.8.tgz#12d00b230602f9ad10ea384f3c228d872126c38f" + integrity sha512-rIjQ0EE1tywiaaSwVF/RGChuYM9v6DQjoBwP4kPYWAxRCtBiOBlorVma/6pM0IOiybZEJvAVLtq1wJ78V7HBxw== dependencies: + "@metamask/safe-event-emitter" "2.0.0" bind-decorator "^1.0.11" bn.js "^5.1.1" + buffer "^6.0.3" clsx "^1.1.0" - preact "^10.3.3" - rxjs "^6.5.4" + eth-block-tracker "4.4.3" + eth-json-rpc-filters "4.2.2" + eth-rpc-errors "4.0.2" + js-sha256 "0.9.0" + json-rpc-engine "6.1.0" + keccak "^3.0.1" + preact "^10.5.9" + rxjs "^6.6.3" + stream-browserify "^3.0.0" + util "^0.12.4" warning@^4.0.3: version "4.0.3" @@ -15342,181 +15696,173 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web3-bzz@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.1.tgz#c7e13e5fbbbe4634b0d883e5440069fc58e58044" - integrity sha512-MN726zFpFpwhs3NMC35diJGkwTVUj+8LM/VWqooGX/MOjgYzNrJ7Wr8EzxoaTCy87edYNBprtxBkd0HzzLmung== +web3-bzz@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.5.2.tgz#a04feaa19462cff6d5a8c87dad1aca4619d9dfc8" + integrity sha512-W/sPCdA+XQ9duUYKHAwf/g69cbbV8gTCRsa1MpZwU7spXECiyJ2EvD/QzAZ+UpJk3GELXFF/fUByeZ3VRQKF2g== dependencies: "@types/node" "^12.12.6" got "9.6.0" swarm-js "^0.1.40" - underscore "1.9.1" -web3-core-helpers@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz#ffd6f47c1b54a8523f00760a8d713f44d0f97e97" - integrity sha512-tMVU0ScyQUJd/HFWfZrvGf+QmPCodPyKQw1gQ+n9We/H3vPPbUxDjNeYnd4BbYy5O9ox+0XG6i3+JlwiSkgDkA== +web3-core-helpers@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.5.2.tgz#b6bd5071ca099ba3f92dfafb552eed2b70af2795" + integrity sha512-U7LJoeUdQ3aY9t5gU7t/1XpcApsWm+4AcW5qKl/44ZxD44w0Dmsq1c5zJm3GuLr/a9MwQfXK4lpmvxVQWHHQRg== dependencies: - underscore "1.9.1" - web3-eth-iban "1.3.1" - web3-utils "1.3.1" + web3-eth-iban "1.5.2" + web3-utils "1.5.2" -web3-core-method@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.1.tgz#c1d8bf1e2104a8d625c99caf94218ad2dc948c92" - integrity sha512-dA38tNVZWTxBFMlLFunLD5Az1AWRi5HqM+AtQrTIhxWCzg7rJSHuaYOZ6A5MHKGPWpdykLhzlna0SsNv5AVs8w== +web3-core-method@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.5.2.tgz#d1d602657be1000a29d11e3ca3bf7bc778dea9a5" + integrity sha512-/mC5t9UjjJoQmJJqO5nWK41YHo+tMzFaT7Tp7jDCQsBkinE68KsUJkt0jzygpheW84Zra0DVp6q19gf96+cugg== dependencies: + "@ethereumjs/common" "^2.4.0" "@ethersproject/transactions" "^5.0.0-beta.135" - underscore "1.9.1" - web3-core-helpers "1.3.1" - web3-core-promievent "1.3.1" - web3-core-subscriptions "1.3.1" - web3-utils "1.3.1" + web3-core-helpers "1.5.2" + web3-core-promievent "1.5.2" + web3-core-subscriptions "1.5.2" + web3-utils "1.5.2" -web3-core-promievent@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz#b4da4b34cd9681e22fcda25994d7629280a1e046" - integrity sha512-jGu7TkwUqIHlvWd72AlIRpsJqdHBQnHMeMktrows2148gg5PBPgpJ10cPFmCCzKT6lDOVh9B7pZMf9eckMDmiA== +web3-core-promievent@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.5.2.tgz#2dc9fe0e5bbeb7c360fc1aac5f12b32d9949a59b" + integrity sha512-5DacbJXe98ozSor7JlkTNCy6G8945VunRRkPxMk98rUrg60ECVEM/vuefk1atACzjQsKx6tmLZuHxbJQ64TQeQ== dependencies: eventemitter3 "4.0.4" -web3-core-requestmanager@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz#6dd2b5161ba778dfffe68994a4accff2decc54fe" - integrity sha512-9WTaN2SoyJX1amRyTzX2FtbVXsyWBI2Wef2Q3gPiWaEo/VRVm3e4Bq8MwxNTUMIJMO8RLGHjtdgsoDKPwfL73Q== +web3-core-requestmanager@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.5.2.tgz#43ccc00779394c941b28e6e07e217350fd1ded71" + integrity sha512-oRVW9OrAsXN2JIZt68OEg1Mb1A9a/L3JAGMv15zLEFEnJEGw0KQsGK1ET2kvZBzvpFd5G0EVkYCnx7WDe4HSNw== dependencies: - underscore "1.9.1" util "^0.12.0" - web3-core-helpers "1.3.1" - web3-providers-http "1.3.1" - web3-providers-ipc "1.3.1" - web3-providers-ws "1.3.1" + web3-core-helpers "1.5.2" + web3-providers-http "1.5.2" + web3-providers-ipc "1.5.2" + web3-providers-ws "1.5.2" -web3-core-subscriptions@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz#be1103259f91b7fc7f4c6a867aa34dea70a636f7" - integrity sha512-eX3N5diKmrxshc6ZBZ8EJxxAhCxdYPbYXuF2EfgdIyHmxwmYqIVvKepzO8388Bx8JD3D0Id/pKE0dC/FnDIHTQ== +web3-core-subscriptions@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.5.2.tgz#8eaebde44f81fc13c45b555c4422fe79393da9cf" + integrity sha512-hapI4rKFk22yurtIv0BYvkraHsM7epA4iI8Np+HuH6P9DD0zj/llaps6TXLM9HyacLBRwmOLZmr+pHBsPopUnQ== dependencies: eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.1" + web3-core-helpers "1.5.2" -web3-core@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.1.tgz#fb0fc5d952a7f3d580a7e6155d2f28be064e64cb" - integrity sha512-QlBwSyjl2pqYUBE7lH9PfLxa8j6AzzAtvLUqkgoaaFJYLP/+XavW1n6dhVCTq+U3L3eNc+bMp9GLjGDJNXMnGg== +web3-core@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.5.2.tgz#ca2b9b1ed3cf84d48b31c9bb91f7628f97cfdcd5" + integrity sha512-sebMpQbg3kbh3vHUbHrlKGKOxDWqjgt8KatmTBsTAWj/HwWYVDzeX+2Q84+swNYsm2DrTBVFlqTErFUwPBvyaA== dependencies: "@types/bn.js" "^4.11.5" "@types/node" "^12.12.6" bignumber.js "^9.0.0" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-core-requestmanager "1.3.1" - web3-utils "1.3.1" + web3-core-helpers "1.5.2" + web3-core-method "1.5.2" + web3-core-requestmanager "1.5.2" + web3-utils "1.5.2" -web3-eth-abi@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz#d60fe5f15c7a3a426c553fdaa4199d07f1ad899c" - integrity sha512-ds4aTeKDUEqTXgncAtxvcfMpPiei9ey7+s2ZZ+OazK2CK5jWhFiJuuj9Q68kOT+hID7E1oSDVsNmJWFD/7lbMw== +web3-eth-abi@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.5.2.tgz#b627eada967f39ae4657ddd61b693cb00d55cb29" + integrity sha512-P3bJbDR5wib4kWGfVeBKBVi27T+AiHy4EJxYM6SMNbpm3DboLDdisu9YBd6INMs8rzxgnprBbGmmyn4jKIDKAA== dependencies: "@ethersproject/abi" "5.0.7" - underscore "1.9.1" - web3-utils "1.3.1" + web3-utils "1.5.2" -web3-eth-accounts@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz#63b247461f1ae0ae46f9a5d5aa896ea80237143e" - integrity sha512-wsV3/0Pbn5+pI8PiCD1CYw7I1dkQujcP//aJ+ZH8PoaHQoG6HnJ7nTp7foqa0r/X5lizImz/g5S8D76t3Z9tHA== +web3-eth-accounts@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.5.2.tgz#cf506c21037fa497fe42f1f055980ce4acf83731" + integrity sha512-F8mtzxgEhxfLc66vPi0Gqd6mpscvvk7Ua575bsJ1p9J2X/VtuKgDgpWcU4e4LKeROQ+ouCpAG9//0j9jQuij3A== dependencies: + "@ethereumjs/common" "^2.3.0" + "@ethereumjs/tx" "^3.2.1" crypto-browserify "3.12.0" eth-lib "0.2.8" - ethereumjs-common "^1.3.2" - ethereumjs-tx "^2.1.1" + ethereumjs-util "^7.0.10" scrypt-js "^3.0.1" - underscore "1.9.1" uuid "3.3.2" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-utils "1.3.1" + web3-core "1.5.2" + web3-core-helpers "1.5.2" + web3-core-method "1.5.2" + web3-utils "1.5.2" -web3-eth-contract@1.3.1, web3-eth-contract@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz#05cb77bd2a671c5480897d20de487f3bae82e113" - integrity sha512-cHu9X1iGrK+Zbrj4wYKwHI1BtVGn/9O0JRsZqd9qcFGLwwAmaCJYy0sDn7PKCKDSL3qB+MDILoyI7FaDTWWTHg== +web3-eth-contract@1.5.2, web3-eth-contract@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.5.2.tgz#ffbd799fd01e36596aaadefba323e24a98a23c2f" + integrity sha512-4B8X/IPFxZCTmtENpdWXtyw5fskf2muyc3Jm5brBQRb4H3lVh1/ZyQy7vOIkdphyaXu4m8hBLHzeyKkd37mOUg== dependencies: "@types/bn.js" "^4.11.5" - underscore "1.9.1" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-core-promievent "1.3.1" - web3-core-subscriptions "1.3.1" - web3-eth-abi "1.3.1" - web3-utils "1.3.1" - -web3-eth-ens@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz#ccfd621ddc1fecb44096bc8e60689499a9eb4421" - integrity sha512-MUQvYgUYQ5gAwbZyHwI7y+NTT6j98qG3MVhGCUf58inF5Gxmn9OlLJRw8Tofgf0K87Tk9Kqw1/2QxUE4PEZMMA== + web3-core "1.5.2" + web3-core-helpers "1.5.2" + web3-core-method "1.5.2" + web3-core-promievent "1.5.2" + web3-core-subscriptions "1.5.2" + web3-eth-abi "1.5.2" + web3-utils "1.5.2" + +web3-eth-ens@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.5.2.tgz#ecb3708f0e8e2e847e9d89e8428da12c30bba6a4" + integrity sha512-/UrLL42ZOCYge+BpFBdzG8ICugaRS4f6X7PxJKO+zAt+TwNgBpjuWfW/ZYNcuqJun/ZyfcTuj03TXqA1RlNhZQ== dependencies: content-hash "^2.5.2" eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-promievent "1.3.1" - web3-eth-abi "1.3.1" - web3-eth-contract "1.3.1" - web3-utils "1.3.1" - -web3-eth-iban@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz#4351e1a658efa5f3218357f0a38d6d8cad82481e" - integrity sha512-RCQLfR9Z+DNfpw7oUauYHg1HcVoEljzhwxKn3vi15gK0ssWnTwRGqUiIyVTeSb836G6oakOd5zh7XYqy7pn+nw== + web3-core "1.5.2" + web3-core-helpers "1.5.2" + web3-core-promievent "1.5.2" + web3-eth-abi "1.5.2" + web3-eth-contract "1.5.2" + web3-utils "1.5.2" + +web3-eth-iban@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.5.2.tgz#f390ad244ef8a6c94de7c58736b0b80a484abc8e" + integrity sha512-C04YDXuSG/aDwOHSX+HySBGb0KraiAVt+/l1Mw7y/fCUrKC/K0yYzMYqY/uYOcvLtepBPsC4ZfUYWUBZ2PO8Vg== dependencies: bn.js "^4.11.9" - web3-utils "1.3.1" + web3-utils "1.5.2" -web3-eth-personal@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz#cfe8af01588870d195dabf0a8d9e34956fb8856d" - integrity sha512-/vZEQpXJfBfYoy9KT911ItfoscEfF0Q2j8tsXzC2xmmasSZ6YvAUuPhflVmAo0IHQSX9rmxq0q1p3sbnE3x2pQ== +web3-eth-personal@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.5.2.tgz#043335a19ab59e119ba61e3bd6c3b8cde8120490" + integrity sha512-nH5N2GiVC0C5XeMEKU16PeFP3Hb3hkPvlR6Tf9WQ+pE+jw1c8eaXBO1CJQLr15ikhUF3s94ICyHcfjzkDsmRbA== dependencies: "@types/node" "^12.12.6" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-net "1.3.1" - web3-utils "1.3.1" + web3-core "1.5.2" + web3-core-helpers "1.5.2" + web3-core-method "1.5.2" + web3-net "1.5.2" + web3-utils "1.5.2" -web3-eth@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.1.tgz#60ac4b58e5fd17b8dbbb8378abd63b02e8326727" - integrity sha512-e4iL8ovj0zNxzbv4LTHEv9VS03FxKlAZD+95MolwAqtVoUnKC2H9X6dli0w6eyXP0aKw+mwY0g0CWQHzqZvtXw== - dependencies: - underscore "1.9.1" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-core-subscriptions "1.3.1" - web3-eth-abi "1.3.1" - web3-eth-accounts "1.3.1" - web3-eth-contract "1.3.1" - web3-eth-ens "1.3.1" - web3-eth-iban "1.3.1" - web3-eth-personal "1.3.1" - web3-net "1.3.1" - web3-utils "1.3.1" - -web3-net@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.1.tgz#79374b1df37429b0839b83b0abc4440ac6181568" - integrity sha512-vuMMWMk+NWHlrNfszGp3qRjH/64eFLiNIwUi0kO8JXQ896SP3Ma0su5sBfSPxNCig047E9GQimrL9wvYAJSO5A== +web3-eth@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.5.2.tgz#0f6470df60a2a7d04df4423ca7721db8ed5ad72b" + integrity sha512-DwWQ6TCOUqvYyo7T20S7HpQDPveNHNqOn2Q2F3E8ZFyEjmqT4XsGiwvm08kB/VgQ4e/ANyq/i8PPFSYMT8JKHg== + dependencies: + web3-core "1.5.2" + web3-core-helpers "1.5.2" + web3-core-method "1.5.2" + web3-core-subscriptions "1.5.2" + web3-eth-abi "1.5.2" + web3-eth-accounts "1.5.2" + web3-eth-contract "1.5.2" + web3-eth-ens "1.5.2" + web3-eth-iban "1.5.2" + web3-eth-personal "1.5.2" + web3-net "1.5.2" + web3-utils "1.5.2" + +web3-net@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.5.2.tgz#58915d7e2dad025d2a08f02c865f3abe61c48eff" + integrity sha512-VEc9c+jfoERhbJIxnx0VPlQDot8Lm4JW/tOWFU+ekHgIiu2zFKj5YxhURIth7RAbsaRsqCb79aE+M0eI8maxVQ== dependencies: - web3-core "1.3.1" - web3-core-method "1.3.1" - web3-utils "1.3.1" + web3-core "1.5.2" + web3-core-method "1.5.2" + web3-utils "1.5.2" web3-provider-engine@15.0.4: version "15.0.4" @@ -15574,42 +15920,40 @@ web3-provider-engine@16.0.1: xhr "^2.2.0" xtend "^4.0.1" -web3-providers-http@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.1.tgz#becbea61706b2fa52e15aca6fe519ee108a8fab9" - integrity sha512-DOujG6Ts7/hAMj0PW5p9/1vwxAIr+1CJ6ZWHshtfOq1v1KnMphVTGOrjcTTUvPT33/DA/so2pgGoPMrgaEIIvQ== +web3-providers-http@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.5.2.tgz#94f95fe5572ca54aa2c2ffd42c63956436c9eb0a" + integrity sha512-dUNFJc9IMYDLZnkoQX3H4ZjvHjGO6VRVCqrBrdh84wPX/0da9dOA7DwIWnG0Gv3n9ybWwu5JHQxK4MNQ444lyA== dependencies: - web3-core-helpers "1.3.1" + web3-core-helpers "1.5.2" xhr2-cookies "1.1.0" -web3-providers-ipc@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz#3cb2572fc5286ab2f3117e0a2dce917816c3dedb" - integrity sha512-BNPscLbvwo+u/tYJrLvPnl/g/SQVSnqP/TjEsB033n4IXqTC4iZ9Of8EDmI0U6ds/9nwNqOBx3KsxbinL46UZA== +web3-providers-ipc@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.5.2.tgz#68a516883c998eeddf60df4cead77baca4fb4aaa" + integrity sha512-SJC4Sivt4g9LHKlRy7cs1jkJgp7bjrQeUndE6BKs0zNALKguxu6QYnzbmuHCTFW85GfMDjhvi24jyyZHMnBNXQ== dependencies: oboe "2.1.5" - underscore "1.9.1" - web3-core-helpers "1.3.1" + web3-core-helpers "1.5.2" -web3-providers-ws@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz#a70140811d138a1a5cf3f0c39d11887c8e341c83" - integrity sha512-DAbVbiizv0Hr/bLKjyyKMHc/66ccVkudan3eRsf+R/PXWCqfXb7q6Lwodj4llvC047pEuLKR521ZKr5wbfk1KQ== +web3-providers-ws@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.5.2.tgz#d336a93ed608b40cdcadfadd1f1bc8d32ea046e0" + integrity sha512-xy9RGlyO8MbJDuKv2vAMDkg+en+OvXG0CGTCM2BTl6l1vIdHpCa+6A/9KV2rK8aU9OBZ7/Pf+Y19517kHVl9RA== dependencies: eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.1" + web3-core-helpers "1.5.2" websocket "^1.0.32" -web3-shh@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.1.tgz#42294d684358c22aa48616cb9a3eb2e9c1e6362f" - integrity sha512-57FTQvOW1Zm3wqfZpIEqL4apEQIR5JAxjqA4RM4eL0jbdr+Zj5Y4J93xisaEVl6/jMtZNlsqYKTVswx8mHu1xw== +web3-shh@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.5.2.tgz#a72a3d903c0708a004db94a72d934a302d880aea" + integrity sha512-wOxOcYt4Sa0AHAI8gG7RulCwVuVjSRS/M/AbFsea3XfJdN6sU13/syY7OdZNjNYuKjYTzxKYrd3dU/K2iqffVw== dependencies: - web3-core "1.3.1" - web3-core-method "1.3.1" - web3-core-subscriptions "1.3.1" - web3-net "1.3.1" + web3-core "1.5.2" + web3-core-method "1.5.2" + web3-core-subscriptions "1.5.2" + web3-net "1.5.2" web3-utils@1.2.1: version "1.2.1" @@ -15624,10 +15968,10 @@ web3-utils@1.2.1: underscore "1.9.1" utf8 "3.0.0" -web3-utils@1.3.1, web3-utils@^1.3.0, web3-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e" - integrity sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ== +web3-utils@1.5.2, web3-utils@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.5.2.tgz#150982dcb1918ffc54eba87528e28f009ebc03aa" + integrity sha512-quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q== dependencies: bn.js "^4.11.9" eth-lib "0.2.8" @@ -15635,21 +15979,20 @@ web3-utils@1.3.1, web3-utils@^1.3.0, web3-utils@^1.3.1: ethjs-unit "0.1.6" number-to-bn "1.7.0" randombytes "^2.1.0" - underscore "1.9.1" utf8 "3.0.0" web3@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" - integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== + version "1.5.2" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.5.2.tgz#736ca2f39048c63964203dd811f519400973e78d" + integrity sha512-aapKLdO8t7Cos6tZLeeQUtCJvTiPMlLcHsHHDLSBZ/VaJEucSTxzun32M8sp3BmF4waDEmhY+iyUM1BKvtAcVQ== dependencies: - web3-bzz "1.3.1" - web3-core "1.3.1" - web3-eth "1.3.1" - web3-eth-personal "1.3.1" - web3-net "1.3.1" - web3-shh "1.3.1" - web3-utils "1.3.1" + web3-bzz "1.5.2" + web3-core "1.5.2" + web3-eth "1.5.2" + web3-eth-personal "1.5.2" + web3-net "1.5.2" + web3-shh "1.5.2" + web3-utils "1.5.2" webidl-conversions@^5.0.0: version "5.0.0" @@ -15672,10 +16015,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" - integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== +webpack-dev-server@3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz#c74028bf5ba8885aaf230e48a20e8936ab8511f0" + integrity sha512-u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -15697,11 +16040,11 @@ webpack-dev-server@3.11.0: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.8" semver "^6.3.0" serve-index "^1.9.1" - sockjs "0.3.20" - sockjs-client "1.4.0" + sockjs "^0.3.21" + sockjs-client "^1.5.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -15766,14 +16109,7 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -websocket-driver@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" - integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= - dependencies: - websocket-extensions ">=0.1.1" - -websocket-driver@>=0.5.1: +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== @@ -15788,9 +16124,9 @@ websocket-extensions@>=0.1.1: integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== websocket@^1.0.32: - version "1.0.33" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.33.tgz#407f763fc58e74a3fa41ca3ae5d78d3f5e3b82a5" - integrity sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA== + version "1.0.34" + resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111" + integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ== dependencies: bufferutil "^4.0.1" debug "^2.2.0" @@ -15812,24 +16148,35 @@ whatwg-fetch@2.0.4: integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== whatwg-fetch@^3.4.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868" - integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A== + version "3.6.2" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" + integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: - lodash.sortby "^4.7.0" - tr46 "^2.0.2" + lodash "^4.7.0" + tr46 "^2.1.0" webidl-conversions "^6.1.0" +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -15841,17 +16188,16 @@ which-pm-runs@^1.0.0: integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= which-typed-array@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" - integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + version "1.1.6" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.6.tgz#f3713d801da0720a7f26f50c596980a9f5c8b383" + integrity sha512-DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q== dependencies: - available-typed-arrays "^1.0.2" - call-bind "^1.0.0" - es-abstract "^1.18.0-next.1" + available-typed-arrays "^1.0.4" + call-bind "^1.0.2" + es-abstract "^1.18.5" foreach "^2.0.5" - function-bind "^1.1.1" - has-symbols "^1.0.1" - is-typed-array "^1.1.3" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.6" which@^1.2.9, which@^1.3.1: version "1.3.1" @@ -15867,23 +16213,6 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -window-getters@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/window-getters/-/window-getters-1.0.0.tgz#b5b264538c4c79cead027f9997850222bf6d0852" - integrity sha512-xyvEFq3x+7dCA7NFhqOmTMk0fPmmAzCUYL2svkw2LGBaXXQLRP0lFnfXHzysri9WZNMkzp/FD1u0w2Qc7Co+JA== - -window-getters@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/window-getters/-/window-getters-1.0.1.tgz#a564c258413b4808789633d8bfb7ed741d798aa0" - integrity sha512-cojBfDeV58XEurDgj+rre15c7dvu27bWCPlOIpwQgreOsw6qQk0UGDR1hi7ZHKw5+L0AENUNNWGG2h4yr2Y3hQ== - -window-metadata@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/window-metadata/-/window-metadata-1.0.0.tgz#fece0446db2f50be0612a211f25fc693917e823b" - integrity sha512-eYoXsZ9X4J+6xZgbHhNAatSR5bCtT409q8B+2Ol9ySx7qsdtgVZcNfox4qszFmKlGsFtT2b1Tcmcy69bRMObcg== - dependencies: - window-getters "^1.0.0" - word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -16105,10 +16434,10 @@ ws@7.1.2: dependencies: async-limiter "^1.0.0" -ws@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd" - integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w== +ws@7.5.3, ws@^7.4.6: + version "7.5.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" + integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== ws@^3.0.0: version "3.3.3" @@ -16120,24 +16449,19 @@ ws@^3.0.0: ultron "~1.1.0" ws@^5.1.1: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" - integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA== + version "5.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" + integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA== dependencies: async-limiter "~1.0.0" ws@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + version "6.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== dependencies: async-limiter "~1.0.0" -ws@^7.2.3: - version "7.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" - integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== - xhr-request-promise@^0.1.2: version "0.1.3" resolved "https://registry.yarnpkg.com/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz#2d5f4b16d8c6c893be97f1a62b0ed4cf3ca5f96c" @@ -16203,21 +16527,21 @@ xtend@~2.1.1: object-keys "~0.4.0" y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -16228,9 +16552,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^1.10.0, yaml@^1.7.2: - version "1.10.0" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" - integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yargs-parser@^10.0.0: version "10.1.0" @@ -16256,9 +16580,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.2.2, yargs-parser@^20.2.3: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^13.2.4, yargs@^13.3.2: version "13.3.2" @@ -16293,7 +16617,7 @@ yargs@^15.1.0, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.1.1: +yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From 0ec73794e32b0258054b39600921daa5913636af Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 00:57:10 +0545 Subject: [PATCH 12/39] update texts --- .env.development | 14 +- .env.production | 14 +- public/i18n/en.json | 4 +- src/components/Tags.tsx | 8 +- src/config/constants/pools.ts | 150 ++++++++++++---------- src/config/constants/types.ts | 1 + src/style/Global.tsx | 2 +- src/views/Pools/Syrup.tsx | 8 +- src/views/Pools/components/CardFooter.tsx | 18 ++- src/views/Pools/components/PoolCard.tsx | 8 +- src/views/Pools/components/PoolCardLP.tsx | 8 +- 11 files changed, 135 insertions(+), 100 deletions(-) diff --git a/.env.development b/.env.development index 83dbebfaa..fdd1100b1 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,16 @@ REACT_APP_CHAIN_ID = "56" # 10+ nodes balanced, US/EU -# REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" +REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced, US/EU -# REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" +REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced in each region, global -# REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" +REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" # testnet -REACT_APP_CHAIN_ID = "97" -REACT_APP_NODE_1 = "https://data-seed-prebsc-1-s1.binance.org:8545/" -REACT_APP_NODE_2 = "https://data-seed-prebsc-2-s1.binance.org:8545/" -REACT_APP_NODE_3 = "https://data-seed-prebsc-1-s2.binance.org:8545/" +#REACT_APP_CHAIN_ID = "97" +#REACT_APP_NODE_1 = "https://data-seed-prebsc-1-s1.binance.org:8545/" +#REACT_APP_NODE_2 = "https://data-seed-prebsc-2-s1.binance.org:8545/" +#REACT_APP_NODE_3 = "https://data-seed-prebsc-1-s2.binance.org:8545/" diff --git a/.env.production b/.env.production index 83dbebfaa..fdd1100b1 100644 --- a/.env.production +++ b/.env.production @@ -1,16 +1,16 @@ REACT_APP_CHAIN_ID = "56" # 10+ nodes balanced, US/EU -# REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" +REACT_APP_NODE_1 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced, US/EU -# REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" +REACT_APP_NODE_2 = "https://bsc-dataseed.binance.org" # 10+ nodes balanced in each region, global -# REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" +REACT_APP_NODE_3 = "https://bsc-dataseed.binance.org" # testnet -REACT_APP_CHAIN_ID = "97" -REACT_APP_NODE_1 = "https://data-seed-prebsc-1-s1.binance.org:8545/" -REACT_APP_NODE_2 = "https://data-seed-prebsc-2-s1.binance.org:8545/" -REACT_APP_NODE_3 = "https://data-seed-prebsc-1-s2.binance.org:8545/" +#REACT_APP_CHAIN_ID = "97" +#REACT_APP_NODE_1 = "https://data-seed-prebsc-1-s1.binance.org:8545/" +#REACT_APP_NODE_2 = "https://data-seed-prebsc-2-s1.binance.org:8545/" +#REACT_APP_NODE_3 = "https://data-seed-prebsc-1-s2.binance.org:8545/" diff --git a/public/i18n/en.json b/public/i18n/en.json index 09fbec936..4b03e9646 100644 --- a/public/i18n/en.json +++ b/public/i18n/en.json @@ -315,13 +315,13 @@ { "data": { "stringId": 410, - "text": "End" + "text": "Remaining Blocks" } }, { "data": { "stringId": 412, - "text": "View project site" + "text": "LP Staking" } }, { diff --git a/src/components/Tags.tsx b/src/components/Tags.tsx index 008b0bcd2..2312db91a 100644 --- a/src/components/Tags.tsx +++ b/src/components/Tags.tsx @@ -25,10 +25,16 @@ const CommunityTag = () => ( ) +const RewardsTag = () => ( + }> + Rewards + +) + const BinanceTag = () => ( }> Binance ) -export { CoreTag, CommunityTag, BinanceTag, RiskTag, NoFeeTag } +export { CoreTag, CommunityTag, BinanceTag, RiskTag, NoFeeTag, RewardsTag } diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 6f52cf569..5bee9851c 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -2,77 +2,97 @@ import { PoolConfig, QuoteToken, PoolCategory } from './types' import contracts from './contracts' const pools: PoolConfig[] = [ - { - sousId: 1, - tokenName: 'BISON', - stakingTokenName: QuoteToken.BISON, - earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - stakingTokenAddress: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - contractAddress: { - 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', - 56: '0x00', - }, - poolCategory: PoolCategory.COMMUNITY, - projectLink: 'https://bishares.finance/', - harvest: true, - tokenPerBlock: '0.000459896', - sortOrder: 1, - isFinished: false, - tokenDecimals: 18, - quoteTokenSymbol: QuoteToken.BISON, - quoteTokenAdresses: contracts.cake, - }, + // { + // sousId: 1, + // tokenName: 'BISON', + // stakingTokenName: QuoteToken.BISON, + // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + // stakingTokenAddress: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + // contractAddress: { + // 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', + // 56: '0x00', + // }, + // poolCategory: PoolCategory.REWARDS, + // projectLink: 'https://bishares.finance/', + // harvest: true, + // tokenPerBlock: '0.000459896', + // sortOrder: 1, + // isFinished: false, + // tokenDecimals: 18, + // quoteTokenSymbol: QuoteToken.BISON, + // quoteTokenAdresses: contracts.cake, + // }, + // { + // sousId: 2, + // tokenName: 'BISON', + // stakingTokenName: QuoteToken.BISONBNB, + // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + // stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', + // contractAddress: { + // 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', + // 56: '0x00', + // }, + // poolCategory: PoolCategory.REWARDS, + // projectLink: 'https://bishares.finance/', + // harvest: true, + // tokenPerBlock: '0.000459896', + // sortOrder: 1, + // isFinished: false, + // tokenDecimals: 18, + // quoteTokenSymbol: QuoteToken.BISON, + // quoteTokenAdresses: contracts.cake, + // },{ + // sousId: 3, + // tokenName: 'BISON', + // stakingTokenName: QuoteToken.BISON, + // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + // stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', + // contractAddress: { + // 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', + // 56: '0x00', + // }, + // poolCategory: PoolCategory.REWARDS, + // projectLink: 'https://bishares.finance/', + // harvest: true, + // tokenPerBlock: '0.000459896', + // sortOrder: 1, + // isFinished: false, + // tokenDecimals: 18, + // quoteTokenSymbol: QuoteToken.BISON, + // quoteTokenAdresses: contracts.cake, + // }, + // { + // sousId: 4, + // tokenName: 'BISON', + // stakingTokenName: QuoteToken.BISONBNB, + // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + // stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', + // contractAddress: { + // 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', + // 56: '0x00', + // }, + // poolCategory: PoolCategory.REWARDS, + // projectLink: 'https://app.apeswap.finance/add/ETH/0x19a6da6e382b85f827088092a3dbe864d9ccba73', + // harvest: true, + // tokenPerBlock: '0.000459896', + // sortOrder: 1, + // isFinished: false, + // tokenDecimals: 18, + // quoteTokenSymbol: QuoteToken.BISON, + // quoteTokenAdresses: contracts.cake, + // }, { sousId: 2, tokenName: 'BISON-BNB', stakingTokenName: QuoteToken.BISONBNB, - earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', - contractAddress: { - 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', - 56: '0x00', - }, - poolCategory: PoolCategory.COMMUNITY, - projectLink: 'https://bishares.finance/', - harvest: true, - tokenPerBlock: '0.000459896', - sortOrder: 1, - isFinished: false, - tokenDecimals: 18, - quoteTokenSymbol: QuoteToken.BISON, - quoteTokenAdresses: contracts.cake, - },{ - sousId: 3, - tokenName: 'BISON', - stakingTokenName: QuoteToken.BISON, - earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - stakingTokenAddress: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - contractAddress: { - 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', - 56: '0x00', - }, - poolCategory: PoolCategory.COMMUNITY, - projectLink: 'https://bishares.finance/', - harvest: true, - tokenPerBlock: '0.000459896', - sortOrder: 1, - isFinished: false, - tokenDecimals: 18, - quoteTokenSymbol: QuoteToken.BISON, - quoteTokenAdresses: contracts.cake, - }, - { - sousId: 4, - tokenName: 'BISON-BNB', - stakingTokenName: QuoteToken.BISONBNB, - earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', + earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', + stakingTokenAddress: '0xec1214ee197304c17eb9e427e246a4fd37ba718e', contractAddress: { - 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', - 56: '0x00', + 97: '0xEA93812aA70eC89932aF6EBe6eCe93135712e4Ab', + 56: '0xEA93812aA70eC89932aF6EBe6eCe93135712e4Ab', }, - poolCategory: PoolCategory.COMMUNITY, - projectLink: 'https://bishares.finance/', + poolCategory: PoolCategory.REWARDS, + projectLink: 'https://app.apeswap.finance/add/ETH/0x19a6da6e382b85f827088092a3dbe864d9ccba73', harvest: true, tokenPerBlock: '0.000459896', sortOrder: 1, diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index e1465a31c..fe7da1133 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -33,6 +33,7 @@ export enum QuoteToken { export enum PoolCategory { 'COMMUNITY' = 'Community', 'CORE' = 'Core', + 'REWARDS' = 'Rewards', 'BINANCE' = 'Binance', // Pools using native BNB behave differently than pools using a token } diff --git a/src/style/Global.tsx b/src/style/Global.tsx index 9ad075996..e764f7093 100644 --- a/src/style/Global.tsx +++ b/src/style/Global.tsx @@ -9,7 +9,7 @@ declare module 'styled-components' { const GlobalStyle = createGlobalStyle` * { - font-family: 'Kanit', sans-serif; + font-family: 'Poppins', sans-serif; } body { background-color: ${({ theme }) => theme.colors.background}; diff --git a/src/views/Pools/Syrup.tsx b/src/views/Pools/Syrup.tsx index aebc15311..b39159b1e 100644 --- a/src/views/Pools/Syrup.tsx +++ b/src/views/Pools/Syrup.tsx @@ -73,11 +73,9 @@ const Farm: React.FC = () => { return ( -
- - {TranslateString(282, 'Earn BISON')} + + {TranslateString(282, 'Graze with the great plains and earn BISON')} -
@@ -106,12 +104,10 @@ const Farm: React.FC = () => { const Hero = styled.div` align-items: center; color: ${({ theme }) => theme.colors.primary}; - display: grid; grid-gap: 32px; grid-template-columns: 1fr; margin-left: auto; margin-right: auto; - max-width: 250px; padding: 48px 0; ul { margin: 0; diff --git a/src/views/Pools/components/CardFooter.tsx b/src/views/Pools/components/CardFooter.tsx index a7bcb7d74..1891287a8 100644 --- a/src/views/Pools/components/CardFooter.tsx +++ b/src/views/Pools/components/CardFooter.tsx @@ -5,13 +5,14 @@ import { getBalanceNumber } from 'utils/formatBalance' import useI18n from 'hooks/useI18n' import { ChevronDown, ChevronUp } from 'react-feather' import Balance from 'components/Balance' -import { CommunityTag, CoreTag, BinanceTag } from 'components/Tags' +import { CommunityTag, CoreTag, BinanceTag, RewardsTag } from 'components/Tags' import { PoolCategory } from 'config/constants/types' const tags = { [PoolCategory.BINANCE]: BinanceTag, [PoolCategory.CORE]: CoreTag, [PoolCategory.COMMUNITY]: CommunityTag, + [PoolCategory.REWARDS]: RewardsTag, } interface Props { @@ -22,6 +23,7 @@ interface Props { blocksUntilStart: number poolCategory: PoolCategory stakingTokenName: string + singleStake: boolean } const StyledFooter = styled.div<{ isFinished: boolean }>` @@ -70,7 +72,7 @@ const Label = styled.div` const TokenLink = styled.a` font-size: 14px; text-decoration: none; - color: #12aab5; + color: white; ` const CardFooter: React.FC = ({ @@ -81,6 +83,7 @@ const CardFooter: React.FC = ({ blocksUntilStart, poolCategory, stakingTokenName, + singleStake }) => { const [isOpen, setIsOpen] = useState(false) const TranslateString = useI18n() @@ -128,9 +131,14 @@ const CardFooter: React.FC = ({ )} - - {TranslateString(412, 'View project site')} - + {singleStake && + + Stake your BISON to earn more BISON rewards and be eligible for the weekly platform distribution. + + } + {!singleStake && + {TranslateString(412, 'LP Staking')} + } )} diff --git a/src/views/Pools/components/PoolCard.tsx b/src/views/Pools/components/PoolCard.tsx index af0d5b98a..616d8a7ea 100644 --- a/src/views/Pools/components/PoolCard.tsx +++ b/src/views/Pools/components/PoolCard.tsx @@ -77,6 +77,7 @@ const PoolCard: React.FC = ({ pool }) => { const accountHasStakedBalance = stakedBalance?.toNumber() > 0 const needsApproval = !accountHasStakedBalance && !allowance.toNumber() && !isBnbPool const isCardActive = isFinished && accountHasStakedBalance + const singleStake = true const convertedLimit = new BigNumber(stakingLimit).multipliedBy(new BigNumber(10).pow(tokenDecimals)) const [onPresentDeposit] = useModal( @@ -152,7 +153,7 @@ const PoolCard: React.FC = ({ pool }) => { (needsApproval && !isOldSyrup ? (
) : ( @@ -169,7 +170,7 @@ const PoolCard: React.FC = ({ pool }) => { : onPresentWithdraw } > - {`Unstake ${stakingTokenName}`} + Unstake {!isOldSyrup && ( @@ -181,7 +182,7 @@ const PoolCard: React.FC = ({ pool }) => { ))} -
{TranslateString(736, 'APY')}:
+
{TranslateString(736, 'APR')}:
{isFinished || isOldSyrup || !apy || apy?.isNaN() || !apy?.isFinite() ? ( '-' ) : ( @@ -206,6 +207,7 @@ const PoolCard: React.FC = ({ pool }) => { blocksUntilStart={blocksUntilStart} poolCategory={poolCategory} stakingTokenName={stakingTokenName} + singleStake={singleStake} /> ) diff --git a/src/views/Pools/components/PoolCardLP.tsx b/src/views/Pools/components/PoolCardLP.tsx index ee32151e3..cc86076f7 100644 --- a/src/views/Pools/components/PoolCardLP.tsx +++ b/src/views/Pools/components/PoolCardLP.tsx @@ -98,6 +98,7 @@ const PoolCard: React.FC = ({ pool }) => { const accountHasStakedBalance = stakedBalance?.toNumber() > 0 const needsApproval = !accountHasStakedBalance && !allowance.toNumber() && !isBnbPool const isCardActive = isFinished && accountHasStakedBalance + const singleStake = false const convertedLimit = new BigNumber(stakingLimit).multipliedBy(new BigNumber(10).pow(tokenDecimals)) const [onPresentDeposit] = useModal( @@ -226,7 +227,7 @@ const apy = getApr(); (needsApproval && !isOldSyrup ? (
) : ( @@ -243,7 +244,7 @@ const apy = getApr(); : onPresentWithdraw } > - {`Unstake ${stakingTokenName}`} + Unstake {!isOldSyrup && ( @@ -255,7 +256,7 @@ const apy = getApr(); ))} -
{TranslateString(736, 'APY')}:
+
{TranslateString(736, 'APR')}:
{isFinished || isOldSyrup || !apy || apy?.isNaN() || !apy?.isFinite() ? ( '-' ) : ( @@ -280,6 +281,7 @@ const apy = getApr(); blocksUntilStart={blocksUntilStart} poolCategory={poolCategory} stakingTokenName={stakingTokenName} + singleStake={singleStake} /> ) From 55f99cc0b291b57378dabd6fc993123d78e4666e Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 01:18:37 +0545 Subject: [PATCH 13/39] update texts --- src/config/constants/pools.ts | 3 ++- src/config/constants/types.ts | 1 + src/views/Pools/components/CardFooter.tsx | 4 +++- src/views/Pools/components/PoolCard.tsx | 4 +++- src/views/Pools/components/PoolCardLP.tsx | 4 +++- yarn.lock | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 5bee9851c..0fc79ac54 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -83,7 +83,8 @@ const pools: PoolConfig[] = [ // }, { sousId: 2, - tokenName: 'BISON-BNB', + poolName: 'BISON-BNB', + tokenName: 'BISON', stakingTokenName: QuoteToken.BISONBNB, earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', stakingTokenAddress: '0xec1214ee197304c17eb9e427e246a4fd37ba718e', diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index fe7da1133..b2ddbcb66 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -65,6 +65,7 @@ export interface FarmConfig { export interface PoolConfig { sousId: number image?: string + poolName: string tokenName: string stakingTokenName: QuoteToken earningToken?: string diff --git a/src/views/Pools/components/CardFooter.tsx b/src/views/Pools/components/CardFooter.tsx index 1891287a8..53fedcf94 100644 --- a/src/views/Pools/components/CardFooter.tsx +++ b/src/views/Pools/components/CardFooter.tsx @@ -16,6 +16,7 @@ const tags = { } interface Props { + poolName: string projectLink: string totalStaked: BigNumber blocksRemaining: number @@ -76,6 +77,7 @@ const TokenLink = styled.a` ` const CardFooter: React.FC = ({ + poolName, projectLink, totalStaked, blocksRemaining, @@ -137,7 +139,7 @@ const CardFooter: React.FC = ({ } {!singleStake && - {TranslateString(412, 'LP Staking')} + {poolName} LP } )} diff --git a/src/views/Pools/components/PoolCard.tsx b/src/views/Pools/components/PoolCard.tsx index 616d8a7ea..166e455b9 100644 --- a/src/views/Pools/components/PoolCard.tsx +++ b/src/views/Pools/components/PoolCard.tsx @@ -37,6 +37,7 @@ const PoolCard: React.FC = ({ pool }) => { const { sousId, image, + poolName, tokenName, stakingTokenName, stakingTokenAddress, @@ -114,7 +115,7 @@ const PoolCard: React.FC = ({ pool }) => { {isFinished && sousId !== 0 && }
- {isOldSyrup && '[OLD]'} {tokenName} {TranslateString(348, 'Pool')} + {isOldSyrup && '[OLD]'} {poolName} {TranslateString(348, 'Pool')}
@@ -200,6 +201,7 @@ const PoolCard: React.FC = ({ pool }) => {
= ({ pool }) => { const { sousId, image, + poolName, tokenName, stakingTokenName, stakingTokenAddress, @@ -188,7 +189,7 @@ const apy = getApr(); {isFinished && sousId !== 0 && }
- {isOldSyrup && '[OLD]'} {tokenName} {TranslateString(348, 'Pool')} + {isOldSyrup && '[OLD]'} {poolName} {TranslateString(348, 'Pool')}
@@ -274,6 +275,7 @@ const apy = getApr();
Date: Sun, 22 Aug 2021 02:04:59 +0545 Subject: [PATCH 14/39] add pools --- src/config/constants/pools.ts | 146 ++++++++++------------ src/views/Pools/Syrup.tsx | 2 +- src/views/Pools/components/CardFooter.tsx | 10 +- src/views/Pools/components/PoolCard.tsx | 2 +- src/views/Pools/components/PoolCardLP.tsx | 2 +- 5 files changed, 73 insertions(+), 89 deletions(-) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 0fc79ac54..8198f1624 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -2,85 +2,27 @@ import { PoolConfig, QuoteToken, PoolCategory } from './types' import contracts from './contracts' const pools: PoolConfig[] = [ - // { - // sousId: 1, - // tokenName: 'BISON', - // stakingTokenName: QuoteToken.BISON, - // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - // stakingTokenAddress: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - // contractAddress: { - // 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', - // 56: '0x00', - // }, - // poolCategory: PoolCategory.REWARDS, - // projectLink: 'https://bishares.finance/', - // harvest: true, - // tokenPerBlock: '0.000459896', - // sortOrder: 1, - // isFinished: false, - // tokenDecimals: 18, - // quoteTokenSymbol: QuoteToken.BISON, - // quoteTokenAdresses: contracts.cake, - // }, - // { - // sousId: 2, - // tokenName: 'BISON', - // stakingTokenName: QuoteToken.BISONBNB, - // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - // stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', - // contractAddress: { - // 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', - // 56: '0x00', - // }, - // poolCategory: PoolCategory.REWARDS, - // projectLink: 'https://bishares.finance/', - // harvest: true, - // tokenPerBlock: '0.000459896', - // sortOrder: 1, - // isFinished: false, - // tokenDecimals: 18, - // quoteTokenSymbol: QuoteToken.BISON, - // quoteTokenAdresses: contracts.cake, - // },{ - // sousId: 3, - // tokenName: 'BISON', - // stakingTokenName: QuoteToken.BISON, - // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - // stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', - // contractAddress: { - // 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', - // 56: '0x00', - // }, - // poolCategory: PoolCategory.REWARDS, - // projectLink: 'https://bishares.finance/', - // harvest: true, - // tokenPerBlock: '0.000459896', - // sortOrder: 1, - // isFinished: false, - // tokenDecimals: 18, - // quoteTokenSymbol: QuoteToken.BISON, - // quoteTokenAdresses: contracts.cake, - // }, - // { - // sousId: 4, - // tokenName: 'BISON', - // stakingTokenName: QuoteToken.BISONBNB, - // earningToken: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - // stakingTokenAddress: '0x197885a5af8ffdc945f2c5677a6e0f3a84c141a2', - // contractAddress: { - // 97: '0xC382c9f0f585bBb4e7459C2Be2Cd6775a0e53351', - // 56: '0x00', - // }, - // poolCategory: PoolCategory.REWARDS, - // projectLink: 'https://app.apeswap.finance/add/ETH/0x19a6da6e382b85f827088092a3dbe864d9ccba73', - // harvest: true, - // tokenPerBlock: '0.000459896', - // sortOrder: 1, - // isFinished: false, - // tokenDecimals: 18, - // quoteTokenSymbol: QuoteToken.BISON, - // quoteTokenAdresses: contracts.cake, - // }, + { + sousId: 1, + poolName: 'BISON', + tokenName: 'BISON', + stakingTokenName: QuoteToken.BISON, + earningToken: '0x19A6Da6e382b85F827088092a3DBe864d9cCba73', + stakingTokenAddress: '0x19A6Da6e382b85F827088092a3DBe864d9cCba73', + contractAddress: { + 97: '0x65114d5af1a33f89d36a79a56c75a4728e02d492', + 56: '0x3d5e1C77e9C81B72b0b0F88Cd63d2Aab38881b96', + }, + poolCategory: PoolCategory.REWARDS, + projectLink: 'https://app.apeswap.finance/swap?inputCurrency=ETH&outputCurrency=0x19A6Da6e382b85F827088092a3DBe864d9cCba73', + harvest: true, + tokenPerBlock: '0.006751543209876540', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, + }, { sousId: 2, poolName: 'BISON-BNB', @@ -90,12 +32,54 @@ const pools: PoolConfig[] = [ stakingTokenAddress: '0xec1214ee197304c17eb9e427e246a4fd37ba718e', contractAddress: { 97: '0xEA93812aA70eC89932aF6EBe6eCe93135712e4Ab', - 56: '0xEA93812aA70eC89932aF6EBe6eCe93135712e4Ab', + 56: '0x99AeB03aCEBAF7b0742a67cE0f3C49E82F5f4897', }, poolCategory: PoolCategory.REWARDS, projectLink: 'https://app.apeswap.finance/add/ETH/0x19a6da6e382b85f827088092a3dbe864d9ccba73', harvest: true, - tokenPerBlock: '0.000459896', + tokenPerBlock: '0.014467592592592600', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, + }, + { + sousId: 3, + poolName: 'BISON-BNB', + tokenName: 'BISON', + stakingTokenName: QuoteToken.BISONBNB, + earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', + stakingTokenAddress: '0xe5da89fc07cbd30bfc92e14bdbe4c6156d309d12', + contractAddress: { + 97: '0xEA93812aA70eC89932aF6EBe6eCe93135712e4Ab', + 56: '0x26DdcC2DA40c7e0a85b2396B9d46b7a36C5295b2', + }, + poolCategory: PoolCategory.REWARDS, + projectLink: 'https://pancakeswap.finance/add/BNB/0x19A6Da6e382b85F827088092a3DBe864d9cCba73', + harvest: true, + tokenPerBlock: '0.014467592592592600', + sortOrder: 1, + isFinished: false, + tokenDecimals: 18, + quoteTokenSymbol: QuoteToken.BISON, + quoteTokenAdresses: contracts.cake, + }, + { + sousId: 4, + poolName: 'biAPE-BNB', + tokenName: 'BISON', + stakingTokenName: QuoteToken.BISONBNB, + earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', + stakingTokenAddress: '0x5035a262543f5ca8502e38a5a55b91a1a26b4f9c', + contractAddress: { + 97: '0xEA93812aA70eC89932aF6EBe6eCe93135712e4Ab', + 56: '0x7aB0BEd80042bCa202dA306F7C58C4c8a0b2fF27', + }, + poolCategory: PoolCategory.REWARDS, + projectLink: 'https://app.apeswap.finance/add/ETH/0xf19b6746769132926ee82f47137aeb7a8702c4b9', + harvest: true, + tokenPerBlock: '0.014467592592592600', sortOrder: 1, isFinished: false, tokenDecimals: 18, diff --git a/src/views/Pools/Syrup.tsx b/src/views/Pools/Syrup.tsx index b39159b1e..3fc6df444 100644 --- a/src/views/Pools/Syrup.tsx +++ b/src/views/Pools/Syrup.tsx @@ -74,7 +74,7 @@ const Farm: React.FC = () => { - {TranslateString(282, 'Graze with the great plains and earn BISON')} + {TranslateString(282, 'Graze on the great plains and earn BISON')} diff --git a/src/views/Pools/components/CardFooter.tsx b/src/views/Pools/components/CardFooter.tsx index 53fedcf94..2d2631185 100644 --- a/src/views/Pools/components/CardFooter.tsx +++ b/src/views/Pools/components/CardFooter.tsx @@ -110,7 +110,7 @@ const CardFooter: React.FC = ({ @@ -135,12 +135,12 @@ const CardFooter: React.FC = ({ )} {singleStake && - Stake your BISON to earn more BISON rewards and be eligible for the weekly platform distribution. + } - {!singleStake && - {poolName} LP - } + + {!singleStake ? `${poolName} LP`: `GET ${poolName}`} + )} diff --git a/src/views/Pools/components/PoolCard.tsx b/src/views/Pools/components/PoolCard.tsx index 166e455b9..bfd18947d 100644 --- a/src/views/Pools/components/PoolCard.tsx +++ b/src/views/Pools/components/PoolCard.tsx @@ -193,7 +193,7 @@ const PoolCard: React.FC = ({ pool }) => {
- 🥞{' '} + {' '} {TranslateString(384, 'Your Stake')}:
diff --git a/src/views/Pools/components/PoolCardLP.tsx b/src/views/Pools/components/PoolCardLP.tsx index b9fee5dfa..128e4e205 100644 --- a/src/views/Pools/components/PoolCardLP.tsx +++ b/src/views/Pools/components/PoolCardLP.tsx @@ -267,7 +267,7 @@ const apy = getApr();
- 🥞{' '} + {' '} {TranslateString(384, 'Your Stake')}:
From 87bb0c5fba93580152ae1f0d11d1324f7009bb37 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 02:11:34 +0545 Subject: [PATCH 15/39] typo --- src/views/Pools/Syrup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Pools/Syrup.tsx b/src/views/Pools/Syrup.tsx index 3fc6df444..c8c7b1e31 100644 --- a/src/views/Pools/Syrup.tsx +++ b/src/views/Pools/Syrup.tsx @@ -74,7 +74,7 @@ const Farm: React.FC = () => { - {TranslateString(282, 'Graze on the great plains and earn BISON')} + {TranslateString(282, 'Graze the great plains and earn BISON')} From 365c321852ff559de7dcb0b34019d6f3cff5cd4e Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 02:22:29 +0545 Subject: [PATCH 16/39] update texts --- public/index.html | 6 +++--- src/config/constants/pools.ts | 4 ++-- src/views/Pools/components/PoolCard.tsx | 8 ++++++-- src/views/Pools/components/PoolCardLP.tsx | 8 ++++++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/public/index.html b/public/index.html index 2c36163c4..027cc5e6e 100644 --- a/public/index.html +++ b/public/index.html @@ -15,17 +15,17 @@ Bishares Finance - + diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 8198f1624..c2c149910 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -25,7 +25,7 @@ const pools: PoolConfig[] = [ }, { sousId: 2, - poolName: 'BISON-BNB', + poolName: 'BISON-BNB APE', tokenName: 'BISON', stakingTokenName: QuoteToken.BISONBNB, earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', @@ -46,7 +46,7 @@ const pools: PoolConfig[] = [ }, { sousId: 3, - poolName: 'BISON-BNB', + poolName: 'BISON-BNB PCS', tokenName: 'BISON', stakingTokenName: QuoteToken.BISONBNB, earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', diff --git a/src/views/Pools/components/PoolCard.tsx b/src/views/Pools/components/PoolCard.tsx index bfd18947d..7a8be9b1b 100644 --- a/src/views/Pools/components/PoolCard.tsx +++ b/src/views/Pools/components/PoolCard.tsx @@ -33,6 +33,10 @@ interface HarvestProps { pool: PoolWithApy } +const CustomCardTitle = styled(CardTitle)` + font-size: 22px; +` + const PoolCard: React.FC = ({ pool }) => { const { sousId, @@ -114,9 +118,9 @@ const PoolCard: React.FC = ({ pool }) => { {isFinished && sousId !== 0 && }
- + {isOldSyrup && '[OLD]'} {poolName} {TranslateString(348, 'Pool')} - +
{tokenName} diff --git a/src/views/Pools/components/PoolCardLP.tsx b/src/views/Pools/components/PoolCardLP.tsx index 128e4e205..5263841dd 100644 --- a/src/views/Pools/components/PoolCardLP.tsx +++ b/src/views/Pools/components/PoolCardLP.tsx @@ -31,6 +31,10 @@ interface HarvestProps { pool: Pool } +const CustomCardTitle = styled(CardTitle)` + font-size: 22px; +` + const PoolCard: React.FC = ({ pool }) => { const { sousId, @@ -188,9 +192,9 @@ const apy = getApr(); > {isFinished && sousId !== 0 && }
- + {isOldSyrup && '[OLD]'} {poolName} {TranslateString(348, 'Pool')} - +
{tokenName} From e056c16dbc9291cf0f7a0cedf3c461ef2387c6bc Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 02:28:03 +0545 Subject: [PATCH 17/39] update overlay --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 4cd932617..19d331758 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1965,7 +1965,7 @@ "@pancakeswap-libs/uikit@bisharesindexfund/bishares-uikit": version "0.10.2" - resolved "https://codeload.github.com/bisharesindexfund/bishares-uikit/tar.gz/63944756f9be85dcadcc230de769ceb4373c04ce" + resolved "https://codeload.github.com/bisharesindexfund/bishares-uikit/tar.gz/9988262a8e15c8ba9c4b7b408ca1f61d82f78c4c" dependencies: "@types/lodash" "^4.14.162" "@types/styled-system" "^5.1.10" From b02c583bba7462f76070b9f6c18bc8cdd91c5cc4 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 02:32:37 +0545 Subject: [PATCH 18/39] update staked text --- src/config/constants/pools.ts | 2 +- src/config/constants/types.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index c2c149910..712962757 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -69,7 +69,7 @@ const pools: PoolConfig[] = [ sousId: 4, poolName: 'biAPE-BNB', tokenName: 'BISON', - stakingTokenName: QuoteToken.BISONBNB, + stakingTokenName: QuoteToken.biAPEBNB, earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', stakingTokenAddress: '0x5035a262543f5ca8502e38a5a55b91a1a26b4f9c', contractAddress: { diff --git a/src/config/constants/types.ts b/src/config/constants/types.ts index b2ddbcb66..78cf1c528 100644 --- a/src/config/constants/types.ts +++ b/src/config/constants/types.ts @@ -28,6 +28,7 @@ export enum QuoteToken { 'UST' = 'UST', 'BISON' = 'BISON', 'BISONBNB' = 'BISON-BNB', + 'biAPEBNB' = 'biAPE-BNB', } export enum PoolCategory { From 5b99e270145cd094bc68e60a7dc5b9ccb6d1f475 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 03:33:21 +0545 Subject: [PATCH 19/39] small fix --- src/config/constants/pools.ts | 2 +- src/views/Pools/components/CardFooter.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 712962757..02a99e741 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -67,7 +67,7 @@ const pools: PoolConfig[] = [ }, { sousId: 4, - poolName: 'biAPE-BNB', + poolName: 'biAPE-BNB APE', tokenName: 'BISON', stakingTokenName: QuoteToken.biAPEBNB, earningToken: '0x19a6da6e382b85f827088092a3dbe864d9ccba73', diff --git a/src/views/Pools/components/CardFooter.tsx b/src/views/Pools/components/CardFooter.tsx index 2d2631185..aa60a9943 100644 --- a/src/views/Pools/components/CardFooter.tsx +++ b/src/views/Pools/components/CardFooter.tsx @@ -115,7 +115,7 @@ const CardFooter: React.FC = ({ Total {stakingTokenName} Staked - + {/* {blocksUntilStart > 0 && ( From fe6e61acbd2e6562d079e7d5588a6a8a3887b1d9 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 03:49:12 +0545 Subject: [PATCH 20/39] token staked fix --- src/views/Pools/components/CardFooter.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/Pools/components/CardFooter.tsx b/src/views/Pools/components/CardFooter.tsx index aa60a9943..8ffa5e690 100644 --- a/src/views/Pools/components/CardFooter.tsx +++ b/src/views/Pools/components/CardFooter.tsx @@ -115,7 +115,11 @@ const CardFooter: React.FC = ({ Total {stakingTokenName} Staked - + {singleStake ? + : + + } + {/* {blocksUntilStart > 0 && ( From 58d79ea81ed256527e1e04c00757d8fc3f6ac1a6 Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 14:32:10 +0545 Subject: [PATCH 21/39] update apr price --- src/config/constants/farms.ts | 95 +++++------------------------------ src/state/hooks.ts | 2 +- 2 files changed, 14 insertions(+), 83 deletions(-) diff --git a/src/config/constants/farms.ts b/src/config/constants/farms.ts index 0b00a5bdd..e22175cd2 100644 --- a/src/config/constants/farms.ts +++ b/src/config/constants/farms.ts @@ -5,121 +5,52 @@ const farms: FarmConfig[] = [ { pid: 0, risk: 5, - lpSymbol: 'BISON LP', - lpAddresses: { - 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', - }, - tokenSymbol: 'BISON', - tokenAddresses: { - 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - isTokenOnly: true, - factory: 'ape' - }, - { - pid: 3, - risk: 3, - lpSymbol: 'BISON-BNB LP', + lpSymbol: 'BISON-BUSD LP', lpAddresses: { - 97: '0x5BAa840959A291e274FF3C523Cd0eb85659a2360', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', + 97: '0xE2115e605a81dc6CB448f5111DE6bEf5B8a760DA', + 56: '0x5eE167b75118125e7d46add5cE61F749BB977A00', }, tokenSymbol: 'BISON', tokenAddresses: { 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', + 56: '0x50f4220C82c9325dC99f729C3328FB5c338BEaae', }, quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, - factory: 'pcs' }, { - pid: 0, + pid: 1, risk: 5, lpSymbol: 'BISON-BNB LP', lpAddresses: { - 97: '0xd48952C7Ff5346d6753f3547B9606769538845B8', - 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', + 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', + 56: '0x45b2eF2ECe32b34D20F6C6caD49043740B05f2A5', }, tokenSymbol: 'BISON', tokenAddresses: { 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', + 56: '0x50f4220C82c9325dC99f729C3328FB5c338BEaae', }, quoteTokenSymbol: QuoteToken.BNB, quoteTokenAdresses: contracts.wbnb, - factory: 'ape' }, + { pid: 2, risk: 3, - lpSymbol: 'BISON-BUSD LP', - lpAddresses: { - 97: '0x1Ab63eDAc9BDfb697E1118BAD44366bb4CeC6c88', - 56: '0x99ffD623a46362d61D5E0F9ABf9728A2A429acf5', - }, - tokenSymbol: 'BISON', - tokenAddresses: { - 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0x279d41f3f78fe5C1f0BA41aE963d6E545113C973', - }, - quoteTokenSymbol: QuoteToken.BUSD, - quoteTokenAdresses: contracts.busd, - }, - { - pid: 4, - risk: 3, lpSymbol: 'BNB-BUSD LP', lpAddresses: { 97: '0xa75c80e7Ca70505AAB6062cF15A2cFC71b6138C0', - 56: '0x1b96b92314c44b159149f7e0303511fb2fc4774f', + 56: '0x1B96B92314C44b159149f7E0303511fB2Fc4774f', }, - tokenSymbol: 'BNB', + tokenSymbol: 'BUSD', tokenAddresses: { - 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', + 97: '0xeD24FC36d5Ee211Ea25A80239Fb8C4Cfd80f12Ee', 56: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', }, quoteTokenSymbol: QuoteToken.BUSD, quoteTokenAdresses: contracts.busd, }, - { - pid: 5, - risk: 5, - lpSymbol: 'biApe-BNB LP', - lpAddresses: { - 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', - 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', - }, - tokenSymbol: 'BISON', - tokenAddresses: { - 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - factory: 'ape' - }, - { - pid: 6, - risk: 5, - lpSymbol: 'biT10-BNB LP', - lpAddresses: { - 97: '0x197885A5af8ffdC945f2c5677A6E0F3A84C141A2', - 56: '0xd1b59d11316e87c3a0a069e80f590ba35cd8d8d3', - }, - tokenSymbol: 'BISON', - tokenAddresses: { - 97: '0xADA2270B0CB5b6254d3d48A6fEE55b72693B746A', - 56: '0xf952fc3ca7325cc27d15885d37117676d25bfda6', - }, - quoteTokenSymbol: QuoteToken.BNB, - quoteTokenAdresses: contracts.wbnb, - factory: 'ape' - }, ] -export default farms \ No newline at end of file +export default farms diff --git a/src/state/hooks.ts b/src/state/hooks.ts index 637354c93..7fa3bec40 100644 --- a/src/state/hooks.ts +++ b/src/state/hooks.ts @@ -20,7 +20,7 @@ export const useFetchPublicData = () => { const dispatch = useDispatch() const { slowRefresh } = useRefresh() useEffect(() => { - // dispatch(fetchFarmsPublicDataAsync()) + dispatch(fetchFarmsPublicDataAsync()) dispatch(fetchPoolsPublicDataAsync()) }, [dispatch, slowRefresh]) } From 714ee668c8ca1d0cc5a47cd11c0fe58118b7170f Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 15:07:08 +0545 Subject: [PATCH 22/39] fixes for biape-bnb apr --- src/views/Pools/components/PoolCardLP.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/Pools/components/PoolCardLP.tsx b/src/views/Pools/components/PoolCardLP.tsx index 5263841dd..a3167735b 100644 --- a/src/views/Pools/components/PoolCardLP.tsx +++ b/src/views/Pools/components/PoolCardLP.tsx @@ -166,9 +166,16 @@ const PoolCard: React.FC = ({ pool }) => { }, [lpTokenContract, stakingTokenAddress]) const getApr = useCallback(() => { - const baseValue = new BigNumber(token0price).times(reserve0) - const quoteValue = new BigNumber(token1price).times(reserve1) + let baseValue; + let quoteValue; + if(pool.poolName !== 'biAPE-BNB APE') { + baseValue = new BigNumber(token0price).times(reserve0) + quoteValue = new BigNumber(token1price).times(reserve1) + } else { + baseValue = new BigNumber(token0price).times(reserve1) + quoteValue = new BigNumber(token1price).times(reserve0) + } const totalValue = baseValue.plus(quoteValue) const lpTokenPrice = totalValue.div(getBalanceNumber(totalSupply)).times(token0price) @@ -180,7 +187,7 @@ const PoolCard: React.FC = ({ pool }) => { ) return new BigNumber(apr); -}, [pool.tokenDecimals, pool.tokenPerBlock, pool.totalStaked, reserve0, reserve1, rewardTokenPrice, token0price, token1price, totalSupply]) +}, [pool.tokenDecimals, pool.tokenPerBlock, pool.totalStaked, pool.poolName, reserve0, reserve1, rewardTokenPrice, token0price, token1price, totalSupply]) const apy = getApr(); From 30463e36324695f820938be6b99122e06e5ee7fc Mon Sep 17 00:00:00 2001 From: shrijana Date: Sun, 22 Aug 2021 17:19:10 +0545 Subject: [PATCH 23/39] update sousID --- src/config/constants/pools.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/constants/pools.ts b/src/config/constants/pools.ts index 02a99e741..728fd0c99 100644 --- a/src/config/constants/pools.ts +++ b/src/config/constants/pools.ts @@ -3,7 +3,7 @@ import contracts from './contracts' const pools: PoolConfig[] = [ { - sousId: 1, + sousId: 5, poolName: 'BISON', tokenName: 'BISON', stakingTokenName: QuoteToken.BISON, From bd7e7e4e6ce2bab9b049e2655efebcc8bcc284c0 Mon Sep 17 00:00:00 2001 From: Dulkin Date: Sun, 22 Aug 2021 19:51:33 +0300 Subject: [PATCH 24/39] added new ui --- .eslintrc | 1 + package.json | 3 + public/BiSharesLogo.png | Bin 0 -> 8208 bytes public/index.html | 1 + src/App.tsx | 83 +++----- src/components/Button/index.tsx | 36 ++++ src/components/Button/styles.module.ts | 22 ++ src/components/ModalWrap/index.tsx | 31 +++ src/components/ModalWrap/styles.module.ts | 46 ++++ src/components/Tags.tsx | 2 +- src/constants/global.constants.ts | 4 + src/constants/icon.constants.tsx | 201 ++++++++++++++++++ src/constants/routes.constants.ts | 5 + src/style/Global.tsx | 1 + src/views/ConnectWallet/index.tsx | 44 ++++ src/views/ConnectWallet/styles.module.ts | 40 ++++ src/views/Layout/Footer/index.tsx | 124 +++++++++++ src/views/Layout/Footer/styles.module.ts | 31 +++ src/views/Layout/Header/index.tsx | 110 ++++++++++ src/views/Layout/Header/styles.module.ts | 37 ++++ src/views/Layout/index.tsx | 29 +++ src/views/Layout/styles.module.ts | 16 ++ src/views/Pools/Syrup.tsx | 34 +-- src/views/Pools/components/Card.tsx | 5 +- src/views/Pools/components/CardFooter.tsx | 84 +++++--- src/views/Pools/components/HarvestButton.tsx | 6 +- src/views/Pools/components/PoolCard.tsx | 31 ++- src/views/Pools/components/PoolCardLP.tsx | 29 +-- src/views/modal/ConnectWalletModal/index.tsx | 32 +++ .../modal/ConnectWalletModal/styles.module.ts | 37 ++++ src/views/modal/LogOutModal/index.tsx | 28 +++ src/views/modal/LogOutModal/styles.module.ts | 19 ++ yarn.lock | 196 ++++++++++++++++- 33 files changed, 1228 insertions(+), 140 deletions(-) create mode 100644 public/BiSharesLogo.png create mode 100644 src/components/Button/index.tsx create mode 100644 src/components/Button/styles.module.ts create mode 100644 src/components/ModalWrap/index.tsx create mode 100644 src/components/ModalWrap/styles.module.ts create mode 100644 src/constants/global.constants.ts create mode 100644 src/constants/icon.constants.tsx create mode 100644 src/constants/routes.constants.ts create mode 100644 src/views/ConnectWallet/index.tsx create mode 100644 src/views/ConnectWallet/styles.module.ts create mode 100644 src/views/Layout/Footer/index.tsx create mode 100644 src/views/Layout/Footer/styles.module.ts create mode 100644 src/views/Layout/Header/index.tsx create mode 100644 src/views/Layout/Header/styles.module.ts create mode 100644 src/views/Layout/index.tsx create mode 100644 src/views/Layout/styles.module.ts create mode 100644 src/views/modal/ConnectWalletModal/index.tsx create mode 100644 src/views/modal/ConnectWalletModal/styles.module.ts create mode 100644 src/views/modal/LogOutModal/index.tsx create mode 100644 src/views/modal/LogOutModal/styles.module.ts diff --git a/.eslintrc b/.eslintrc index f7f79391d..8bb800a30 100644 --- a/.eslintrc +++ b/.eslintrc @@ -24,6 +24,7 @@ "@typescript-eslint/no-use-before-define": 0, "@typescript-eslint/explicit-module-boundary-types": 0, "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-empty-function": 0, "radix": 0, "import/no-extraneous-dependencies": 0 // End temporary rules diff --git a/package.json b/package.json index f74d01088..92e71dfb5 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,8 @@ "@binance-chain/bsc-use-wallet": "^0.8.1", "@crowdin/crowdin-api-client": "^1.10.1", "@ethersproject/abi": "^5.0.7", + "@material-ui/core": "^4.12.3", + "@material-ui/icons": "^4.11.2", "@pancakeswap-libs/uikit": "bisharesindexfund/bishares-uikit", "@reduxjs/toolkit": "^1.5.0", "@types/react": "^17.0.0", @@ -44,6 +46,7 @@ "@types/styled-components": "^5.1.7", "bignumber.js": "^9.0.0", "chart.js": "^2.9.4", + "classnames": "^2.3.1", "iframe-resizer-react": "^1.1.0", "lodash": "^4.17.20", "react": "^17.0.1", diff --git a/public/BiSharesLogo.png b/public/BiSharesLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..3b00d8498220eb2aa3c54276f7c09ef1a4b64a0b GIT binary patch literal 8208 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

05Iyi_O`PQpq=KzHwuIu)A~Q;iKQ%1{yM4?YYJX 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 + diff --git a/src/App.tsx b/src/App.tsx index b12244334..d15e71100 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,23 +1,17 @@ -import React, { useEffect, Suspense, lazy } from 'react' -import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom' +import React, { useEffect, Suspense, lazy, memo, FC } from 'react' +import { BrowserRouter as Router, Route, Switch } from 'react-router-dom' import { useWallet } from '@binance-chain/bsc-use-wallet' import { ResetCSS } from '@pancakeswap-libs/uikit' import BigNumber from 'bignumber.js' import { useFetchPublicData, useFetchPriceData, useFetchTotalSupplyData } from 'state/hooks' import GlobalStyle from './style/Global' -import Menu from './components/Menu' + import PageLoader from './components/PageLoader' -// import NftGlobalNotification from './views/Nft/components/NftGlobalNotification' +import Layout from './views/Layout'; +import ConnectWallet from './views/ConnectWallet'; -// Route-based code splitting -// Only pool is included in the main bundle because of it's the most visited page' -const Home = lazy(() => import('./views/Home')) -// const Farms = lazy(() => import('./views/Farms')) -// const Lottery = lazy(() => import('./views/Lottery')) const Pools = lazy(() => import('./views/Pools')) -// const Ifos = lazy(() => import('./views/Ifos')) const NotFound = lazy(() => import('./views/NotFound')) -// const Nft = lazy(() => import('./views/Nft')) // This config is required for number formating BigNumber.config({ @@ -25,13 +19,13 @@ BigNumber.config({ DECIMAL_PLACES: 80, }) -const App: React.FC = () => { - const { account, connect } = useWallet() - useEffect(() => { +const App: FC = () => { + const { account, connect } = useWallet(); + useEffect(() => { if (!account && window.localStorage.getItem('accountStatus')) { connect('injected') } - }, [account, connect]) + }, [account, connect]); useFetchPublicData() @@ -41,47 +35,26 @@ const App: React.FC = () => { return ( - - -

- }> - - {/* - - */} - - - - {/* - - */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* Redirect */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* 404 */} - - - - - {/* */} + + + + }> + + +
+ { + account + ? + : + } +
+ + + + + ) } -export default React.memo(App) +export default memo(App) diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx new file mode 100644 index 000000000..7c23b2f9e --- /dev/null +++ b/src/components/Button/index.tsx @@ -0,0 +1,36 @@ +// @ts-ignore +import React, { FC } from 'react' +import classNames from 'classnames'; +import { Button as MaterialButton } from '@material-ui/core'; +import { ButtonProps as MuiButtonProps } from "@material-ui/core/Button"; + +import CircularProgress from '@material-ui/core/CircularProgress'; + +import useStyles from './styles.module'; + +type Props = MuiButtonProps & { + className?: string + onClick?: () => void + outLine?: boolean + loader?: boolean + disabled?: boolean +} + +const Button: FC = ({ children, className, onClick, outLine, + loader, disabled, ...props +}) => { + const classes = useStyles(); + + return ( + {} : onClick} + disabled={loader || disabled} + {...props} + > + {loader ? : children} + + ); +}; + +export default Button; diff --git a/src/components/Button/styles.module.ts b/src/components/Button/styles.module.ts new file mode 100644 index 000000000..49d64db20 --- /dev/null +++ b/src/components/Button/styles.module.ts @@ -0,0 +1,22 @@ +import { makeStyles } from '@material-ui/core/styles'; + +const useStyles = makeStyles(() => ({ + button: { + height: '50px', + width: '240px', + border: '1px solid #DAA10E', + background: 'rgba(218, 161, 14, 0.15)', + borderRadius: '100px', + color: '#DAA10E', + textTransform: 'none' + }, + disable: { + '& span': { + fontWeight: 'bold', + color: '#1E1F20', + } + } + } +)); + +export default useStyles; diff --git a/src/components/ModalWrap/index.tsx b/src/components/ModalWrap/index.tsx new file mode 100644 index 000000000..df548c973 --- /dev/null +++ b/src/components/ModalWrap/index.tsx @@ -0,0 +1,31 @@ +import React from 'react'; +import Modal from '@material-ui/core/Modal'; + +import { CloseIcon } from '../../constants/icon.constants'; + +import useStyles from './styles.module'; + +const ModalWrap = ({ + children, iconTitle, title, onClose, +}) => { + const classes = useStyles(); + + return ( + +
+
+ {iconTitle}{title} + {onClose && } +
+ {children} +
+ + ); +}; + +export default ModalWrap; diff --git a/src/components/ModalWrap/styles.module.ts b/src/components/ModalWrap/styles.module.ts new file mode 100644 index 000000000..1c3c7c49d --- /dev/null +++ b/src/components/ModalWrap/styles.module.ts @@ -0,0 +1,46 @@ +import { makeStyles } from '@material-ui/core/styles'; + +const useStyles = makeStyles(() => ({ + modalWrap: { + background: '#1E1F20', + position: 'absolute', + top: '50%', + left: '50%', + transform: 'translate(-50%, -50%)', + borderRadius: '32px', + minWidth: '340px', + boxSizing: 'border-box', + border: '1px solid #333333', + }, + title: { + padding: '24px', + borderBottom: '0.5px solid #333333', + fontSize: '16px', + /* fontWeight: '700', */ + color: '#FFF', + display: 'flex', + alignItems: 'center', + textTransform: 'uppercase', + position: 'relative', + + '& svg': { + marginRight: '15px', + }, + }, + + closeIcon: { + position: 'absolute', + background: 'transparent', + border: 'none', + cursor: 'pointer', + right: '24px', + top: '50%', + transform: 'translate(0, -50%)', + + '& svg': { + marginRight: '0', + }, + }, +})); + +export default useStyles; diff --git a/src/components/Tags.tsx b/src/components/Tags.tsx index 2312db91a..faa1f3a29 100644 --- a/src/components/Tags.tsx +++ b/src/components/Tags.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { Tag, VerifiedIcon, CommunityIcon, BinanceIcon } from '@pancakeswap-libs/uikit' +import { Tag, VerifiedIcon, CommunityIcon, BinanceIcon, Image } from '@pancakeswap-libs/uikit' const NoFeeTag = () => ( }> diff --git a/src/constants/global.constants.ts b/src/constants/global.constants.ts new file mode 100644 index 000000000..a68deefcd --- /dev/null +++ b/src/constants/global.constants.ts @@ -0,0 +1,4 @@ +export const BSC_SCAN_URL = 'https://bscscan.com/address/'; +export const CHAIN_ID = 56; +export const RPC_URL_56 = 'https://bsc-dataseed1.binance.org'; +export const POLLING_INTERVAL = 12000; \ No newline at end of file diff --git a/src/constants/icon.constants.tsx b/src/constants/icon.constants.tsx new file mode 100644 index 000000000..7a7407d12 --- /dev/null +++ b/src/constants/icon.constants.tsx @@ -0,0 +1,201 @@ +/* eslint-disable max-len */ +import React from 'react'; + +export const ZapOffIcon = ( + + + + + + + + + + + + + + + + + + + +); + +export const LogIn = ( + + + + + +); + +export const Wallet = ( + + + +); + +export const TwitterIcon = ( + + + +); + +export const GitHub = ( + + + +); + +export const TelegramIcon = ( + + + +); + +export const MediumSquareIcon = ( + + + +); + +export const DiscordIcon = ( + + + +); + +export const AlertTriangle = ( + + + + + + + + + + + + + + + + + + +); + +export const SwitchIcon = ( + + + + + + + +); + +export const CopyIcon = ( + + + + +); + +export const ArrowUpIcon = ( + + + + +); + +export const ArrowUpGreen = ( + + + + +); + +export const ArrowDownRed = ( + + + + +); + +export const ZapIcon = ( + + + +); + +export const CloseIcon = ( + + + + + +); + +export const MetaMaskIcon = ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +); + +export const WalletConnectIcon = ( + + + + +); + +export const MagicIcon = ( + + + +); + +export const ArrowDownIcon = ( + + + +); diff --git a/src/constants/routes.constants.ts b/src/constants/routes.constants.ts new file mode 100644 index 000000000..358cfe636 --- /dev/null +++ b/src/constants/routes.constants.ts @@ -0,0 +1,5 @@ +export const PATH_INDEX = '/'; +export const MAIN_INDEX = '/'; + +export const LINK_PATH_HOME = 'https://bishares.finance/'; +export const LINK_PATH_ABOUT = 'https://bishares.finance/about-us'; \ No newline at end of file diff --git a/src/style/Global.tsx b/src/style/Global.tsx index e764f7093..29ad6a622 100644 --- a/src/style/Global.tsx +++ b/src/style/Global.tsx @@ -13,6 +13,7 @@ const GlobalStyle = createGlobalStyle` } body { background-color: ${({ theme }) => theme.colors.background}; + overflow-x: hidden; img { height: auto; diff --git a/src/views/ConnectWallet/index.tsx b/src/views/ConnectWallet/index.tsx new file mode 100644 index 000000000..e8bdae65b --- /dev/null +++ b/src/views/ConnectWallet/index.tsx @@ -0,0 +1,44 @@ +import React from 'react'; +import { useWeb3React } from '@web3-react/core'; +import { useWalletModal } from '@pancakeswap-libs/uikit' +import { useWallet } from '@binance-chain/bsc-use-wallet' + +import Button from '../../components/Button'; + +import { ZapOffIcon, LogIn, AlertTriangle } from '../../constants/icon.constants'; +import { CHAIN_ID } from '../../constants/global.constants'; + +import useStyles from './styles.module'; + +const ConnectWallet = () => { + const classes = useStyles(); + const { chainId, account } = useWeb3React(); + const { connect, reset } = useWallet() + const { onPresentConnectModal } = useWalletModal(connect, reset) + + + return ( +
+ { + (!!account && chainId !== CHAIN_ID) + ? ( + <> +
{AlertTriangle}
+
WRONG NETWORK DETECTED
+
Please connect to the Binance Smart Chain Network
+ + ) + : ( + <> +
{ZapOffIcon}
+
Connect a Wallet to ACCESS the DASHBOARD
+ + + + ) + } +
+ ); +}; + +export default ConnectWallet; \ No newline at end of file diff --git a/src/views/ConnectWallet/styles.module.ts b/src/views/ConnectWallet/styles.module.ts new file mode 100644 index 000000000..a884b87b1 --- /dev/null +++ b/src/views/ConnectWallet/styles.module.ts @@ -0,0 +1,40 @@ +import { makeStyles } from '@material-ui/core/styles'; + +const useStyles = makeStyles(() => ({ + wrap: { + background: '#1E1F20', + border: '1px solid #4D4D4D', + borderRadius: '32px', + padding: '40px 65px', + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + position: 'absolute', + top: '50%', + left: '50%', + transform: 'translate(-50%, -50%)', + }, + + text: { + textTransform: 'uppercase', + margin: '20px 0 32px', + maxWidth: '230px', + textAlign: 'center', + lineHeight: '25px', + color: '#FFF', + }, + + description: { + color: '#9F9F9F', + margin: ' -10px 0 32px', + }, + + button: { + '& svg': { + marginRight: '12px', + }, + }, + } +)); + +export default useStyles; diff --git a/src/views/Layout/Footer/index.tsx b/src/views/Layout/Footer/index.tsx new file mode 100644 index 000000000..7c45e8452 --- /dev/null +++ b/src/views/Layout/Footer/index.tsx @@ -0,0 +1,124 @@ +import React from 'react'; +import classNames from 'classnames'; +import { + Grid, AppBar, Toolbar, Typography, Link as MaterialLink, +} from '@material-ui/core'; +import { useWeb3React } from '@web3-react/core'; +import useMediaQuery from '@material-ui/core/useMediaQuery'; + + +import { + TwitterIcon, GitHub, TelegramIcon, MediumSquareIcon, DiscordIcon, +} from '../../../constants/icon.constants'; + +import useStyles from './styles.module'; + +const footerLinks = [ + { + icon: TwitterIcon, + href: 'https://twitter.com/BiSharesFinance', + }, + { + icon: GitHub, + href: 'https://github.com/bisharesindexfund', + }, + { + icon: TelegramIcon, + href: 'https://t.me/bishares', + }, + { + icon: MediumSquareIcon, + href: 'https://bi-shares.medium.com', + }, + { + icon: DiscordIcon, + href: 'https://discord.com/invite/w2jejq5rBP', + }, +]; + +const Footer = () => { + const { account } = useWeb3React(); + const classes = useStyles(); + const matches = useMediaQuery('(max-width:1350px)'); + + return ( + + + + + { + footerLinks.map(item => ( + + + {item.icon} + + + )) + } + + + + + Gordian Audit + + + + + DefiYield Audit + + + + + + + © 2021 by Bishares Finance + + + + + + + ); +}; + +export default Footer; \ No newline at end of file diff --git a/src/views/Layout/Footer/styles.module.ts b/src/views/Layout/Footer/styles.module.ts new file mode 100644 index 000000000..3aaa4dd6d --- /dev/null +++ b/src/views/Layout/Footer/styles.module.ts @@ -0,0 +1,31 @@ +import { + makeStyles, +} from '@material-ui/core/styles'; + +const useStyles = makeStyles(() => ({ + footer: { + width: '100vw', + backgroundColor: '#1E1F20', + padding: '49px 33px', + boxSizing: 'border-box', + + }, + title: { + color: '#9F9F9F' + }, + + link: { + display: 'flex', + alignItems: 'flex-end', + }, + mobileIcon: { + marginBottom: '10px', + }, + centerLink: { + display: 'flex', + justifyContent: 'center', + marginBottom: '5px', + }, +})); + +export default useStyles; \ No newline at end of file diff --git a/src/views/Layout/Header/index.tsx b/src/views/Layout/Header/index.tsx new file mode 100644 index 000000000..c2ab64c33 --- /dev/null +++ b/src/views/Layout/Header/index.tsx @@ -0,0 +1,110 @@ +import React, { useState, useMemo, FC, MouseEventHandler } from 'react'; +import classNames from 'classnames'; +import { Grid, AppBar, Toolbar, Button as MuButton, } from '@material-ui/core'; +import { Link } from 'react-router-dom'; +import useMediaQuery from '@material-ui/core/useMediaQuery'; +import { Image , useWalletModal } from '@pancakeswap-libs/uikit' +import { useWallet } from '@binance-chain/bsc-use-wallet' +import Menu from '@material-ui/core/Menu'; +import MenuItem from '@material-ui/core/MenuItem'; + +import Button from '../../../components/Button'; + +import LogOutModal from '../../modal/LogOutModal'; + +import { LogIn, Wallet, ArrowDownIcon } from '../../../constants/icon.constants'; +import { PATH_INDEX, LINK_PATH_HOME, LINK_PATH_ABOUT } from '../../../constants/routes.constants'; + +import useStyles from './styles.module'; + + +const Header = () => { + const classes = useStyles(); + const [isLogOutModal, setLogOutModal] = useState(false); + const [isDropDown, setDropDown] = useState(null); + const matches = useMediaQuery('(max-width:960px)'); + const { connect, reset, account } = useWallet(); + const { onPresentConnectModal } = useWalletModal(connect, reset); + + + const walletAddress = useMemo(() => ( + account && `${account?.slice(0, 7) }...${account?.slice(account?.length - 4, account?.length)}` + ), [account]); + + + return ( + + + + + + logo + + + { + !matches && ( + + Home + About + Funds + + ) + } + + { + account + ? ( + ) + : ( + ) + } + + { + matches && ( + + + setDropDown(null)} + > + Home + About + Funds + + + ) + } + + {isLogOutModal && setLogOutModal(false)} title={walletAddress} account={account} />} + + + ); +}; + +export default Header; \ No newline at end of file diff --git a/src/views/Layout/Header/styles.module.ts b/src/views/Layout/Header/styles.module.ts new file mode 100644 index 000000000..5a2f4b428 --- /dev/null +++ b/src/views/Layout/Header/styles.module.ts @@ -0,0 +1,37 @@ +import { makeStyles } from '@material-ui/core/styles'; + +const useStyles = makeStyles(() => ({ + header: { + padding: '36px 32px', + backgroundColor: '#191919', + minHeight: '5vh', + background: 'linear-gradient(90deg, rgba(0,0,0,0) 60%, rgba(219,165,23,0.542454481792717) 160%)', + borderBottom: '1px solid #4D4D4D', + }, + link: { + color: '#CACACA', + fontSize: '16px', + textTransform: 'capitalize', + }, + button: { + textTransform: 'none', + fontSize: '18px', + position: 'relative', + '& svg': { + marginRight: '8px', + }, + }, + mobileButton: { + width: '51px', + height: '63px', + '& svg': { + marginRight: '0', + }, + }, + linMenu: { + textDecoration: 'none', + color: '#DAA10E', + }, +})); + +export default useStyles; \ No newline at end of file diff --git a/src/views/Layout/index.tsx b/src/views/Layout/index.tsx new file mode 100644 index 000000000..c9e15094b --- /dev/null +++ b/src/views/Layout/index.tsx @@ -0,0 +1,29 @@ +import React, { FC } from 'react'; +import { Grid } from '@material-ui/core'; + +import Header from './Header'; +import Footer from './Footer'; + +import useStyles from './styles.module'; + +const Layout:FC = ({ children }) => { + const classes = useStyles(); + return ( + + +
+ + + {children} + + +