replace search-and-replace with patches

patches/00-fix-references.patch

+diff --git a/contracts/mocks/ContextMock.sol b/contracts/mocks/ContextMock.sol
+index ae989969..5975438f 100644
+--- a/contracts/mocks/ContextMock.sol
++++ b/contracts/mocks/ContextMock.sol
+@@ -45,11 +45,11 @@ contract ContextMockCallerUpgradeable is Initializable {
+         
+     }
+ 
+-    function callSender(ContextMock context) public {
++    function callSender(ContextMockUpgradeable context) public {
+         context.msgSender();
+     }
+ 
+-    function callData(ContextMock context, uint256 integerValue, string memory stringValue) public {
++    function callData(ContextMockUpgradeable context, uint256 integerValue, string memory stringValue) public {
+         context.msgData(integerValue, stringValue);
+     }
+ }
+diff --git a/contracts/mocks/Create2Impl.sol b/contracts/mocks/Create2Impl.sol
+index 5661a5ea..216f0266 100644
+--- a/contracts/mocks/Create2Impl.sol
++++ b/contracts/mocks/Create2Impl.sol
+@@ -24,7 +24,7 @@ contract Create2MockUpgradeable is Initializable {
+ 
+     function deployERC1820Implementer(uint256 value, bytes32 salt) public {
+         // solhint-disable-next-line indent
+-        Create2.deploy(value, salt, type(ERC1820Implementer).creationCode);
++        Create2.deploy(value, salt, type(ERC1820ImplementerUpgradeable).creationCode);
+     }
+ 
+     function computeAddress(bytes32 salt, bytes32 codeHash) public view returns (address) {
+diff --git a/contracts/mocks/ERC721GSNRecipientMock.sol b/contracts/mocks/ERC721GSNRecipientMock.sol
+index 322ba7ca..1b75ceb8 100644
+--- a/contracts/mocks/ERC721GSNRecipientMock.sol
++++ b/contracts/mocks/ERC721GSNRecipientMock.sol
+@@ -35,10 +35,10 @@ contract ERC721GSNRecipientMockUpgradeable is Initializable, ERC721Upgradeable,
+     }
+ 
+     function _msgSender() internal view override(ContextUpgradeable, GSNRecipientUpgradeable) returns (address payable) {
+-        return GSNRecipient._msgSender();
++        return GSNRecipientUpgradeable._msgSender();
+     }
+ 
+     function _msgData() internal view override(ContextUpgradeable, GSNRecipientUpgradeable) returns (bytes memory) {
+-        return GSNRecipient._msgData();
++        return GSNRecipientUpgradeable._msgData();
+     }
+ }
+diff --git a/contracts/mocks/GSNRecipientMock.sol b/contracts/mocks/GSNRecipientMock.sol
+index 4f29dec0..95ea1db1 100644
+--- a/contracts/mocks/GSNRecipientMock.sol
++++ b/contracts/mocks/GSNRecipientMock.sol
+@@ -44,10 +44,10 @@ contract GSNRecipientMockUpgradeable is Initializable, ContextMockUpgradeable, G
+     }
+ 
+     function _msgSender() internal override(ContextUpgradeable, GSNRecipientUpgradeable) view virtual returns (address payable) {
+-        return GSNRecipient._msgSender();
++        return GSNRecipientUpgradeable._msgSender();
+     }
+ 
+     function _msgData() internal override(ContextUpgradeable, GSNRecipientUpgradeable) view virtual returns (bytes memory) {
+-        return GSNRecipient._msgData();
++        return GSNRecipientUpgradeable._msgData();
+     }
+ }
+diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol
+index 4884937f..4fe0b398 100644
+--- a/contracts/mocks/ReentrancyMock.sol
++++ b/contracts/mocks/ReentrancyMock.sol
+@@ -45,7 +45,7 @@ contract ReentrancyMockUpgradeable is Initializable, ReentrancyGuardUpgradeable
+         }
+     }
+ 
+-    function countAndCall(ReentrancyAttack attacker) public nonReentrant {
++    function countAndCall(ReentrancyAttackUpgradeable attacker) public nonReentrant {
+         _count();
+         bytes4 func = bytes4(keccak256("callback()"));
+         attacker.callSender(func);
+diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol
+index 53828632..9fcf9cc6 100644
+--- a/contracts/mocks/SafeERC20Helper.sol
++++ b/contracts/mocks/SafeERC20Helper.sol
+@@ -178,7 +178,7 @@ contract SafeERC20MockUpgradeable is Initializable, ContextUpgradeable {
+     }
+ 
+     function setAllowance(uint256 allowance_) public {
+-        ERC20ReturnTrueMock(address(_token)).setAllowance(allowance_);
++        ERC20ReturnTrueMockUpgradeable(address(_token)).setAllowance(allowance_);
+     }
+ 
+     function allowance() public view returns (uint256) {
+diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol
+index 9decf658..3763f2dc 100644
+--- a/contracts/payment/PullPayment.sol
++++ b/contracts/payment/PullPayment.sol
+@@ -22,7 +22,7 @@ import "../Initializable.sol";
+  * payments with {payments}, and retrieve them with {withdrawPayments}.
+  */
+ contract PullPaymentUpgradeable is Initializable {
+-    Escrow private _escrow;
++    EscrowUpgradeable private _escrow;
+ 
+     
+     function __PullPayment_init() internal initializer {
+@@ -32,7 +32,7 @@ contract PullPaymentUpgradeable is Initializable {
+     function __PullPayment_init_unchained() internal initializer {
+         
+         
+-        _escrow = new Escrow();
++        _escrow = new EscrowUpgradeable();
+     
+     }
+ 

patches/01-initialize-escrow.patch

+diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol
+index 69d2fc5c..f71282d3 100644
+--- a/contracts/payment/PullPayment.sol
++++ b/contracts/payment/PullPayment.sol
+@@ -33,7 +33,7 @@ contract PullPaymentUpgradeable is Initializable {
+         
+         
+         _escrow = new EscrowUpgradeable();
+-    
++        _escrow.initialize();
+     }
+
+

scripts/upgrade-safe.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-git checkout contracts
+git checkout contracts test
 rm -rf build contracts/Initializable.sol
 
 npm run compile
@@ -15,15 +15,11 @@ mv __upgradeable__ contracts
 
 git checkout $(git ls-files -d)
 
-sed -i -e 's/(ERC1820Implementer/\0Upgradeable/' contracts/mocks/Create2Impl.sol
+# git add contracts
 
-rs "contract\.fromArtifact\('(.*?Mock.*?)'\)" "contract.fromArtifact('\${1}Upgradeable')"
+rs "contract\.fromArtifact\('([^I].*?)'\)" "contract.fromArtifact('\${1}Upgradeable')" test
 
-rs -w 'ContextMock context' 'ContextMockUpgradeable context' contracts/mocks/ContextMock.sol
-rs -F 'GSNRecipient._msg' 'GSNRecipientUpgradeable._msg' contracts/mocks/{,ERC721}GSNRecipientMock.sol
-rs '(new )Escrow|Escrow( private)' '${1}EscrowUpgradeable${2}' contracts/payment/PullPayment.sol
-rs -w 'ReentrancyAttack attacker' 'ReentrancyAttackUpgradeable attacker' contracts/mocks/ReentrancyMock.sol
-rs -F 'ERC20ReturnTrueMock(' 'ERC20ReturnTrueMockUpgradeable(' contracts/mocks/SafeERC20Helper.sol
+cat patches/* | patch -p1
 
 rs ' +$' '' contracts