Skip to content

Commit

Permalink
rename event
Browse files Browse the repository at this point in the history
  • Loading branch information
evelinemolnar committed Sep 16, 2024
1 parent eb048d8 commit 073c8a7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
12 changes: 9 additions & 3 deletions contracts/ERC20Safe.sol
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ contract ERC20Safe is Initializable, BridgeRole, Pausable {
);

//optional
event TransactionProcessed(
event DelayedTransactionProcessed(
address indexed sender,
address indexed tokenAddress,
uint256 amount,
Expand Down Expand Up @@ -356,7 +356,13 @@ contract ERC20Safe is Initializable, BridgeRole, Pausable {
delayedTransactions[i] = delayedTransactions[delayedTransactions.length - 1];
delayedTransactions.pop();

emit TransactionProcessed(dt.sender, dt.tokenAddress, dt.amount, dt.recipientAddress, dt.isLarge);
emit DelayedTransactionProcessed(
dt.sender,
dt.tokenAddress,
dt.amount,
dt.recipientAddress,
dt.isLarge
);
} else {
i++;
}
Expand Down Expand Up @@ -475,7 +481,7 @@ contract ERC20Safe is Initializable, BridgeRole, Pausable {
delayedTransactions[index] = delayedTransactions[delayedTransactions.length - 1];
delayedTransactions.pop();

emit TransactionProcessed(dt.sender, dt.tokenAddress, dt.amount, dt.recipientAddress, dt.isLarge);
emit DelayedTransactionProcessed(dt.sender, dt.tokenAddress, dt.amount, dt.recipientAddress, dt.isLarge);
}

/**
Expand Down
17 changes: 13 additions & 4 deletions test/Safe.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,10 @@ describe("ERC20Safe", function () {
}

// Trigger processing of delayed transactions
await expect(safe.deposit(genericERC20.address, 50, recipientAddress)).to.emit(safe, "TransactionProcessed");
await expect(safe.deposit(genericERC20.address, 50, recipientAddress)).to.emit(
safe,
"DelayedTransactionProcessed",
);
});

it("processes delayed large transactions after 24 hours", async function () {
Expand All @@ -504,15 +507,18 @@ describe("ERC20Safe", function () {
}

// Trigger processing of delayed transactions
await expect(safe.deposit(genericERC20.address, 500, recipientAddress)).to.emit(safe, "TransactionProcessed");
await expect(safe.deposit(genericERC20.address, 500, recipientAddress)).to.emit(
safe,
"DelayedTransactionProcessed",
);
});

it("admin can process delayed transactions immediately", async function () {
// Deposit causing delay
await safe.deposit(genericERC20.address, 700, recipientAddress); // Delayed

// Admin processes delayed transaction
await expect(safe.processDelayedTransactionImmediately(0)).to.emit(safe, "TransactionProcessed");
await expect(safe.processDelayedTransactionImmediately(0)).to.emit(safe, "DelayedTransactionProcessed");
});

it("does not process delayed transactions before 24 hours", async function () {
Expand All @@ -525,7 +531,10 @@ describe("ERC20Safe", function () {
}

// Attempt to trigger processing
await expect(safe.deposit(genericERC20.address, 400, recipientAddress)).to.not.emit(safe, "TransactionProcessed");
await expect(safe.deposit(genericERC20.address, 400, recipientAddress)).to.not.emit(
safe,
"DelayedTransactionProcessed",
);
});
});
});

0 comments on commit 073c8a7

Please sign in to comment.