fix: add compound deployment + fix ordering (AztecProtocol#289)

liusanchuan · Dec 1, 2022 · b928e84 · b928e84
1 parent e66e222
commit b928e84
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 73 deletions.
diff --git a/src/deployment/AggregateDeployment.s.sol b/src/deployment/AggregateDeployment.s.sol
@@ -28,6 +28,10 @@ contract AggregateDeployment is BaseDeployment {
     address internal erc4626Bridge;
 
     function deployAndListAll() public {
+        DataProviderDeployment dataProviderDeploy = new DataProviderDeployment();
+        dataProviderDeploy.setUp();
+        address dataProvider = dataProviderDeploy.deploy();
+
         emit log("--- Curve ---");
         {
             CurveDeployment curveDeployment = new CurveDeployment();
@@ -120,85 +124,30 @@ contract AggregateDeployment is BaseDeployment {
             liquityTroveDeployment.deployAndList(400);
         }
 
-        readStats();
-    }
-
-    function bogota() public {
-        deployAndListAll();
-
-        emit log("--- Donation ---");
-        {
-            DonationDeployment deploy = new DonationDeployment();
-            deploy.setUp();
-            deploy.deployAndList();
-        }
-
-        emit log("--- Angle ---");
+        emit log("--- Compound ---");
         {
-            AngleSLPDeployment deploy = new AngleSLPDeployment();
-            deploy.setUp();
-            deploy.deployAndList();
-        }
+            ERC4626Lister lister = new ERC4626Lister();
+            lister.setUp();
 
-        emit log("--- Uniswap --");
-        {
-            UniswapDeployment deploy = new UniswapDeployment();
-            deploy.setUp();
-            deploy.deployAndList();
+            address erc4626CompoundDai = 0x6D088fe2500Da41D7fA7ab39c76a506D7c91f53b;
+            lister.listVault(erc4626Bridge, erc4626CompoundDai);
+            uint256 erc4626CDaiId = listAsset(erc4626CompoundDai, 55000);
+            emit log_named_uint("ERC4626 compound dai id", erc4626CDaiId);
         }
 
-        emit log("--- Curve steth lp ---");
+        emit log("--- Let anyone deploy ---");
         {
-            CurveStethLpDeployment deploy = new CurveStethLpDeployment();
-            deploy.setUp();
-            deploy.deployAndList();
+            IRollupProcessor rp = IRollupProcessor(ROLLUP_PROCESSOR);
+            if (!rp.allowThirdPartyContracts()) {
+                vm.broadcast();
+                rp.setAllowThirdPartyContracts(true);
+            }
         }
 
-        IRollupProcessor rp = IRollupProcessor(ROLLUP_PROCESSOR);
-        vm.broadcast();
-        rp.setAllowThirdPartyContracts(true);
-
-        emit log("--- data provider ---");
+        emit log("--- Data Provider ---");
         {
-            DataProviderDeployment deploy = new DataProviderDeployment();
-            deploy.setUp();
-            address provider = deploy.deployAndListMany();
-
-            uint256[] memory assetIds = new uint256[](4);
-            string[] memory assetTags = new string[](4);
-
-            assetIds[0] = 8;
-            assetIds[1] = 9;
-            assetIds[2] = 10;
-            assetIds[3] = 11;
-            assetTags[0] = "sandai_eur";
-            assetTags[1] = "sanweth_eur";
-            assetTags[2] = "lusd";
-            assetTags[3] = "stecrv";
-
-            uint256[] memory bridgeAddressIds = new uint256[](7);
-            string[] memory bridgeTags = new string[](7);
-            bridgeAddressIds[0] = 12;
-            bridgeTags[0] = "DonationBridge";
-            bridgeAddressIds[1] = 13;
-            bridgeTags[1] = "AngleSLPBridgeDeposit";
-            bridgeAddressIds[2] = 14;
-            bridgeTags[2] = "AngleSLPBridgeWithdraw";
-            bridgeAddressIds[3] = 15;
-            bridgeTags[3] = "UniswapBridge500K";
-            bridgeAddressIds[4] = 16;
-            bridgeTags[4] = "UniswapBridge800K";
-            bridgeAddressIds[5] = 17;
-            bridgeTags[5] = "LiquityTroveBridge";
-            bridgeAddressIds[6] = 18;
-            bridgeTags[6] = "CurveStEthLpBridge";
-
-            vm.broadcast();
-            DataProvider(provider).addAssetsAndBridges(assetIds, assetTags, bridgeAddressIds, bridgeTags);
-            deploy.readProvider(provider);
+            dataProviderDeploy.updateNames(dataProvider);
         }
-
-        // readStats();
     }
 
     function readStats() public {

diff --git a/src/deployment/dataprovider/DataProviderDeployment.s.sol b/src/deployment/dataprovider/DataProviderDeployment.s.sol
@@ -23,7 +23,7 @@ contract DataProviderDeployment is BaseDeployment {
     function read() public {
         address provider = 0x8B2E54fa4398C8f7502f30aC94Cb1f354390c8ab;
         if (block.chainid == 3567) {
-            provider = 0x1C6182E3CEaf416B10963731E8283722e274964E;
+            provider = 0x1fD1c41a895565dB55a72a873eBA83A39FF01CD2;
         } else if (block.chainid == 0xa57ec) {
             provider = 0xA33B20Ba45cA9C265bbF7b35a75717590EDfc868;
         }
@@ -94,15 +94,14 @@ contract DataProviderDeployment is BaseDeployment {
     function deployAndListMany() public returns (address) {
         address provider = deploy();
         updateNames(provider);
-        readProvider(provider);
         return provider;
     }
 
     function updateNames(address _provider) public {
         DataProvider provider = DataProvider(_provider);
         IRollupProcessor rp = provider.ROLLUP_PROCESSOR();
 
-        uint256 supportedAssetLength = rp.getSupportedAssetsLength();
+        uint256 supportedAssetLength = rp.getSupportedAssetsLength() + 1;
         uint256[] memory assetIds = new uint256[](supportedAssetLength);
         string[] memory assetTags = new string[](supportedAssetLength);
         for (uint256 i = 0; i < supportedAssetLength; i++) {