Skip to content

Commit 4903bd1

Browse files
committed
add rateAsset1 for USDe arm
1 parent af77b64 commit 4903bd1

26 files changed

Lines changed: 592 additions & 576 deletions
Lines changed: 508 additions & 508 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

schema.graphql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ type ArmDailyStat @entity {
754754
rateUSD: Float!
755755
rateETH: Float!
756756
rateNative: Float!
757+
rateAsset1: Float!
757758
}
758759

759760
type ArmAddressYield @entity {

src/mainnet/processors/origin-arms.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as originEthenaArmAbi from '@abi/origin-ethena-arm'
2+
import { ensureExchangeRate } from '@shared/post-processors/exchange-rates'
23
import { createOriginARMProcessors } from '@templates/origin-arm'
34
import { addresses } from '@utils/addresses'
45

@@ -39,8 +40,8 @@ export const originArmProcessors = [
3940
token1: 'sUSDe',
4041
getRate1: async (ctx, block) => {
4142
// The same standard exists on sUSDe to determine it's rate to USDe
42-
const contract = new originEthenaArmAbi.Contract(ctx, block.header, addresses.tokens.sUSDe)
43-
return await contract.convertToAssets(10n ** 18n)
43+
const rate = await ensureExchangeRate(ctx, block, 'sUSDe', 'USDe')
44+
return rate?.rate ?? 10n ** 18n
4445
},
4546
capManagerAddress: addresses.arms['ARM-USDe-sUSDe'].capManager,
4647
armType: 'ethena',

src/model/generated/aeroClPoolState.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, DateTimeColumn as DateTimeColumn_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, ManyToOne as ManyToOne_, FloatColumn as FloatColumn_} from "@subsquid/typeorm-store"
1+
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, DateTimeColumn as DateTimeColumn_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, ManyToOne as ManyToOne_, Relation as Relation_, FloatColumn as FloatColumn_} from "@subsquid/typeorm-store"
22
import {AeroCLPoolTick} from "./aeroClPoolTick.model"
33

44
@Entity_()
@@ -49,7 +49,7 @@ export class AeroCLPoolState {
4949

5050
@Index_()
5151
@ManyToOne_(() => AeroCLPoolTick, {nullable: true})
52-
tick!: AeroCLPoolTick
52+
tick!: Relation_<AeroCLPoolTick>
5353

5454
@FloatColumn_({nullable: false})
5555
tickPrice!: number

src/model/generated/armDailyStat.model.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,7 @@ export class ArmDailyStat {
9191

9292
@FloatColumn_({nullable: false})
9393
rateNative!: number
94+
95+
@FloatColumn_({nullable: false})
96+
rateAsset1!: number
9497
}

src/model/generated/beaconDepositEvent.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, DateTimeColumn as DateTimeColumn_, ManyToOne as ManyToOne_} from "@subsquid/typeorm-store"
1+
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, DateTimeColumn as DateTimeColumn_, ManyToOne as ManyToOne_, Relation as Relation_} from "@subsquid/typeorm-store"
22
import {BeaconDepositPubkey} from "./beaconDepositPubkey.model"
33

44
@Entity_()
@@ -36,7 +36,7 @@ export class BeaconDepositEvent {
3636

3737
@Index_()
3838
@ManyToOne_(() => BeaconDepositPubkey, {nullable: true})
39-
pubkey!: BeaconDepositPubkey
39+
pubkey!: Relation_<BeaconDepositPubkey>
4040

4141
@StringColumn_({nullable: false})
4242
withdrawalCredentials!: string

src/model/generated/beaconDepositPubkey.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, DateTimeColumn as DateTimeColumn_, IntColumn as IntColumn_, OneToMany as OneToMany_} from "@subsquid/typeorm-store"
1+
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, DateTimeColumn as DateTimeColumn_, IntColumn as IntColumn_, OneToMany as OneToMany_, Relation as Relation_} from "@subsquid/typeorm-store"
22
import {BeaconDepositEvent} from "./beaconDepositEvent.model"
33

44
@Entity_()
@@ -20,5 +20,5 @@ export class BeaconDepositPubkey {
2020
count!: number
2121

2222
@OneToMany_(() => BeaconDepositEvent, e => e.pubkey)
23-
deposits!: BeaconDepositEvent[]
23+
deposits!: Relation_<BeaconDepositEvent[]>
2424
}

src/model/generated/esAccount.model.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, ManyToOne as ManyToOne_, OneToMany as OneToMany_} from "@subsquid/typeorm-store"
1+
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, ManyToOne as ManyToOne_, Relation as Relation_, OneToMany as OneToMany_} from "@subsquid/typeorm-store"
22

33
@Entity_()
44
export class ESAccount {
@@ -35,8 +35,8 @@ export class ESAccount {
3535

3636
@Index_()
3737
@ManyToOne_(() => ESAccount, {nullable: true})
38-
delegateTo!: ESAccount | undefined | null
38+
delegateTo!: Relation_<ESAccount> | undefined | null
3939

4040
@OneToMany_(() => ESAccount, e => e.delegateTo)
41-
delegatesFrom!: ESAccount[]
41+
delegatesFrom!: Relation_<ESAccount[]>
4242
}

src/model/generated/esLockup.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, DateTimeColumn as DateTimeColumn_, OneToMany as OneToMany_} from "@subsquid/typeorm-store"
1+
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, BigIntColumn as BigIntColumn_, DateTimeColumn as DateTimeColumn_, OneToMany as OneToMany_, Relation as Relation_} from "@subsquid/typeorm-store"
22
import {ESLockupState} from "./_esLockupState"
33
import {ESLockupEvent} from "./esLockupEvent.model"
44

@@ -56,5 +56,5 @@ export class ESLockup {
5656
state!: ESLockupState | undefined | null
5757

5858
@OneToMany_(() => ESLockupEvent, e => e.lockup)
59-
events!: ESLockupEvent[]
59+
events!: Relation_<ESLockupEvent[]>
6060
}

src/model/generated/esLockupEvent.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, DateTimeColumn as DateTimeColumn_, ManyToOne as ManyToOne_} from "@subsquid/typeorm-store"
1+
import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, DateTimeColumn as DateTimeColumn_, ManyToOne as ManyToOne_, Relation as Relation_} from "@subsquid/typeorm-store"
22
import {ESLockupEventType} from "./_esLockupEventType"
33
import {ESLockup} from "./esLockup.model"
44

@@ -36,5 +36,5 @@ export class ESLockupEvent {
3636

3737
@Index_()
3838
@ManyToOne_(() => ESLockup, {nullable: true})
39-
lockup!: ESLockup
39+
lockup!: Relation_<ESLockup>
4040
}

0 commit comments

Comments
 (0)