Skip to content

Add GovernorTimelockControl address to TimelockController salt #4432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frangio merged 13 commits into from
Jul 12, 2023
Merged

Add GovernorTimelockControl address to TimelockController salt #4432

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4a9a6aa
Add GovernorTimelockControl address to TimelockController salt
ernestognw Jul 6, 2023
00ff5e1
Add changeset
ernestognw Jul 6, 2023
b63d484
Merge branch 'master' into lib-834-use-governor-address-in-id-hash
ernestognw Jul 9, 2023
bcb0b84
Merge branch 'master' into lib-834-use-governor-address-in-id-hash
ernestognw Jul 12, 2023
fd0ef64
add logging
frangio Jul 12, 2023
5903861
remove only
frangio Jul 12, 2023
ce91062
add only
frangio Jul 12, 2023
29a1b1d
fix only
frangio Jul 12, 2023
4d21d32
remove only
frangio Jul 12, 2023
225c6ec
fix timelockSalt
frangio Jul 12, 2023
3563815
remove console.log
frangio Jul 12, 2023
e775b46
add period
frangio Jul 12, 2023
9dd7f39
Update .changeset/purple-cats-cheer.md
ernestognw Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix timelockSalt
  • Loading branch information
@frangio
frangio committed Jul 12, 2023
commit 225c6ec94e9b94e5205a42aecfe9faec7b8d2996
2 changes: 1 addition & 1 deletion test/governance/extensions/GovernorTimelockControl.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ contract('GovernorTimelockControl', function (accounts) {
for (const { mode, Token } of TOKENS) {
describe(`using ${Token._json.contractName}`, function () {
const timelockSalt = (address, descriptionHash) =>
web3.utils.numberToHex(web3.utils.toBN(address).shln(96).xor(web3.utils.toBN(descriptionHash)));
'0x' + web3.utils.toBN(address).shln(96).xor(web3.utils.toBN(descriptionHash)).toString(16, 64);

beforeEach(async function () {
const [deployer] = await web3.eth.getAccounts();
Expand Down