Commit 5943c418 authored by tre's avatar tre

fix nonce

parent 31c09175
...@@ -80,9 +80,9 @@ contract Faucet_Initializer is Test { ...@@ -80,9 +80,9 @@ contract Faucet_Initializer is Test {
address _eip712VerifyingContract, address _eip712VerifyingContract,
address recipient, address recipient,
bytes memory id, bytes memory id,
uint256 nonce bytes32 nonce
) internal view returns (bytes memory) { ) internal view returns (bytes memory) {
AdminFAM.Proof memory proof = AdminFAM.Proof(recipient, bytes32(keccak256(abi.encode(nonce))), id); AdminFAM.Proof memory proof = AdminFAM.Proof(recipient, nonce, id);
return return
_getSignature( _getSignature(
_issuerPrivateKey, _issuerPrivateKey,
...@@ -104,6 +104,7 @@ contract FaucetTest is Faucet_Initializer { ...@@ -104,6 +104,7 @@ contract FaucetTest is Faucet_Initializer {
function test_AuthAdmin_drip_succeeds() external { function test_AuthAdmin_drip_succeeds() external {
_enableFaucetAuthModule(); _enableFaucetAuthModule();
bytes32 nonce = faucetHelper.consumeNonce();
bytes memory signature bytes memory signature
= issueProofWithEIP712Domain( = issueProofWithEIP712Domain(
faucetAuthAdminKey, faucetAuthAdminKey,
...@@ -113,17 +114,18 @@ contract FaucetTest is Faucet_Initializer { ...@@ -113,17 +114,18 @@ contract FaucetTest is Faucet_Initializer {
address(adminFam), address(adminFam),
fundsReceiver, fundsReceiver,
abi.encodePacked(fundsReceiver), abi.encodePacked(fundsReceiver),
faucetHelper.currentNonce() nonce
); );
vm.prank(nonAdmin); vm.prank(nonAdmin);
faucet.drip( faucet.drip(
Faucet.DripParameters(payable(fundsReceiver), faucetHelper.consumeNonce()), Faucet.DripParameters(payable(fundsReceiver), nonce),
Faucet.AuthParameters(adminFam, abi.encodePacked(fundsReceiver), signature)); Faucet.AuthParameters(adminFam, abi.encodePacked(fundsReceiver), signature));
} }
function test_nonAdmin_drip_fails() external { function test_nonAdmin_drip_fails() external {
_enableFaucetAuthModule(); _enableFaucetAuthModule();
bytes32 nonce = faucetHelper.consumeNonce();
bytes memory signature bytes memory signature
= issueProofWithEIP712Domain( = issueProofWithEIP712Domain(
nonAdminKey, nonAdminKey,
...@@ -133,13 +135,13 @@ contract FaucetTest is Faucet_Initializer { ...@@ -133,13 +135,13 @@ contract FaucetTest is Faucet_Initializer {
address(adminFam), address(adminFam),
fundsReceiver, fundsReceiver,
abi.encodePacked(fundsReceiver), abi.encodePacked(fundsReceiver),
faucetHelper.currentNonce() nonce
); );
vm.prank(nonAdmin); vm.prank(nonAdmin);
vm.expectRevert("Faucet: drip parameters could not be verified by security module"); vm.expectRevert("Faucet: drip parameters could not be verified by security module");
faucet.drip( faucet.drip(
Faucet.DripParameters(payable(fundsReceiver), faucetHelper.consumeNonce()), Faucet.DripParameters(payable(fundsReceiver), nonce),
Faucet.AuthParameters(adminFam, abi.encodePacked(fundsReceiver), signature)); Faucet.AuthParameters(adminFam, abi.encodePacked(fundsReceiver), signature));
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment