diff --git a/src/Unit/Exchange/callGenerators/uniswapV3.ts b/src/Unit/Exchange/callGenerators/uniswapV3.ts index d600e9d..2ef3f04 100644 --- a/src/Unit/Exchange/callGenerators/uniswapV3.ts +++ b/src/Unit/Exchange/callGenerators/uniswapV3.ts @@ -25,11 +25,11 @@ export async function generateOrion3Call( recipient: string, provider: JsonRpcProvider ) { - if (typeof amount === 'undefined') amount = 0 + if (amount === undefined) amount = 0 const encodedPool = await encodePoolV3(swap.pool, swap.assetIn, swap.assetOut, provider) const executorInterface = SwapExecutor__factory.createInterface() - let calldata = executorInterface.encodeFunctionData('orionV3SingleSwapTo', [encodedPool, recipient, amount]) + const calldata = executorInterface.encodeFunctionData('orionV3SingleSwapTo', [encodedPool, recipient, amount]) return addCallParams(calldata) } diff --git a/src/Unit/Exchange/callGenerators/utils.ts b/src/Unit/Exchange/callGenerators/utils.ts index 15a8172..e49217b 100644 --- a/src/Unit/Exchange/callGenerators/utils.ts +++ b/src/Unit/Exchange/callGenerators/utils.ts @@ -63,25 +63,21 @@ export function addCallParams( export function createPatchMask(calldata: BytesLike, patchParams?: PatchParams) { let firstByte = 0 - let mask = ethers.solidityPacked(["uint256"], [(calldata.length - 4) / 2 - 32]) + let mask = ethers.solidityPacked(["uint256"], [(calldata.length - 4) / 2 - 32]) //finding offset of last 32 bytes slot in calldata mask = ethers.dataSlice(mask, 1) if (patchParams) { if (patchParams.skipOnZeroAmount !== undefined && patchParams.skipOnZeroAmount === false) { firstByte += 32 - console.log(firstByte) } if (patchParams.skipCallDataPatching !== undefined && patchParams.skipCallDataPatching) { firstByte += 64 - console.log(firstByte) } if (patchParams.skipValuePatching !== undefined && patchParams.skipValuePatching) { firstByte += 128 - console.log(firstByte) } } const encodedFirstByte = ethers.solidityPacked(["uint8"], [firstByte]) mask = ethers.hexlify(ethers.concat([encodedFirstByte, mask])) - console.log(mask) return mask }