Theo/proposal-22-governance-and-rewards-patch
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get actual account nonce while signing messages to ERC20Permit

Browse Source
This commit is contained in:
Theo 2023-05-27 17:17:58 +03:00
parent ccd71034ea
commit ff9f10c5b3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/ProposalUtils.sol
View File

@ -4,6 +4,8 @@ pragma experimental ABIEncoderV2;
import { Test } from "@forge-std/Test.sol"; import { Test } from "@forge-std/Test.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { ERC20Permit } from "torn-token/contracts/ERC20Permit.sol";
import { console2 } from "@forge-std/console2.sol";
import { Mock } from "./Mock.sol"; import { Mock } from "./Mock.sol";
import { Proposal, IGovernance } from "@interfaces/IGovernance.sol"; import { Proposal, IGovernance } from "@interfaces/IGovernance.sol";
@ -53,12 +55,15 @@ contract ProposalUtils is Mock, Parameters, Test {
function retrieveAndLockBalance(uint256 privateKey, address voter, uint256 amount) internal { function retrieveAndLockBalance(uint256 privateKey, address voter, uint256 amount) internal {
uint256 lockTimestamp = block.timestamp + PROPOSAL_DURATION; uint256 lockTimestamp = block.timestamp + PROPOSAL_DURATION;
uint256 accountNonce = ERC20Permit(_tokenAddress).nonces(voter);
console2.log("Account nonce: %s", accountNonce);
bytes32 messageHash = keccak256( bytes32 messageHash = keccak256(
abi.encodePacked( abi.encodePacked(
PERMIT_FUNC_SELECTOR, PERMIT_FUNC_SELECTOR,
EIP712_DOMAIN, EIP712_DOMAIN,
keccak256(abi.encode(PERMIT_TYPEHASH, voter, _governanceAddress, amount, 0, lockTimestamp)) keccak256(abi.encode(PERMIT_TYPEHASH, voter, _governanceAddress, amount, accountNonce, lockTimestamp))
) )
); );