Fix: Better script structure (#88)

* fix: better script structure

* fix: add new ABI

* fix: add default MgvArbitrage to ativate script

* fix: UNLICENSED to Unlicense

Co-authored-by: Espen Højsgaard <[email protected]>

* fix: correct license on scripts

* fix: all UNLICENSED to Unlicense

---------

Co-authored-by: Espen Højsgaard <[email protected]>

packages/mangrove-arbitrage/abi/MgvArbitrage.json

@@ -288,6 +288,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "router",
+      "outputs": [
+        {
+          "internalType": "contract ISwapRouter",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -301,6 +314,32 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newArbitrager",
+          "type": "address"
+        }
+      ],
+      "name": "setArbitrager",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "contract IMangrove",
+          "name": "newMgv",
+          "type": "address"
+        }
+      ],
+      "name": "setMgv",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {

packages/mangrove-arbitrage/script/MgvArbitrageActivateTokens.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.13;
 
 import {Deployer} from "mgv_script/lib/Deployer.sol";
@@ -13,7 +13,7 @@ contract MgvArbitrageActivateTokens is Deployer {
     innerRun({
       tkn1: IERC20(envAddressOrName("TKN1")),
       tkn2: IERC20(envAddressOrName("TKN2")),
-      arbitrageContract: envAddressOrName("ARBITRAGECONTRACT")
+      arbitrageContract: envAddressOrName("ARBITRAGECONTRACT", "MgvArbitrage")
     });
   }
 

packages/mangrove-arbitrage/script/MgvArbitrageTestDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.13;
 
 import {Deployer} from "mgv_script/lib/Deployer.sol";

packages/mangrove-arbitrage/script/MgvArbitrageDeployer.s.sol → packages/mangrove-arbitrage/script/deployers/MgvArbitrageDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.13;
 
 import {Deployer} from "mgv_script/lib/Deployer.sol";
@@ -10,7 +10,7 @@ contract MgvArbitrageDeployer is Deployer {
 
   function run() public {
     innerRun({
-      admin: envAddressOrName("CHIEF"),
+      admin: envAddressOrName("CHIEF", broadcaster()),
       arbitrager: envAddressOrName("ARBITRAGER"),
       mgv: envAddressOrName("MGV", "Mangrove")
     });

packages/mangrove-arbitrage/script/deployers/MumbaiMgvArbitrageDeployer.s.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.13;
+
+import {Deployer} from "mgv_script/lib/Deployer.sol";
+import {MgvArbitrageDeployer} from "script/deployers/MgvArbitrageDeployer.s.sol";
+
+contract MumbaiMgvArbitrageDeployer is Deployer {
+  MgvArbitrageDeployer public arbDeployer;
+
+  function run() public {
+    runWithChainSpecificParams();
+    outputDeployment();
+  }
+
+  function runWithChainSpecificParams() public {
+    arbDeployer = new MgvArbitrageDeployer();
+    arbDeployer.innerRun({
+      admin: broadcaster(),
+      arbitrager: envAddressOrName("ARBITRAGER", "Arbitrager"),
+      mgv: envAddressOrName("MGV", "Mangrove")
+    });
+  }
+}

packages/mangrove-arbitrage/script/deployers/PolygonMgvArbitrageDeployer.s.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.13;
+
+import {Deployer} from "mgv_script/lib/Deployer.sol";
+import {MgvArbitrageDeployer} from "script/deployers/MgvArbitrageDeployer.s.sol";
+
+contract PolygonMgvArbitrageDeployer is Deployer {
+  MgvArbitrageDeployer public arbDeployer;
+
+  function run() public {
+    runWithChainSpecificParams();
+    outputDeployment();
+  }
+
+  function runWithChainSpecificParams() public {
+    arbDeployer = new MgvArbitrageDeployer();
+    arbDeployer.innerRun({
+      admin: broadcaster(),
+      arbitrager: envAddressOrName("ARBITRAGER", "Arbitrager"),
+      mgv: envAddressOrName("MGV", "Mangrove")
+    });
+  }
+}

packages/mangrove-arbitrage/src/MyPinnedPolygon.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: BSD-2-Clause
 pragma solidity ^0.8.10;
 
 import {GenericFork} from "mgv_test/lib/forks/Generic.sol";

packages/mangrove-arbitrage/test/MgvArbitrage.t.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: BSD-2-Clause
 pragma solidity ^0.8.10;
 
 import {MangroveTest} from "mgv_test/lib/MangroveTest.sol";

packages/mangrove-arbitrage/test/MgvArbitrageActivateTokensTest.t.sol

@@ -1,9 +1,9 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: BSD-2-Clause
 pragma solidity ^0.8.10;
 
 import {Deployer} from "mgv_script/lib/Deployer.sol";
 import {MgvArbitrageActivateTokens} from "script/MgvArbitrageActivateTokens.s.sol";
-import {MgvArbitrageDeployer} from "script/MgvArbitrageDeployer.s.sol";
+import {MgvArbitrageDeployer} from "script/deployers/MgvArbitrageDeployer.s.sol";
 import {IERC20} from "mgv_src/IERC20.sol";
 import "mgv_test/lib/forks/Polygon.sol";
 import {MangroveJsDeploy} from "mgv_script/toy/MangroveJs.s.sol";

packages/mangrove-arbitrage/test/deployers/BaseMgvArbitrageDeployerTest.t.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: BSD-2-Clause
+pragma solidity ^0.8.10;
+
+import {Deployer} from "mgv_script/lib/Deployer.sol";
+import {MangroveDeployer} from "mgv_script/core/deployers/MangroveDeployer.s.sol";
+import {MgvArbitrageDeployer} from "script/deployers/MgvArbitrageDeployer.s.sol";
+
+import {Test2, Test} from "mgv_lib/Test2.sol";
+
+abstract contract BaseMgvArbitrageDeployerTest is Deployer, Test2 {
+  MgvArbitrageDeployer mgvArbDeployer;
+  MangroveDeployer mgvDeployer;
+  address admin;
+  address arbitrager;
+
+  function test_toy_ens_has_addresses() public {
+    assertEq(mgvArbDeployer.mgvArb().arbitrager(), arbitrager, "Wrong arbitrager address");
+    assertEq(mgvArbDeployer.mgvArb().admin(), admin, "Wrong admin address");
+    assertEq(address(mgvArbDeployer.mgvArb().mgv()), fork.get("Mangrove"), "Wrong mgv address");
+    assertEq(fork.get("MgvArbitrage"), address(mgvArbDeployer.mgvArb()), "MgvArbitrage address not correct");
+  }
+}

packages/mangrove-arbitrage/test/deployers/MgvArbitrageDeployerTest.t.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: BSD-2-Clause
+pragma solidity ^0.8.10;
+
+import {MangroveDeployer} from "mgv_script/core/deployers/MangroveDeployer.s.sol";
+import {MgvArbitrageDeployer} from "script/deployers/MgvArbitrageDeployer.s.sol";
+import {BaseMgvArbitrageDeployerTest} from "test/deployers/BaseMgvArbitrageDeployerTest.t.sol";
+
+import {Test2, Test} from "mgv_lib/Test2.sol";
+
+contract MgvArbitrageDeployerTest is BaseMgvArbitrageDeployerTest {
+  function setUp() public {
+    arbitrager = freshAddress("arbitrager");
+    admin = freshAddress("chief");
+
+    mgvDeployer = new MangroveDeployer();
+    mgvDeployer.innerRun({chief: admin, gasprice: 1, gasmax: 2_000_000, gasbot: address(0)});
+    mgvArbDeployer = new MgvArbitrageDeployer();
+    mgvArbDeployer.innerRun({admin: admin, arbitrager: arbitrager, mgv: address(mgvDeployer.mgv())});
+  }
+}

packages/mangrove-arbitrage/test/deployers/MumbaiMgvArbitrageDeployerTest.t.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: BSD-2-Clause
+pragma solidity ^0.8.10;
+
+import {MangroveDeployer} from "mgv_script/core/deployers/MangroveDeployer.s.sol";
+import {MumbaiMgvArbitrageDeployer} from "script/deployers/MumbaiMgvArbitrageDeployer.s.sol";
+import {BaseMgvArbitrageDeployerTest} from "test/deployers/BaseMgvArbitrageDeployerTest.t.sol";
+
+import {Test2, Test} from "mgv_lib/Test2.sol";
+
+contract MumbaiMgvArbitrageDeployerTest is BaseMgvArbitrageDeployerTest {
+  function setUp() public {
+    admin = broadcaster();
+    arbitrager = freshAddress("arbitrager");
+    fork.set("Arbitrager", arbitrager);
+
+    mgvDeployer = new MangroveDeployer();
+    mgvDeployer.innerRun({chief: admin, gasprice: 1, gasmax: 2_000_000, gasbot: address(0)});
+    MumbaiMgvArbitrageDeployer mumbaiMgvArbitrageDeployer = new MumbaiMgvArbitrageDeployer();
+
+    mumbaiMgvArbitrageDeployer.runWithChainSpecificParams();
+
+    mgvArbDeployer = mumbaiMgvArbitrageDeployer.arbDeployer();
+  }
+}

packages/mangrove-arbitrage/test/deployers/PolygonMgvArbitrageDeployerTest.t.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: BSD-2-Clause
+pragma solidity ^0.8.10;
+
+import {MangroveDeployer} from "mgv_script/core/deployers/MangroveDeployer.s.sol";
+import {PolygonMgvArbitrageDeployer} from "script/deployers/PolygonMgvArbitrageDeployer.s.sol";
+import {BaseMgvArbitrageDeployerTest} from "test/deployers/BaseMgvArbitrageDeployerTest.t.sol";
+
+import {Test2, Test} from "mgv_lib/Test2.sol";
+
+contract PolygonMgvArbitrageDeployerTest is BaseMgvArbitrageDeployerTest {
+  function setUp() public {
+    admin = broadcaster();
+    arbitrager = freshAddress("arbitrager");
+    fork.set("Arbitrager", arbitrager);
+
+    mgvDeployer = new MangroveDeployer();
+    mgvDeployer.innerRun({chief: admin, gasprice: 1, gasmax: 2_000_000, gasbot: address(0)});
+
+    PolygonMgvArbitrageDeployer polygonMgvArbitrageDeployer = new PolygonMgvArbitrageDeployer();
+
+    polygonMgvArbitrageDeployer.runWithChainSpecificParams();
+
+    mgvArbDeployer = polygonMgvArbitrageDeployer.arbDeployer();
+  }
+}