improve stateTransitionWait

This commit is contained in:
Hadrien Croubois
2023-05-04 16:51:18 +02:00
parent e856ebbbb5
commit fd5f309d86
8 changed files with 33 additions and 23 deletions

View File

@ -1,6 +1,6 @@
--- governance/Governor.sol 2023-03-07 10:48:47.730155491 +0100
+++ governance/Governor.sol 2023-03-14 22:09:12.664754077 +0100
@@ -216,6 +216,21 @@
--- governance/Governor.sol 2023-05-03 09:17:45.566699712 +0200
+++ governance/Governor.sol 2023-05-04 15:18:42.667741565 +0200
@@ -224,6 +224,21 @@
return _proposals[proposalId].proposer;
}

View File

@ -1,6 +1,6 @@
--- governance/extensions/GovernorPreventLateQuorum.sol 2023-03-15 17:13:06.879632860 +0100
+++ governance/extensions/GovernorPreventLateQuorum.sol 2023-03-15 14:14:59.121060484 +0100
@@ -84,6 +84,11 @@
--- governance/extensions/GovernorPreventLateQuorum.sol 2023-05-03 09:17:45.566699712 +0200
+++ governance/extensions/GovernorPreventLateQuorum.sol 2023-05-04 15:18:42.657742113 +0200
@@ -82,6 +82,11 @@
return _voteExtension;
}

View File

@ -1,5 +1,5 @@
--- governance/extensions/GovernorTimelockControl.sol 2023-03-14 15:48:49.307543354 +0100
+++ governance/extensions/GovernorTimelockControl.sol 2023-03-16 16:01:13.857331689 +0100
--- governance/extensions/GovernorTimelockControl.sol 2023-05-04 11:44:55.587737817 +0200
+++ governance/extensions/GovernorTimelockControl.sol 2023-05-04 15:18:42.661075263 +0200
@@ -24,7 +24,7 @@
* _Available since v4.3._
*/
@ -21,3 +21,13 @@
/**
* @dev Function to queue a proposal to the timelock.
*/
@@ -163,4 +168,9 @@
emit TimelockChange(address(_timelock), address(newTimelock));
_timelock = newTimelock;
}
+
+ // FV
+ function timelockId(uint256 proposalId) public view returns (bytes32) {
+ return _timelockIds[proposalId];
+ }
}

View File

@ -1,7 +1,7 @@
--- governance/extensions/GovernorVotesQuorumFraction.sol 2023-03-07 10:48:47.733488857 +0100
+++ governance/extensions/GovernorVotesQuorumFraction.sol 2023-03-15 22:52:06.424537201 +0100
@@ -62,6 +62,11 @@
return _quorumNumeratorHistory.upperLookupRecent(timepoint.toUint32());
--- governance/extensions/GovernorVotesQuorumFraction.sol 2023-05-03 09:17:45.570033048 +0200
+++ governance/extensions/GovernorVotesQuorumFraction.sol 2023-05-04 15:18:42.664408414 +0200
@@ -61,6 +61,11 @@
return _quorumNumeratorHistory.upperLookupRecent(SafeCast.toUint32(timepoint));
}
+ // FV

View File

@ -1,5 +1,5 @@
--- token/ERC721/ERC721.sol 2023-03-07 10:48:47.736822221 +0100
+++ token/ERC721/ERC721.sol 2023-03-09 19:49:39.669338673 +0100
--- token/ERC721/ERC721.sol 2023-04-27 22:16:54.864065073 +0200
+++ token/ERC721/ERC721.sol 2023-05-04 15:18:42.671074716 +0200
@@ -199,6 +199,11 @@
return _owners[tokenId];
}