FlashMintLeveraged: Support for fixed input Issuance

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   checkout_and_compile:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     steps:
       - checkout
@@ -33,7 +33,7 @@ jobs:
             - ~/index-coop-smart-contracts
   test:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     parallelism: 2
     steps:
@@ -60,7 +60,7 @@ jobs:
 
   test_integration_polygon:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     steps:
       - setup_remote_docker:
@@ -83,7 +83,7 @@ jobs:
 
   test_integration_optimism:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     steps:
       - setup_remote_docker:
@@ -106,7 +106,7 @@ jobs:
 
   test_integration_ethereum:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     steps:
       - setup_remote_docker:
@@ -129,7 +129,7 @@ jobs:
 
   coverage:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     parallelism: 2
     steps:
@@ -166,7 +166,7 @@ jobs:
 
   report_coverage:
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:20.12.2
     working_directory: ~/index-coop-smart-contracts
     steps:
       - attach_workspace:
@@ -184,26 +184,63 @@ jobs:
           command: |
             cat coverage/lcov.info | ./node_modules/.bin/coveralls
 
+  test_integration_arbitrum:
+    docker:
+      - image: cimg/node:20.12.2
+    working_directory: ~/index-coop-smart-contracts
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: false
+      - run:
+          name: Fetch solc version
+          command: docker pull ethereum/solc:0.6.10
+      - restore_cache:
+          key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Set Up Environment Variables
+          command: cp .env.default .env
+      - run:
+          name: Test RPC
+          command: yarn chain:fork:arbitrum
+          environment:
+            ARBITRUM_RPC_URL: https://arb-mainnet.g.alchemy.com/v2/NpgutFt2TfCFgUsHixNBsyoIkdgfg6tH
+            NETWORK: arbitrum
+            FORK: TRUE
+          background: true
+      - run:
+          name: Hardhat Test
+          environment:
+            ARBITRUM_RPC_URL: https://arb-mainnet.g.alchemy.com/v2/NpgutFt2TfCFgUsHixNBsyoIkdgfg6tH
+            NETWORK: arbitrum
+            FORK: TRUE
+          command: yarn run test:integration:arbitrum
+
 workflows:
   version: 2
   build-and-test:
     jobs:
       - checkout_and_compile
-      - test:
-          requires:
-            - checkout_and_compile
+      # TODO: Comment back in when adding a new non-integration test (and use .only() to avoid rerunning all the old tests)
+      # - test:
+      #     requires:
+      #       - checkout_and_compile
       - test_integration_ethereum:
           requires:
             - checkout_and_compile
-      - test_integration_polygon:
-          requires:
-            - checkout_and_compile
-      - test_integration_optimism:
+      # TODO: Reactivate when developing new contract on polygon (and use .only() to avoid rerunning all the old tests)
+      # - test_integration_polygon:
+      #     requires:
+      #       - checkout_and_compile
+      # TODO: Reactivate when developing new contract on optimism (and use .only() to avoid rerunning all the old tests)
+      # - test_integration_optimism:
+      #     requires:
+      #       - checkout_and_compile
+      - test_integration_arbitrum:
           requires:
             - checkout_and_compile
-      - coverage:
-          requires:
-            - checkout_and_compile
-      - report_coverage:
-          requires:
-            - coverage
+      # - coverage:
+      #     requires:
+      #       - checkout_and_compile
+      # - report_coverage:
+      #     requires:
+      #       - coverage

.github/workflows/publish.yaml

@@ -14,17 +14,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
       - name: copy env
         run: cp .env.default .env
       - name: install
         run: yarn
       - name: build
         run: yarn build
-      - name: test
-        run: |
-          yarn chain &
-          yarn test
 
   publish:
     runs-on: ubuntu-latest
@@ -34,7 +30,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
       - name: copy env
         run: cp .env.default .env
       - name: install

contracts/exchangeIssuance/DEXAdapter.sol

@@ -100,7 +100,7 @@ library DEXAdapter {
         external
         returns (uint256)
     {
-        if (_swapData.path[0] == _swapData.path[_swapData.path.length -1]) {
+        if (_swapData.path.length == 0 || _swapData.path[0] == _swapData.path[_swapData.path.length -1]) {
             return _amountIn;
         }
 
@@ -151,7 +151,7 @@ library DEXAdapter {
         external
         returns (uint256 amountIn)
     {
-        if (_swapData.path[0] == _swapData.path[_swapData.path.length -1]) {
+        if (_swapData.path.length == 0 || _swapData.path[0] == _swapData.path[_swapData.path.length -1]) {
             return _amountOut;
         }
 

contracts/exchangeIssuance/FlashMintLeveraged.sol

@@ -36,6 +36,7 @@ import { DEXAdapter } from "./DEXAdapter.sol";
 import {IVault, IFlashLoanRecipient} from "../interfaces/external/balancer-v2/IVault.sol";
 import {IPool} from "../interfaces/IPool.sol";
 
+
 /**
  * @title FlashMintLeveraged
  * @author Index Coop
@@ -284,6 +285,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapDataOutputToken
     )
         external
+        virtual
         nonReentrant
     {
         _initiateRedemption(
@@ -315,6 +317,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapDataOutputToken
     )
         external
+        virtual
         nonReentrant
     {
         _initiateRedemption(
@@ -346,6 +349,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapDataInputToken
     )
         external
+        virtual
         nonReentrant
     {
         _initiateIssuance(
@@ -373,6 +377,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapDataInputToken
     )
         external
+        virtual
         payable
         nonReentrant
     {
@@ -784,6 +789,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapData
     )
         internal
+        virtual
         returns (uint256)
     {
         if(address(_outputToken) == _collateralToken){
@@ -820,6 +826,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapData
     )
         internal
+        virtual
         isValidPath(_swapData.path, _collateralToken, addresses.weth)
         returns(uint256)
     {
@@ -958,6 +965,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
         DEXAdapter.SwapData memory _swapData
     )
         internal
+        virtual
         returns (uint256)
     {
         if(address(_inputToken) == _collateralToken){
@@ -998,6 +1006,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
 
     )
         internal
+        virtual
         returns(uint256)
     {
         IWETH(addresses.weth).deposit{value: _maxAmountEth}();