Merge pull request #149 from CirclesUBI/revert-multisend

Revert v3.1.1.and v3.1.2: remove multisend
CirclesUBI · Dec 2, 2022 · c8a6e34 · c8a6e34
2 parents 1d5bc40 + b78f346
commit c8a6e34
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 96 deletions.
diff --git a/.env.example b/.env.example
@@ -14,7 +14,6 @@ HUB_ADDRESS=0xCfEB869F69431e42cdB54A4F4f105C19C080A601
 PROXY_FACTORY_ADDRESS=0x9b1f7F645351AF3631a656421eD2e40f2802E6c0
 SAFE_ADDRESS=0x2612Af3A521c2df9EAF28422Ca335b04AdF3ac66
 SAFE_DEFAULT_CALLBACK_HANDLER=0x67B5656d60a809915323Bf2C40A8bEF15A152e3e
-MULTISEND_CALLONLY_ADDRESS=0x0290FB167208Af455bB137780163b7B7a9a10C16
 
 # Smart contract addresses of the Base CRC version
 PROXY_FACTORY_ADDRESS_CRC=0xD833215cBcc3f914bD1C9ece3EE7BF8B14f841bb

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '14'
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
           sudo echo "127.0.1.1 relay.circles.local" | sudo tee -a /etc/hosts
 
       - name: Check out circles-core repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: circles-core
 
@@ -28,15 +28,15 @@ jobs:
       - name: Read node version from .nvmrc
         working-directory: circles-core
         id: nvmrc
-        run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
+        run: echo "NODE_VERSION=$(cat .nvmrc)" >> $GITHUB_OUTPUT
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '${{ steps.nvmrc.outputs.NODE_VERSION }}'
 
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS.
           path: ~/.npm
@@ -46,7 +46,7 @@ jobs:
             ${{ runner.OS }}-
 
       - name: Get circles-docker repository and copy configs
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: CirclesUBI/circles-docker.git
           ref: main

diff --git a/README.md b/README.md
@@ -96,7 +96,6 @@ const core = new CirclesCore(web3, {
   relayServiceEndpoint: 'http://relay.circles.local',
   subgraphName: 'circlesubi/circles-subgraph',
   fallbackHandlerAddress: '0x67B5656d60a809915323Bf2C40A8bEF15A152e3e',
-  multiSendCallOnlyAddress: '0x0290FB167208Af455bB137780163b7B7a9a10C16'
 });
 
 // Create existing account from private key which owns a Safe

diff --git a/src/common/constants.js b/src/common/constants.js
@@ -1,6 +1,5 @@
 // Gnosis Safe operation types
 export const CALL_OP = 0;
-export const DELEGATE_OP = 1;
 
 // Gnosis Safe owner threshold
 export const SAFE_THRESHOLD = 1;

diff --git a/src/common/getContracts.js b/src/common/getContracts.js
@@ -1,7 +1,6 @@
 import GnosisSafeContract from '@gnosis.pm/safe-contracts/build/artifacts/contracts/GnosisSafeL2.sol/GnosisSafeL2.json';
 import GnosisSafeCRCVersionContract from '@circles/safe-contracts/build/contracts/GnosisSafe.json';
 import HubContract from '@circles/circles-contracts/build/contracts/Hub.json';
-import MultiSendCallOnlyContract from '@gnosis.pm/safe-contracts/build/artifacts/contracts/libraries/MultiSendCallOnly.sol/MultiSendCallOnly.json';
 import ProxyFactoryContract from '@gnosis.pm/safe-contracts/build/artifacts/contracts/proxies/GnosisSafeProxyFactory.sol/GnosisSafeProxyFactory.json';
 import TokenContract from '@circles/circles-contracts/build/contracts/Token.json';
 
@@ -73,12 +72,7 @@ export function getTokenContract(web3, address) {
  * @return {Object} - contract instances
  */
 export default function getContracts(web3, options) {
-  const {
-    safeMasterAddress,
-    proxyFactoryAddress,
-    hubAddress,
-    multiSendCallOnlyAddress,
-  } = options;
+  const { safeMasterAddress, proxyFactoryAddress, hubAddress } = options;
 
   // Gnosis master Safe copy
   const safeMaster = getSafeContract(web3, safeMasterAddress);
@@ -93,16 +87,8 @@ export default function getContracts(web3, options) {
   // Circles Hub
   const hub = getContract(web3, HubContract.abi, hubAddress);
 
-  // Multisend Call Only contract
-  const multiSendCallOnly = getContract(
-    web3,
-    MultiSendCallOnlyContract.abi,
-    multiSendCallOnlyAddress,
-  );
-
   return {
     hub,
-    multiSendCallOnly,
     proxyFactory,
     safeMaster,
   };

diff --git a/src/common/multiSend.js b/src/common/multiSend.js
diff --git a/src/index.js b/src/index.js
@@ -29,7 +29,6 @@ export default class CirclesCore {
    * @param {string} options.fallbackHandlerAddress - address of the fallback handler of the Safe contract
    * @param {string} options.graphNodeEndpoint - URL of the graph node
    * @param {string} options.hubAddress - address of deployed Circles Hub contract
-   * @param {string} options.multiSendCallOnlyAddress - address of deployed Gnosis MultiSendCallOnly contract
    * @param {string} options.proxyFactoryAddress - address of deployed Gnosis ProxyFactory contract
    * @param {string} options.relayServiceEndpoint - URL of the Relayer server
    * @param {string} options.safeMasterAddress - address of deployed Gnosis Safe master copy contract
@@ -49,9 +48,6 @@ export default class CirclesCore {
       hubAddress: {
         type: web3.utils.checkAddressChecksum,
       },
-      multiSendCallOnlyAddress: {
-        type: web3.utils.checkAddressChecksum,
-      },
       proxyFactoryAddress: {
         type: web3.utils.checkAddressChecksum,
       },

diff --git a/src/safe.js b/src/safe.js
@@ -1,5 +1,4 @@
 import {
-  DELEGATE_OP,
   SAFE_LAST_VERSION,
   SAFE_THRESHOLD,
   SENTINEL_ADDRESS,
@@ -11,7 +10,6 @@ import {
   getSafeContract,
   getSafeCRCVersionContract,
 } from '~/common/getContracts';
-import encodeMultiSendCall from '~/common/multiSend';
 
 /**
  * Helper method to receive a list of all Gnosis Safe owners.
@@ -129,7 +127,7 @@ export default function createSafeModule(
   globalOptions,
 ) {
   const { fallbackHandlerAddress } = globalOptions;
-  const { safeMaster, multiSendCallOnly } = contracts;
+  const { safeMaster } = contracts;
   return {
     /**
      * Predict Safe address.
@@ -518,7 +516,8 @@ export default function createSafeModule(
       });
 
       const safeVersion = await getVersion(web3, options.safeAddress);
-      let txHash;
+      let txHashChangeMasterCopy;
+      let txHashFallbackHandler;
 
       if (safeVersion != SAFE_LAST_VERSION) {
         // References:
@@ -536,44 +535,28 @@ export default function createSafeModule(
         const updateSafeTxData = safeInstance.methods
           .changeMasterCopy(safeMaster.options.address)
           .encodeABI();
-        // Then we setup the fallbackHandler
-        const fallbackHandlerTxData = safeInstance.methods
-          .setFallbackHandler(fallbackHandlerAddress)
-          .encodeABI();
-
-        const txs = [
-          {
-            to: options.safeAddress,
-            value: '0',
-            data: updateSafeTxData,
-          },
-          {
-            to: options.safeAddress,
-            value: '0',
-            data: fallbackHandlerTxData,
-          },
-        ];
-
-        const multiSendCallTxData = encodeMultiSendCall(
-          web3,
-          txs,
-          multiSendCallOnly,
-        );
-
-        txHash = await utils.executeTokenSafeTx(account, {
+        txHashChangeMasterCopy = await utils.executeTokenSafeTx(account, {
           safeAddress: options.safeAddress,
-          to: multiSendCallOnly.options.address,
-          txData: multiSendCallTxData,
+          to: options.safeAddress,
+          txData: updateSafeTxData,
           isCRCVersion: true,
-          operation: DELEGATE_OP,
         });
-        if (!txHash) {
+        if (!txHashChangeMasterCopy) {
           throw new CoreError(
             `Safe with version ${safeVersion} failed to change the Master Copy`,
           );
         }
+        // Then we setup the fallbackHandler
+        const fallbackHandlerTxData = safeInstance.methods
+          .setFallbackHandler(fallbackHandlerAddress)
+          .encodeABI();
+        txHashFallbackHandler = await utils.executeTokenSafeTx(account, {
+          safeAddress: options.safeAddress,
+          to: options.safeAddress,
+          txData: fallbackHandlerTxData,
+        });
       }
-      return txHash;
+      return { txHashChangeMasterCopy, txHashFallbackHandler };
     },
   };
 }
diff --git a/src/utils.js b/src/utils.js
@@ -744,13 +744,10 @@ export default function createUtilsModule(web3, contracts, globalOptions) {
           type: 'boolean',
           default: false,
         },
-        operation: {
-          type: 'number',
-          default: CALL_OP,
-        },
       });
 
-      const { txData, safeAddress, to, isCRCVersion, operation } = options;
+      const { txData, safeAddress, to, isCRCVersion } = options;
+      const operation = CALL_OP;
       const refundReceiver = ZERO_ADDRESS;
       const value = 0;
 

diff --git a/test/common.test.js b/test/common.test.js
@@ -175,7 +175,6 @@ describe('Common', () => {
     beforeEach(() => {
       contracts = getContracts(web3, {
         hubAddress: ZERO_ADDRESS,
-        multiSendCallOnlyAddress: ZERO_ADDRESS,
         proxyFactoryAddress: ZERO_ADDRESS,
         safeMasterAddress: ZERO_ADDRESS,
       });
@@ -184,7 +183,6 @@ describe('Common', () => {
     it('should give us access to contracts', () => {
       expect(contracts.safeMaster.methods).toBeDefined();
       expect(contracts.hub.methods).toBeDefined();
-      expect(contracts.multiSendCallOnly.methods).toBeDefined();
       expect(contracts.proxyFactory.methods).toBeDefined();
     });
 

diff --git a/test/helpers/core.js b/test/helpers/core.js
@@ -8,7 +8,6 @@ export default function createCore() {
     fallbackHandlerAddress: process.env.SAFE_DEFAULT_CALLBACK_HANDLER,
     graphNodeEndpoint: process.env.GRAPH_NODE_ENDPOINT,
     hubAddress: process.env.HUB_ADDRESS,
-    multiSendCallOnlyAddress: process.env.MULTISEND_CALLONLY_ADDRESS,
     proxyFactoryAddress: process.env.PROXY_FACTORY_ADDRESS,
     relayServiceEndpoint: process.env.RELAY_SERVICE_ENDPOINT,
     safeMasterAddress: process.env.SAFE_ADDRESS,

diff --git a/test/safe.test.js b/test/safe.test.js
@@ -258,7 +258,6 @@ describe('Safe', () => {
       const hubAddress = core.options.hubAddress;
       contracts = await getContracts(web3, {
         hubAddress: hubAddress,
-        multiSendCallOnlyAddress: ZERO_ADDRESS,
         proxyFactoryAddress: ZERO_ADDRESS,
         safeMasterAddress: ZERO_ADDRESS,
       });
@@ -292,11 +291,13 @@ describe('Safe', () => {
     });
 
     it('I should get the last version when update the Safe version of a deployed Safe', async () => {
-      const txHash = await core.safe.updateToLastVersion(ownerCRCVersion, {
-        safeAddress: CRCVersionSafeAddress,
-      });
+      const { txHashChangeMasterCopy, txHashFallbackHandler } =
+        await core.safe.updateToLastVersion(ownerCRCVersion, {
+          safeAddress: CRCVersionSafeAddress,
+        });
 
-      expect(web3.utils.isHexStrict(txHash)).toBe(true);
+      expect(web3.utils.isHexStrict(txHashChangeMasterCopy)).toBe(true);
+      expect(web3.utils.isHexStrict(txHashFallbackHandler)).toBe(true);
 
       const version = await core.safe.getVersion(ownerCRCVersion, {
         safeAddress: CRCVersionSafeAddress,

diff --git a/test/token.test.js b/test/token.test.js
@@ -89,7 +89,6 @@ describe('Token', () => {
     hubAddress = core.options.hubAddress;
     contracts = await getContracts(web3, {
       hubAddress: hubAddress,
-      multiSendCallOnlyAddress: ZERO_ADDRESS,
       proxyFactoryAddress: ZERO_ADDRESS,
       safeMasterAddress: ZERO_ADDRESS,
     });