Chore: Upgrades for PoR and SigFix (#125)

* deploy new DLCManager on Base * chore: execute base upgrade * feat: safe proposal for proxyadmin transfer
DLC-link · Nov 18, 2024 · a52f5e5 · a52f5e5
1 parent 00c43c7
commit a52f5e5
Show file tree

Hide file tree

Showing 10 changed files with 1,809 additions and 39 deletions.
diff --git a/.openzeppelin/base-sepolia.json b/.openzeppelin/base-sepolia.json
diff --git a/.openzeppelin/base.json b/.openzeppelin/base.json
diff --git a/.openzeppelin/sepolia.json b/.openzeppelin/sepolia.json
diff --git a/deploymentFiles/base/DLCManager.2024-11-11T19:01:36.661Z.json b/deploymentFiles/base/DLCManager.2024-11-11T19:01:36.661Z.json
@@ -0,0 +1,141 @@
+{
+  "network": "base",
+  "updatedAt": "2024-11-01T10:22:01.026Z",
+  "gitSHA": "8204612",
+  "contract": {
+    "name": "DLCManager",
+    "address": "0xE0d2c0979583Db7fD7E8779ADd83cA7Eb6BC7BD7",
+    "signerAddress": "0x9506Ea24038609679732855F757041a3C1C06623",
+    "abi": [
+      "constructor()",
+      "error ClosingFundedVault()",
+      "error ContractNotWhitelisted()",
+      "error DLCNotFound()",
+      "error DLCNotFunded()",
+      "error DLCNotPending()",
+      "error DLCNotReadyOrFunded()",
+      "error DepositTooLarge(uint256 deposit, uint256 maximumDeposit)",
+      "error DepositTooSmall(uint256 deposit, uint256 minimumDeposit)",
+      "error DuplicateSignature()",
+      "error DuplicateSigner(address signer)",
+      "error FeeRateOutOfBounds(uint256 feeRate)",
+      "error IncompatibleRoles()",
+      "error InsufficientMintedBalance(uint256 minted, uint256 amount)",
+      "error InsufficientTokenBalance(uint256 balance, uint256 amount)",
+      "error InvalidRange()",
+      "error InvalidSigner()",
+      "error NoSignerRenouncement()",
+      "error NotCreatorContract()",
+      "error NotDLCAdmin()",
+      "error NotEnoughReserves(uint256 reserves, uint256 amount)",
+      "error NotEnoughSignatures()",
+      "error NotOwner()",
+      "error NotWhitelisted()",
+      "error SignerNotApproved(address signer)",
+      "error ThresholdMinimumReached(uint16 _minimumThreshold)",
+      "error ThresholdTooLow(uint16 _minimumThreshold)",
+      "error Unauthorized()",
+      "error UnderCollateralized(uint256 newValueLocked, uint256 valueMinted)",
+      "event Burn(address from, uint256 amount)",
+      "event CreateDLC(bytes32 uuid, address creator, uint256 timestamp)",
+      "event DefaultAdminDelayChangeCanceled()",
+      "event DefaultAdminDelayChangeScheduled(uint48 newDelay, uint48 effectSchedule)",
+      "event DefaultAdminTransferCanceled()",
+      "event DefaultAdminTransferScheduled(address indexed newAdmin, uint48 acceptSchedule)",
+      "event Initialized(uint8 version)",
+      "event Mint(address to, uint256 amount)",
+      "event Paused(address account)",
+      "event RoleAdminChanged(bytes32 indexed role, bytes32 indexed previousAdminRole, bytes32 indexed newAdminRole)",
+      "event RoleGranted(bytes32 indexed role, address indexed account, address indexed sender)",
+      "event RoleRevoked(bytes32 indexed role, address indexed account, address indexed sender)",
+      "event SetBtcFeeRecipient(string btcFeeRecipient)",
+      "event SetBtcMintFeeRate(uint256 newBtcMintFeeRate)",
+      "event SetBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate)",
+      "event SetDlcBTCPoRFeed(address feed)",
+      "event SetMaximumDeposit(uint256 newMaximumDeposit)",
+      "event SetMinimumDeposit(uint256 newMinimumDeposit)",
+      "event SetPorEnabled(bool enabled)",
+      "event SetStatusFunded(bytes32 uuid, string btcTxId, address creator, uint256 newValueLocked, uint256 amountToMint)",
+      "event SetStatusPending(bytes32 uuid, string btcTxId, address creator, string taprootPubKey, uint256 newValueLocked)",
+      "event SetThreshold(uint16 newThreshold)",
+      "event SetWhitelistingEnabled(bool isWhitelistingEnabled)",
+      "event TransferTokenContractOwnership(address newOwner)",
+      "event Unpaused(address account)",
+      "event UnwhitelistAddress(address addressToUnWhitelist)",
+      "event WhitelistAddress(address addressToWhitelist)",
+      "event Withdraw(bytes32 uuid, uint256 amount, address sender)",
+      "function APPROVED_SIGNER() view returns (bytes32)",
+      "function DEFAULT_ADMIN_ROLE() view returns (bytes32)",
+      "function DLC_ADMIN_ROLE() view returns (bytes32)",
+      "function WHITELISTED_CONTRACT() view returns (bytes32)",
+      "function acceptDefaultAdminTransfer()",
+      "function attestorGroupPubKey() view returns (string)",
+      "function beginDefaultAdminTransfer(address newAdmin)",
+      "function btcFeeRecipient() view returns (string)",
+      "function btcMintFeeRate() view returns (uint256)",
+      "function btcRedeemFeeRate() view returns (uint256)",
+      "function cancelDefaultAdminTransfer()",
+      "function changeDefaultAdminDelay(uint48 newDelay)",
+      "function defaultAdmin() view returns (address)",
+      "function defaultAdminDelay() view returns (uint48)",
+      "function defaultAdminDelayIncreaseWait() view returns (uint48)",
+      "function dlcBTC() view returns (address)",
+      "function dlcBTCPoRFeed() view returns (address)",
+      "function dlcIDsByUUID(bytes32) view returns (uint256)",
+      "function dlcs(uint256) view returns (bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)",
+      "function getAllDLCs(uint256 startIndex, uint256 endIndex) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)[])",
+      "function getAllVaultUUIDsForAddress(address owner) view returns (bytes32[])",
+      "function getAllVaultsForAddress(address owner) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)[])",
+      "function getDLC(bytes32 uuid) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId))",
+      "function getDLCByIndex(uint256 index) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId))",
+      "function getMinimumThreshold() view returns (uint16)",
+      "function getRoleAdmin(bytes32 role) view returns (bytes32)",
+      "function getSignerCount() view returns (uint16)",
+      "function getThreshold() view returns (uint16)",
+      "function getTotalValueMintedInVaults() view returns (uint256)",
+      "function getVault(bytes32 uuid) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId))",
+      "function grantRole(bytes32 role, address account)",
+      "function hasRole(bytes32 role, address account) view returns (bool)",
+      "function initialize(address defaultAdmin, address dlcAdminRole, uint16 threshold, address tokenContract, string btcFeeRecipientToSet)",
+      "function isWhitelisted(address account) view returns (bool)",
+      "function maximumDeposit() view returns (uint256)",
+      "function minimumDeposit() view returns (uint256)",
+      "function owner() view returns (address)",
+      "function pauseContract()",
+      "function paused() view returns (bool)",
+      "function pendingDefaultAdmin() view returns (address newAdmin, uint48 schedule)",
+      "function pendingDefaultAdminDelay() view returns (uint48 newDelay, uint48 schedule)",
+      "function porEnabled() view returns (bool)",
+      "function renounceRole(bytes32 role, address account)",
+      "function revokeRole(bytes32 role, address account)",
+      "function rollbackDefaultAdminDelay()",
+      "function setAttestorGroupPubKey(string pubKey)",
+      "function setBtcFeeRecipient(string btcFeeRecipientToSet)",
+      "function setBtcFeeRecipientForVault(bytes32 uuid, string btcFeeRecipientToSet)",
+      "function setBtcMintFeeRate(uint256 newBtcMintFeeRate)",
+      "function setBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate)",
+      "function setBurnerOnTokenContract(address burner)",
+      "function setDlcBTCPoRFeed(address feed)",
+      "function setMaximumDeposit(uint256 newMaximumDeposit)",
+      "function setMinimumDeposit(uint256 newMinimumDeposit)",
+      "function setMinterOnTokenContract(address minter)",
+      "function setPorEnabled(bool enabled)",
+      "function setStatusFunded(bytes32 uuid, string btcTxId, bytes[] signatures, uint256 newValueLocked)",
+      "function setStatusPending(bytes32 uuid, string wdTxId, bytes[] signatures, string taprootPubKey, uint256 newValueLocked)",
+      "function setTSSCommitment(bytes32 commitment)",
+      "function setThreshold(uint16 newThreshold)",
+      "function setWhitelistingEnabled(bool isWhitelistingEnabled)",
+      "function setupVault() returns (bytes32)",
+      "function supportsInterface(bytes4 interfaceId) view returns (bool)",
+      "function transferTokenContractOwnership(address newOwner)",
+      "function tssCommitment() view returns (bytes32)",
+      "function unpauseContract()",
+      "function unwhitelistAddress(address addressToUnWhitelist)",
+      "function userVaults(address, uint256) view returns (bytes32)",
+      "function whitelistAddress(address addressToWhitelist)",
+      "function whitelistingEnabled() view returns (bool)",
+      "function withdraw(bytes32 uuid, uint256 amount)"
+    ]
+  },
+  "upgradeData": "0x99a88ec4000000000000000000000000e0d2c0979583db7fd7e8779add83ca7eb6bc7bd700000000000000000000000007234079573a5c1e2c0b3f1da3bd5ad675b5a2a7"
+}
diff --git a/deploymentFiles/base/DLCManager.json b/deploymentFiles/base/DLCManager.json
@@ -1,7 +1,7 @@
 {
   "network": "base",
-  "updatedAt": "2024-09-27T08:04:46.295Z",
-  "gitSHA": "9c2375d",
+  "updatedAt": "2024-11-01T10:22:01.026Z",
+  "gitSHA": "8204612",
   "contract": {
     "name": "DLCManager",
     "address": "0xE0d2c0979583Db7fD7E8779ADd83cA7Eb6BC7BD7",
@@ -27,6 +27,7 @@
       "error NoSignerRenouncement()",
       "error NotCreatorContract()",
       "error NotDLCAdmin()",
+      "error NotEnoughReserves(uint256 reserves, uint256 amount)",
       "error NotEnoughSignatures()",
       "error NotOwner()",
       "error NotWhitelisted()",
@@ -50,8 +51,10 @@
       "event SetBtcFeeRecipient(string btcFeeRecipient)",
       "event SetBtcMintFeeRate(uint256 newBtcMintFeeRate)",
       "event SetBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate)",
+      "event SetDlcBTCPoRFeed(address feed)",
       "event SetMaximumDeposit(uint256 newMaximumDeposit)",
       "event SetMinimumDeposit(uint256 newMinimumDeposit)",
+      "event SetPorEnabled(bool enabled)",
       "event SetStatusFunded(bytes32 uuid, string btcTxId, address creator, uint256 newValueLocked, uint256 amountToMint)",
       "event SetStatusPending(bytes32 uuid, string btcTxId, address creator, string taprootPubKey, uint256 newValueLocked)",
       "event SetThreshold(uint16 newThreshold)",
@@ -77,6 +80,7 @@
       "function defaultAdminDelay() view returns (uint48)",
       "function defaultAdminDelayIncreaseWait() view returns (uint48)",
       "function dlcBTC() view returns (address)",
+      "function dlcBTCPoRFeed() view returns (address)",
       "function dlcIDsByUUID(bytes32) view returns (uint256)",
       "function dlcs(uint256) view returns (bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)",
       "function getAllDLCs(uint256 startIndex, uint256 endIndex) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)[])",
@@ -88,6 +92,7 @@
       "function getRoleAdmin(bytes32 role) view returns (bytes32)",
       "function getSignerCount() view returns (uint16)",
       "function getThreshold() view returns (uint16)",
+      "function getTotalValueMintedInVaults() view returns (uint256)",
       "function getVault(bytes32 uuid) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId))",
       "function grantRole(bytes32 role, address account)",
       "function hasRole(bytes32 role, address account) view returns (bool)",
@@ -100,6 +105,7 @@
       "function paused() view returns (bool)",
       "function pendingDefaultAdmin() view returns (address newAdmin, uint48 schedule)",
       "function pendingDefaultAdminDelay() view returns (uint48 newDelay, uint48 schedule)",
+      "function porEnabled() view returns (bool)",
       "function renounceRole(bytes32 role, address account)",
       "function revokeRole(bytes32 role, address account)",
       "function rollbackDefaultAdminDelay()",
@@ -109,9 +115,11 @@
       "function setBtcMintFeeRate(uint256 newBtcMintFeeRate)",
       "function setBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate)",
       "function setBurnerOnTokenContract(address burner)",
+      "function setDlcBTCPoRFeed(address feed)",
       "function setMaximumDeposit(uint256 newMaximumDeposit)",
       "function setMinimumDeposit(uint256 newMinimumDeposit)",
       "function setMinterOnTokenContract(address minter)",
+      "function setPorEnabled(bool enabled)",
       "function setStatusFunded(bytes32 uuid, string btcTxId, bytes[] signatures, uint256 newValueLocked)",
       "function setStatusPending(bytes32 uuid, string wdTxId, bytes[] signatures, string taprootPubKey, uint256 newValueLocked)",
       "function setTSSCommitment(bytes32 commitment)",
@@ -128,5 +136,6 @@
       "function whitelistingEnabled() view returns (bool)",
       "function withdraw(bytes32 uuid, uint256 amount)"
     ]
-  }
+  },
+  "upgradeData": "0x99a88ec4000000000000000000000000e0d2c0979583db7fd7e8779add83ca7eb6bc7bd700000000000000000000000007234079573a5c1e2c0b3f1da3bd5ad675b5a2a7"
 }
diff --git a/...iles/basesepolia/DLCManager.proposed.json → .../DLCManager.2024-10-30T14:41:18.621Z.json b/...iles/basesepolia/DLCManager.proposed.json → .../DLCManager.2024-10-30T14:41:18.621Z.json
@@ -1,7 +1,7 @@
 {
   "network": "basesepolia",
-  "updatedAt": "2024-10-09T11:39:15.234Z",
-  "gitSHA": "5a0ee77",
+  "updatedAt": "2024-10-30T14:33:57.040Z",
+  "gitSHA": "bec9b25",
   "contract": {
     "name": "DLCManager",
     "address": "0x050C24dBf1eEc17babE5fc585F06116A259CC77A",
@@ -27,6 +27,7 @@
       "error NoSignerRenouncement()",
       "error NotCreatorContract()",
       "error NotDLCAdmin()",
+      "error NotEnoughReserves(uint256 reserves, uint256 amount)",
       "error NotEnoughSignatures()",
       "error NotOwner()",
       "error NotWhitelisted()",
@@ -50,8 +51,10 @@
       "event SetBtcFeeRecipient(string btcFeeRecipient)",
       "event SetBtcMintFeeRate(uint256 newBtcMintFeeRate)",
       "event SetBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate)",
+      "event SetDlcBTCPoRFeed(address feed)",
       "event SetMaximumDeposit(uint256 newMaximumDeposit)",
       "event SetMinimumDeposit(uint256 newMinimumDeposit)",
+      "event SetPorEnabled(bool enabled)",
       "event SetStatusFunded(bytes32 uuid, string btcTxId, address creator, uint256 newValueLocked, uint256 amountToMint)",
       "event SetStatusPending(bytes32 uuid, string btcTxId, address creator, string taprootPubKey, uint256 newValueLocked)",
       "event SetThreshold(uint16 newThreshold)",
@@ -77,6 +80,7 @@
       "function defaultAdminDelay() view returns (uint48)",
       "function defaultAdminDelayIncreaseWait() view returns (uint48)",
       "function dlcBTC() view returns (address)",
+      "function dlcBTCPoRFeed() view returns (address)",
       "function dlcIDsByUUID(bytes32) view returns (uint256)",
       "function dlcs(uint256) view returns (bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)",
       "function getAllDLCs(uint256 startIndex, uint256 endIndex) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId)[])",
@@ -88,6 +92,7 @@
       "function getRoleAdmin(bytes32 role) view returns (bytes32)",
       "function getSignerCount() view returns (uint16)",
       "function getThreshold() view returns (uint16)",
+      "function getTotalValueMintedInVaults() view returns (uint256)",
       "function getVault(bytes32 uuid) view returns (tuple(bytes32 uuid, address protocolContract, uint256 timestamp, uint256 valueLocked, address creator, uint8 status, string fundingTxId, string closingTxId, string btcFeeRecipient, uint256 btcMintFeeBasisPoints, uint256 btcRedeemFeeBasisPoints, string taprootPubKey, uint256 valueMinted, string wdTxId))",
       "function grantRole(bytes32 role, address account)",
       "function hasRole(bytes32 role, address account) view returns (bool)",
@@ -100,6 +105,7 @@
       "function paused() view returns (bool)",
       "function pendingDefaultAdmin() view returns (address newAdmin, uint48 schedule)",
       "function pendingDefaultAdminDelay() view returns (uint48 newDelay, uint48 schedule)",
+      "function porEnabled() view returns (bool)",
       "function renounceRole(bytes32 role, address account)",
       "function revokeRole(bytes32 role, address account)",
       "function rollbackDefaultAdminDelay()",
@@ -109,9 +115,11 @@
       "function setBtcMintFeeRate(uint256 newBtcMintFeeRate)",
       "function setBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate)",
       "function setBurnerOnTokenContract(address burner)",
+      "function setDlcBTCPoRFeed(address feed)",
       "function setMaximumDeposit(uint256 newMaximumDeposit)",
       "function setMinimumDeposit(uint256 newMinimumDeposit)",
       "function setMinterOnTokenContract(address minter)",
+      "function setPorEnabled(bool enabled)",
       "function setStatusFunded(bytes32 uuid, string btcTxId, bytes[] signatures, uint256 newValueLocked)",
       "function setStatusPending(bytes32 uuid, string wdTxId, bytes[] signatures, string taprootPubKey, uint256 newValueLocked)",
       "function setTSSCommitment(bytes32 commitment)",
@@ -128,5 +136,6 @@
       "function whitelistingEnabled() view returns (bool)",
       "function withdraw(bytes32 uuid, uint256 amount)"
     ]
-  }
+  },
+  "upgradeData": "0x99a88ec4000000000000000000000000050c24dbf1eec17babe5fc585f06116a259cc77a000000000000000000000000be782c45b94712bebe8ce11f2acbff71c5190c0c"
 }