Skip to content

Commit

Permalink
fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszaaa committed Apr 17, 2024
1 parent be92d3e commit 0223e45
Show file tree
Hide file tree
Showing 8 changed files with 3,650 additions and 3,648 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
ROLLUP_SEQUENCER_MANGATA_NODE_URL=ws://node-alice:9944
ROLLUP_SEQUENCER_ETH_CHAIN_URL=ws://anvil:8545
ROLLUP_SEQUENCER_MNEMONIC="0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b"
ROLLUP_SEQUENCER_BLOCK_NUMBER_DELAY=0

# UPDATER
ROLLUP_UPDATER_MANGATA_NODE_URL=ws://node-alice:9944
Expand Down
6 changes: 3 additions & 3 deletions rolldown-contract/src/rolldown.sol
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ contract RollDown {

struct L1Update {
Deposit[] pendingDeposits;
CancelResolution[] pendingCancelResultions;
CancelResolution[] pendingCancelResolutions;
WithdrawalResolution[] pendingWithdrawalResolutions;
L2UpdatesToRemove[] pendingL2UpdatesToRemove;
}
Expand Down Expand Up @@ -496,7 +496,7 @@ contract RollDown {
}

result.pendingDeposits = new Deposit[](depositsCounter);
result.pendingCancelResultions = new CancelResolution[](cancelsCounter);
result.pendingCancelResolutions = new CancelResolution[](cancelsCounter);
result.pendingWithdrawalResolutions = new WithdrawalResolution[](
withdrawalsCounter
);
Expand All @@ -521,7 +521,7 @@ contract RollDown {
updatesToBeRemovedCounter++
] = l2UpdatesToRemove[requestId];
} else if (cancelResolutions[requestId].l2RequestId > 0) {
result.pendingCancelResultions[
result.pendingCancelResolutions[
cancelsCounter++
] = cancelResolutions[requestId];
} else {
Expand Down
14 changes: 7 additions & 7 deletions rolldown-contract/test/rolldown.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ contract RollDownTest is Test {

// Assert
assertEq(l1Update.pendingDeposits.length, 1);
assertEq(l1Update.pendingCancelResultions.length, 0);
assertEq(l1Update.pendingCancelResolutions.length, 0);
assertEq(l1Update.pendingL2UpdatesToRemove.length, 0);
assertEq(l1Update.pendingDeposits[0].depositRecipient, alice);
assertEq(l1Update.pendingDeposits[0].tokenAddress, tokenAddress);
Expand All @@ -66,7 +66,7 @@ contract RollDownTest is Test {
RollDown.L1Update memory l1Update = rollDown.getUpdateForL2();
assertEq(l1Update.pendingDeposits.length, 1);
assertEq(l1Update.pendingL2UpdatesToRemove.length, 0);
assertEq(l1Update.pendingCancelResultions.length, 0);
assertEq(l1Update.pendingCancelResolutions.length, 0);
assertEq(l1Update.pendingDeposits[0].requestId.id, 1);

RollDown.L2Update memory l2Update;
Expand All @@ -84,7 +84,7 @@ contract RollDownTest is Test {
l1Update = rollDown.getUpdateForL2();
assertEq(l1Update.pendingL2UpdatesToRemove.length, 1);
assertEq(l1Update.pendingDeposits.length, 0);
assertEq(l1Update.pendingCancelResultions.length, 0);
assertEq(l1Update.pendingCancelResolutions.length, 0);
assertEq(l1Update.pendingL2UpdatesToRemove[0].requestId.id, 2);
assertEq(
l1Update.pendingL2UpdatesToRemove[0].l2UpdatesToRemove.length,
Expand All @@ -106,7 +106,7 @@ contract RollDownTest is Test {
l1Update = rollDown.getUpdateForL2();
assertEq(l1Update.pendingL2UpdatesToRemove.length, 1);
assertEq(l1Update.pendingDeposits.length, 0);
assertEq(l1Update.pendingCancelResultions.length, 0);
assertEq(l1Update.pendingCancelResolutions.length, 0);
assertEq(l1Update.pendingL2UpdatesToRemove[0].requestId.id, 3);
assertEq(
l1Update.pendingL2UpdatesToRemove[0].l2UpdatesToRemove.length,
Expand All @@ -129,7 +129,7 @@ contract RollDownTest is Test {
l1Update = rollDown.getUpdateForL2();
assertEq(l1Update.pendingL2UpdatesToRemove.length, 1);
assertEq(l1Update.pendingDeposits.length, 0);
assertEq(l1Update.pendingCancelResultions.length, 0);
assertEq(l1Update.pendingCancelResolutions.length, 0);
assertEq(l1Update.pendingL2UpdatesToRemove[0].requestId.id, 4);
assertEq(
l1Update.pendingL2UpdatesToRemove[0].l2UpdatesToRemove.length,
Expand Down Expand Up @@ -171,7 +171,7 @@ contract RollDownTest is Test {
RollDown.L1Update memory l1Update;
l1Update.pendingDeposits = new RollDown.Deposit[](1);
l1Update.pendingL2UpdatesToRemove = new RollDown.L2UpdatesToRemove[](1);
l1Update.pendingCancelResultions = new RollDown.CancelResolution[](1);
l1Update.pendingCancelResolutions = new RollDown.CancelResolution[](1);
l1Update
.pendingWithdrawalResolutions = new RollDown.WithdrawalResolution[](
1
Expand All @@ -185,7 +185,7 @@ contract RollDownTest is Test {
timeStamp: 1
});

l1Update.pendingCancelResultions[0] = RollDown.CancelResolution({
l1Update.pendingCancelResolutions[0] = RollDown.CancelResolution({
requestId: RollDown.RequestId({id: 6, origin: RollDown.Origin.L1}),
l2RequestId: 7,
cancelJustified: true,
Expand Down
1 change: 1 addition & 0 deletions rollup-sequencer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ services:
ETH_CHAIN_URL: ${ROLLUP_SEQUENCER_ETH_CHAIN_URL:-wss://ethereum.publicnode.com}
MANGATA_CONTRACT_ADDRESS: "0x5f3f1dbd7b74c6b46e8c44f98792a1daf8d69154"
MNEMONIC: ${ROLLUP_SEQUENCER_MNEMONIC:-'//Bob'}
BLOCK_NUMBER_DELAY: ${ROLLUP_SEQUENCER_BLOCK_NUMBER_DELAY}
24 changes: 12 additions & 12 deletions rollup-sequencer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rollup-sequencer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"typescript": "5.3.2"
},
"dependencies": {
"@mangata-finance/sdk": "2.2.1-eth-rollup-develop.20",
"@mangata-finance/types": "2.2.3-eth-rollup-develop.27",
"@mangata-finance/sdk": "2.2.1-feature-fix-typo.1",
"@mangata-finance/types": "2.2.3-feature-fix-typo.1",
"@polkadot/api": "^10.12.2",
"dotenv": "^16.3.1",
"viem": "^2.9.2"
Expand Down
3,624 changes: 1,812 additions & 1,812 deletions rollup-sequencer/src/RollDown.json

Large diffs are not rendered by default.

3,624 changes: 1,812 additions & 1,812 deletions rollup-updater/src/RollDown.json

Large diffs are not rendered by default.

0 comments on commit 0223e45

Please sign in to comment.