Skip to content

Commit

Permalink
transfers optimisation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Matlefebvre1234
Matlefebvre1234 committed Dec 1, 2023
1 parent ecd8381 commit 4575acf
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 66 deletions.
145 changes: 97 additions & 48 deletions src/queries.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,43 +162,68 @@ test("getTotalSupply with options", () => {

// Test Balance Change
test("getBalanceChange", () => {
const parameters = new URLSearchParams({ chain, owner: address });
expect(formatSQL(getBalanceChanges(parameters))).toContain(
formatSQL(`SELECT balance_changes.contract as contract,
Contracts.name as name,
Contracts.symbol as symbol,
Contracts.decimals as decimals,
balance_changes.owner as owner,
balance_changes.old_balance as old_balance,
balance_changes.new_balance as new_balance,
balance_changes.transaction_id as transaction_id,
balance_changes.id as id,
balance_changes.module_hash as module_hash,
balance_changes.chain as chain,
block_number,
timestamp`)
const parameters1 = new URLSearchParams({ chain, owner: address, contract: address });
const parameters2 = new URLSearchParams({ chain, owner: address });
const parameters3 = new URLSearchParams({ chain, contract: address });

expect(formatSQL(getBalanceChanges(parameters1))).toContain(
formatSQL(`SELECT
contract as contract,
owner as owner,
newBalance as balance,
toDateTime(timestamp) as timestamp,
transaction as transaction_id,
chain as chain,
block_number`)
);
expect(formatSQL(getBalanceChanges(parameters))).toContain(
formatSQL(`FROM balance_changes`)
expect(formatSQL(getBalanceChanges(parameters2))).toContain(
formatSQL(`SELECT
owner,
contract,
toDateTime(last_value(timestamp)) AS timestamp,
last_value(newBalance) AS balance`)
);

expect(formatSQL(getBalanceChanges(parameters3))).toContain(
formatSQL(`SELECT
owner,
contract,
toDateTime(last_value(timestamp)) as timestamp,
last_value(newBalance) as balance`)
);

expect(formatSQL(getBalanceChanges(parameters1))).toContain(
formatSQL(`FROM mv_balance_changes_owner`)
);

expect(formatSQL(getBalanceChanges(parameters))).toContain(
formatSQL(
`LEFT JOIN Contracts ON Contracts.address = balance_changes.contract`
)
expect(formatSQL(getBalanceChanges(parameters2))).toContain(
formatSQL(`FROM mv_balance_changes_contract`)
);

expect(formatSQL(getBalanceChanges(parameters))).toContain(
formatSQL(`WHERE(chain == '${chain}' AND owner == '${address}')`)
expect(formatSQL(getBalanceChanges(parameters3))).toContain(
formatSQL(`FROM mv_balance_changes_contract`)
);

expect(formatSQL(getBalanceChanges(parameters))).toContain(
formatSQL(`ORDER BY block_number DESC`)

expect(formatSQL(getBalanceChanges(parameters1))).toContain(
formatSQL(`WHERE(chain == '${chain}' AND owner == '${address}' AND contract == '${address}')`)
);

expect(formatSQL(getBalanceChanges(parameters))).toContain(
formatSQL(`LIMIT 100`)
expect(formatSQL(getBalanceChanges(parameters1))).toContain(
formatSQL(`ORDER BY timestamp DESC`)
);

expect(formatSQL(getBalanceChanges(parameters2))).toContain(
formatSQL(`GROUP BY (contract, owner) ORDER BY timestamp DESC`)
);

expect(formatSQL(getBalanceChanges(parameters3))).toContain(
formatSQL(`GROUP BY (contract, owner) ORDER BY timestamp DESC`)
);


expect(formatSQL(getBalanceChanges(parameters1))).toContain(
formatSQL(`LIMIT 1`)
);
});

Expand All @@ -221,32 +246,52 @@ test("getBalanceChanges with options", () => {
// Test getTransfers

test("getTransfers", () => {
const parameters = new URLSearchParams({ chain, contract: address, from: address, to: address, transaction_id });
expect(formatSQL(getTransfers(parameters))).toContain(
formatSQL(`SELECT
const parameters1 = new URLSearchParams({ chain, contract: address });
const parameters2 = new URLSearchParams({ chain, from: address });
const parameters3 = new URLSearchParams({ chain, to: address });
const parameters4 = new URLSearchParams({ chain, from: address, to: address });
const parameters5 = new URLSearchParams({ chain, contract: address, from: address, to: address, transaction_id });
expect(formatSQL(getTransfers(parameters1))).toContain(
formatSQL(`SELECT
address as contract,
from,
to,
value as amount,
transaction as transaction_id,
block_number,
timestamp,
chain`)
from,
to,
value as amount,
transaction as transaction_id,
block_number,
timestamp,
chain`)

);
expect(formatSQL(getTransfers(parameters))).toContain(
formatSQL(`FROM Transfers`)
expect(formatSQL(getTransfers(parameters1))).toContain(
formatSQL(`FROM mv_transfers_contract`)
);

expect(formatSQL(getTransfers(parameters2))).toContain(
formatSQL(`FROM mv_transfers_from`)
);

expect(formatSQL(getTransfers(parameters))).toContain(
formatSQL(`WHERE(Transfers.chain == '${chain}' AND Transfers.address == '${address}' AND Transfers.from == '${address}' AND Transfers.to == '${address}' AND Transfers.transaction == '${transaction_id}')`)
expect(formatSQL(getTransfers(parameters3))).toContain(
formatSQL(`FROM mv_transfers_to`)
);

expect(formatSQL(getTransfers(parameters))).toContain(
formatSQL(`ORDER BY block_number DESC`)
expect(formatSQL(getTransfers(parameters4))).toContain(
formatSQL(`FROM mv_transfers_from`)
);

expect(formatSQL(getTransfers(parameters))).toContain(




expect(formatSQL(getTransfers(parameters5))).toContain(
formatSQL(`WHERE(chain == '${chain}' AND address == '${address}' AND from == '${address}' AND to == '${address}' AND transaction == '${transaction_id}')`)
);

expect(formatSQL(getTransfers(parameters5))).toContain(
formatSQL(`ORDER BY timestamp DESC`)
);

expect(formatSQL(getTransfers(parameters5))).toContain(
formatSQL(`LIMIT 100`)
);
});
Expand All @@ -255,19 +300,23 @@ test("getTransfers", () => {
test("getHolders", () => {
const parameters = new URLSearchParams({ chain, contract: address });
expect(formatSQL(getHolders(parameters))).toContain(
formatSQL(`SELECT owner`)
formatSQL(`SELECT
owner,
newBalance AS balance,
block_number,
toDateTime(timestamp) AS timestamp`)
);
expect(formatSQL(getHolders(parameters))).toContain(
formatSQL(`FROM balance_changes`)
formatSQL(`FROM mv_balance_changes_contract`)
);


expect(formatSQL(getHolders(parameters))).toContain(
formatSQL(`WHERE ((owner,block_number)IN(SELECTowner,max(block_number)FROMbalance_changesGROUPBYowner) AND chain == '${chain}' AND contract == '${address}' AND CAST(new_balance as int) > 0)`)
formatSQL(`WHERE (chain == '${chain}' AND contract == '${address}' AND CAST(balance as int) > 0)`)
);

expect(formatSQL(getHolders(parameters))).toContain(
formatSQL(`GROUP BY owner`)
formatSQL(`ORDER BY timestamp DESC`)
);

expect(formatSQL(getHolders(parameters))).toContain(
Expand Down
49 changes: 31 additions & 18 deletions src/queries.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ function balance_changes_contract_query(table: string) {








export function getTotalSupply(searchParams: URLSearchParams, example?: boolean) {
// Params
const address = getAddress(searchParams, "address", false)?.toLowerCase();
Expand Down Expand Up @@ -181,11 +186,11 @@ export function getBalanceChanges(searchParams: URLSearchParams, example?: boole

// SQL Query
table = 'BalanceChange'
contractTable = 'Contracts';


if (contract && owner) query += balance_changes_owner_contract_query(mvOwnerTable);
if (!contract && owner) query += balance_changes_owner_query(mvContractTable);
if (contract && !owner) query += balance_changes_contract_query(mvContractTable);
else if (!contract && owner) query += balance_changes_owner_query(mvContractTable);
else if (contract && !owner) query += balance_changes_contract_query(mvContractTable);

if (!example) {
// WHERE statements
Expand Down Expand Up @@ -258,15 +263,19 @@ export function getHolders(searchParams: URLSearchParams, example?: boolean) {
}

export function getTransfers(searchParams: URLSearchParams, example?: boolean) {
// Params

const contract = getAddress(searchParams, "contract", false)?.toLowerCase();
const from = getAddress(searchParams, "from", false)?.toLowerCase();
const to = getAddress(searchParams, "to", false)?.toLowerCase();
const chain = searchParams.get("chain");
const transaction_id = searchParams.get("transaction_id")?.toLowerCase();
const amount = searchParams.get("amount");
// Query
const table = 'Transfers'


// SQL Query
let mvFromTable = "mv_transfers_from"
let mvToTable = "mv_transfers_to"
let mvContractTable = "mv_transfers_contract"

let query = `SELECT
address as contract,
Expand All @@ -276,19 +285,24 @@ export function getTransfers(searchParams: URLSearchParams, example?: boolean) {
transaction as transaction_id,
block_number,
timestamp,
chain
FROM ${table} `;
chain`

if (contract) query += ` FROM ${mvContractTable}`
else if (!contract && from && !to) query += ` FROM ${mvFromTable}`
else if (!contract && !from && to) query += ` FROM ${mvToTable}`
else if (!contract && from && to) query += ` FROM ${mvFromTable}`


if (!example) {
// WHERE statements
const where = [];

// equals
if (chain) where.push(`${table}.chain == '${chain}'`);
if (contract) where.push(`${table}.address == '${contract}'`);
if (from) where.push(`${table}.from == '${from}'`);
if (to) where.push(`${table}.to == '${to}'`);
if (transaction_id) where.push(`${table}.transaction == '${transaction_id}'`);
if (chain) where.push(`chain == '${chain}'`);
if (contract) where.push(`address == '${contract}'`);
if (from) where.push(`from == '${from}'`);
if (to) where.push(`to == '${to}'`);
if (transaction_id) where.push(`transaction == '${transaction_id}'`);

//add amount filter
addAmountFilter(searchParams, where);
Expand All @@ -297,12 +311,11 @@ export function getTransfers(searchParams: URLSearchParams, example?: boolean) {

// Join WHERE statements with AND
if (where.length) query += ` WHERE(${where.join(' AND ')})`;

// Sort and Limit
const sort_by = searchParams.get("sort_by");
query += ` ORDER BY block_number ${sort_by ?? DEFAULT_SORT_BY} `

//add ORDER BY and GROUP BY
query += ` ORDER BY timestamp DESC`
}

//ADD limit
const limit = parseLimit(searchParams.get("limit"), 100);
query += ` LIMIT ${limit} `
const offset = searchParams.get("offset");
Expand Down

0 comments on commit 4575acf

Please sign in to comment.