Update deployment information

Author: bbenligiray

packages/dao/README.md

@@ -48,9 +48,22 @@ and run
 npm run deploy:rinkeby
 ```
 
-## Verifying the DAO deployment
+## Verifying the Mainnet deployment
 
-**This needs to be repeated with the final mainnet deployment.**
+```json
+{
+  "api3Token": "0x0b38210ea11411557c13457D4dA7dC6ea731B88a",
+  "timelockManager": "0xFaef86994a37F1c8b2A5c73648F07dd4eFF02baA",
+  "api3Pool": "0x6dd655f10d4b9e242ae186d9050b68f725c76d76",
+  "convenience": "0x95087266018b9637aff3d76d4e0cad7e52c19636",
+  "dao": "0x593ea926ee9820a933488b6a288433c387d06dba",
+  "acl": "0x1e7ecc6d3b5b4cfdfc71cb7c3ea9ac4a55f4195a",
+  "votingAppPrimary": "0xdb6c812e439ce5c740570578681ea7aadba5170b",
+  "votingAppSecondary": "0x1c8058e72e4902b3431ef057e8d9a58a73f26372",
+  "agentAppPrimary": "0xd9f80bdb37e6bad114d747e60ce6d2aaf26704ae",
+  "agentAppSecondary": "0x556ecbb0311d350491ba0ec7e019c354d7723ce0"
+}
+```
 
 1. Install aragonCLI globally (specifying the package version because latest seems to be broken for some machines):
 ```sh
@@ -62,10 +75,12 @@ Run it and make sure that it is connected to the correct chain.
 
 3. Inspect the DAO with the following
 ```sh
-aragon dao apps <DAO kernel address> --use-frame
+aragon dao apps 0x593ea926ee9820a933488b6a288433c387d06dba --use-frame
+```
+Review that the displayed information is correct.
+```sh
+aragon dao apps 0x9B64177757a0BD2A042446C8d910526476B7Bf57 --use-frame
 ```
-For example, you can use `0x825cc178f0510de72c8d3af4be69917935b3d269` on Rinkeby (**note that this may not be identical to the final version**).
-Review the displayed information is correct.
 
 4. In (3), you should have seen Api3Voting apps with the ID `0x323c4eb511f386e7972d45b948cc546db35e9ccc7161c056fb07e09abd87e554`.
 This is derived as `namehash("api3voting.open.aragonpm.eth")`.
@@ -80,13 +95,18 @@ Then check the source code at this implementation address using Etherscan and ve
 
 6. Verify that the ACL (Access Control List) is configured correctly
 ```sh
-aragon dao acl <DAO kernel address> --use-frame
+aragon dao acl 0x593ea926ee9820a933488b6a288433c387d06dba --use-frame
+```
+
+You can compare with API3DAOv1
+```sh
+aragon dao acl 0x9B64177757a0BD2A042446C8d910526476B7Bf57 --use-frame
 ```
 
 7. Check that the following values are initialized correctly
 - `api3Pool` and the voting parameters (`supportRequiredPct` and `minAcceptQuorumPct`) at the Api3Voting apps
 - `api3Token`, `timelockManager`, `agentAppPrimary`, `agentAppSecondary`, `votingAppPrimary` and `votingAppSecondary` at the pool contract
-- If any claims manager contracts are set for the pool, they are audited and implemented to pay out claims in a trustless way with fail-safes such as payout limits (note that the pool will be deployed with no claims managers set initially)
+- If any claims manager contracts are set for the pool, they are audited and implemented to pay out claims in a trustless way with fail-safes such as payout limits (note that the pool will be deployed with no claims managers set initially and the DAO does not allow proposals in the first epoch to set a claims manager)
 
 ## Permissions
 

packages/dao/arapp.json

@@ -6,13 +6,13 @@
       "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1"
     },
     "mainnet": {
-      "appName": "api3template.aragonpm.eth",
+      "appName": "api3-dao-template.open.aragonpm.eth",
       "network": "mainnet",
       "registry": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
       "wsRPC": "wss://mainnet.eth.aragon.network/ws"
     },
     "rinkeby": {
-      "appName": "api3-template-rqjrt5.open.aragonpm.eth",
+      "appName": "api3-template-ijyy8.open.aragonpm.eth",
       "network": "rinkeby",
       "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
       "wsRPC": "wss://rinkeby.eth.aragon.network/ws"

packages/dao/scripts/deploy.js

@@ -17,7 +17,7 @@ const minAcceptQuorumPct1 = 50e16;
 const supportRequiredPct2 = 50e16;
 const minAcceptQuorumPct2 = 15e16;
 
-const gasPrice = "55" + "000" + "000" + "000";
+const gasPrice = "35" + "000" + "000" + "000";
 
 /**
  * Returns the address of the deployer
@@ -50,8 +50,7 @@ module.exports = async (callback) => {
     let api3Token, api3Pool;
     let api3TokenAddress, timelockManagerAddress;
     if (network === "mainnet") {
-      // TODO: replace below with 0x0b38210ea11411557c13457D4dA7dC6ea731B88a
-      api3TokenAddress = "0x0000000000000000000000000000000000000001";
+      api3TokenAddress = "0x0b38210ea11411557c13457D4dA7dC6ea731B88a";
       timelockManagerAddress = "0xFaef86994a37F1c8b2A5c73648F07dd4eFF02baA";
       api3Pool = await Api3Pool.new(api3TokenAddress, timelockManagerAddress, {
         gasPrice: gasPrice,
@@ -101,8 +100,7 @@ module.exports = async (callback) => {
 
     let templateId;
     if (network === "mainnet") {
-      // TODO: replace below with the final name
-      templateId = "api3-template-test.open";
+      templateId = "api3-dao-template.open";
     } else if (network === "rinkeby" || network === "ropsten") {
       templateId = `api3-template-${Math.random()
         .toString(36)
@@ -129,8 +127,7 @@ module.exports = async (callback) => {
 
     let daoId;
     if (network === "mainnet") {
-      // TODO: replace below with the final name
-      daoId = "api3-test";
+      daoId = "api3dao";
     } else {
       daoId = `api3-${Math.random().toString(36).substring(7)}`;
     }