Move ECDSA
message hash methods to its own MessageHashUtils
library by ernestognw · Pull Request #4430 · OpenZeppelin/openzeppelin-contracts (original) (raw)
I merge master with:
git merge master -X theirs
Then applied the patch with bash scripts/upgradeable/patch-apply.sh
, solved conflicts (ECDSA
vs MessageHashUtils
import in EIP-712), and saved the patch with bash scripts/upgradeable/patch-save.sh
.
Should be fine but I did the same conflict resolution before, let me know if I'm missing something.