Transpile 3d23f874

buidler/task-get-compiler-input.js

+// adds storageLayout to solc outputSelection, necessary for storage gaps
+
+const { internalTask } = require('@nomiclabs/buidler/config');
+const { TASK_COMPILE_GET_COMPILER_INPUT } = require('@nomiclabs/buidler/builtin-tasks/task-names');
+
+internalTask(TASK_COMPILE_GET_COMPILER_INPUT, async (args, bre, runSuper) => {
+  const input = await runSuper();
+  input.settings.outputSelection['*']['*'].push('storageLayout');
+  return input;
+});

buidler/task-test-get-files.js

+// ignores the proxy tests
+
 const { internalTask } = require('@nomiclabs/buidler/config');
 
 const { TASK_TEST_GET_TEST_FILES } = require('@nomiclabs/buidler/builtin-tasks/task-names');

contracts/GSN/ContextUpgradeSafe.sol

@@ -28,4 +28,5 @@ abstract contract ContextUpgradeSafe is __Initializable {
         this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
         return msg.data;
     }
+    uint256[50] private __gap;
 }

contracts/GSN/GSNRecipientERC20FeeUpgradeSafe.sol

@@ -112,6 +112,7 @@ contract GSNRecipientERC20FeeUpgradeSafe is __Initializable, GSNRecipientUpgrade
         // After the relayed call has been executed and the actual charge estimated, the excess pre-charge is returned
         _token.safeTransfer(from, maxPossibleCharge.sub(actualCharge));
     }
+    uint256[49] private __gap;
 }
 
 /**
@@ -167,4 +168,5 @@ contract __unstable__ERC20OwnedUpgradeSafe is __Initializable, ERC20UpgradeSafe,
             return super.transferFrom(sender, recipient, amount);
         }
     }
+    uint256[50] private __gap;
 }

contracts/GSN/GSNRecipientSignatureUpgradeSafe.sol

@@ -76,4 +76,5 @@ contract GSNRecipientSignatureUpgradeSafe is __Initializable, GSNRecipientUpgrad
     function _preRelayedCall(bytes memory) internal virtual override returns (bytes32) { }
 
     function _postRelayedCall(bytes memory, bool, uint256, bytes32) internal virtual override { }
+    uint256[49] private __gap;
 }

contracts/GSN/GSNRecipientUpgradeSafe.sol

@@ -236,4 +236,5 @@ abstract contract GSNRecipientUpgradeSafe is __Initializable, IRelayRecipientUpg
 
         return actualData;
     }
+    uint256[49] private __gap;
 }

contracts/access/AccessControlUpgradeSafe.sol

@@ -222,4 +222,5 @@ abstract contract AccessControlUpgradeSafe is __Initializable, ContextUpgradeSaf
             emit RoleRevoked(role, account, _msgSender());
         }
     }
+    uint256[49] private __gap;
 }

contracts/access/OwnableUpgradeSafe.sol

@@ -71,4 +71,5 @@ contract OwnableUpgradeSafe is __Initializable, ContextUpgradeSafe {
         emit OwnershipTransferred(_owner, newOwner);
         _owner = newOwner;
     }
+    uint256[49] private __gap;
 }

contracts/access/TimelockControllerUpgradeSafe.sol

@@ -285,4 +285,5 @@ contract TimelockControllerUpgradeSafe is __Initializable, AccessControlUpgradeS
         emit MinDelayChange(_minDelay, newDelay);
         _minDelay = newDelay;
     }
+    uint256[48] private __gap;
 }

contracts/introspection/ERC165UpgradeSafe.sol

@@ -56,4 +56,5 @@ contract ERC165UpgradeSafe is __Initializable, IERC165UpgradeSafe {
         require(interfaceId != 0xffffffff, "ERC165: invalid interface id");
         _supportedInterfaces[interfaceId] = true;
     }
+    uint256[49] private __gap;
 }

contracts/introspection/ERC1820ImplementerUpgradeSafe.sol

@@ -41,4 +41,5 @@ contract ERC1820ImplementerUpgradeSafe is __Initializable, IERC1820ImplementerUp
     function _registerInterfaceForAddress(bytes32 interfaceHash, address account) internal virtual {
         _supportedInterfaces[interfaceHash][account] = true;
     }
+    uint256[49] private __gap;
 }

contracts/mocks/AccessControlMockUpgradeSafe.sol

@@ -19,4 +19,5 @@ contract AccessControlMockUpgradeSafe is __Initializable, AccessControlUpgradeSa
     function setRoleAdmin(bytes32 roleId, bytes32 adminRoleId) public {
         _setRoleAdmin(roleId, adminRoleId);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/AddressImplUpgradeSafe.sol

@@ -46,4 +46,5 @@ contract AddressImplUpgradeSafe is __Initializable {
 
     // sendValue's tests require the contract to hold Ether
     receive () external payable { }
+    uint256[49] private __gap;
 }

contracts/mocks/ArraysImplUpgradeSafe.sol

@@ -21,4 +21,5 @@ contract ArraysImplUpgradeSafe is __Initializable {
     function findUpperBound(uint256 element) external view returns (uint256) {
         return _array.findUpperBound(element);
     }
+    uint256[49] private __gap;
 }

contracts/mocks/CallReceiverMockUpgradeSafe.sol

@@ -54,4 +54,5 @@ contract CallReceiverMockUpgradeSafe is __Initializable {
         sharedAnswer = "42";
         return "0x1234";
     }
+    uint256[48] private __gap;
 }

contracts/mocks/ClashingImplementationUpgradeSafe.sol

@@ -24,4 +24,5 @@ contract ClashingImplementationUpgradeSafe is __Initializable {
   function delegatedFunction() external pure returns (bool) {
     return true;
   }
+    uint256[50] private __gap;
 }

contracts/mocks/ConditionalEscrowMockUpgradeSafe.sol

@@ -26,4 +26,5 @@ contract ConditionalEscrowMockUpgradeSafe is __Initializable, ConditionalEscrowU
     function withdrawalAllowed(address payee) public view override returns (bool) {
         return _allowed[payee];
     }
+    uint256[49] private __gap;
 }

contracts/mocks/ContextMockUpgradeSafe.sol

@@ -24,6 +24,7 @@ contract ContextMockUpgradeSafe is __Initializable, ContextUpgradeSafe {
     function msgData(uint256 integerValue, string memory stringValue) public {
         emit Data(_msgData(), integerValue, stringValue);
     }
+    uint256[50] private __gap;
 }
 
 contract ContextMockCallerUpgradeSafe is __Initializable {
@@ -40,4 +41,5 @@ contract ContextMockCallerUpgradeSafe is __Initializable {
     function callData(ContextMockUpgradeSafe context, uint256 integerValue, string memory stringValue) public {
         context.msgData(integerValue, stringValue);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/CountersImplUpgradeSafe.sol

@@ -27,4 +27,5 @@ contract CountersImplUpgradeSafe is __Initializable {
     function decrement() public {
         _counter.decrement();
     }
+    uint256[49] private __gap;
 }

contracts/mocks/Create2ImplUpgradeSafe.sol

@@ -31,4 +31,5 @@ contract Create2ImplUpgradeSafe is __Initializable {
     }
 
     receive() payable external {}
+    uint256[50] private __gap;
 }

contracts/mocks/DummyImplementationUpgradeSafe.sol

@@ -11,6 +11,7 @@ abstract contract ImplUpgradeSafe is __Initializable {
     function __Impl_init_unchained() internal __initializer {
     }
   function version() public pure virtual returns (string memory); 
+    uint256[50] private __gap;
 }
 
 contract DummyImplementationUpgradeSafe is __Initializable {
@@ -57,6 +58,7 @@ contract DummyImplementationUpgradeSafe is __Initializable {
   function reverts() public pure {
     require(false);
   }
+    uint256[47] private __gap;
 }
 
 contract DummyImplementationV2UpgradeSafe is __Initializable, DummyImplementationUpgradeSafe {
@@ -74,4 +76,5 @@ contract DummyImplementationV2UpgradeSafe is __Initializable, DummyImplementatio
   function version() public pure override returns (string memory) {
     return "V2";
   }
+    uint256[50] private __gap;
 }

contracts/mocks/ECDSAMockUpgradeSafe.sol

@@ -21,4 +21,5 @@ contract ECDSAMockUpgradeSafe is __Initializable {
     function toEthSignedMessageHash(bytes32 hash) public pure returns (bytes32) {
         return hash.toEthSignedMessageHash();
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC1155BurnableMockUpgradeSafe.sol

@@ -19,4 +19,5 @@ contract ERC1155BurnableMockUpgradeSafe is __Initializable, ERC1155BurnableUpgra
     function mint(address to, uint256 id, uint256 value, bytes memory data) public {
         _mint(to, id, value, data);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC1155MockUpgradeSafe.sol

@@ -40,4 +40,5 @@ contract ERC1155MockUpgradeSafe is __Initializable, ERC1155UpgradeSafe {
     function burnBatch(address owner, uint256[] memory ids, uint256[] memory values) public {
         _burnBatch(owner, ids, values);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC1155PausableMockUpgradeSafe.sol

@@ -39,4 +39,5 @@ contract ERC1155PausableMockUpgradeSafe is __Initializable, ERC1155MockUpgradeSa
     {
         super._beforeTokenTransfer(operator, from, to, ids, amounts, data);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC1155ReceiverMockUpgradeSafe.sol

@@ -69,4 +69,5 @@ contract ERC1155ReceiverMockUpgradeSafe is __Initializable, IERC1155ReceiverUpgr
         emit BatchReceived(operator, from, ids, values, data, gasleft());
         return _batRetval;
     }
+    uint256[49] private __gap;
 }

contracts/mocks/ERC165/ERC165InterfacesSupportedUpgradeSafe.sol

@@ -52,6 +52,7 @@ contract SupportsInterfaceWithLookupMockUpgradeSafe is __Initializable, IERC165U
         require(interfaceId != 0xffffffff, "ERC165InterfacesSupported: invalid interface id");
         _supportedInterfaces[interfaceId] = true;
     }
+    uint256[49] private __gap;
 }
 
 contract ERC165InterfacesSupportedUpgradeSafe is __Initializable, SupportsInterfaceWithLookupMockUpgradeSafe {
@@ -65,4 +66,5 @@ contract ERC165InterfacesSupportedUpgradeSafe is __Initializable, SupportsInterf
             _registerInterface(interfaceIds[i]);
         }
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC165/ERC165NotSupportedUpgradeSafe.sol

@@ -9,4 +9,5 @@ contract ERC165NotSupportedUpgradeSafe is __Initializable {    function __ERC165
 
     function __ERC165NotSupported_init_unchained() internal __initializer {
     }
- }
+     uint256[50] private __gap;
+}

contracts/mocks/ERC165CheckerMockUpgradeSafe.sol

@@ -25,4 +25,5 @@ contract ERC165CheckerMockUpgradeSafe is __Initializable {
     function supportsAllInterfaces(address account, bytes4[] memory interfaceIds) public view returns (bool) {
         return account.supportsAllInterfaces(interfaceIds);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC165MockUpgradeSafe.sol

@@ -16,4 +16,5 @@ contract ERC165MockUpgradeSafe is __Initializable, ERC165UpgradeSafe {
     function registerInterface(bytes4 interfaceId) public {
         _registerInterface(interfaceId);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC1820ImplementerMockUpgradeSafe.sol

@@ -16,4 +16,5 @@ contract ERC1820ImplementerMockUpgradeSafe is __Initializable, ERC1820Implemente
     function registerInterfaceForAddress(bytes32 interfaceHash, address account) public {
         _registerInterfaceForAddress(interfaceHash, account);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC20BurnableMockUpgradeSafe.sol

@@ -26,4 +26,5 @@ contract ERC20BurnableMockUpgradeSafe is __Initializable, ERC20BurnableUpgradeSa
     ) internal __initializer {
         _mint(initialAccount, initialBalance);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC20CappedMockUpgradeSafe.sol

@@ -18,4 +18,5 @@ contract ERC20CappedMockUpgradeSafe is __Initializable, ERC20CappedUpgradeSafe {
     function mint(address to, uint256 tokenId) public {
         _mint(to, tokenId);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC20DecimalsMockUpgradeSafe.sol

@@ -15,4 +15,5 @@ contract ERC20DecimalsMockUpgradeSafe is __Initializable, ERC20UpgradeSafe {
     function __ERC20DecimalsMock_init_unchained(string memory name, string memory symbol, uint8 decimals) internal __initializer {
         _setupDecimals(decimals);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC20MockUpgradeSafe.sol

@@ -42,4 +42,5 @@ contract ERC20MockUpgradeSafe is __Initializable, ERC20UpgradeSafe {
     function approveInternal(address owner, address spender, uint256 value) public {
         _approve(owner, spender, value);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC20PausableMockUpgradeSafe.sol

@@ -44,4 +44,5 @@ contract ERC20PausableMockUpgradeSafe is __Initializable, ERC20PausableUpgradeSa
     function burn(address from, uint256 amount) public {
         _burn(from, amount);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC20SnapshotMockUpgradeSafe.sol

@@ -39,4 +39,5 @@ contract ERC20SnapshotMockUpgradeSafe is __Initializable, ERC20SnapshotUpgradeSa
     function burn(address account, uint256 amount) public {
         _burn(account, amount);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC721BurnableMockUpgradeSafe.sol

@@ -19,4 +19,5 @@ contract ERC721BurnableMockUpgradeSafe is __Initializable, ERC721BurnableUpgrade
     function mint(address to, uint256 tokenId) public {
         _mint(to, tokenId);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC721GSNRecipientMockUpgradeSafe.sol

@@ -34,4 +34,5 @@ contract ERC721GSNRecipientMockUpgradeSafe is __Initializable, ERC721UpgradeSafe
     function _msgData() internal view override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) returns (bytes memory) {
         return GSNRecipientUpgradeSafe._msgData();
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC721MockUpgradeSafe.sol

@@ -46,4 +46,5 @@ contract ERC721MockUpgradeSafe is __Initializable, ERC721UpgradeSafe {
     function burn(uint256 tokenId) public {
         _burn(tokenId);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC721PausableMockUpgradeSafe.sol

@@ -40,4 +40,5 @@ contract ERC721PausableMockUpgradeSafe is __Initializable, ERC721PausableUpgrade
     function unpause() external {
         _unpause();
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC721ReceiverMockUpgradeSafe.sol

@@ -27,4 +27,5 @@ contract ERC721ReceiverMockUpgradeSafe is __Initializable, IERC721ReceiverUpgrad
         emit Received(operator, from, tokenId, data, gasleft());
         return _retval;
     }
+    uint256[49] private __gap;
 }

contracts/mocks/ERC777MockUpgradeSafe.sol

@@ -41,4 +41,5 @@ contract ERC777MockUpgradeSafe is __Initializable, ContextUpgradeSafe, ERC777Upg
     function approveInternal(address holder, address spender, uint256 value) public {
         _approve(holder, spender, value);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ERC777SenderRecipientMockUpgradeSafe.sol

@@ -156,5 +156,6 @@ contract ERC777SenderRecipientMockUpgradeSafe is __Initializable, ContextUpgrade
     function burn(IERC777UpgradeSafe token, uint256 amount, bytes memory data) public {
         token.burn(amount, data);
     }
+    uint256[49] private __gap;
 }
 

contracts/mocks/EnumerableMapMockUpgradeSafe.sol

@@ -44,4 +44,5 @@ contract EnumerableMapMockUpgradeSafe is __Initializable {
     function get(uint256 key) public view returns (address) {
         return _map.get(key);
     }
+    uint256[48] private __gap;
 }

contracts/mocks/EnumerableSetMockUpgradeSafe.sol

@@ -40,6 +40,7 @@ contract EnumerableBytes32SetMockUpgradeSafe is __Initializable {
     function at(uint256 index) public view returns (bytes32) {
         return _set.at(index);
     }
+    uint256[48] private __gap;
 }
 
 // AddressSet
@@ -77,6 +78,7 @@ contract EnumerableAddressSetMockUpgradeSafe is __Initializable {
     function at(uint256 index) public view returns (address) {
         return _set.at(index);
     }
+    uint256[48] private __gap;
 }
 
 // UintSet
@@ -114,4 +116,5 @@ contract EnumerableUintSetMockUpgradeSafe is __Initializable {
     function at(uint256 index) public view returns (uint256) {
         return _set.at(index);
     }
+    uint256[48] private __gap;
 }

contracts/mocks/EtherReceiverMockUpgradeSafe.sol

@@ -21,4 +21,5 @@ contract EtherReceiverMockUpgradeSafe is __Initializable {
             revert();
         }
     }
+    uint256[49] private __gap;
 }

contracts/mocks/GSNRecipientERC20FeeMockUpgradeSafe.sol

@@ -25,4 +25,5 @@ contract GSNRecipientERC20FeeMockUpgradeSafe is __Initializable, GSNRecipientUpg
     function mockFunction() public {
         emit MockFunctionCalled(token().balanceOf(_msgSender()));
     }
+    uint256[50] private __gap;
 }

contracts/mocks/GSNRecipientMockUpgradeSafe.sol

@@ -45,4 +45,5 @@ contract GSNRecipientMockUpgradeSafe is __Initializable, ContextMockUpgradeSafe,
     function _msgData() internal override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) view virtual returns (bytes memory) {
         return GSNRecipientUpgradeSafe._msgData();
     }
+    uint256[50] private __gap;
 }

contracts/mocks/GSNRecipientSignatureMockUpgradeSafe.sol

@@ -21,4 +21,5 @@ contract GSNRecipientSignatureMockUpgradeSafe is __Initializable, GSNRecipientUp
     function mockFunction() public {
         emit MockFunctionCalled();
     }
+    uint256[50] private __gap;
 }

contracts/mocks/InitializableMockUpgradeSafe.sol

@@ -41,4 +41,5 @@ contract InitializableMockUpgradeSafe is __Initializable, InitializableUpgradeSa
     require(false, "InitializableMock forced failure");
   }
 
+    uint256[48] private __gap;
 }

contracts/mocks/MathMockUpgradeSafe.sol

@@ -23,4 +23,5 @@ contract MathMockUpgradeSafe is __Initializable {
     function average(uint256 a, uint256 b) public pure returns (uint256) {
         return MathUpgradeSafe.average(a, b);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/MerkleProofWrapperUpgradeSafe.sol

@@ -15,4 +15,5 @@ contract MerkleProofWrapperUpgradeSafe is __Initializable {
     function verify(bytes32[] memory proof, bytes32 root, bytes32 leaf) public pure returns (bool) {
         return MerkleProofUpgradeSafe.verify(proof, root, leaf);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/MultipleInheritanceInitializableMocksUpgradeSafe.sol

@@ -32,6 +32,7 @@ contract SampleHumanUpgradeSafe is __Initializable, InitializableUpgradeSafe {
   function initialize() public initializer {
     isHuman = true;
   }
+    uint256[49] private __gap;
 }
 
 /**
@@ -52,6 +53,7 @@ contract SampleMotherUpgradeSafe is __Initializable, InitializableUpgradeSafe, S
     SampleHumanUpgradeSafe.initialize();
     mother = value;
   }
+    uint256[49] private __gap;
 }
 
 /**
@@ -72,6 +74,7 @@ contract SampleGrampsUpgradeSafe is __Initializable, InitializableUpgradeSafe, S
     SampleHumanUpgradeSafe.initialize();
     gramps = value;
   }
+    uint256[49] private __gap;
 }
 
 /**
@@ -93,6 +96,7 @@ contract SampleFatherUpgradeSafe is __Initializable, InitializableUpgradeSafe, S
     SampleGrampsUpgradeSafe.initialize(_gramps);
     father = _father;
   }
+    uint256[49] private __gap;
 }
 
 /**
@@ -117,4 +121,5 @@ contract SampleChildUpgradeSafe is __Initializable, InitializableUpgradeSafe, Sa
     SampleFatherUpgradeSafe.initialize(_gramps, _father);
     child = _child;
   }
+    uint256[49] private __gap;
 }

contracts/mocks/OwnableMockUpgradeSafe.sol

@@ -13,4 +13,5 @@ contract OwnableMockUpgradeSafe is __Initializable, OwnableUpgradeSafe {    func
 
     function __OwnableMock_init_unchained() internal __initializer {
     }
- }
+     uint256[50] private __gap;
+}

contracts/mocks/PausableMockUpgradeSafe.sol

@@ -35,4 +35,5 @@ contract PausableMockUpgradeSafe is __Initializable, PausableUpgradeSafe {
     function unpause() external {
         _unpause();
     }
+    uint256[48] private __gap;
 }

contracts/mocks/PullPaymentMockUpgradeSafe.sol

@@ -18,4 +18,5 @@ contract PullPaymentMockUpgradeSafe is __Initializable, PullPaymentUpgradeSafe {
     function callTransfer(address dest, uint256 amount) public {
         _asyncTransfer(dest, amount);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ReentrancyAttackUpgradeSafe.sol

@@ -17,4 +17,5 @@ contract ReentrancyAttackUpgradeSafe is __Initializable, ContextUpgradeSafe {
         (bool success,) = _msgSender().call(abi.encodeWithSelector(data));
         require(success, "ReentrancyAttack: failed call");
     }
+    uint256[50] private __gap;
 }

contracts/mocks/ReentrancyMockUpgradeSafe.sol

@@ -47,4 +47,5 @@ contract ReentrancyMockUpgradeSafe is __Initializable, ReentrancyGuardUpgradeSaf
     function _count() private {
         counter += 1;
     }
+    uint256[49] private __gap;
 }

contracts/mocks/RegressionImplementationUpgradeSafe.sol

@@ -21,6 +21,7 @@ contract Implementation1UpgradeSafe is __Initializable, InitializableUpgradeSafe
   function setValue(uint _number) public {
     _value = _number;
   }
+    uint256[49] private __gap;
 }
 
 contract Implementation2UpgradeSafe is __Initializable, InitializableUpgradeSafe {
@@ -43,6 +44,7 @@ contract Implementation2UpgradeSafe is __Initializable, InitializableUpgradeSafe
   function getValue() public view returns (uint) {
     return _value;
   }
+    uint256[49] private __gap;
 }
 
 contract Implementation3UpgradeSafe is __Initializable, InitializableUpgradeSafe {
@@ -65,6 +67,7 @@ contract Implementation3UpgradeSafe is __Initializable, InitializableUpgradeSafe
   function getValue(uint _number) public view returns (uint) {
     return _value + _number;
   }
+    uint256[49] private __gap;
 }
 
 contract Implementation4UpgradeSafe is __Initializable, InitializableUpgradeSafe {
@@ -92,4 +95,5 @@ contract Implementation4UpgradeSafe is __Initializable, InitializableUpgradeSafe
   fallback() external {
     _value = 1;
   }
+    uint256[49] private __gap;
 }

contracts/mocks/SafeCastMockUpgradeSafe.sol

@@ -62,4 +62,5 @@ contract SafeCastMockUpgradeSafe is __Initializable {
     function toInt8(int a) public pure returns (int8) {
         return a.toInt8();
     }
+    uint256[50] private __gap;
 }

contracts/mocks/SafeERC20HelperUpgradeSafe.sol

@@ -40,6 +40,7 @@ contract ERC20ReturnFalseMockUpgradeSafe is __Initializable, ContextUpgradeSafe
         require(_dummy == 0); // Duummy read from a state variable so that the function is view
         return 0;
     }
+    uint256[48] private __gap;
 }
 
 contract ERC20ReturnTrueMockUpgradeSafe is __Initializable, ContextUpgradeSafe {
@@ -78,6 +79,7 @@ contract ERC20ReturnTrueMockUpgradeSafe is __Initializable, ContextUpgradeSafe {
     function allowance(address owner, address) public view returns (uint256) {
         return _allowances[owner];
     }
+    uint256[48] private __gap;
 }
 
 contract ERC20NoReturnMockUpgradeSafe is __Initializable, ContextUpgradeSafe {
@@ -113,6 +115,7 @@ contract ERC20NoReturnMockUpgradeSafe is __Initializable, ContextUpgradeSafe {
     function allowance(address owner, address) public view returns (uint256) {
         return _allowances[owner];
     }
+    uint256[48] private __gap;
 }
 
 contract SafeERC20WrapperUpgradeSafe is __Initializable, ContextUpgradeSafe {
@@ -156,4 +159,5 @@ contract SafeERC20WrapperUpgradeSafe is __Initializable, ContextUpgradeSafe {
     function allowance() public view returns (uint256) {
         return _token.allowance(address(0), address(0));
     }
+    uint256[49] private __gap;
 }

contracts/mocks/SafeMathMockUpgradeSafe.sol

@@ -31,4 +31,5 @@ contract SafeMathMockUpgradeSafe is __Initializable {
     function mod(uint256 a, uint256 b) public pure returns (uint256) {
         return SafeMathUpgradeSafe.mod(a, b);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/SignedSafeMathMockUpgradeSafe.sol

@@ -27,4 +27,5 @@ contract SignedSafeMathMockUpgradeSafe is __Initializable {
     function add(int256 a, int256 b) public pure returns (int256) {
         return SignedSafeMathUpgradeSafe.add(a, b);
     }
+    uint256[50] private __gap;
 }

contracts/mocks/SingleInheritanceInitializableMocksUpgradeSafe.sol

@@ -22,6 +22,7 @@ contract MigratableMockV1UpgradeSafe is __Initializable, InitializableUpgradeSaf
   function initialize(uint256 value) public payable initializer {
     x = value;
   }
+    uint256[49] private __gap;
 }
 
 /**
@@ -46,6 +47,7 @@ contract MigratableMockV2UpgradeSafe is __Initializable, MigratableMockV1Upgrade
     y = anotherValue;
     _migratedV2 = true;
   }
+    uint256[48] private __gap;
 }
 
 /**
@@ -71,4 +73,5 @@ contract MigratableMockV3UpgradeSafe is __Initializable, MigratableMockV2Upgrade
     y = oldX;
     _migratedV3 = true;
   }
+    uint256[49] private __gap;
 }

contracts/mocks/StringsMockUpgradeSafe.sol

@@ -15,4 +15,5 @@ contract StringsMockUpgradeSafe is __Initializable {
     function fromUint256(uint256 value) public pure returns (string memory) {
         return StringsUpgradeSafe.toString(value);
     }
+    uint256[50] private __gap;
 }

contracts/payment/PaymentSplitterUpgradeSafe.sol

@@ -137,4 +137,5 @@ contract PaymentSplitterUpgradeSafe is __Initializable, ContextUpgradeSafe {
         _totalShares = _totalShares.add(shares_);
         emit PayeeAdded(account, shares_);
     }
+    uint256[45] private __gap;
 }

contracts/payment/PullPaymentUpgradeSafe.sol

@@ -72,4 +72,5 @@ contract PullPaymentUpgradeSafe is __Initializable {
     function _asyncTransfer(address dest, uint256 amount) internal virtual {
         _escrow.deposit{ value: amount }(dest);
     }
+    uint256[49] private __gap;
 }

contracts/payment/escrow/ConditionalEscrowUpgradeSafe.sol

@@ -31,4 +31,5 @@ abstract contract ConditionalEscrowUpgradeSafe is __Initializable, EscrowUpgrade
         require(withdrawalAllowed(payee), "ConditionalEscrow: payee is not allowed to withdraw");
         super.withdraw(payee);
     }
+    uint256[50] private __gap;
 }

contracts/payment/escrow/EscrowUpgradeSafe.sol

@@ -74,4 +74,5 @@ contract EscrowUpgradeSafe is __Initializable, OwnableUpgradeSafe {
 
         emit Withdrawn(payee, payment);
     }
+    uint256[49] private __gap;
 }

contracts/payment/escrow/RefundEscrowUpgradeSafe.sol

@@ -99,4 +99,5 @@ contract RefundEscrowUpgradeSafe is __Initializable, ConditionalEscrowUpgradeSaf
     function withdrawalAllowed(address) public view override returns (bool) {
         return _state == State.Refunding;
     }
+    uint256[49] private __gap;
 }

contracts/presets/ERC1155PresetMinterPauserUpgradeSafe.sol

@@ -113,4 +113,5 @@ contract ERC1155PresetMinterPauserUpgradeSafe is __Initializable, ContextUpgrade
     {
         super._beforeTokenTransfer(operator, from, to, ids, amounts, data);
     }
+    uint256[50] private __gap;
 }

contracts/presets/ERC20PresetMinterPauserUpgradeSafe.sol

@@ -95,4 +95,5 @@ contract ERC20PresetMinterPauserUpgradeSafe is __Initializable, ContextUpgradeSa
     function _beforeTokenTransfer(address from, address to, uint256 amount) internal virtual override(ERC20UpgradeSafe, ERC20PausableUpgradeSafe) {
         super._beforeTokenTransfer(from, to, amount);
     }
+    uint256[50] private __gap;
 }

contracts/presets/ERC721PresetMinterPauserAutoIdUpgradeSafe.sol

@@ -111,4 +111,5 @@ contract ERC721PresetMinterPauserAutoIdUpgradeSafe is __Initializable, ContextUp
     function _beforeTokenTransfer(address from, address to, uint256 tokenId) internal virtual override(ERC721UpgradeSafe, ERC721PausableUpgradeSafe) {
         super._beforeTokenTransfer(from, to, tokenId);
     }
+    uint256[49] private __gap;
 }

contracts/proxy/InitializableUpgradeSafe.sol

@@ -67,4 +67,5 @@ abstract contract InitializableUpgradeSafe is __Initializable {
         assembly { cs := extcodesize(self) }
         return cs == 0;
     }
+    uint256[49] private __gap;
 }

contracts/proxy/ProxyAdminUpgradeSafe.sol

@@ -83,4 +83,5 @@ contract ProxyAdminUpgradeSafe is __Initializable, OwnableUpgradeSafe {
     function upgradeAndCall(TransparentUpgradeableProxyUpgradeSafe proxy, address implementation, bytes memory data) public payable onlyOwner {
         proxy.upgradeToAndCall{value: msg.value}(implementation, data);
     }
+    uint256[50] private __gap;
 }

contracts/proxy/ProxyUpgradeSafe.sol

@@ -87,4 +87,5 @@ abstract contract ProxyUpgradeSafe is __Initializable {
      */
     function _beforeFallback() internal virtual {
     }
+    uint256[50] private __gap;
 }

contracts/proxy/TransparentUpgradeableProxyUpgradeSafe.sol

@@ -157,4 +157,5 @@ contract TransparentUpgradeableProxyUpgradeSafe is __Initializable, UpgradeableP
         require(msg.sender != _admin(), "TransparentUpgradeableProxy: admin cannot fallback to proxy target");
         super._beforeFallback();
     }
+    uint256[50] private __gap;
 }

contracts/proxy/UpgradeableProxyUpgradeSafe.sol

@@ -83,4 +83,5 @@ contract UpgradeableProxyUpgradeSafe is __Initializable, ProxyUpgradeSafe {
             sstore(slot, newImplementation)
         }
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC1155/ERC1155BurnableUpgradeSafe.sol

@@ -37,4 +37,5 @@ abstract contract ERC1155BurnableUpgradeSafe is __Initializable, ERC1155UpgradeS
 
         _burnBatch(account, ids, values);
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC1155/ERC1155HolderUpgradeSafe.sol

@@ -24,4 +24,5 @@ contract ERC1155HolderUpgradeSafe is __Initializable, ERC1155ReceiverUpgradeSafe
     function onERC1155BatchReceived(address, address, uint256[] memory, uint256[] memory, bytes memory) public virtual override returns (bytes4) {
         return this.onERC1155BatchReceived.selector;
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC1155/ERC1155PausableUpgradeSafe.sol

@@ -46,4 +46,5 @@ abstract contract ERC1155PausableUpgradeSafe is __Initializable, ERC1155UpgradeS
 
         require(!paused(), "ERC1155Pausable: token transfer while paused");
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC1155/ERC1155ReceiverUpgradeSafe.sol

@@ -21,4 +21,5 @@ abstract contract ERC1155ReceiverUpgradeSafe is __Initializable, ERC165UpgradeSa
             ERC1155ReceiverUpgradeSafe(0).onERC1155BatchReceived.selector
         );
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC1155/ERC1155UpgradeSafe.sol

@@ -417,4 +417,5 @@ contract ERC1155UpgradeSafe is __Initializable, ContextUpgradeSafe, ERC165Upgrad
 
         return array;
     }
+    uint256[47] private __gap;
 }

contracts/token/ERC20/ERC20BurnableUpgradeSafe.sol

@@ -45,4 +45,5 @@ abstract contract ERC20BurnableUpgradeSafe is __Initializable, ContextUpgradeSaf
         _approve(account, _msgSender(), decreasedAllowance);
         _burn(account, amount);
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC20/ERC20CappedUpgradeSafe.sol

@@ -46,4 +46,5 @@ abstract contract ERC20CappedUpgradeSafe is __Initializable, ERC20UpgradeSafe {
             require(totalSupply().add(amount) <= _cap, "ERC20Capped: cap exceeded");
         }
     }
+    uint256[49] private __gap;
 }

contracts/token/ERC20/ERC20PausableUpgradeSafe.sol

@@ -34,4 +34,5 @@ abstract contract ERC20PausableUpgradeSafe is __Initializable, ERC20UpgradeSafe,
 
         require(!paused(), "ERC20Pausable: token transfer while paused");
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC20/ERC20SnapshotUpgradeSafe.sol

@@ -186,4 +186,5 @@ abstract contract ERC20SnapshotUpgradeSafe is __Initializable, ERC20UpgradeSafe
             return ids[ids.length - 1];
         }
     }
+    uint256[46] private __gap;
 }

contracts/token/ERC20/ERC20UpgradeSafe.sol

@@ -309,4 +309,5 @@ contract ERC20UpgradeSafe is __Initializable, ContextUpgradeSafe, IERC20UpgradeS
      * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks].
      */
     function _beforeTokenTransfer(address from, address to, uint256 amount) internal virtual { }
+    uint256[44] private __gap;
 }

contracts/token/ERC20/TokenTimelockUpgradeSafe.sol

@@ -69,4 +69,5 @@ contract TokenTimelockUpgradeSafe is __Initializable {
 
         _token.safeTransfer(_beneficiary, amount);
     }
+    uint256[47] private __gap;
 }

contracts/token/ERC721/ERC721BurnableUpgradeSafe.sol

@@ -31,4 +31,5 @@ abstract contract ERC721BurnableUpgradeSafe is __Initializable, ContextUpgradeSa
         require(_isApprovedOrOwner(_msgSender(), tokenId), "ERC721Burnable: caller is not owner nor approved");
         _burn(tokenId);
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC721/ERC721HolderUpgradeSafe.sol

@@ -27,4 +27,5 @@ contract ERC721HolderUpgradeSafe is __Initializable, IERC721ReceiverUpgradeSafe
     function onERC721Received(address, address, uint256, bytes memory) public virtual override returns (bytes4) {
         return this.onERC721Received.selector;
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC721/ERC721PausableUpgradeSafe.sol

@@ -35,4 +35,5 @@ abstract contract ERC721PausableUpgradeSafe is __Initializable, ERC721UpgradeSaf
 
         require(!paused(), "ERC721Pausable: token transfer while paused");
     }
+    uint256[50] private __gap;
 }

contracts/token/ERC721/ERC721UpgradeSafe.sol

@@ -477,4 +477,5 @@ contract ERC721UpgradeSafe is __Initializable, ContextUpgradeSafe, ERC165Upgrade
      * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks].
      */
     function _beforeTokenTransfer(address from, address to, uint256 tokenId) internal virtual { }
+    uint256[41] private __gap;
 }

contracts/token/ERC777/ERC777UpgradeSafe.sol

@@ -510,4 +510,5 @@ contract ERC777UpgradeSafe is __Initializable, ContextUpgradeSafe, IERC777Upgrad
      * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks].
      */
     function _beforeTokenTransfer(address operator, address from, address to, uint256 amount) internal virtual { }
+    uint256[41] private __gap;
 }

contracts/utils/PausableUpgradeSafe.sol

@@ -93,4 +93,5 @@ contract PausableUpgradeSafe is __Initializable, ContextUpgradeSafe {
         _paused = false;
         emit Unpaused(_msgSender());
     }
+    uint256[49] private __gap;
 }

contracts/utils/ReentrancyGuardUpgradeSafe.sol

@@ -64,4 +64,5 @@ contract ReentrancyGuardUpgradeSafe is __Initializable {
         // https://eips.ethereum.org/EIPS/eip-2200)
         _status = _NOT_ENTERED;
     }
+    uint256[49] private __gap;
 }

scripts/transpile-push.sh

@@ -14,5 +14,5 @@ git checkout --orphan master
 git reset --soft origin/master
 if ! git diff --cached --quiet; then
   git commit -m "Transpile $COMMIT"
-  git push origin master
 fi
+git push origin master