@@ -11,7 +11,7 @@ You will modify this section as you go through the checklist
1111### Diamond addresses
1212
1313``` json
14- export TERMINUS_DIAMOND=""
14+ export TERMINUS_DIAMOND="0x99A558BDBdE247C2B2716f0D4cFb0E246DFB697D "
1515```
1616
1717### ` TerminusInitializer ` address
@@ -29,118 +29,124 @@ export TERMINUS_FACET_ADDRESS="0x63Cf75b3ffE339Ec30524F204a5FfB97813bF9fB"
2929
3030## Environment variables
3131
32- - [ ] ` export DAO_NETWORK=matic `
33- - [ ] ` export DAO_OWNER=<path to keystore file for owner account> `
34- - [ ] ` export DAO_OWNER_ADDRESS=$(jq -r .address $DAO_OWNER) `
35- - [ ] ` export MAX_FEE_PER_GAS="10000 gwei" `
36- - [ ] ` export CONFIRMATIONS=5 `
37- - [ ] ` export TERMINUS_ADDRESSES=.secrets/terminus-mainnet-diamond.json `
38- - [ ] ` export DIAMOND_CUT_FACET_ADDRESS=$(jq -r .DiamondCutFacet $TERMINUS_ADDRESSES) `
39- - [ ] ` export DIAMOND_LOUPE_FACET_ADDRESS=$(jq -r .DiamondLoupeFacet $TERMINUS_ADDRESSES) `
40- - [ ] ` export OWNERSHIP_FACET_ADDRESS=$(jq -r .OwnershipFacet $TERMINUS_ADDRESSES) `
41- - [ ] ` export TERMINUS_FACET_ADDRESS=0x9718FA06867D2939981151D193cF7ee2B924aec0 `
42- - [ ] ` export TERMINUS_INITIALIZER_ADDRESS=0x7BcBEE435544bD6F2B2c892040d5B7cD1B00fec7 `
43- - [ ] ` export WETH=0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619 `
44- - [ ] ` export TERMINUS_POOL_BASE_PRICE=10000000000000000 `
32+ - [x] ` export DAO_NETWORK=matic `
33+ - [x] ` export DAO_OWNER=<path to keystore file for owner account> `
34+ - [x] ` export DAO_OWNER_ADDRESS=$(jq -r .address $DAO_OWNER) `
35+ - [x] ` export MAX_FEE_PER_GAS="1000 gwei" `
36+ - [x] ` export MAX_PRIORITY_FEE_PER_GAS="35 gwei" `
37+ - [x] ` export CONFIRMATIONS=5 `
38+ - [x] ` export TERMINUS_ADDRESSES=.secrets/terminus-mainnet-diamond.json `
39+ - [x] ` export DIAMOND_CUT_FACET_ADDRESS=$(jq -r .DiamondCutFacet $TERMINUS_ADDRESSES) `
40+ - [x] ` export DIAMOND_LOUPE_FACET_ADDRESS=$(jq -r .DiamondLoupeFacet $TERMINUS_ADDRESSES) `
41+ - [x] ` export OWNERSHIP_FACET_ADDRESS=$(jq -r .OwnershipFacet $TERMINUS_ADDRESSES) `
42+ - [x] ` export TERMINUS_FACET_ADDRESS=0x9718FA06867D2939981151D193cF7ee2B924aec0 `
43+ - [x] ` export TERMINUS_INITIALIZER_ADDRESS=0x7BcBEE435544bD6F2B2c892040d5B7cD1B00fec7 `
44+ - [x] ` export WETH=0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619 `
45+ - [x] ` export TERMINUS_POOL_BASE_PRICE=10000000000000000 `
4546
4647## Deployment
4748
48- - [ ] Deploy diamond with all core facets
49+ - [x ] Deploy diamond
4950
5051``` bash
5152dao core diamond deploy \
5253 --network $DAO_NETWORK \
5354 --sender $DAO_OWNER \
5455 --max-fee-per-gas " $MAX_FEE_PER_GAS " \
56+ --max-priority-fee-per-gas " $MAX_PRIORITY_FEE_PER_GAS " \
5557 --confirmations $CONFIRMATIONS \
56- --owner $DAO_OWNER_ADDRESS \
5758 --contract-owner-arg $DAO_OWNER_ADDRESS \
58- --diamond-cut-facet-arg $DIAMOND_CUT_FACET
59+ --diamond-cut-facet-arg $DIAMOND_CUT_FACET_ADDRESS
5960```
6061
61- - [ ] Store JSON output under ` Deployed addresses / Diamond addresses ` above.
62+ - [x ] Store JSON output under ` Deployed addresses / Diamond addresses ` above.
6263
63- - [ ] Export diamond proxy address: ` export TERMINUS_DIAMOND="" `
64+ - [x ] Export diamond proxy address: ` export TERMINUS_DIAMOND="0x99A558BDBdE247C2B2716f0D4cFb0E246DFB697D " `
6465
65- - [ ] Attach ` DiamondLoupeFacet ` to diamond:
66+ - [x ] Attach ` DiamondLoupeFacet ` to diamond:
6667
6768``` bash
6869dao core facet-cut \
6970 --address $TERMINUS_DIAMOND \
7071 --network $DAO_NETWORK \
7172 --sender $DAO_OWNER \
7273 --max-fee-per-gas " $MAX_FEE_PER_GAS " \
74+ --max-priority-fee-per-gas " $MAX_PRIORITY_FEE_PER_GAS " \
7375 --confirmations $CONFIRMATIONS \
7476 --facet-name DiamondLoupeFacet \
7577 --facet-address $DIAMOND_LOUPE_FACET_ADDRESS \
7678 --action add
7779```
7880
79- - [ ] Attach ` OwnershipFacet ` to diamond:
81+ - [x ] Attach ` OwnershipFacet ` to diamond:
8082
8183``` bash
8284dao core facet-cut \
8385 --address $TERMINUS_DIAMOND \
8486 --network $DAO_NETWORK \
8587 --sender $DAO_OWNER \
8688 --max-fee-per-gas " $MAX_FEE_PER_GAS " \
89+ --max-priority-fee-per-gas " $MAX_PRIORITY_FEE_PER_GAS " \
8790 --confirmations $CONFIRMATIONS \
88- --facet-name DiamondLoupeFacet \
89- --facet-address $DIAMOND_LOUPE_FACET_ADDRESS \
91+ --facet-name OwnershipFacet \
92+ --facet-address $OWNERSHIP_FACET_ADDRESS \
9093 --action add
9194```
9295
93- - [ ] Attach ` TerminusFacet ` to diamond:
96+ - [x ] Attach ` TerminusFacet ` to diamond:
9497
9598``` bash
9699dao core facet-cut \
97100 --address $TERMINUS_DIAMOND \
98101 --network $DAO_NETWORK \
99102 --sender $DAO_OWNER \
100103 --max-fee-per-gas " $MAX_FEE_PER_GAS " \
104+ --max-priority-fee-per-gas " $MAX_PRIORITY_FEE_PER_GAS " \
101105 --confirmations $CONFIRMATIONS \
102106 --facet-name TerminusFacet \
103107 --facet-address $TERMINUS_FACET_ADDRESS \
104108 --action add \
105109 --initializer-address $TERMINUS_INITIALIZER_ADDRESS
106110```
107111
108- - [ ] Check the number of pools on the Terminus contract: ` dao terminus total-pools --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
112+ - [x ] Check the number of pools on the Terminus contract: ` dao terminus total-pools --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
109113
110- - [ ] Number of pools is ` 0 `
114+ - [x ] Number of pools is ` 0 `
111115
112- - [ ] Check the Terminus controller: ` dao terminus terminus-controller --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
116+ - [x ] Check the Terminus controller: ` dao terminus terminus-controller --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
113117
114- - [ ] Controller should be the same as ` $DAO_OWNER_ADDRESS `
118+ - [x ] Controller should be the same as ` $DAO_OWNER_ADDRESS `
115119
116- - [ ] Set pool base price:
120+ - [x ] Set pool base price:
117121
118122``` bash
119123dao terminus set-pool-base-price \
120124 --network $DAO_NETWORK \
121125 --address $TERMINUS_DIAMOND \
122126 --sender $DAO_OWNER \
123127 --max-fee-per-gas " $MAX_FEE_PER_GAS " \
128+ --max-priority-fee-per-gas " $MAX_PRIORITY_FEE_PER_GAS " \
124129 --confirmations $CONFIRMATIONS \
125130 --new-base-price $TERMINUS_POOL_BASE_PRICE
126131```
127132
128- - [ ] Check pool base price: ` dao terminus pool-base-price --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
133+ - [x ] Check pool base price: ` dao terminus pool-base-price --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
129134
130- - [ ] Pool base price should be same as ` $TERMINUS_POOL_BASE_PRICE `
135+ - [x ] Pool base price should be same as ` $TERMINUS_POOL_BASE_PRICE `
131136
132- - [ ] Set up payment token:
137+ - [x ] Set up payment token:
133138
134139``` bash
135140dao terminus set-payment-token \
136141 --network $DAO_NETWORK \
137142 --address $TERMINUS_DIAMOND \
138143 --sender $DAO_OWNER \
139144 --max-fee-per-gas " $MAX_FEE_PER_GAS " \
145+ --max-priority-fee-per-gas " $MAX_PRIORITY_FEE_PER_GAS " \
140146 --confirmations $CONFIRMATIONS \
141147 --new-payment-token $WETH
142148```
143149
144- - [ ] Check payment token: ` dao terminus payment-token --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
150+ - [x ] Check payment token: ` dao terminus payment-token --network $DAO_NETWORK --address $TERMINUS_DIAMOND `
145151
146- - [ ] Payment token should be same as ` $WETH `
152+ - [x ] Payment token should be same as ` $WETH `
0 commit comments