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

Use eth_calls instead of storage calls in mapping code #365

Merged
merged 2 commits into from
Sep 23, 2022
Merged

Use eth_calls instead of storage calls in mapping code #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
029bf03
Use eth_calls instead of storage calls
nikugogoi Sep 23, 2022
abb5f79
Use eth_call in _updateFeeVars
nikugogoi Sep 23, 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
4 changes: 3 additions & 1 deletion packages/erc20-watcher/src/fill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ const log = debug('vulcanize:server');
export const main = async (): Promise<any> => {
const argv = await yargs(hideBin(process.argv)).parserConfiguration({
'parse-numbers': false
}).options({
}).env(
'FILL'
).options({
configFile: {
alias: 'f',
type: 'string',
Expand Down
4 changes: 3 additions & 1 deletion packages/uni-info-watcher/src/fill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ const log = debug('vulcanize:server');
export const main = async (): Promise<any> => {
const argv = await yargs(hideBin(process.argv)).parserConfiguration({
'parse-numbers': false
}).options({
}).env(
'FILL'
).options({
configFile: {
alias: 'f',
type: 'string',
Expand Down
66 changes: 40 additions & 26 deletions packages/uni-info-watcher/src/indexer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { updatePoolDayData, updatePoolHourData, updateTickDayData, updateTokenDa
import { Token } from './entity/Token';
import { convertTokenToDecimal, loadFactory, loadTransaction, safeDiv } from './utils';
import { createTick, feeTierToTickSpacing } from './utils/tick';
import { WATCHED_CONTRACTS } from './utils/constants';
import { FACTORY_ADDRESS, WATCHED_CONTRACTS } from './utils/constants';
import { Position } from './entity/Position';
import { Database } from './database';
import { Event } from './entity/Event';
Expand Down Expand Up @@ -1379,33 +1379,33 @@ export class Indexer implements IndexerInterface {
let position = await this._db.getPosition({ id: tokenId.toString(), blockHash });

if (!position) {
console.time('time:indexer#_getPosition-storage_call_for_getPosition');
const nfpmPosition = await this._uniClient.getPosition(blockHash, tokenId);
console.timeEnd('time:indexer#_getPosition-storage_call_for_getPosition');
try {
console.time('time:indexer#_getPosition-eth_call_for_positions');
const { value: positionResult } = await this._uniClient.positions(blockHash, contractAddress, tokenId);
console.timeEnd('time:indexer#_getPosition-eth_call_for_positions');

// The contract call reverts in situations where the position is minted and deleted in the same block.
// From my investigation this happens in calls from BancorSwap.
// (e.g. 0xf7867fa19aa65298fadb8d4f72d0daed5e836f3ba01f0b9b9631cdc6c36bed40)
let factoryAddress = FACTORY_ADDRESS;

if (nfpmPosition) {
console.time('time:indexer#_getPosition-storage_call_for_poolIdToPoolKey');
const { token0: token0Address, token1: token1Address, fee } = await this._uniClient.poolIdToPoolKey(blockHash, nfpmPosition.poolId);
console.timeEnd('time:indexer#_getPosition-storage_call_for_poolIdToPoolKey');
if (this._isDemo) {
// Currently fetching address from Factory entity in database as only one exists.
const [factory] = await this._db.getModelEntitiesNoTx(Factory, { hash: blockHash }, {}, { limit: 1 });
factoryAddress = factory.id;
}

console.time('time:indexer#_getPosition-storage_call_for_getPool');
let { pool: poolAddress } = await this._uniClient.getPool(blockHash, token0Address, token1Address, fee);
console.timeEnd('time:indexer#_getPosition-storage_call_for_getPool');
console.time('time:indexer#_getPosition-eth_call_for_getPool');
let { value: poolAddress } = await this._uniClient.callGetPool(blockHash, factoryAddress, positionResult.token0, positionResult.token1, positionResult.fee);
console.timeEnd('time:indexer#_getPosition-eth_call_for_getPool');

// Get the pool address in lowercase.
poolAddress = utils.hexlify(poolAddress);

position = new Position();
position.id = tokenId.toString();
position.pool = poolAddress;
position.token0 = utils.hexlify(token0Address);
position.token1 = utils.hexlify(token1Address);
position.tickLower = poolAddress.concat('#').concat(nfpmPosition.tickLower.toString());
position.tickUpper = poolAddress.concat('#').concat(nfpmPosition.tickUpper.toString());
position.token0 = utils.hexlify(positionResult.token0);
position.token1 = utils.hexlify(positionResult.token1);
position.tickLower = poolAddress.concat('#').concat(positionResult.tickLower.toString());
position.tickUpper = poolAddress.concat('#').concat(positionResult.tickUpper.toString());

const dbTx = await this._db.createTransactionRunner();

Expand All @@ -1421,22 +1421,36 @@ export class Indexer implements IndexerInterface {
await dbTx.release();
}

position.feeGrowthInside0LastX128 = BigInt(nfpmPosition.feeGrowthInside0LastX128.toString());
position.feeGrowthInside1LastX128 = BigInt(nfpmPosition.feeGrowthInside1LastX128.toString());
position.feeGrowthInside0LastX128 = BigInt(positionResult.feeGrowthInside0LastX128.toString());
position.feeGrowthInside1LastX128 = BigInt(positionResult.feeGrowthInside1LastX128.toString());
} catch (error: any) {
// The contract call reverts in situations where the position is minted and deleted in the same block.
// From my investigation this happens in calls from BancorSwap.
// (e.g. 0xf7867fa19aa65298fadb8d4f72d0daed5e836f3ba01f0b9b9631cdc6c36bed40)

if (error.message !== utils.Logger.errors.CALL_EXCEPTION) {
log('nfpm positions eth_call failed');
throw error;
}
}
}

return position || null;
}

async _updateFeeVars (position: Position, block: Block, contractAddress: string, tokenId: bigint): Promise<Position> {
console.time('time:indexer#_updateFeeVars-storage_call_for_getPosition');
const nfpmPosition = await this._uniClient.getPosition(block.hash, tokenId);
console.timeEnd('time:indexer#_updateFeeVars-storage_call_for_getPosition');
try {
console.time('time:indexer#_updateFeeVars-eth_call_for_positions');
const { value: positionResult } = await this._uniClient.positions(block.hash, contractAddress, tokenId);
console.timeEnd('time:indexer#_updateFeeVars-eth_call_for_positions');

if (nfpmPosition) {
position.feeGrowthInside0LastX128 = BigInt(nfpmPosition.feeGrowthInside0LastX128.toString());
position.feeGrowthInside1LastX128 = BigInt(nfpmPosition.feeGrowthInside1LastX128.toString());
if (positionResult) {
position.feeGrowthInside0LastX128 = BigInt(positionResult.feeGrowthInside0LastX128.toString());
position.feeGrowthInside1LastX128 = BigInt(positionResult.feeGrowthInside1LastX128.toString());
}
} catch (error) {
log('nfpm positions eth_call failed');
log(error);
}

return position;
Expand Down
4 changes: 3 additions & 1 deletion packages/uni-watcher/src/fill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ const log = debug('vulcanize:server');
export const main = async (): Promise<any> => {
const argv = await yargs(hideBin(process.argv)).parserConfiguration({
'parse-numbers': false
}).options({
}).env(
'FILL'
).options({
configFile: {
alias: 'f',
type: 'string',
Expand Down