AP-724 mainnet readiness #345

stevieraykatz · 2023-08-24T22:21:50Z

Closes: https://linear.app/angel-protocol/issue/AP-698/core-contracts-deployed-to-polygon-mainnet

Explanation of the solution

At some point we started deploying contracts with proxyAdmin signer instead of deployer. This PR changes the deployer back to deployer signer.

In prod, we don't want the proxyAdmin to be an EOA wallet but instead to be a multisig. If we use a multisig that is a proxy for this proxyAdmin ms, then it needs a proxy admin and we get into a weird "who watches the watcher" situation. The solution I've employed is to deploy an immutable proxyAdmin multisig which largely resembles the GenericMultisig we use extensively in our protocol sans the upgrade path. In the rare event that we need to update the implementation of our ProxyAdmin wallet, we can deploy a new immutable multisig and then transfer proxy admin from the old admin ms to the new one.

In a lot of cases, our deployment scripts did an implicit lookup for the old proxyAdmin signer and then passed the signer's address into the proxy admin arg for proxy initialization. I've added an argument to these scripts so that the admin address must be specified explicitly.

Instructions on making this work

run yarn or yarn install to install npm dependencies

linear · 2023-08-24T22:21:52Z

AP-698 Core contracts deployed to Polygon (mainnet)

Multisig configs

AP Team Multisig
- owners:
  - 0xF71eba1cf57997B6C52eA33D7939A330D6D85502
  - 0x165d1f1361490974ea2F2A4079b5828E81F13b11
  - 0x3b8172A70229AE7a540Ce164d640C7C9e072876b
  - 0x13C9060a611e4277a93ca259068256271fC2d7B4
- _approvalsRequired: 2
- _requireExecution: false
- _transactionExpiry: 604800 (secs in 1 week)
Charity Applications Multisig
- owners:
  - 0xF71eba1cf57997B6C52eA33D7939A330D6D85502
  - 0x165d1f1361490974ea2F2A4079b5828E81F13b11
  - 0x13C9060a611e4277a93ca259068256271fC2d7B4
- _approvalsRequired: 1
- _requireExecution: false
- _transactionExpiry: 345600 (secs in 4 days)
- _gasAmount: 0.18 MATIC (actual input would be 0.18 * 10^18 ??)
- _seedSplitToLiquid: 0
- _seedAsset: address(0)
- _seedAmount: 0

Protocol-Level Fees (in bps):

Balance: 0
BalanceCharity: 0
Deposit: 150 (ie. 1.5%)
DepositCharity: 150 (ie. 1.5%)
Withdraw: 0
WithdrawCharity: 0
EarlyLockedWithdraw: 0
EarlyLockedWithdrawCharity: 1000 (ie. 10%)

contracts/multisigs/scripts/deployProxyAdmin.ts

tasks/deploy/deployAngelProtocol.ts

…mit upgrade txs to proxyAdminMultisig

tasks/deploy/deployAngelProtocol.ts

utils/manageAddressFile/types.ts

.env.template

contracts/multisigs/scripts/deployAPTeamMultiSig.ts

utils/env.config.ts

tasks/deploy/deploySideChain.ts

tasks/manage/gasFwdFactory/updateRegistrar.ts

tasks/manage/verifyRegistrar.ts

tasks/upgrade/endowmentMultiSig/upgradeEmitter.ts

contracts/multisigs/ProxyAdmin.sol

…ions optional signers

linear · 2023-08-26T01:03:52Z

AP-724 Infrastructure changes to support mainnet deployment

#345

linear · 2023-08-26T01:20:41Z

AP-698 Core contracts deployed to Polygon (mainnet)

Registrar configs

Treasury: 0x4C6cDdFC00064D73E64B34aE453884de1Bf6D639

Multisig configs

AP Team Multisig
- owners:
  - 0xF71eba1cf57997B6C52eA33D7939A330D6D85502
  - 0x165d1f1361490974ea2F2A4079b5828E81F13b11
  - 0x3b8172A70229AE7a540Ce164d640C7C9e072876b
  - 0x13C9060a611e4277a93ca259068256271fC2d7B4
- approvalsRequired: 2
- requireExecution: false
- transactionExpiry: 604800 (secs in 1 week)
Charity Applications Multisig
- owners:
  - 0xF71eba1cf57997B6C52eA33D7939A330D6D85502
  - 0x165d1f1361490974ea2F2A4079b5828E81F13b11
  - 0x13C9060a611e4277a93ca259068256271fC2d7B4
- approvalsRequired: 1
- requireExecution: false
- transactionExpiry: 345600 (secs in 4 days)
- gasAmount: 0.18 MATIC (actual input would be 0.18 * 10^18 ??)
- seedSplitToLiquid: 0
- seedAsset: address(0)
- seedAmount: 0

Protocol-Level Fees (in bps):

Balance: 0
BalanceCharity: 0
Deposit: 150 (ie. 1.5%)
DepositCharity: 150 (ie. 1.5%)
Withdraw: 0
WithdrawCharity: 0
EarlyLockedWithdraw: 0
EarlyLockedWithdrawCharity: 1000 (ie. 10%)

…achieved

…oxy__factory

…er creation

… public

config/index.ts

.env.template

* FYEO-ANGL-ID-29: MISSING ZERO ADDRESS CHECKS * validator used in core contracts * add more checks w/ Validator; Fix validator imports; --------- Co-authored-by: Andrey <SovereignAndrey>

stevieraykatz added 3 commits August 24, 2023 00:12

Change config to match new username/project

3e9628c

Merge branch 'master' into AP-698-mainnet-readiness

013ff54

Added ProxyAdmin multisig singleton, changed deployer back to Signer

aa7229f

stevieraykatz added the WIP label Aug 24, 2023

stevieraykatz changed the title ~~AP-698 mainnet readiness~~ [WIP] AP-698 mainnet readiness Aug 24, 2023

stevieraykatz commented Aug 24, 2023

View reviewed changes

contracts/multisigs/scripts/deployProxyAdmin.ts Outdated Show resolved Hide resolved

stevieraykatz commented Aug 24, 2023

View reviewed changes

tasks/deploy/deployAngelProtocol.ts Outdated Show resolved Hide resolved

SovereignAndrey reviewed Aug 24, 2023

View reviewed changes

tasks/deploy/deployAngelProtocol.ts Outdated Show resolved Hide resolved

stevieraykatz added 5 commits August 25, 2023 00:49

Added proxyAdminSigner to env deps on prod/dev, upgrade tasks now sub…

82045e9

…mit upgrade txs to proxyAdminMultisig

Fixes according to tsc output

866efdb

Lint

76068f8

fix remaining issues with tests, typo in env.config

27da7bc

Resolved open conversation with env switching proxyAdminSigner

be57a5e

0xNeshi suggested changes Aug 25, 2023

View reviewed changes

stevieraykatz self-assigned this Aug 25, 2023

stevieraykatz added 7 commits August 25, 2023 21:53

Add pkey helper method, rename contract to ProxyAdminMultisig

f0525c8

Remove _PROD proxyAdmin signer

8f052ac

Move proxyAdmin address into multiSig struct, Address PR comments

fdeb56b

Address tsc complains from refactor

5bf0265

Add type safety to env.config, remove unused env vars

7292129

explicitly call deploy scripts with a deployer Signer

a62a900

Added config fields for prod, made apTeamMultisig and charityApplicat…

eb4891f

…ions optional signers

SovereignAndrey changed the title ~~[WIP] AP-698 mainnet readiness~~ [WIP] AP-724 mainnet readiness Aug 26, 2023

stevieraykatz added 3 commits August 26, 2023 01:13

Added multisig signer args to tasks

260fb6e

lint

6787b53

Fix useless ternary

7edd0f2

stevieraykatz changed the title ~~[WIP] AP-724 mainnet readiness~~ AP-724 mainnet readiness Aug 26, 2023

0xNeshi and others added 23 commits August 28, 2023 15:46

Deploy ProxyAdminMultiSig by default

12a2007

Remove proxyAdminMultiSig from saved addresses

ed27f3a

Increase transaction expiry time for ProxyAdminMultiSig

e86f91c

Fix modifier error messages in MultiSig(s)

a3d2e6f

Fix Accounts diamond owner to be set to APTeamMultiSig

ab50784

Add yes flag to deploy:GasFwd

38c36ae

Better logs

accfcda

Use apTeam2 wallet in createEndowment

06c9bed

Use isConfirmed in MultiSigGeneric where possible

ecf3f5d

Fix CharityApplications executeProposal only if enough confirmations …

d602260

…achieved

Update createEndowment to work with prod and dev

f817d08

Minor fixes in manage:accounts:updateConfig

271b336

Fix upgrade:endowmentMultiSig:emitter - use ITransparentUpgradeablePr…

d5ac4af

…oxy__factory

Transfer EndowmentMultiSigFactory ownership to ProxyAdminMultiSig aft…

7f83928

…er creation

Make proxyAdmin and implementationAddress in EndowmentMultiSigFactory…

e4e845d

… public

add missing env vars to template

a9336ce

remove override

dee1195

Set EndowmentMultiSigFactory owner to APTeamMultiSig proxy

b11945f

Update deployGasFwd.Data.admin -> proxyAdmin

2e2b3fb

Remove address validation in OwnershipFacet.owner

f34acd4

Fix manage:changeAdmin

b118ed7

Add missing address validation to OwnershipFacet.transferOwnership

a84d96d

Remove NETWORK and VERIFY_CONTRACTS from .env

23ea91f

0xNeshi suggested changes Aug 29, 2023

View reviewed changes

config/index.ts Show resolved Hide resolved

config/index.ts Show resolved Hide resolved

0xNeshi reviewed Aug 30, 2023

View reviewed changes

.env.template Show resolved Hide resolved

SovereignAndrey and others added 3 commits August 30, 2023 14:59

FYEO-ANGL-ID-29: Fix last of missing Zero Address checks (#348)

0c755f0

* FYEO-ANGL-ID-29: MISSING ZERO ADDRESS CHECKS * validator used in core contracts * add more checks w/ Validator; Fix validator imports; --------- Co-authored-by: Andrey <SovereignAndrey>

Pass owners array to deployProxyAdminMultiSig

1983b9b

Pass ProxyAdminMultiSig owners in deploy scripts

39e3e21

0xNeshi merged commit 283a226 into master Aug 30, 2023

0xNeshi deleted the AP-698-mainnet-readiness branch August 30, 2023 07:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AP-724 mainnet readiness #345

AP-724 mainnet readiness #345

stevieraykatz commented Aug 24, 2023 •

edited

Loading

linear bot commented Aug 24, 2023

Multisig configs

Protocol-Level Fees (in bps):

linear bot commented Aug 26, 2023

linear bot commented Aug 26, 2023

Registrar configs

Multisig configs

Protocol-Level Fees (in bps):

AP-724 mainnet readiness #345

AP-724 mainnet readiness #345

Conversation

stevieraykatz commented Aug 24, 2023 • edited Loading

Explanation of the solution

Instructions on making this work

linear bot commented Aug 24, 2023

Multisig configs

Protocol-Level Fees (in bps):

linear bot commented Aug 26, 2023

linear bot commented Aug 26, 2023

Registrar configs

Multisig configs

Protocol-Level Fees (in bps):

stevieraykatz commented Aug 24, 2023 •

edited

Loading