diff --git a/action-ids/plasma/action-ids.json b/action-ids/plasma/action-ids.json index 6553af699..d521f403e 100644 --- a/action-ids/plasma/action-ids.json +++ b/action-ids/plasma/action-ids.json @@ -309,5 +309,67 @@ "sweepProtocolFeesForWrappedToken(address,address,uint256,uint256,address)": "0xe3c9b8d04d7f290f4bab02d1623198fe8061c2a92d4452580dc1d9875bbbd8d0" } } + }, + "20251020-vault-v2.1": { + "Vault": { + "useAdaptor": false, + "actionIds": { + "batchSwap(uint8,(bytes32,uint256,uint256,uint256,bytes)[],address[],(address,bool,address,bool),int256[],uint256)": "0x1282ab709b2b70070f829c46bc36f76b32ad4989fecb2fcb09a1b3ce00bbfc30", + "deregisterTokens(bytes32,address[])": "0xe4f8ff74aa05a4d54a06e035d5e86947bc6474f8d7b166ebeb49fc9178d28551", + "exitPool(bytes32,address,address,(address[],uint256[],bytes,bool))": "0xc149e88b59429ded7f601ab52ecd62331cac006ae07c16543439ed138dcb8d34", + "flashLoan(address,address[],uint256[],bytes)": "0x96ebe854ca6ab6242ad127dcd7809576513b0c64571e515cedd7b8885612c82d", + "joinPool(bytes32,address,address,(address[],uint256[],bytes,bool))": "0x78ad1b68d148c070372f8643c4648efbb63c6a8a338f3c24714868e791367653", + "managePoolBalance((uint8,bytes32,address,uint256)[])": "0x7275fb98594b03dc36a7de69051058e9e2d05cabeb4fe7d9c87bc69f94d9d084", + "manageUserBalance((uint8,address,uint256,address,address)[])": "0xeba777d811cd36c06d540d7ff2ed18ed042fd67bbf7c9afcf88c818c7ee6b498", + "queryBatchSwap(uint8,(bytes32,uint256,uint256,uint256,bytes)[],address[],(address,bool,address,bool))": "0xf5f701b3adfba2adad8f16a8be5a989593e42a2caa84c5c6e60b22143db65a2f", + "registerPool(uint8)": "0x956dfce4343a6be4df20714d3dc413ef59e73fa9995d3d247e7c8d12efd33ac2", + "registerTokens(bytes32,address[],address[])": "0xad5bd4a1cc4243b4d772a8a55d24792c1f57cc45eb97ed1291b82d96125a7626", + "setAuthorizer(address)": "0x1cbb503dcc0f4acaedf71a098211ff8b15a220fc26a6974a8d9deaab040fa6e0", + "setPaused(bool)": "0xb5593fe09464f360ecf835d5b9319ce69900ae1b29d13844b73c250b1f5f92fb", + "setRelayerApproval(address,address,bool)": "0x0014a06d322ff07fcc02b12f93eb77bb76e28cdee4fc0670b9dec98d24bbfec8", + "swap((bytes32,uint8,address,address,uint256,bytes),(address,bool,address,bool),uint256,uint256)": "0x7b8a1d293670124924a0f532213753b89db10bde737249d4540e9a03657d1aff" + } + }, + "ProtocolFeesCollector": { + "useAdaptor": false, + "actionIds": { + "setFlashLoanFeePercentage(uint256)": "0xbe2a180d5cc5d803a8eec4cea569989fc1c593d7eeadd1f262f360a68b0e842e", + "setSwapFeePercentage(uint256)": "0xb28b769768735d011b267f781c3be90bce51d5059ba015bc7a28b3e882fb2083", + "withdrawCollectedFees(address[],uint256[],address)": "0xb2b6e48fa160a7c887d9d7a68b6a9bb9d47d4953d33e07f3a39e175d75e97796" + } + }, + "BalancerQueries": { + "useAdaptor": true, + "actionIds": {} + } + }, + "20210418-vault": { + "Vault": { + "useAdaptor": false, + "actionIds": { + "batchSwap(uint8,(bytes32,uint256,uint256,uint256,bytes)[],address[],(address,bool,address,bool),int256[],uint256)": "0x1282ab709b2b70070f829c46bc36f76b32ad4989fecb2fcb09a1b3ce00bbfc30", + "deregisterTokens(bytes32,address[])": "0xe4f8ff74aa05a4d54a06e035d5e86947bc6474f8d7b166ebeb49fc9178d28551", + "exitPool(bytes32,address,address,(address[],uint256[],bytes,bool))": "0xc149e88b59429ded7f601ab52ecd62331cac006ae07c16543439ed138dcb8d34", + "flashLoan(address,address[],uint256[],bytes)": "0x96ebe854ca6ab6242ad127dcd7809576513b0c64571e515cedd7b8885612c82d", + "joinPool(bytes32,address,address,(address[],uint256[],bytes,bool))": "0x78ad1b68d148c070372f8643c4648efbb63c6a8a338f3c24714868e791367653", + "managePoolBalance((uint8,bytes32,address,uint256)[])": "0x7275fb98594b03dc36a7de69051058e9e2d05cabeb4fe7d9c87bc69f94d9d084", + "manageUserBalance((uint8,address,uint256,address,address)[])": "0xeba777d811cd36c06d540d7ff2ed18ed042fd67bbf7c9afcf88c818c7ee6b498", + "queryBatchSwap(uint8,(bytes32,uint256,uint256,uint256,bytes)[],address[],(address,bool,address,bool))": "0xf5f701b3adfba2adad8f16a8be5a989593e42a2caa84c5c6e60b22143db65a2f", + "registerPool(uint8)": "0x956dfce4343a6be4df20714d3dc413ef59e73fa9995d3d247e7c8d12efd33ac2", + "registerTokens(bytes32,address[],address[])": "0xad5bd4a1cc4243b4d772a8a55d24792c1f57cc45eb97ed1291b82d96125a7626", + "setAuthorizer(address)": "0x1cbb503dcc0f4acaedf71a098211ff8b15a220fc26a6974a8d9deaab040fa6e0", + "setPaused(bool)": "0xb5593fe09464f360ecf835d5b9319ce69900ae1b29d13844b73c250b1f5f92fb", + "setRelayerApproval(address,address,bool)": "0x0014a06d322ff07fcc02b12f93eb77bb76e28cdee4fc0670b9dec98d24bbfec8", + "swap((bytes32,uint8,address,address,uint256,bytes),(address,bool,address,bool),uint256,uint256)": "0x7b8a1d293670124924a0f532213753b89db10bde737249d4540e9a03657d1aff" + } + }, + "ProtocolFeesCollector": { + "useAdaptor": false, + "actionIds": { + "setFlashLoanFeePercentage(uint256)": "0xbe2a180d5cc5d803a8eec4cea569989fc1c593d7eeadd1f262f360a68b0e842e", + "setSwapFeePercentage(uint256)": "0xb28b769768735d011b267f781c3be90bce51d5059ba015bc7a28b3e882fb2083", + "withdrawCollectedFees(address[],uint256[],address)": "0xb2b6e48fa160a7c887d9d7a68b6a9bb9d47d4953d33e07f3a39e175d75e97796" + } + } } } \ No newline at end of file diff --git a/addresses/plasma.json b/addresses/plasma.json index 279f7c084..7407d6b10 100644 --- a/addresses/plasma.json +++ b/addresses/plasma.json @@ -9,6 +9,24 @@ "status": "ACTIVE", "version": "v2" }, + "20210418-vault": { + "contracts": [ + { + "name": "Vault", + "address": "0xBA12222222228d8Ba445958a75a0704d566BF2C8" + }, + { + "name": "ProtocolFeesCollector", + "address": "0xce88686553686DA562CE7Cea497CE749DA109f9F" + }, + { + "name": "BalancerQueries", + "address": "0xa3b370092aeb56770B23315252aB5E16DAcBF62B" + } + ], + "status": "ACTIVE", + "version": "v2" + }, "20220325-test-balancer-token": { "contracts": [ { @@ -19,6 +37,24 @@ "status": "ACTIVE", "version": "v2" }, + "20251020-vault-v2.1": { + "contracts": [ + { + "name": "Vault", + "address": "0xBA12222222228d8Ba445958a75a0704d566BF2C8" + }, + { + "name": "ProtocolFeesCollector", + "address": "0xce88686553686DA562CE7Cea497CE749DA109f9F" + }, + { + "name": "BalancerQueries", + "address": "0xa3b370092aeb56770B23315252aB5E16DAcBF62B" + } + ], + "status": "ACTIVE", + "version": "v2" + }, "20241204-v3-vault": { "contracts": [ { diff --git a/deployment-txs/plasma.json b/deployment-txs/plasma.json index c89a9840f..47192ad14 100644 --- a/deployment-txs/plasma.json +++ b/deployment-txs/plasma.json @@ -42,5 +42,7 @@ "0x1311Fbc9F60359639174c1e7cC2032DbDb5Cc4d1": "0xf526066ec2d16a715987644f7d60503028e1f355fe687c9ff58f63c94d42ecd5", "0x0f08eEf2C785AA5e7539684aF04755dEC1347b7c": "0xdc3051abec6cb94e7164f2cfd5a73bceabe58b91f24ab269a6f05f1139f20c79", "0xc49a3d36aD36c69216b4B534b3cCf34039143f87": "0xa10a9bbce07d73a2227219903a267c18c06de1636c13c60d5eb8b81e0584fa22", - "0xc9b36096f5201ea332Db35d6D195774ea0D5988f": "0xf3487754485d10440d3c83b63253a020d16562608aabba81ea8292f424efab72" + "0xc9b36096f5201ea332Db35d6D195774ea0D5988f": "0xf3487754485d10440d3c83b63253a020d16562608aabba81ea8292f424efab72", + "0xBA12222222228d8Ba445958a75a0704d566BF2C8": "0xbf9b18f21075ec8b96e7e5179ad278f6bb40788b3f3cb1a738cef62aa1c6f79f", + "0xa3b370092aeb56770B23315252aB5E16DAcBF62B": "0xc53b999c4e0010b018d07a76db12e1f3454c10e28994d8a17ccd90ef5fd6006b" } \ No newline at end of file diff --git a/v2/tasks/20210418-vault/index.ts b/v2/tasks/20210418-vault/index.ts index 7180a2083..a53ab9879 100644 --- a/v2/tasks/20210418-vault/index.ts +++ b/v2/tasks/20210418-vault/index.ts @@ -1,7 +1,14 @@ import { VaultDeployment } from './input'; -import { Task, TaskRunOptions } from '@src'; +import { Task, TaskMode, TaskRunOptions } from '@src'; + +const skipCheckNetworkList = ['plasma']; export default async (task: Task, { force, from }: TaskRunOptions = {}): Promise => { + if (task.mode === TaskMode.CHECK && skipCheckNetworkList.includes(task.network)) { + // Vault was deployed in another task; skip check. + return; + } + const input = task.input() as VaultDeployment; const vaultArgs = [input.Authorizer, input.WETH, input.pauseWindowDuration, input.bufferPeriodDuration]; const vault = await task.deployAndVerify('Vault', vaultArgs, from, force); diff --git a/v2/tasks/20210418-vault/output/plasma.json b/v2/tasks/20210418-vault/output/plasma.json new file mode 100644 index 000000000..eafb9952b --- /dev/null +++ b/v2/tasks/20210418-vault/output/plasma.json @@ -0,0 +1,5 @@ +{ + "Vault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8", + "ProtocolFeesCollector": "0xce88686553686DA562CE7Cea497CE749DA109f9F", + "BalancerQueries": "0xa3b370092aeb56770B23315252aB5E16DAcBF62B" +} \ No newline at end of file diff --git a/v2/tasks/20210418-vault/readme.md b/v2/tasks/20210418-vault/readme.md index 0bdcc8df5..9e86ed0e7 100644 --- a/v2/tasks/20210418-vault/readme.md +++ b/v2/tasks/20210418-vault/readme.md @@ -19,6 +19,7 @@ Aditionally, the `WETH` argument may represent different things in different net - [Base mainnet addresses](./output/base.json) - [Fraxtal mainnet addresses](./output/fraxtal.json) - [Mode mainnet addresses](./output/mode.json) +- [Plasma mainnet addresses](./output/plasma.json) - [Sepolia testnet addresses](./output/sepolia.json) - [`Vault` artifact](./artifact/Vault.json) - [`BalancerHelpers` artifact](./artifact/BalancerHelpers.json) diff --git a/v2/tasks/20251020-vault-v2.1/output/plasma.json b/v2/tasks/20251020-vault-v2.1/output/plasma.json new file mode 100644 index 000000000..eafb9952b --- /dev/null +++ b/v2/tasks/20251020-vault-v2.1/output/plasma.json @@ -0,0 +1,5 @@ +{ + "Vault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8", + "ProtocolFeesCollector": "0xce88686553686DA562CE7Cea497CE749DA109f9F", + "BalancerQueries": "0xa3b370092aeb56770B23315252aB5E16DAcBF62B" +} \ No newline at end of file diff --git a/v2/tasks/20251020-vault-v2.1/readme.md b/v2/tasks/20251020-vault-v2.1/readme.md index 3b3acfc91..269b97d01 100644 --- a/v2/tasks/20251020-vault-v2.1/readme.md +++ b/v2/tasks/20251020-vault-v2.1/readme.md @@ -12,5 +12,6 @@ It also extends the pause window to match V3. ## Useful Files - [Code](https://github.com/balancer/balancer-v2-monorepo/commit/febdff69169d2927e662cc92a713b5c528b0fa9b). +- [Plasma mainnet addresses](./output/plasma.json) - [`Vault` artifact](./artifact/Vault.json) - [`BalancerQueries` artifact](./artifact/BalancerQueries.json)