Skip to content

fix: make event case consistant between evm & svm #760

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
merged 5 commits into from
Nov 25, 2024
Merged

fix: make event case consistant between evm & svm #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c656d24
WIP
chrismaree Nov 22, 2024
6471803
WIP
chrismaree Nov 22, 2024
ad21b8b
WIP
chrismaree Nov 23, 2024
8ca5205
Discard changes to programs/svm-spoke/src/event.rs
chrismaree Nov 25, 2024
cc27ebb
Discard changes to programs/svm-spoke/src/instructions/admin.rs
chrismaree Nov 25, 2024
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
4 changes: 2 additions & 2 deletions contracts/SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ abstract contract SpokePool is
bytes32 indexed l2TokenAddress,
address caller
);
event EmergencyDeleteRootBundle(uint256 indexed rootBundleId);
event EmergencyDeletedRootBundle(uint256 indexed rootBundleId);
event PausedDeposits(bool isPaused);
event PausedFills(bool isPaused);

Expand Down Expand Up @@ -352,7 +352,7 @@ abstract contract SpokePool is
// would require a new list in storage to keep track of keys.
//slither-disable-next-line mapping-deletion
delete rootBundles[rootBundleId];
emit EmergencyDeleteRootBundle(rootBundleId);
emit EmergencyDeletedRootBundle(rootBundleId);
}

/**************************************
Expand Down
2 changes: 1 addition & 1 deletion test/evm/hardhat/SpokePool.Admin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe("SpokePool Admin Functions", async function () {
expect(await spokePool.rootBundles(0)).has.property("relayerRefundRoot", mockRelayerRefundRoot);

await expect(spokePool.connect(owner).emergencyDeleteRootBundle(0))
.to.emit(spokePool, "EmergencyDeleteRootBundle")
.to.emit(spokePool, "EmergencyDeletedRootBundle")
.withArgs(0);

expect(await spokePool.rootBundles(0)).has.property("slowRelayRoot", ethers.utils.hexZeroPad("0x0", 32));
Expand Down
12 changes: 6 additions & 6 deletions test/svm/SvmSpoke.HandleReceiveMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,34 +520,34 @@ describe("svm_spoke.handle_receive_message", () => {
messageBody,
});

// Remaining accounts specific to EmergencyDeleteRootBundle.
// Remaining accounts specific to EmergencyDeletedRootBundle.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this and below should be renamed as it refers to accounts, not an event

// Same 3 remaining accounts passed for HandleReceiveMessage context.
const emergencyDeleteRootBundleRemainingAccounts = remainingAccounts.slice(0, 3);
// closer in self-invoked EmergencyDeleteRootBundle.
// closer in self-invoked EmergencyDeletedRootBundle.
emergencyDeleteRootBundleRemainingAccounts.push({
isSigner: true,
isWritable: true,
pubkey: provider.wallet.publicKey,
});
// state in self-invoked EmergencyDeleteRootBundle.
// state in self-invoked EmergencyDeletedRootBundle.
emergencyDeleteRootBundleRemainingAccounts.push({
isSigner: false,
isWritable: false,
pubkey: state,
});
// root_bundle in self-invoked EmergencyDeleteRootBundle.
// root_bundle in self-invoked EmergencyDeletedRootBundle.
emergencyDeleteRootBundleRemainingAccounts.push({
isSigner: false,
isWritable: true,
pubkey: rootBundle,
});
// event_authority in self-invoked EmergencyDeleteRootBundle (appended by Anchor with event_cpi macro).
// event_authority in self-invoked EmergencyDeletedRootBundle (appended by Anchor with event_cpi macro).
emergencyDeleteRootBundleRemainingAccounts.push({
isSigner: false,
isWritable: false,
pubkey: eventAuthority,
});
// program in self-invoked EmergencyDeleteRootBundle (appended by Anchor with event_cpi macro).
// program in self-invoked EmergencyDeletedRootBundle (appended by Anchor with event_cpi macro).
emergencyDeleteRootBundleRemainingAccounts.push({
isSigner: false,
isWritable: false,
Expand Down
Loading