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

Refactor/get logs #558

Merged
merged 4 commits into from
Dec 12, 2023
Merged

Refactor/get logs #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c064c9e
update node types to 18
gmbronco Dec 9, 2023
c674b25
isolated sync-wallet-balances
gmbronco Dec 9, 2023
0e66b53
fetching logs by array of addresses
gmbronco Dec 9, 2023
595557a
remove service binding, add output
franzns Dec 12, 2023
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
2 changes: 1 addition & 1 deletion modules/balancer/balancer.resolvers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getTokenAmountRaw } from '../sor/utils';
const balancerResolvers: Resolvers = {
Query: {
sorGetCowSwaps: async (parent, args, context) => {
const amountToken = args.swapType === "EXACT_IN" ? args.tokenIn : args.tokenOut;
const amountToken = args.swapType === 'EXACT_IN' ? args.tokenIn : args.tokenOut;
// Use TokenAmount to help follow scaling requirements in later logic
// args.swapAmount is RawScale, e.g. 1USDC should be passed as 1000000
const amount = await getTokenAmountRaw(amountToken, args.swapAmount, args.chain);
Expand Down
31 changes: 13 additions & 18 deletions modules/subgraphs/beets-bar-subgraph/beets-bar.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
} from './generated/beets-bar-subgraph-types';
import { Cache, CacheClass } from 'memory-cache';
import { twentyFourHoursInMs } from '../../common/time';
import { networkContext } from '../../network/network-context.service';

const ALL_USERS_CACHE_KEY = `beets-bar-subgraph_all-users`;
const BEETS_BAR_CACHE_KEY_PREFIX = `beets-bar`;
Expand All @@ -17,7 +16,7 @@ const BEETS_BAR_NOW_CACHE_KEY = `beets-bar-now`;
export class BeetsBarSubgraphService {
cache: CacheClass<string, any>;

constructor() {
constructor(private subgraphUrl: string, private fbeetsAddress?: string, private chainId = 250) {
this.cache = new Cache<string, any>();
}

Expand All @@ -42,7 +41,7 @@ export class BeetsBarSubgraphService {
}> {
const { beetsBarUser, beetsBar, previousBeetsBarUser, previousBeetsBar } = await this.sdk.BeetsBarPortfolioData(
{
barId: networkContext.data.fbeets?.address || '',
barId: this.fbeetsAddress || '',
userAddress,
previousBlockNumber,
},
Expand All @@ -59,7 +58,7 @@ export class BeetsBarSubgraphService {
public async getBeetsBar(block?: number): Promise<BeetsBarFragment> {
if (block) {
const cached = this.cache.get(
`${BEETS_BAR_CACHE_KEY_PREFIX}:${networkContext.chainId}:${block}`,
`${BEETS_BAR_CACHE_KEY_PREFIX}:${this.chainId}:${block}`,
) as BeetsBarFragment | null;

if (cached) {
Expand All @@ -68,12 +67,12 @@ export class BeetsBarSubgraphService {
}

const { bar } = await this.sdk.GetBeetsBar({
id: networkContext.data.fbeets?.address || '',
id: this.fbeetsAddress || '',
block: { number: block },
});

this.cache.put(
`${BEETS_BAR_CACHE_KEY_PREFIX}:${networkContext.chainId}:${block}`,
`${BEETS_BAR_CACHE_KEY_PREFIX}:${this.chainId}:${block}`,
bar ?? this.emptyBeetsBar,
twentyFourHoursInMs,
);
Expand All @@ -86,21 +85,19 @@ export class BeetsBarSubgraphService {
}

public async getBeetsBarNow(): Promise<BeetsBarFragment> {
const cached = this.cache.get(
`${BEETS_BAR_NOW_CACHE_KEY}:${networkContext.chainId}`,
) as BeetsBarFragment | null;
const cached = this.cache.get(`${BEETS_BAR_NOW_CACHE_KEY}:${this.chainId}`) as BeetsBarFragment | null;

if (cached) {
return cached;
}

const { bar } = await this.sdk.GetBeetsBar({ id: networkContext.data.fbeets?.address || '' });
const { bar } = await this.sdk.GetBeetsBar({ id: this.fbeetsAddress || '' });

if (!bar) {
return this.emptyBeetsBar;
}

this.cache.put(`${BEETS_BAR_NOW_CACHE_KEY}:${networkContext.chainId}`, bar, 60000);
this.cache.put(`${BEETS_BAR_NOW_CACHE_KEY}:${this.chainId}`, bar, 60000);

return bar;
}
Expand All @@ -116,7 +113,7 @@ export class BeetsBarSubgraphService {
}

public async getUserAtBlock(address: string, block: number): Promise<BeetsBarUserFragment | null> {
const cachedUsers = this.cache.get(`${ALL_USERS_CACHE_KEY}:${networkContext.chainId}:${block}`) as
const cachedUsers = this.cache.get(`${ALL_USERS_CACHE_KEY}:${this.chainId}:${block}`) as
| BeetsBarUserFragment[]
| null;

Expand All @@ -126,21 +123,21 @@ export class BeetsBarSubgraphService {

const users = await this.getAllUsers({ block: { number: block } });

this.cache.put(`${ALL_USERS_CACHE_KEY}:${networkContext.chainId}:${block}`, users, twentyFourHoursInMs);
this.cache.put(`${ALL_USERS_CACHE_KEY}:${this.chainId}:${block}`, users, twentyFourHoursInMs);

return users.find((user) => user.id === address) || null;
}

private get sdk() {
const client = new GraphQLClient(networkContext.data.subgraphs.beetsBar || '');
const client = new GraphQLClient(this.subgraphUrl || '');

return getSdk(client);
}

private get emptyBeetsBar(): BeetsBarFragment {
return {
id: networkContext.data.fbeets?.address || '',
address: networkContext.data.fbeets?.address || '',
id: this.fbeetsAddress || '',
address: this.fbeetsAddress || '',
block: '',
decimals: 19,
fBeetsBurned: '0',
Expand All @@ -156,5 +153,3 @@ export class BeetsBarSubgraphService {
};
}
}

export const beetsBarService = new BeetsBarSubgraphService();
Loading