Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
akolotov committed Sep 29, 2023
1 parent a08e502 commit 6f354d8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions script/scripts/BOBPoolMigration.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ contract BOBPoolMigration is Script, StdCheats {
transferVerifier, treeVerifier, batchDepositVerifier,
address(queue_proxy)
);
UniswapV3Seller seller = new UniswapV3Seller(uniV3Router, uniV3Quoter, usdc_addr, 100, address(0x7F5c764cBc14f9669B88837ca1490cCa17c31607), 500);
UniswapV3Seller seller =
new UniswapV3Seller(uniV3Router, uniV3Quoter, usdc_addr, 100, address(0x7F5c764cBc14f9669B88837ca1490cCa17c31607), 500);
ZkBobDirectDepositQueue queueImpl = new ZkBobDirectDepositQueue(address(pool), usdc_addr, 1);
vm.stopPrank();

Expand Down Expand Up @@ -123,7 +124,7 @@ contract BOBPoolMigration is Script, StdCheats {
queue_proxy.directDeposit(actor, amount, zk_addr);
Vm.Log[] memory entries = vm.getRecordedLogs();
uint8 log_index = 255;
for(uint8 i=0; i<entries.length; i++) {
for (uint8 i = 0; i < entries.length; i++) {
if (entries[i].topics[0] == 0xcde1b1a4bd18b6b8ddb2a80b1fce51c4eee01748267692ac6bc0770a84bc6c58) {
log_index = i;
}
Expand Down Expand Up @@ -283,4 +284,4 @@ contract BOBPoolMigration is Script, StdCheats {
bool retval = makeDepositOutOfNomination();
require(retval == false, "Deposit must revert");
}
}
}
4 changes: 3 additions & 1 deletion src/zkbob/ZkBobPoolUSDCMigrated.sol
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ contract ZkBobPoolUSDCMigrated is ZkBobPool, ZkBobTokenSellerMixin, ZkBobUSDCPer
bool retval = IERC20(bob_addr).approve(address(swapRouter), cur_bob_balance);
uint256 usdc_received = swapRouter.exactInput(
ISwapRouter.ExactInputParams({
path: abi.encodePacked(bob_addr, uint24(100), 0x7F5c764cBc14f9669B88837ca1490cCa17c31607, uint24(500), token),
path: abi.encodePacked(
bob_addr, uint24(100), 0x7F5c764cBc14f9669B88837ca1490cCa17c31607, uint24(500), token
),
recipient: address(this),
deadline: block.timestamp,
amountIn: cur_bob_balance,
Expand Down

0 comments on commit 6f354d8

Please sign in to comment.