Skip to content
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

Jump to bottom

Improving gas estimates for l2s #53

Merged
merged 14 commits into from
Feb 1, 2022
Merged

Improving gas estimates for l2s #53

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d9ab147
adding optimism l1 security fee to gas estimates
snreynolds Jan 21, 2022
3ae60e3
Fix code style issues with Prettier
lint-action Jan 21, 2022
cc3a85f
fix: ensure compatibility with v2
snreynolds Jan 25, 2022
4393d04
Merge branch 'gas-estimate-improvements' of https://github.com/Uniswa…
snreynolds Jan 25, 2022
b820e78
fix: default to v3 when no protocol specified
snreynolds Jan 25, 2022
99babc8
update arbgas numbers and remove config changes
snreynolds Jan 26, 2022
1e0fd61
test cleanup and fix comile issue
snreynolds Jan 26, 2022
2b671b0
cleanup and comments
snreynolds Jan 26, 2022
2f6af8b
remove comments
snreynolds Jan 26, 2022
b7b9fbb
add multicall function and change provider name
snreynolds Jan 31, 2022
679d9b0
remove and rename variables, add dummy swap config
snreynolds Jan 31, 2022
00d574e
remove logs
snreynolds Feb 1, 2022
fefaf64
fixing merge conflicts
snreynolds Feb 1, 2022
3de4a88
rremove 02 typeing
snreynolds Feb 1, 2022
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
11 changes: 11 additions & 0 deletions cli/base-command.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { Command, flags } from '@oclif/command';
import { ParserOutput } from '@oclif/parser/lib/parse';
import DEFAULT_TOKEN_LIST from '@uniswap/default-token-list';
import { Protocol } from '@uniswap/router-sdk';
import { Currency, CurrencyAmount, Token } from '@uniswap/sdk-core';
import { MethodParameters } from '@uniswap/v3-sdk';
import { default as bunyan, default as Logger } from 'bunyan';
Expand Down Expand Up @@ -34,6 +35,7 @@ import {
UniswapMulticallProvider,
V3PoolProvider,
V3QuoteProvider,
V3RouteWithValidQuote,
} from '../src';
import { LegacyGasPriceProvider } from '../src/providers/legacy-gas-price-provider';
import { OnChainGasPriceProvider } from '../src/providers/on-chain-gas-price-provider';
Expand Down Expand Up @@ -318,5 +320,14 @@ export abstract class BaseCommand extends Command {
estimatedGasUsed: estimatedGasUsed.toString(),
gasPriceWei: gasPriceWei.toString(),
});
const hops = routeAmounts[0]?.poolAddresses.length;
Copy link
Contributor

Choose a reason for hiding this comment

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

Have to sum across all the routeAmounts

this.logger.info(`Total hops ${hops}`);

if (routeAmounts[0]?.protocol == Protocol.V3) {
const v3Route = routeAmounts[0] as V3RouteWithValidQuote;
this.logger.info(
`Total initialized ticks crossed ${v3Route.initializedTicksCrossedList.length}`
);
Copy link
Contributor

Choose a reason for hiding this comment

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

Each element in the initializedTIcksCrossedList is the number of ticks crossed for each pool so you need to sum them

Copy link
Member Author

@snreynolds snreynolds Feb 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Right! Actually these can just be deleted - I just needed these data points when I was manual testing with arbirtrum and optimism (and I was only ever looking at a swap with 1 route).

If you think these are good to print out though in general, I can change it back to summing over all the routes.

}
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"scripts": {
"compile-v3-types": "npx typechain --target ethers-v5 --out-dir src/types/v3 './node_modules/@uniswap/?(v3-core|v3-periphery)/artifacts/contracts/**/*.json'",
"compile-v2-types": "npx typechain --target ethers-v5 --out-dir src/types/v2 './node_modules/@uniswap/?(v2-core|v2-periphery)/build/*UniswapV2*.json'",
"compile-router": "npx typechain --target ethers-v5 --out-dir src/types/other './node_modules/@uniswap/swap-router-contracts/artifacts/contracts/SwapRouter02.sol/SwapRouter02.json'",
"compile-router": "npx typechain --target ethers-v5 --out-dir src/types/router02 './node_modules/@uniswap/swap-router-contracts/artifacts/contracts/SwapRouter02.sol/SwapRouter02.json'",
"compile-external-types": "npx typechain --target ethers-v5 --out-dir src/types/other 'src/abis/**/*.json'",
"build": "run-p compile-v3-types compile-v2-types compile-router compile-external-types && run-p build:*",
"build:main": "tsc -p tsconfig.json",
Expand Down
298 changes: 298 additions & 0 deletions src/abis/gasPriceOracle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,298 @@
[
{
"inputs": [
{
"internalType": "address",
"name": "_owner",
"type": "address"
}
],
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "DecimalsUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "GasPriceUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "L1BaseFeeUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "OverheadUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "ScalarUpdated",
"type": "event"
},
{
"inputs": [],
"name": "decimals",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "gasPrice",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes",
"name": "_data",
"type": "bytes"
}
],
"name": "getL1Fee",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes",
"name": "_data",
"type": "bytes"
}
],
"name": "getL1GasUsed",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "l1BaseFee",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "overhead",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "owner",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "renounceOwnership",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "scalar",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_decimals",
"type": "uint256"
}
],
"name": "setDecimals",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_gasPrice",
"type": "uint256"
}
],
"name": "setGasPrice",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_baseFee",
"type": "uint256"
}
],
"name": "setL1BaseFee",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_overhead",
"type": "uint256"
}
],
"name": "setOverhead",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_scalar",
"type": "uint256"
}
],
"name": "setScalar",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "transferOwnership",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
}
]
25 changes: 25 additions & 0 deletions src/providers/multicall-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@ export type CallSameFunctionOnContractWithMultipleParams<
additionalConfig?: TAdditionalConfig;
};

export type CallMultipleFunctionsOnSameContractParams<
TFunctionParams,
TAdditionalConfig = any
> = {
address: string;
contractInterface: Interface;
functionNames: string[];
functionParams?: TFunctionParams[];
providerConfig?: ProviderConfig;
additionalConfig?: TAdditionalConfig;
};

export type SuccessResult<TReturn> = {
success: true;
result: TReturn;
Expand Down Expand Up @@ -96,4 +108,17 @@ export abstract class IMulticallProvider<TMulticallConfig = any> {
blockNumber: BigNumber;
results: Result<TReturn>[];
}>;

public abstract callMultipleFunctionsOnSameContract<
TFunctionParams extends any[] | undefined,
TReturn = any
>(
params: CallMultipleFunctionsOnSameContractParams<
TFunctionParams,
TMulticallConfig
>
): Promise<{
blockNumber: BigNumber;
results: Result<TReturn>[];
}>;
}
Loading