Update StorageAccessible related function names (#291)

Author: rmeissner

contracts/common/StorageAccessible.sol

@@ -32,7 +32,7 @@ contract StorageAccessible {
      * @param targetContract Address of the contract containing the code to execute.
      * @param calldataPayload Calldata that should be sent to the target contract (encoded method name and arguments).
      */
-    function simulateDelegatecallInternal(address targetContract, bytes memory calldataPayload) external {
+    function simulateAndRevert(address targetContract, bytes memory calldataPayload) external {
         // solhint-disable-next-line no-inline-assembly
         assembly {
             let success := delegatecall(gas(), targetContract, add(calldataPayload, 0x20), mload(calldataPayload), 0, 0)

contracts/handler/CompatibilityFallbackHandler.sol

@@ -63,15 +63,16 @@ contract CompatibilityFallbackHandler is DefaultCallbackHandler, ISignatureValid
      * @param targetContract Address of the contract containing the code to execute.
      * @param calldataPayload Calldata that should be sent to the target contract (encoded method name and arguments).
      */
-    function simulateDelegatecall(
+    function simulate(
         address targetContract, // solhint-disable-line no-unused-var
         bytes calldata calldataPayload // solhint-disable-line no-unused-var
     ) public returns (bytes memory response) {
         // solhint-disable-next-line no-inline-assembly
         assembly {
             let internalCalldata := mload(0x40)
-            // Store `simulateDelegatecallInternal.selector`.
-            mstore(internalCalldata, "\x43\x21\x8e\x19")
+            // Store `simulateAndRevert.selector`.
+            // String representation is used to force right padding
+            mstore(internalCalldata, "\xb4\xfa\xba\x09")
             // Abuse the fact that both this and the internal methods have the
             // same signature, and differ only in symbol name (and therefore,
             // selector) and copy calldata directly. This saves us approximately
@@ -91,7 +92,7 @@ contract CompatibilityFallbackHandler is DefaultCallbackHandler, ISignatureValid
                     0,
                     internalCalldata,
                     calldatasize(),
-                    // The `simulateDelegatecallInternal` call always reverts, and
+                    // The `simulateAndRevert` call always reverts, and
                     // instead encodes whether or not it was successful in the return
                     // data. The first 32-byte word of the return data contains the
                     // `success` value, so write it to memory address 0x00 (which is

contracts/interfaces/ViewStorageAccessible.sol

@@ -4,8 +4,8 @@ pragma solidity >=0.5.0 <0.6.0;
 /// @notice Adjusted version of https://github.com/gnosis/util-contracts/blob/3db1e531cb243a48ea91c60a800d537c1000612a/contracts/StorageAccessible.sol
 interface ViewStorageAccessible {
     /**
-     * @dev Same as `simulateDelegatecall` on StorageAccessible. Marked as view so that it can be called from external contracts
+     * @dev Same as `simulate` on StorageAccessible. Marked as view so that it can be called from external contracts
      * that want to run simulations from within view functions. Will revert if the invoked simulation attempts to change state.
      */
-    function simulateDelegatecall(address targetContract, bytes calldata calldataPayload) external view returns (bytes memory);
+    function simulate(address targetContract, bytes calldata calldataPayload) external view returns (bytes memory);
 }

test/accessors/SimulateTxAccessor.spec.ts

@@ -57,7 +57,7 @@ describe("SimulateTxAccessor", async () => {
             const { safe, accessor, simulator } = await setupTests()
             const tx = buildContractCall(safe, "getOwners", [], 0)
             const simulationData = accessor.interface.encodeFunctionData("simulate", [tx.to, tx.value, tx.data, tx.operation])
-            const acccessibleData = await simulator.callStatic.simulateDelegatecall(accessor.address, simulationData) 
+            const acccessibleData = await simulator.callStatic.simulate(accessor.address, simulationData) 
             const simulation = accessor.interface.decodeFunctionResult("simulate", acccessibleData)
             expect(
                 safe.interface.decodeFunctionResult("getOwners", simulation.returnData)[0]
@@ -76,7 +76,7 @@ describe("SimulateTxAccessor", async () => {
             const userBalance = await hre.ethers.provider.getBalance(user2.address)
             const tx = buildContractCall(interactor, "sendAndReturnBalance", [user2.address, parseEther("1")], 0, true)
             const simulationData = accessor.interface.encodeFunctionData("simulate", [tx.to, tx.value, tx.data, tx.operation])
-            const acccessibleData = await simulator.callStatic.simulateDelegatecall(accessor.address, simulationData) 
+            const acccessibleData = await simulator.callStatic.simulate(accessor.address, simulationData) 
             const simulation = accessor.interface.decodeFunctionResult("simulate", acccessibleData)
             expect(
                 interactor.interface.decodeFunctionResult("sendAndReturnBalance", simulation.returnData)[0]
@@ -93,7 +93,7 @@ describe("SimulateTxAccessor", async () => {
             const { safe, accessor, interactor, simulator } = await setupTests()
             const tx = buildContractCall(interactor, "sendAndReturnBalance", [user2.address, parseEther("1")], 0, true)
             const simulationData = accessor.interface.encodeFunctionData("simulate", [tx.to, tx.value, tx.data, tx.operation])
-            const acccessibleData = await simulator.callStatic.simulateDelegatecall(accessor.address, simulationData) 
+            const acccessibleData = await simulator.callStatic.simulate(accessor.address, simulationData) 
             const simulation = accessor.interface.decodeFunctionResult("simulate", acccessibleData)
             expect(simulation.returnData).to.be.deep.eq("0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000f5472616e73666572206661696c65640000000000000000000000000000000000")
             expect(

test/core/GnosisSafe.StorageAccessible.spec.ts

@@ -40,26 +40,26 @@ describe("StorageAccessible", async () => {
         })
     })
 
-    describe("simulateDelegatecallInternal", async () => {
+    describe("simulateAndRevert", async () => {
 
         it('should revert changes', async () => {
             const { safe, killLib } = await setupTests()
             await expect(
-                safe.callStatic.simulateDelegatecallInternal(killLib.address, killLib.interface.encodeFunctionData("killme"))
+                safe.callStatic.simulateAndRevert(killLib.address, killLib.interface.encodeFunctionData("killme"))
             ).to.be.reverted
         })
 
         it('should revert the revert with message', async () => {
             const { safe, killLib } = await setupTests()
             await expect(
-                safe.callStatic.simulateDelegatecallInternal(killLib.address, killLib.interface.encodeFunctionData("trever"))
+                safe.callStatic.simulateAndRevert(killLib.address, killLib.interface.encodeFunctionData("trever"))
             ).to.be.reverted
         })
 
         it('should return estimate in revert', async () => {
             const { safe, killLib } = await setupTests()
             await expect(
-                safe.callStatic.simulateDelegatecallInternal(killLib.address, killLib.interface.encodeFunctionData("estimate", [safe.address, "0x"]))
+                safe.callStatic.simulateAndRevert(killLib.address, killLib.interface.encodeFunctionData("estimate", [safe.address, "0x"]))
             ).to.be.reverted
         })
     })

test/handlers/CompatibilityFallbackHandler.spec.ts

@@ -149,7 +149,7 @@ describe("CompatibilityFallbackHandler", async () => {
     })
 
 
-    describe("simulateDelegatecall", async () => {
+    describe("simulate", async () => {
 
         it.skip('can be called for any Safe', async () => {
         })
@@ -158,7 +158,7 @@ describe("CompatibilityFallbackHandler", async () => {
             const { validator, killLib } = await setupTests()
             const code = await ethers.provider.getCode(validator.address)
             expect(
-                await validator.callStatic.simulateDelegatecall(killLib.address, killLib.interface.encodeFunctionData("killme"))
+                await validator.callStatic.simulate(killLib.address, killLib.interface.encodeFunctionData("killme"))
             ).to.be.eq("0x")
             expect(
                 await ethers.provider.getCode(validator.address)
@@ -168,20 +168,20 @@ describe("CompatibilityFallbackHandler", async () => {
         it('should return result', async () => {
             const { validator, killLib, handler } = await setupTests()
             expect(
-                await validator.callStatic.simulateDelegatecall(killLib.address, killLib.interface.encodeFunctionData("expose"))
+                await validator.callStatic.simulate(killLib.address, killLib.interface.encodeFunctionData("expose"))
             ).to.be.eq("0x000000000000000000000000" + handler.address.slice(2).toLowerCase())
         })
 
         it('should propagate revert message', async () => {
             const { validator, killLib } = await setupTests()
             await expect(
-                validator.callStatic.simulateDelegatecall(killLib.address, killLib.interface.encodeFunctionData("trever"))
+                validator.callStatic.simulate(killLib.address, killLib.interface.encodeFunctionData("trever"))
             ).to.revertedWith("Why are you doing this?")
         })
 
         it('should simulate transaction', async () => {
             const { validator, killLib } = await setupTests()
-            const estimate = await validator.callStatic.simulateDelegatecall(
+            const estimate = await validator.callStatic.simulate(
                 killLib.address,
                 killLib.interface.encodeFunctionData("estimate", [validator.address, "0x"])
             )
@@ -190,7 +190,7 @@ describe("CompatibilityFallbackHandler", async () => {
 
         it('should return modified state', async () => {
             const { validator, killLib } = await setupTests()
-            const value = await validator.callStatic.simulateDelegatecall(
+            const value = await validator.callStatic.simulate(
                 killLib.address,
                 killLib.interface.encodeFunctionData("updateAndGet", [])
             )