diff --git a/src/quark-core/src/QuarkNonceManager.sol b/src/quark-core/src/QuarkNonceManager.sol index cb72e2da..748d527e 100644 --- a/src/quark-core/src/QuarkNonceManager.sol +++ b/src/quark-core/src/QuarkNonceManager.sol @@ -22,7 +22,6 @@ contract QuarkNonceManager { error InvalidSubmissionToken(address wallet, bytes32 nonce, bytes32 submissionToken); event NonceSubmitted(address wallet, bytes32 nonce, bytes32 submissionToken); - event NonceCanceled(address wallet, bytes32 nonce); /// @notice Represents the unclaimed bytes32 value. bytes32 public constant FREE = QuarkNonceManagerMetadata.FREE; @@ -39,7 +38,7 @@ contract QuarkNonceManager { */ function cancel(bytes32 nonce) external { submissions[msg.sender][nonce] = EXHAUSTED; - emit NonceCanceled(msg.sender, nonce); + emit NonceSubmitted(msg.sender, nonce, EXHAUSTED); } /** diff --git a/test/quark-core/QuarkWallet.t.sol b/test/quark-core/QuarkWallet.t.sol index 508deff3..b560cec2 100644 --- a/test/quark-core/QuarkWallet.t.sol +++ b/test/quark-core/QuarkWallet.t.sol @@ -661,7 +661,7 @@ contract QuarkWalletTest is Test { new SignatureHelper().signOp(alicePrivateKey, aliceWallet, cancelOp); vm.resumeGasMetering(); vm.expectEmit(true, true, true, true); - emit QuarkNonceManager.NonceCanceled(address(aliceWallet), op.nonce); + emit QuarkNonceManager.NonceSubmitted(address(aliceWallet), op.nonce, bytes32(type(uint256).max)); aliceWallet.executeQuarkOperationWithSubmissionToken(cancelOp, submissionTokens[1], cancelV, cancelR, cancelS); // and now you can no longer replay