From 121e6a2a0a747d497226ac5856bdab23b24fd29f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 19:43:16 +0000 Subject: [PATCH 1/3] Update OpenZeppelin Contracts to v4.9.0 --- packages/core/package.json | 4 ++-- .../src/environments/hardhat/package-lock.json | 12 ++++++------ .../hardhat/upgradeable/package-lock.json | 12 ++++++------ yarn.lock | 18 +++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index c3de98691..1626627de 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,8 +20,8 @@ "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable" }, "devDependencies": { - "@openzeppelin/contracts": "4.8.3", - "@openzeppelin/contracts-upgradeable": "4.8.3", + "@openzeppelin/contracts": "4.9.0", + "@openzeppelin/contracts-upgradeable": "4.9.0", "@types/node": "^10.17.51", "@types/rimraf": "^3.0.0", "array.prototype.flat": "^1.2.4", diff --git a/packages/core/src/environments/hardhat/package-lock.json b/packages/core/src/environments/hardhat/package-lock.json index 48ae293a3..2a6cb2809 100644 --- a/packages/core/src/environments/hardhat/package-lock.json +++ b/packages/core/src/environments/hardhat/package-lock.json @@ -1408,9 +1408,9 @@ } }, "node_modules/@openzeppelin/contracts": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.8.3.tgz", - "integrity": "sha512-bQHV8R9Me8IaJoJ2vPG4rXcL7seB7YVuskr4f+f5RyOStSZetwzkWtoqDMl5erkBJy0lDRUnIR2WIkPiC0GJlg==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.0.tgz", + "integrity": "sha512-DUP74AFGKlic2sQb/CmgrN2aUPMFGxRrmCTUxLHsiU2RzwWqVuMPZBxiAyvlff6Pea77uylAX6B5x9W6evEbhA==", "dev": true }, "node_modules/@scure/base": { @@ -9707,9 +9707,9 @@ } }, "@openzeppelin/contracts": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.8.3.tgz", - "integrity": "sha512-bQHV8R9Me8IaJoJ2vPG4rXcL7seB7YVuskr4f+f5RyOStSZetwzkWtoqDMl5erkBJy0lDRUnIR2WIkPiC0GJlg==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.0.tgz", + "integrity": "sha512-DUP74AFGKlic2sQb/CmgrN2aUPMFGxRrmCTUxLHsiU2RzwWqVuMPZBxiAyvlff6Pea77uylAX6B5x9W6evEbhA==", "dev": true }, "@scure/base": { diff --git a/packages/core/src/environments/hardhat/upgradeable/package-lock.json b/packages/core/src/environments/hardhat/upgradeable/package-lock.json index 08eb7be74..e35772fab 100644 --- a/packages/core/src/environments/hardhat/upgradeable/package-lock.json +++ b/packages/core/src/environments/hardhat/upgradeable/package-lock.json @@ -1464,9 +1464,9 @@ } }, "node_modules/@openzeppelin/contracts-upgradeable": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.3.tgz", - "integrity": "sha512-SXDRl7HKpl2WDoJpn7CK/M9U4Z8gNXDHHChAKh0Iz+Wew3wu6CmFYBeie3je8V0GSXZAIYYwUktSrnW/kwVPtg==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.0.tgz", + "integrity": "sha512-+6i2j6vr2fdudTqkBvG+UOosankukxYzg3WN1nqU7ijjQ5A4osWaD3ip6CEz6YvDoSdZgcFVZoiGr7zRlUUoZw==", "dev": true }, "node_modules/@openzeppelin/hardhat-upgrades": { @@ -10224,9 +10224,9 @@ } }, "@openzeppelin/contracts-upgradeable": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.3.tgz", - "integrity": "sha512-SXDRl7HKpl2WDoJpn7CK/M9U4Z8gNXDHHChAKh0Iz+Wew3wu6CmFYBeie3je8V0GSXZAIYYwUktSrnW/kwVPtg==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.0.tgz", + "integrity": "sha512-+6i2j6vr2fdudTqkBvG+UOosankukxYzg3WN1nqU7ijjQ5A4osWaD3ip6CEz6YvDoSdZgcFVZoiGr7zRlUUoZw==", "dev": true }, "@openzeppelin/hardhat-upgrades": { diff --git a/yarn.lock b/yarn.lock index 0ae8c6f57..c1a2afba1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -746,15 +746,15 @@ "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1" "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1" -"@openzeppelin/contracts-upgradeable@4.8.3": - version "4.8.3" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.3.tgz#6b076a7b751811b90fe3a172a7faeaa603e13a3f" - integrity sha512-SXDRl7HKpl2WDoJpn7CK/M9U4Z8gNXDHHChAKh0Iz+Wew3wu6CmFYBeie3je8V0GSXZAIYYwUktSrnW/kwVPtg== - -"@openzeppelin/contracts@4.8.3": - version "4.8.3" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.3.tgz#cbef3146bfc570849405f59cba18235da95a252a" - integrity sha512-bQHV8R9Me8IaJoJ2vPG4rXcL7seB7YVuskr4f+f5RyOStSZetwzkWtoqDMl5erkBJy0lDRUnIR2WIkPiC0GJlg== +"@openzeppelin/contracts-upgradeable@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.0.tgz#70aaef469c8ac5bb0ff781480f3d321cbf7be3a8" + integrity sha512-+6i2j6vr2fdudTqkBvG+UOosankukxYzg3WN1nqU7ijjQ5A4osWaD3ip6CEz6YvDoSdZgcFVZoiGr7zRlUUoZw== + +"@openzeppelin/contracts@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.0.tgz#683f33b6598970051bc5f0806fd8660da9e018dd" + integrity sha512-DUP74AFGKlic2sQb/CmgrN2aUPMFGxRrmCTUxLHsiU2RzwWqVuMPZBxiAyvlff6Pea77uylAX6B5x9W6evEbhA== "@pkgjs/parseargs@^0.11.0": version "0.11.0" From 64192676aab9e34f03c92ffe523228ed0d5cbf63 Mon Sep 17 00:00:00 2001 From: Eric Lau Date: Thu, 25 May 2023 15:08:08 -0400 Subject: [PATCH 2/3] Fix overrides --- packages/core/src/erc721.test.ts.md | 36 ++++++++++++++++++++++++ packages/core/src/erc721.test.ts.snap | Bin 1720 -> 1727 bytes packages/core/src/erc721.ts | 1 + packages/core/src/governor.test.ts.md | 8 ++++++ packages/core/src/governor.test.ts.snap | Bin 1721 -> 1736 bytes packages/core/src/governor.ts | 13 +++++++++ packages/core/src/zip.test.ts | 2 ++ 7 files changed, 60 insertions(+) diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md index d4c582709..44baa48c4 100644 --- a/packages/core/src/erc721.test.ts.md +++ b/packages/core/src/erc721.test.ts.md @@ -96,6 +96,15 @@ Generated by [AVA](https://avajs.dev). {␊ return super.tokenURI(tokenId);␊ }␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC721, ERC721URIStorage)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ }␊ ` @@ -135,6 +144,15 @@ Generated by [AVA](https://avajs.dev). {␊ return super.tokenURI(tokenId);␊ }␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC721, ERC721URIStorage)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ }␊ ` @@ -178,6 +196,15 @@ Generated by [AVA](https://avajs.dev). {␊ return super.tokenURI(tokenId);␊ }␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC721, ERC721URIStorage)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ }␊ ` @@ -224,6 +251,15 @@ Generated by [AVA](https://avajs.dev). {␊ return super.tokenURI(tokenId);␊ }␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC721, ERC721URIStorage)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ }␊ ` diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap index fe9835a16e7fc8fda79a622276ee333a01682839..597d7d51e7aff9a5d2768b2679a56e6d1ac39600 100644 GIT binary patch literal 1727 zcmV;w20-~iRzVh{cz;Hq1B(m=u>Qybrfijdud=iqu z8tQB+DIbdn00000000B+TFY)5Hx%_FK@sh`FA74)LPBLt?KDjtqd*kJLDkxcYs*Et zsX)z87UK~)Avu=iAd3cFbXW8f(rtl$K!Gm$2l<2kO38V1W-LpQWXp-Pv1fRBc^~H< zUJ~=B)3&L3%zyg>2`p@c+K^)ta{?XSrGo$b#{7C^Wm}?5k zO66dvR1Bnx6;Rx5epf7mm#+%13W2{}=`R8eG#*!r}J~;|L1W zhl8qvi40)Xw5e+u*y(WN`<}VC**#^XzTUiBYwq=4Y;gD()ppkh&f{mB4@r&p>()09 zH@~ev->DhWbEQ9#r{{>cJ;Y$!M%hfQ-qA93d-V!3HP%dYDx_U94Lo?W9eHB%B0AY*n|*;x~o!~N;PjNyE@QBrS?D|{)KO-deN|A>m9dkV>5a@!Kgp3BXOz8 zVr)}tr~M1+(04OyUec~iVI52E16)D|9_3ZmYpt^Q^{XsNaRsxc)VJkveFaa%VA~_Q`l#XuMDb1d}Iht2peSU74uT(A`dhy2|Fc zFr>sDNXrmQA*mHDl-Roh(D>s>G*e|#@mA7mWx-SnrkXlao!-u;D*1$o$xu(y545wy zb#qH2uFB01l(;UMk1fRbK)t-1pW( z2v3Zz^cv-nkv9F-X@(7e28T<&g&%sEwUVmAdF%x)>GtXR-8IeO#Zm%;=!A+q+F$uw zgWR9<2ss};CL1_{N-lJ|1H)plBi6PXd-v8iCOmiss=W62yp2PBCO1KQLV`XzxBf z3qv4dLDUwx1{IYi={bk46YZ{rJqMyV$e!Z7<2{aKybmLz31LH!(Ax4nXep`euCSF6 zjKk|s(L}-^=L`j*&Kc1Io+sdiJ!|25o_$^_G$r$S12f};_Pk#Al*X&unS2BJp0qL} z@X(YSoJ%?nj|UF*o7q9x%`|eZ>*O3-3cqR{+@P@N;1(U+2i(EEtFFVty@RY}*S;UD zfRtm4262uWM1M4up+yV1Xdy>vf?CiOUCN|Duw)byg8Ge~WBXU@N_JRhr+putbk;Y1 V(YP)e*AW}n{{h-~sgnyk000==N#y_l literal 1720 zcmV;p21ofpRzVU+#kEw)S~sF zS_X8_EFX&q00000000B+TFq}8MHJ6R5vs+7J3=F?2U|E^l2Y2VLaOVg!jQBfaZr1~ z8t;zdY1T8_nb|l_)dPqFH^hZAMdE}6cO(w{2mC`w%zp1}|R~UKIj;yHZ~ST!u3$KU@4>)7f3T;yQce9haB_QvzB_ z@x7gf+=Pihj6fSWE<=DGBF3kmkc_v_Z@ z57xh^Ki{kwQgg*W;iu<_xIM&R+eTSWE#K5Ubz}JwJT=x%bR?u)(hWR#vJq)_y5lP# zz2|IDkVa~D5$I6crhVn$5E~r81P-`#^9vU;@*QX5fT6lp*h^CWC}`5Gz5; zVu*9lVYF8P;Wt4mz?GO=yY(sXtkSUJ2W=?K?k+w?Fo~pn0*GQA$~lpsSca_fQSPm(`yqYuB*;z(l|{CG%?yKhBwJdA2-Sx@DYcgx zKLSGmzWkd8@Sm^V)sX@CY3!hB$~0^|>67v9oA{s#2sTexgK*eEThdXbp;v>33+2rd zAxMcmkdh&m0#7SCD3Ry`(D>^}G*g(WcqeJGF%Rp@4(p>E`Ef13VPZ1Wld%fzY?NQ? zYEk~|+FKgsr)_ctwz*NKu0kO{kJR9D<@}JNj2#wzsRsYt^C6mk3>=0JWkUg40UUJl zbIm!~6cdC&oKg~?O@$8lEG=TybQzO?DkXDFiX_6TMl?@UZ$_f(Dh>0S)x{Mp7kzjc zV};3b(Sty@(ep#NjKU(K%4c$s!?}JJk;hah zLn12^0OvfIivb??1v&TaOAX-mEZ(={1NGt>@ZrcCQm`i6<0RTPMs37%?(H4TP4!tE z!~|}td4KBaF||i=mbM|Vo;NeTxfUAN^B^R0d*g9)W2d$AWOG9{76-^Q;eqsq^k%$J zERWd)#s1ot@g;Vo3rY_+9@X|Xo2}YI$=PFD0X@E7<%n2_C7X_TPeO(q;)&6fKBGJ` z($2rmnBtUQgTn=k_>;rXp<|MzR1D5yEpS0|jjK1sn8A@n0)yy~ioCSH^p^&?-)9kW zK6*?xa0HdP(CH2gi@}aq*=TIvUR|58OAA0P&~a@WxQ@hzg}kgG6ekC&fXYJt`cE3vy$gd5 z5*j&YDKK@;if-^c0?+JO30L#v^IV}Znav5zlpF0?9ru*Ri`%KZxAlgUG9%=nb1rZ$ zs2?5=9O^T*M%m32a<1#-G%bZ6vUZRzV;050cQaVEsuy3PQw%CId14%f&5K` zKfZ7rOIY75@4dS8`jUFR^4ijy*X}LXYUE(|{@1s^bZzQ~^mfCczHpCR%0DI#8;6yE zTgNSngv@gtSDcgY>uYz{KH9ES+*ZK2AS<7;fcihsAfTS>*KFnsZrLKNCAL|3X0 zX0FLvRENtG>F@bz-HrIIg;yRNbdkH@teM_qKvX)q*+Co>$_Z zN0A>_LE20O?LPIa^Xe)IqNeBC@&~6xRmfe35>7?L{g6~6*B2X`TdQeY)GH|?oAo>O z`ZkfDv~_Yy>65tJ+|(}RE^{W`RyI)_X7j`d4X)GmyW9CzWYdQylpM(pXQ$GoPO~Ag za&?EYf~S$osY9CQmglL(NtVc| zL=Bm=K#mfdyMf*_g$Nmf(&_6s~P zePM+sUGHU;YHjf@J(9YCN+Q(pE$`DyhATF$PsnVw{(0jaQj?F)&;u;}T{*qJvl^X+*h zqwyO$joVQuSSwkwh~kW17_a=J!T6sQz&KzWFg{TjU$58iUKx!KYz&|bPzERilmW^B z<%I&}ca5OzP}^-;UTDDNeGQX$fXQRUIcyL0B}dB(&bhSkW3R z3Kj*6fw$UNjF91ka zb-H^R#tMg;3K(wwGkn>fMe~wNlxB>19@nKrISkIMF10rKFMaJ|J_GfSR@bQNm>i}c`G61=78vq%A3_u1T1CRm8#sLOEo<~4_zb_yY z)^Y_7o8qu34x7&3Vbe_Si_rA?ZyK8ZQt}1La83KgeNk@$wpn7quuDb!ME04O9VBq*f83W@6iNuA#`WaqDG z66n7-W=;Z4O0}pB{H0JB1NDTmav0h0V1H+$-g$C@*?LtyGWOH>E9H~?FP1>v#X(*0 zB6tzJXs~%sdGYKW9T;U55&=cJN?{)~65ex?-X125 z5BexwQ!MX7TwdPOaQWUca2dEfpSZjUTppP5y-$7Ca(yeFKS%kO?DffIdI9BtazOdi zu@g`ZCkH=7N>`dN+%(+}D}0(enRdK#nw^ssI20wpoJ! literal 1721 zcmV;q21fZoRzVLYMTgw z5LD~kNiynsXFEIVBvd`{1Uy4|7{m)8E{F?9#06e}nf+t$tjA8B*vZ=d`jU8Ocjo*1 z&3NYX`*|jLzT5V>`#AdPXDXTW=^@$UT`B@D$N`i4BosX4k>eA&FKD#SeUC+f6RO{2 z^y72SbENalr3Wuxc=dvQz4Xe3*Dv0>)M$|H`?tTo{v~s15Yg)`j|P(MGAceMcUwEP zP&j)XheX_G9+OAp`{v5cm5(-SHP#8akYwpo9@5|k8iv$oLBr*N6pkySMykyTT-x|N zlewa5S=t=uNqQ)iD#nATSIHKSmB3(cTUF!JiB$O&mo%DOO%Gx&;?8IKepNV;dUsfd z>b~F7_j5n1vz9+j?jGfL5*CsC_iM!NwEp!(Z|SWmzh79=K%Ul!dMOE!6tOG0sJD{m z$s@@hQ}tl!0iOz0lwDg+9@ekC`ubAeh^4{er0RNF^^j6ic>TuUZ6!tZlANc{YRS*t zI7q4>U9O#WoBGaCeVK%D+h?x&At=!m3g%HFsEkDrk$TJmxwgKsocTq+(lWB%ywPlK z67@-2B?pu~PRi{~-KTXfq2-Nf%%Cl$fo-wle%9EwmN3$qRAfP% z-InwQT6a88jiTt=??{JsxHuxx5qngsStYZxU($8_SWh?YBjx%2W!Le2y*Q~7HI?Wg zlNG2@;tCd;JyY_K#VNhMK4Ev}mh}wDbr*ydrP=-Sh#pcmws!Y5GEt``B_FI6HGSbk z`+e(Gm3nRQPdt+Pj!He$v#n^;3%VVZ8Q_0powx0ONph!1z>Qe6`uUd1f>|vN3=%KpCJ6PzERilotw= z-?4(SM_tx&{K$gI4-HJ-0wzxslg|iet4yrO3m*rOr^pX)jKZQxC85nmCW_WzQLrdj z6f6oBokJFV(`3=+C=9)4VCW~nP+%x9bXG9*3?LK;3Iqj$0zrYGW#fRL!x6M=5@T?f0i%%b8nt-i8934=W#QXsD|KNja@M|S0I|0(P+XF;GVXZPx*nfC_*5F zKnQ`*q6b2e83?t7)8&=}jPDsy&>Iy$!07T$=t$OPzG}M=yA-b8(uN{_dBG%q*>STN zvCQ!H>8gBLfX&lq$oCerfclm-(>6O*BMbmbgQdaJ7R^&->DHZxTdN!ERodV}g}c`5 z>NUx-!R2oQt^dFVmjz+!S^owAJPn>Ur_pNjG$6XN`Er0VKpCKH(LAR~=fk%K`1r%M zRRA&o8Gu~64S)i`2F&m$neKNOG&?=Xo2lQ=Mm1C#T2U~(M?CPAbi zQV?l{yfgLy1Ch=nkv4}DX?}Y0I5fTdn}Mdk;4EczIk&25VVtGZXDOTKn{CEPN}Qxb z;u~Sc^ur9Cq^v{?fCvc@5+bD05t1+iBz*?alAXV3gh2njHgh4+w4xS$jHeP2#>jX= zs~jh6xbtvpt=W5WirIQyJu>#^@t3xz`JWhpx{HIl;6?Bvc+sMHPI>Y0Z4($(6$$}m zwn||iG!ou(lHMLaGra+X#Xe}HgTcsPWH2%qd4UkWSX{pJz`*5O75|fU zz-8d_NpX1{xI8lBdz%Kl!vZInKTq>-#hcU1^a9EO<$&^Y$4)>wpd3(s43xiXLV1z% zNX{9^UjxV&7Rd2;JdnQzDg%{)%0OkH@*<=16%&>9reMWG-Y87|*TCezfXOq4$!QOt zGbd-m>{w84<+tXKR)>>QT>xc(^4WoMI_5yiAmvlDU~wn`m0$dmHW#cs)Vf)O<)Ow* PjF$fgL@kidWT^lEac5cW diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts index 3a85c2377..8667ec6ef 100644 --- a/packages/core/src/governor.ts +++ b/packages/core/src/governor.ts @@ -117,6 +117,7 @@ function addBase(c: ContractBuilder, { name }: GovernorOptions) { c.addOverride('Governor', functions._cancel); c.addOverride('Governor', functions._executor); c.addOverride('Governor', supportsInterface); + c.addOverride('Governor', functions.cancel); } function addSettings(c: ContractBuilder, allOpts: Required) { @@ -365,6 +366,8 @@ function addBravo(c: ContractBuilder, { bravo, timelock }: GovernorOptions) { path: '@openzeppelin/contracts/governance/compatibility/GovernorCompatibilityBravo.sol', }); c.addOverride('IGovernor', functions.state); + c.addOverride('IGovernor', functions.cancel); + c.addOverride('GovernorCompatibilityBravo', functions.cancel); c.addOverride('GovernorCompatibilityBravo', functions.propose); c.addOverride('IERC165', supportsInterface); } @@ -433,6 +436,16 @@ const functions = defineFunctions({ returns: ['uint256'], kind: 'internal', }, + cancel: { + args: [ + { name: 'targets', type: 'address[] memory' }, + { name: 'values', type: 'uint256[] memory' }, + { name: 'calldatas', type: 'bytes[] memory' }, + { name: 'descriptionHash', type: 'bytes32' }, + ], + returns: ['uint256'], + kind: 'public', + }, state: { args: [ { name: 'proposalId', type: 'uint256' }, diff --git a/packages/core/src/zip.test.ts b/packages/core/src/zip.test.ts index 0bbe2c4a1..949cc057c 100644 --- a/packages/core/src/zip.test.ts +++ b/packages/core/src/zip.test.ts @@ -55,6 +55,7 @@ test('erc721 auto increment', t => { '@openzeppelin/contracts/utils/introspection/IERC165.sol', '@openzeppelin/contracts/utils/math/', '@openzeppelin/contracts/utils/math/Math.sol', + '@openzeppelin/contracts/utils/math/SignedMath.sol', 'MyToken.sol', ]); }); @@ -99,6 +100,7 @@ test('erc721 auto increment uups', t => { '@openzeppelin/contracts-upgradeable/utils/introspection/IERC165Upgradeable.sol', '@openzeppelin/contracts-upgradeable/utils/math/', '@openzeppelin/contracts-upgradeable/utils/math/MathUpgradeable.sol', + '@openzeppelin/contracts-upgradeable/utils/math/SignedMathUpgradeable.sol', 'MyToken.sol', ]); }); From fb43d8207b6fad304c52271a1a96bd2af159dff6 Mon Sep 17 00:00:00 2001 From: Eric Lau Date: Thu, 25 May 2023 15:13:49 -0400 Subject: [PATCH 3/3] Update changelog --- packages/core/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 73240bbd4..523a08670 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +- **Breaking change**: Update to OpenZeppelin Contracts 4.9. ([#252](https://github.com/OpenZeppelin/contracts-wizard/pull/252)) + ## 0.2.3 (2023-03-23) - Fix module not found error. ([#235](https://github.com/OpenZeppelin/contracts-wizard/issues/235))