Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
5943c418
Commit
5943c418
authored
May 03, 2023
by
tre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix nonce
parent
31c09175
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
Faucet.t.sol
.../contracts-periphery/contracts/foundry-tests/Faucet.t.sol
+8
-6
No files found.
packages/contracts-periphery/contracts/foundry-tests/Faucet.t.sol
View file @
5943c418
...
@@ -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));
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment