Temporarily turning docker off

argentlabs · Apr 1, 2021 · 33f2956 · 33f2956
1 parent 7d404ae
commit 33f2956
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 15 deletions.
diff --git a/lib_0.7/paraswap/V4/AugustusSwapper.sol b/lib_0.7/paraswap/V4/AugustusSwapper.sol
@@ -154,7 +154,14 @@ contract AugustusSwapper is AdapterStorage, TokenFetcherAugustus {
                 path
             )
         );
-        require(success, "Call to uniswap proxy failed");
+        // require(success, "Call to uniswap proxy failed");
+        if (!success) {
+            // solhint-disable-next-line no-inline-assembly
+            assembly {
+                returndatacopy(0, 0, returndatasize())
+                revert(0, returndatasize())
+            }
+        }
 
     }
 
@@ -229,7 +236,15 @@ contract AugustusSwapper is AdapterStorage, TokenFetcherAugustus {
                 path
             )
         );
-        require(success, "Call to uniswap proxy failed");
+        // require(success, "Call to uniswap proxy failed");
+        if (!success) {
+            // solhint-disable-next-line no-inline-assembly
+            assembly {
+                returndatacopy(0, 0, returndatasize())
+                revert(0, returndatasize())
+            }
+        }
+
 
     }
 
@@ -402,7 +417,14 @@ contract AugustusSwapper is AdapterStorage, TokenFetcherAugustus {
                 startIndexes[i + 1].sub(startIndexes[i]), // length of calldata
                 exchangeData// total calldata
             );
-            require(result, "External call failed");
+            // require(result, "External call failed");
+            if (!result) {
+                // solhint-disable-next-line no-inline-assembly
+                assembly {
+                    returndatacopy(0, 0, returndatasize())
+                    revert(0, returndatasize())
+                }
+            }
         }
 
         receivedAmount = Utils.tokenBalance(

diff --git a/test/paraswapV4.js b/test/paraswapV4.js
@@ -325,5 +325,5 @@ contract("Paraswap Filter", (accounts) => {
     });
   }
 
-  ["multiSwap", "simpleSwap", "swapOnUniswap", "swapOnUniswapFork", "megaSwap"].map(testsForMethod);
+  ["multiSwap", "simpleSwap", "swapOnUniswap", "swapOnUniswapFork", "megaSwap"].forEach(testsForMethod);
 });
diff --git a/truffle-config-contracts-legacy-1.3.js b/truffle-config-contracts-legacy-1.3.js
@@ -8,7 +8,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.5.4",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-contracts-legacy-1.6.js b/truffle-config-contracts-legacy-1.6.js
@@ -8,7 +8,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.5.4",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-contracts-legacy-2.4.js b/truffle-config-contracts-legacy-2.4.js
@@ -8,7 +8,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.6.12",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-contracts-test.js b/truffle-config-contracts-test.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.6.12",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-infrastructure-0.5.js b/truffle-config-infrastructure-0.5.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.5.4",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-infrastructure.js b/truffle-config-infrastructure.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.6.12",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-lib-0.5.js b/truffle-config-lib-0.5.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.5.4",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-lib-0.7.js b/truffle-config-lib-0.7.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.7.5",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-modules.js b/truffle-config-modules.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.6.12",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config-wallet.js b/truffle-config-wallet.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.6.12",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,

diff --git a/truffle-config.js b/truffle-config.js
@@ -7,7 +7,7 @@ module.exports = {
   compilers: {
     solc: {
       version: "0.6.12",
-      docker: true,
+      docker: false,
       settings: {
         optimizer: {
           enabled: true,