Add jobs and scripts running external tests for Gnosis v2

.circleci/config.yml

@@ -850,6 +850,38 @@ jobs:
       #- run: *gitter_notify_failure
       #- run: *gitter_notify_success
 
+  t_ems_compile_ext_gnosis_v2:
+    docker:
+      - image: circleci/node:10
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: External GnosisSafe v2 compilation
+          command: |
+            export COMPILE_ONLY=1
+            test/externalTests/gnosis-v2.sh /tmp/workspace/soljson.js
+
+  t_ems_test_ext_gnosis_v2:
+    docker:
+      - image: circleci/node:10
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: External GnosisSafe v2 tests
+          command: |
+            test/externalTests/gnosis-v2.sh /tmp/workspace/soljson.js
+      # TODO: Re-enable notifications once this is running nightly rather than as a PR check
+      #- run: *gitter_notify_failure
+      #- run: *gitter_notify_success
+
   t_ems_compile_ext_zeppelin:
     docker:
       - image: circleci/node:10
@@ -1124,10 +1156,12 @@ workflows:
       - t_ems_solcjs: *workflow_emscripten
       - t_ems_compile_ext_colony: *workflow_emscripten
       - t_ems_compile_ext_gnosis: *workflow_emscripten
+      - t_ems_compile_ext_gnosis_v2: *workflow_emscripten
       - t_ems_compile_ext_zeppelin: *workflow_emscripten
       - t_ems_compile_ext_ens: *workflow_emscripten
       - t_ems_test_ext_colony: *workflow_emscripten
       - t_ems_test_ext_gnosis: *workflow_emscripten
+      - t_ems_test_ext_gnosis_v2: *workflow_emscripten
       - t_ems_test_ext_zeppelin: *workflow_emscripten
 
       # Windows build and tests

test/externalTests.sh

@@ -44,6 +44,7 @@ printTask "Running external tests..."
 
 "$REPO_ROOT/externalTests/zeppelin.sh" "$SOLJSON"
 "$REPO_ROOT/externalTests/gnosis.sh" "$SOLJSON"
+"$REPO_ROOT/externalTests/gnosis-v2.sh" "$SOLJSON"
 "$REPO_ROOT/externalTests/colony.sh" "$SOLJSON"
 "$REPO_ROOT/externalTests/ens.sh" "$SOLJSON"
 

test/externalTests/gnosis-v2.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# This file is part of solidity.
+#
+# solidity is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# solidity is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with solidity.  If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2020 solidity contributors.
+#------------------------------------------------------------------------------
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$1"
+SOLJSON="$1"
+
+function install_fn { npm install --package-lock; }
+function compile_fn { npx truffle compile; }
+function test_fn { npm test; }
+
+function gnosis_safe_test
+{
+    OPTIMIZER_LEVEL=1
+    CONFIG="truffle-config.js"
+
+    truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/safe-contracts.git v2_070
+
+    sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_070_new|g' package.json
+    sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7"|g' package.json
+
+    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
+    rm -f package-lock.json
+
+    run_install "$SOLJSON" install_fn
+
+    truffle_run_test "$SOLJSON" compile_fn test_fn
+}
+
+external_test Gnosis-Safe gnosis_safe_test