Merge branch 'master' into address-lookup

* master: (26 commits) Deprecate managed pool deployment (#2044) Add support for cash and managed to MockVault (#2064) chore: add .nvmrc file (#2066) Make `approveVault` payable (`BaseRelayerLibrary`). (#2067) Do new aave linear deploy (#2055) Deploy entrypoint (#2062) (Re) deployment preparation: `AuthorizerAdaptorEntrypoint` (#2060) chore: update deployment readmes to point to artifact files rather than abis (#2061) Expose deployment artifacts from deployments package rather than ABI + bytecode (#2058) chore: add missing action-ids (#2025) Remove Protocol Fee Splitter task (#2054) Adaptor entrypoint events (#2051) Verify AaveLinearPool on deployment (#2040) Rename IPoolVersion --> IFactoryCreatedPoolVersion. (#2045) docs: remove deprecated networks from jsdoc (#2029) Add Version unit test. (#2038) Update linear build info (#2041) Make unnecessarily async functions sync (#2030) Do deployment (#2035) Aave linear pool versioning (#2032) ...
balancer · Nov 28, 2022 · 72acdde · 72acdde
2 parents 37d14bf + b729e12
commit 72acdde
Show file tree

Hide file tree

Showing 489 changed files with 30,773 additions and 49,101 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v14.21.1
diff --git a/pkg/deployments/CHANGELOG.md b/pkg/deployments/CHANGELOG.md
@@ -4,11 +4,21 @@
 
 ### New Deployments
 
-- Deployed `ProtocolFeeSplitter` to Mainnet.
 - Deployed core infrastructure (`Authorizer`, `Vault`, `AuthorizerAdaptor`, `ProtocolFeeWithdrawer`, `ProtocolFeePercentagesProvider`, `BalancerQueries` and `BatchRelayer`) to Gnosis and BNB.
 - Deployed core Pool factories (`WeightedPoolFactory`, `ComposableStablePoolFactory`, `LiquidityBootstrappingPool`, `AaveLinearPool`) to BNB.
 - Deployed `AuthorizerAdaptorEntrypoint` to all networks.
 - Deployed `AaveLinearPoolFactory` to all networks.
+- Deployed `PoolRecoveryHelper` to all networks.
+
+### Deprecations
+
+- Deprecated `20211021-managed-pool` due to lacking features and not being expected to ever be used. A new version will be released soon.
+
+### API Changes
+
+- Made `getBalancerContractAbi`, `getBalancerContractBytecode`, `getBalancerContractAddress` and `getBalancerDeployment` synchronous rather than asynchronous functions.
+- Added `getBalancerContractArtifact` which returns a artifact file for the contract in the same format used by Hardhat.
+- Deprecated `getBalancerContractBytecode` in favour of `getBalancerContractArtifact`.
 
 ## 3.0.0 (2022-10-25)
 

diff --git a/pkg/deployments/README.md b/pkg/deployments/README.md
@@ -47,19 +47,19 @@ Returns an [Ethers](https://docs.ethers.io/v5/) contract object for a contract d
 
 _Note: requires using [Hardhat](https://hardhat.org/) with the [`hardhat-ethers`](https://hardhat.org/plugins/nomiclabs-hardhat-ethers.html) plugin._
 
-- **async function getBalancerContractAbi(taskID, contract)**
+- **function getBalancerContractAbi(taskID, contract)**
 
 Returns a contract's [ABI](https://docs.soliditylang.org/en/latest/abi-spec.html).
 
-- **async function getBalancerContractBytecode(taskID, contract)**
+- **function getBalancerContractBytecode(taskID, contract)**
 
 Returns a contract's [creation code](https://docs.soliditylang.org/en/latest/contracts.html#creating-contracts).
 
-- **async function getBalancerContractAddress(taskID, contract, network)**
+- **function getBalancerContractAddress(taskID, contract, network)**
 
 Returns the address of a contract's canonical deployment.
 
-- **async function getBalancerDeployment(taskID, network)**
+- **function getBalancerDeployment(taskID, network)**
 
 Returns an object with all contracts from a deployment and their addresses.
 
@@ -100,10 +100,9 @@ Returns an object with all contracts from a deployment and their addresses.
 | Composable Stable Pools                                 | [`20220906-composable-stable-pool`](./tasks/20220906-composable-stable-pool)                         |
 | Weighted Pool V2                                        | [`20220908-weighted-pool-v2`](./tasks/20220908-weighted-pool-v2)                                     |
 | Batch Relayer V4                                        | [`20220916-batch-relayer-v4`](./tasks/20220916-batch-relayer-v4)                                     |
-| Managed Pool                                            | [`20221021-managed-pool`](./tasks/20221021-managed-pool)                                             |
-| Protocol Fee Splitter                                   | [`20221027-fee-splitter`](./tasks/20221027-fee-splitter)                                             |
-| Authorizer Adaptor Entrypoint                           | [`20221111-authorizer-adaptor-entrypoint`](./tasks/20221111-authorizer-adaptor-entrypoint)           |
 | Linear Pools for Aave aTokens with built-in rebalancing | [`20221115-aave-rebalanced-linear-pool`](./tasks/20221115-aave-rebalanced-linear-pool)               |
+| Pool Recovery Helper                                    | [`20221123-pool-recovery-helper`](./tasks/20221123-pool-recovery-helper)                             |
+| Authorizer Adaptor Entrypoint                           | [`20221124-authorizer-adaptor-entrypoint`](./tasks/20221124-authorizer-adaptor-entrypoint)           |
 
 ## Scripts
 
@@ -149,3 +148,4 @@ Go to each deprecated deployment's readme file to learn more about why it is dep
 | Optimism Root Gauges, for veBAL voting                  | [`20220628-optimism-root-gauge-factory`](./tasks/deprecated/20220628-optimism-root-gauge-factory)   |
 | Batch Relayer V3                                        | [`20220720-batch-relayer-v3`](./tasks/deprecated/20220720-batch-relayer-v3)                         |
 | Linear Pools for Aave aTokens with built-in rebalancing | [`20220817-aave-rebalanced-linear-pool`](./tasks/deprecated/20220817-aave-rebalanced-linear-pool)   |
+| Managed Pool                                            | [`20221021-managed-pool`](./tasks/deprecated/20221021-managed-pool)                                 |
diff --git a/pkg/deployments/action-ids/arbitrum/action-ids.json b/pkg/deployments/action-ids/arbitrum/action-ids.json
@@ -426,5 +426,45 @@
         "updateProtocolFeePercentageCache()": "0x17a40867ce1e1ecc681858d636ee089a349e5d886de539bd79a354d921649f0e"
       }
     }
+  },
+  "20221123-pool-recovery-helper": {
+    "PoolRecoveryHelper": {
+      "useAdaptor": false,
+      "actionIds": {
+        "addPoolFactory(address)": "0xda62096c4d8f1d48218270a8cfece514fe2fb09e756e8d76aa98186a68f5c35c",
+        "enableRecoveryMode(address)": "0x586dc651a6be8b58209f3181edd6d0d9dd0079ff0e0bf4a20bc92b27d2aadcec",
+        "removePoolFactory(address)": "0xa450560b4243ca4b627c589e0f1f51c3022ac250bb247dc70009744aee0fe13b"
+      }
+    }
+  },
+  "20221115-aave-rebalanced-linear-pool": {
+    "AaveLinearPoolFactory": {
+      "useAdaptor": false,
+      "actionIds": {
+        "create(string,string,address,address,uint256,uint256,address)": "0xce1c9e518c0270b5db510d1cd33336a3d6a6d80154e5535dcf4825442712d291",
+        "disable()": "0x7d9e561eb57049f7aa87abe6ccd3a88c062d0112ae53f060cf1aeac13d17a567"
+      }
+    },
+    "AaveLinearPool": {
+      "useAdaptor": false,
+      "factoryOutput": "0x77f0e64Faf0FDeAF0b632919214ba142f0478424",
+      "actionIds": {
+        "disableRecoveryMode()": "0x15f00bddcd311bbb6cb92c87b273ded5f162a286cbc5fdd8f20f6a9e6e1c9fff",
+        "enableRecoveryMode()": "0xed5630bca392a4970a1901079b4d679f7a22b124ac0fbf88e17c8a3a4daa267a",
+        "initialize()": "0xd3457c3b7bf9fb1f545d7d8c25d7b088ab15e0a71a3c5359d4b9c3827c0e19d6",
+        "pause()": "0x718fffbe2c8b4df95b0f67dd732370c9e580255923b4ecc837aafe975e17403e",
+        "setSwapFeePercentage(uint256)": "0xf12947894def448d0c9e33d6220a4f23cbbdb269739ac99695817db884648f5e",
+        "setTargets(uint256,uint256)": "0xbe17db3a209eabd6173aeb955c3e5d02b6c71f7453406425e1b1ec733233081a",
+        "unpause()": "0x26d530e934979106bf47db262f8f2ec443528a326fc167183dd5895f16fac8e8"
+      }
+    }
+  },
+  "20221124-authorizer-adaptor-entrypoint": {
+    "AuthorizerAdaptorEntrypoint": {
+      "useAdaptor": false,
+      "actionIds": {
+        "performAction(address,bytes)": "0xf30af7479cfcd4e7270ce592c1bb3c208dae2172a952b757164f0e975f759426"
+      }
+    }
   }
 }
diff --git a/pkg/deployments/action-ids/arbitrum/expected-collisions.json b/pkg/deployments/action-ids/arbitrum/expected-collisions.json
@@ -320,5 +320,19 @@
       "signature": "multicall(bytes[])",
       "useAdaptor": true
     }
+  ],
+  "0xf30af7479cfcd4e7270ce592c1bb3c208dae2172a952b757164f0e975f759426": [
+    {
+      "taskId": "20220325-authorizer-adaptor",
+      "contractName": "AuthorizerAdaptor",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    },
+    {
+      "taskId": "20221124-authorizer-adaptor-entrypoint",
+      "contractName": "AuthorizerAdaptorEntrypoint",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    }
   ]
 }
diff --git a/pkg/deployments/action-ids/bsc/action-ids.json b/pkg/deployments/action-ids/bsc/action-ids.json
@@ -161,5 +161,45 @@
         "multicall(bytes[])": "0xa96c0afabf02c31b02bc22d11bd1916fc2af814a7ef07810f1fe61455e25846c"
       }
     }
+  },
+  "20221123-pool-recovery-helper": {
+    "PoolRecoveryHelper": {
+      "useAdaptor": false,
+      "actionIds": {
+        "addPoolFactory(address)": "0x90ce8036a67bbe2451d4f50ab7353343339db901728ae2de09928006819ee686",
+        "enableRecoveryMode(address)": "0xd803b6aadd1ec41e42e680b246ebc3f68425ee6cfba1883b53b8fd01e7f37c6b",
+        "removePoolFactory(address)": "0x25cbdd96392463c2c0b1e5a2db364a18327ef561b6ceeb4a444b694dbf2c7890"
+      }
+    }
+  },
+  "20221115-aave-rebalanced-linear-pool": {
+    "AaveLinearPoolFactory": {
+      "useAdaptor": false,
+      "actionIds": {
+        "create(string,string,address,address,uint256,uint256,address)": "0x18bbe66f9ee0fa867a5c3a3b866c7232ce1a4f593b66f60d2c7171b83cc64a75",
+        "disable()": "0x7cf853433ae44dd53983ad26c3cf7c882945b82d2eb522fb24ce73612294a64e"
+      }
+    },
+    "AaveLinearPool": {
+      "useAdaptor": false,
+      "factoryOutput": "0x4ca6AC0509E6381Ca7CD872a6cdC0Fbf00600Fa1",
+      "actionIds": {
+        "disableRecoveryMode()": "0x1c267204227561ec63def99aab91b9726193e7a26874d2775e0a4b38633b7376",
+        "enableRecoveryMode()": "0xfd79f5c92029716ec3ed11a0667bd71f0f45a277ce72fc966e31f3656d9eeef8",
+        "initialize()": "0x39ae3d04752faea084e1f10898c2ce2a4bbf60f82ec5e127c5b7ed4336eeac02",
+        "pause()": "0xe7ece35e7358cc40287bbde361fb5b5b8972eb60006ec52a880d5c648c5445d3",
+        "setSwapFeePercentage(uint256)": "0xbb8ab20be352b28f09f6b1abf3450af47cf8b4868db746358803021a259957fa",
+        "setTargets(uint256,uint256)": "0xbc38932cdf27ed50930076ef487ffd87a4880484cb6411cc2841a0c968342f2f",
+        "unpause()": "0x90c589fc159019d7f13565320460b0b7cc3c5c699cbbc17dc34fca4c9a926e55"
+      }
+    }
+  },
+  "20221124-authorizer-adaptor-entrypoint": {
+    "AuthorizerAdaptorEntrypoint": {
+      "useAdaptor": false,
+      "actionIds": {
+        "performAction(address,bytes)": "0xc04f5846b82301fafb719d6ec3ed20e109163bfc25b65b683a0b0b6d309a369c"
+      }
+    }
   }
 }
diff --git a/pkg/deployments/action-ids/bsc/expected-collisions.json b/pkg/deployments/action-ids/bsc/expected-collisions.json
@@ -26,5 +26,19 @@
       "signature": "queryJoin(bytes32,address,address,(address[],uint256[],bytes,bool))",
       "useAdaptor": true
     }
+  ],
+  "0xc04f5846b82301fafb719d6ec3ed20e109163bfc25b65b683a0b0b6d309a369c": [
+    {
+      "taskId": "20220325-authorizer-adaptor",
+      "contractName": "AuthorizerAdaptor",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    },
+    {
+      "taskId": "20221124-authorizer-adaptor-entrypoint",
+      "contractName": "AuthorizerAdaptorEntrypoint",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    }
   ]
 }
diff --git a/pkg/deployments/action-ids/gnosis/action-ids.json b/pkg/deployments/action-ids/gnosis/action-ids.json
@@ -125,5 +125,13 @@
         "multicall(bytes[])": "0x7185383e43f020ab904662da44f16100098c51050788ead1d7709e241f4cace5"
       }
     }
+  },
+  "20221124-authorizer-adaptor-entrypoint": {
+    "AuthorizerAdaptorEntrypoint": {
+      "useAdaptor": false,
+      "actionIds": {
+        "performAction(address,bytes)": "0x6fef9a8dcafc0cebe8ac27f7da400eca76b1550c0c7b475c9a6ce1334f4cd1b3"
+      }
+    }
   }
 }
diff --git a/pkg/deployments/action-ids/gnosis/expected-collisions.json b/pkg/deployments/action-ids/gnosis/expected-collisions.json
@@ -26,5 +26,19 @@
       "signature": "queryJoin(bytes32,address,address,(address[],uint256[],bytes,bool))",
       "useAdaptor": true
     }
+  ],
+  "0x6fef9a8dcafc0cebe8ac27f7da400eca76b1550c0c7b475c9a6ce1334f4cd1b3": [
+    {
+      "taskId": "20220325-authorizer-adaptor",
+      "contractName": "AuthorizerAdaptor",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    },
+    {
+      "taskId": "20221124-authorizer-adaptor-entrypoint",
+      "contractName": "AuthorizerAdaptorEntrypoint",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    }
   ]
 }
diff --git a/pkg/deployments/action-ids/goerli/action-ids.json b/pkg/deployments/action-ids/goerli/action-ids.json
@@ -68,6 +68,17 @@
         "create(string,string,address[],uint256[],uint256,address,bool)": "0x74182feb84818a2d0e5ed316275ae31631bdec6ce38492398affc4c52dec36cf",
         "disable()": "0x73e484d8e6be4efe276f7962b312ac5e45277aa362fc0d67328aa643b5c8086b"
       }
+    },
+    "NoProtocolFeeLiquidityBootstrappingPool": {
+      "useAdaptor": false,
+      "factoryOutput": "0x90e492526C6885cb2D590eBafA07c3019d6A1A75",
+      "actionIds": {
+        "setAssetManagerPoolConfig(address,bytes)": "0xdb50cedbf0ddc4ef72d518659cb159bf10ef522022ddbd825468983b19d1437a",
+        "setPaused(bool)": "0x6bb77cd0f0aa0778bb18405dd81ba0dd36cfef9e0301ea97fcfa0d435f0c68e5",
+        "setSwapEnabled(bool)": "0x5d8292fc016fe02f403fc3a6897dc61b7b8aba97a3aeceac08d6950b8fc173b8",
+        "setSwapFeePercentage(uint256)": "0xef1485f9a4af8ef0d73feb5ce04b051a221042628d7b821cd55883e8accaa62e",
+        "updateWeightsGradually(uint256,uint256,uint256[])": "0xdeebad052cf52de2fc4a7776c135c36a8d8ada1d46a3bac6ff5722dea8c17f8d"
+      }
     }
   },
   "20211203-batch-relayer": {
@@ -590,6 +601,20 @@
         "create(string,string,address,address,uint256,uint256,address)": "0x527e5a8917fef9f19f55ea7d3f9dc98c00e4836cf918d2af144d2ef91076a53c",
         "disable()": "0x9f637c196de3124bc0febbb78f206994fdb68c3f8fe8070b42230a76e14ece0b"
       }
+    },
+    "AaveLinearPool": {
+      "useAdaptor": false,
+      "factoryOutput": "0x07c896050dd6e273c199f06d7516f8a4a369d23a",
+      "actionIds": {
+        "disableRecoveryMode()": "0x4b0cfb0e3afde1903ef88f0072b490a0d78f1027a165371b1b4732daa84a9559",
+        "enableRecoveryMode()": "0xd6f4df0a512a29fa4cf2fcfbe4a0b5ea1266a4bbb1ab6fb5761205dbb038441f",
+        "initialize()": "0x44366ad56a4f1e6acffb39c514200785009a251154f813acbfd16509a492cade",
+        "pause()": "0xf5a74fe74a42c6fe47ddc84feffff02db467d464946b66b317ef6ceeb66bda38",
+        "setAssetManagerPoolConfig(address,bytes)": "0x20165844cf9e6c2a6f49b8a283d786c5aaa1d89c711042e31d2928eb36d23824",
+        "setSwapFeePercentage(uint256)": "0x49832d9b75ad868dbf821cf6ee67ab240ff87c62516d7ce788883fdb8845b215",
+        "setTargets(uint256,uint256)": "0x7385bbbac73cd47b216da5217f45cf50ec5653dd6951e8272421d5aa8ff94df5",
+        "unpause()": "0xa4f38ba3cf0b1b3ea8bc7b3022ecc6976c184fbbe48d5bebcde37f1c03640b19"
+      }
     }
   },
   "20220906-composable-stable-pool": {
@@ -665,5 +690,45 @@
         "updateProtocolFeePercentageCache()": "0x5f506869a4e7d71cdd3300156e93255616486d8a28c659a096cac8055bdf1e6d"
       }
     }
+  },
+  "20221123-pool-recovery-helper": {
+    "PoolRecoveryHelper": {
+      "useAdaptor": false,
+      "actionIds": {
+        "addPoolFactory(address)": "0x1ef9ebf17e6cb20013888ccc67c7738c82a57e350ff8b2f45c4034a1c4fe7a82",
+        "enableRecoveryMode(address)": "0x94a599a04a3486414f2bc16589657fbd9e89bad629c52c12eac47282134f4d57",
+        "removePoolFactory(address)": "0xc0752596453bbce0bf94d874591e784b93cce5a01db369dcc137bbf8f497105b"
+      }
+    }
+  },
+  "20221115-aave-rebalanced-linear-pool": {
+    "AaveLinearPoolFactory": {
+      "useAdaptor": false,
+      "actionIds": {
+        "create(string,string,address,address,uint256,uint256,address)": "0xb0b54e4779ff9a37a30b4c8b342d2544a1b686d0bec33f0fa9867694ba3a57cd",
+        "disable()": "0xfe2cd5cd940ba4eb7434d46a67dd8c75a40a0cbd6601421d2d8b2d947b971ef3"
+      }
+    },
+    "AaveLinearPool": {
+      "useAdaptor": false,
+      "factoryOutput": "0x88D07558470484c03d3bb44c3ECc36CAfCF43253",
+      "actionIds": {
+        "disableRecoveryMode()": "0xd525025938a7a57846d1702e0fe6ad1abaeaa5fe5dcd1d90e47058c4983b7340",
+        "enableRecoveryMode()": "0xef27dca346aa51238760b94ff3180dee990313a7f12834aa759a17d597603a30",
+        "initialize()": "0xc0deae184afb6d30dd114541559768404f53574210d142305bb1df9c2d924870",
+        "pause()": "0x08a07a28943b9fd03d078571cc4b142bc18c8ec7e0556e4562620c6e49162b28",
+        "setSwapFeePercentage(uint256)": "0x9ece5ed53c8547cc53b3f118eb0f4eeda2744827f0b128b6007ac28c3ff5fc06",
+        "setTargets(uint256,uint256)": "0x913ac1c232c89aeaa0021e2344973cb498de977a10e2038e67cdc9e74674ef13",
+        "unpause()": "0x4b11bfc905756d063392a926d9089f9f44694030a746d780cb78ac07d19c4c46"
+      }
+    }
+  },
+  "20221124-authorizer-adaptor-entrypoint": {
+    "AuthorizerAdaptorEntrypoint": {
+      "useAdaptor": false,
+      "actionIds": {
+        "performAction(address,bytes)": "0x86de7f38b01b0cb905a3ac31f25891f3ba5a50f5074181ac37bfbd28a4e31f16"
+      }
+    }
   }
 }
diff --git a/pkg/deployments/action-ids/goerli/expected-collisions.json b/pkg/deployments/action-ids/goerli/expected-collisions.json
@@ -437,6 +437,20 @@
       "useAdaptor": true
     }
   ],
+  "0x86de7f38b01b0cb905a3ac31f25891f3ba5a50f5074181ac37bfbd28a4e31f16": [
+    {
+      "taskId": "20220325-authorizer-adaptor",
+      "contractName": "AuthorizerAdaptor",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    },
+    {
+      "taskId": "20221124-authorizer-adaptor-entrypoint",
+      "contractName": "AuthorizerAdaptorEntrypoint",
+      "signature": "performAction(address,bytes)",
+      "useAdaptor": false
+    }
+  ],
   "0x7f4b0536efcbd917495f0d8e7a96852c08739243c797e73f00d32999233f8d5d": [
     {
       "taskId": "20220325-gauge-controller",
@@ -1025,4 +1039,4 @@
       "useAdaptor": true
     }
   ]
-}
+}