@sentio/sdk 2.57.13-rc.2 → 2.57.13-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/aptos/ext/aptos-dex.d.ts +1 -1
- package/lib/aptos/ext/aptos-dex.d.ts.map +1 -1
- package/lib/aptos/ext/aptos-dex.js +1 -1
- package/lib/aptos/ext/aptos-dex.js.map +1 -1
- package/lib/move/ext/coin.d.ts +1 -1
- package/lib/move/ext/coin.d.ts.map +1 -1
- package/lib/move/ext/move-dex.d.ts +2 -2
- package/lib/move/ext/move-dex.d.ts.map +1 -1
- package/lib/move/ext/move-dex.js +11 -11
- package/lib/move/ext/move-dex.js.map +1 -1
- package/package.json +3 -3
- package/src/aptos/ext/aptos-dex.ts +1 -1
- package/src/move/ext/coin.ts +1 -1
- package/src/move/ext/move-dex.ts +12 -12
|
@@ -6,7 +6,7 @@ import { TokenInfo } from './token.js';
|
|
|
6
6
|
export type PoolAdaptor<T> = MovePoolAdaptor<MoveResource, T>;
|
|
7
7
|
export declare class CoinList implements MoveCoinList<TokenInfo, AptosNetwork> {
|
|
8
8
|
calculateValueInUsd(amount: bigint, coinInfo: TokenInfo, timestamp: number, network?: AptosNetwork): Promise<BigDecimal>;
|
|
9
|
-
getCoinInfo(type: string): Promise<TokenInfo>;
|
|
9
|
+
getCoinInfo(type: string, network?: AptosNetwork): Promise<TokenInfo>;
|
|
10
10
|
whiteListed(type: string): boolean;
|
|
11
11
|
whitelistCoins(): Map<string, TokenInfo>;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos-dex.d.ts","sourceRoot":"","sources":["../../../src/aptos/ext/aptos-dex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,OAAO,EAAoB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAClG,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAA4B,SAAS,EAAyC,MAAM,YAAY,CAAA;AAEvG,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;AAE7D,qBAAa,QAAS,YAAW,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC;IACpE,mBAAmB,CACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,YAAoC,GAC5C,OAAO,CAAC,UAAU,CAAC;IAIhB,WAAW,CAAC,IAAI,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"aptos-dex.d.ts","sourceRoot":"","sources":["../../../src/aptos/ext/aptos-dex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,OAAO,EAAoB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAClG,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAA4B,SAAS,EAAyC,MAAM,YAAY,CAAA;AAEvG,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;AAE7D,qBAAa,QAAS,YAAW,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC;IACpE,mBAAmB,CACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,YAAoC,GAC5C,OAAO,CAAC,UAAU,CAAC;IAIhB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,YAAoC;IAI7E,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIlC,cAAc;CAGf;AAED,eAAO,MAAM,aAAa,UAAiB,CAAA;AAE3C,qBAAa,QAAQ,CAAC,CAAC,CAAE,SAAQ,OAAO,CACtC,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,qBAAqB,EACrB,CAAC,CACF;IACC,QAAQ,WAAiB;IACjB,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CACpC;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CAErB"}
|
|
@@ -5,7 +5,7 @@ export class CoinList {
|
|
|
5
5
|
calculateValueInUsd(amount, coinInfo, timestamp, network = AptosNetwork.MAIN_NET) {
|
|
6
6
|
return tokenTokenValueInUsd(amount, coinInfo, timestamp, network);
|
|
7
7
|
}
|
|
8
|
-
async getCoinInfo(type) {
|
|
8
|
+
async getCoinInfo(type, network = AptosNetwork.MAIN_NET) {
|
|
9
9
|
return getTokenInfoWithFallback(type);
|
|
10
10
|
}
|
|
11
11
|
whiteListed(type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos-dex.js","sourceRoot":"","sources":["../../../src/aptos/ext/aptos-dex.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAgB,OAAO,EAAE,gBAAgB,EAAmB,MAAM,yBAAyB,CAAA;AAElG,OAAO,EAAE,wBAAwB,EAAa,oBAAoB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIvG,MAAM,OAAO,QAAQ;IACnB,mBAAmB,CACjB,MAAc,EACd,QAAmB,EACnB,SAAiB,EACjB,UAAwB,YAAY,CAAC,QAAQ;QAE7C,OAAO,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;
|
|
1
|
+
{"version":3,"file":"aptos-dex.js","sourceRoot":"","sources":["../../../src/aptos/ext/aptos-dex.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAgB,OAAO,EAAE,gBAAgB,EAAmB,MAAM,yBAAyB,CAAA;AAElG,OAAO,EAAE,wBAAwB,EAAa,oBAAoB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIvG,MAAM,OAAO,QAAQ;IACnB,mBAAmB,CACjB,MAAc,EACd,QAAmB,EACnB,SAAiB,EACjB,UAAwB,YAAY,CAAC,QAAQ;QAE7C,OAAO,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,UAAwB,YAAY,CAAC,QAAQ;QAC3E,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,OAAO,eAAe,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,cAAc;QACZ,OAAO,eAAe,EAAE,CAAA;IAC1B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,QAAQ,EAAE,CAAA;AAE3C,MAAM,OAAO,QAAY,SAAQ,OAShC;IACC,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAA;CAE1B;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAiB,EACjB,KAAa,EACb,KAAa,EACb,WAAmB,EACnB,WAAmB;IAEnB,OAAO,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;AACrF,CAAC"}
|
package/lib/move/ext/coin.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export interface BaseCoinInfo {
|
|
|
9
9
|
export interface MoveCoinList<TokenType extends BaseCoinInfo, Network> {
|
|
10
10
|
whiteListed(type: string): boolean;
|
|
11
11
|
whitelistCoins(): Map<string, TokenType>;
|
|
12
|
-
getCoinInfo(type: string): Promise<TokenType>;
|
|
12
|
+
getCoinInfo(type: string, network: Network): Promise<TokenType>;
|
|
13
13
|
calculateValueInUsd(amount: bigint, coinInfo: TokenType, timestamp: number, network: Network): Promise<BigDecimal>;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=coin.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coin.d.ts","sourceRoot":"","sources":["../../../src/move/ext/coin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,MAAM,WAAW,YAAY;IAE3B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,YAAY,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO;IACnE,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACxC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"coin.d.ts","sourceRoot":"","sources":["../../../src/move/ext/coin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,MAAM,WAAW,YAAY;IAE3B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,YAAY,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO;IACnE,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACxC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;IAC/D,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;CACnH"}
|
|
@@ -18,9 +18,9 @@ export declare class MoveDex<TokenType extends BaseCoinInfo, Network, ModuleType
|
|
|
18
18
|
tvlByPool: Gauge;
|
|
19
19
|
tvlByCoin: Gauge;
|
|
20
20
|
constructor(volume: Gauge, volumeByCoin: Gauge, tvlAll: Gauge, tvlByCoin: Gauge, tvlByPool: Gauge, poolAdaptor: MovePoolAdaptor<StructType, T>);
|
|
21
|
-
recordTradingVolume(ctx:
|
|
21
|
+
recordTradingVolume(ctx: AccountContextType, coinx: string, coiny: string, coinXAmount: bigint, coinYAmount: bigint, extraLabels?: any): Promise<BigDecimal>;
|
|
22
22
|
syncPools(resources: StructType[], ctx: AccountContextType, poolsHandler?: (pools: DecodedStruct<StructType, T>[]) => Promise<void> | void): Promise<void>;
|
|
23
|
-
getPair(coinx: string, coiny: string): Promise<string>;
|
|
23
|
+
getPair(coinx: string, coiny: string, ctx: AccountContextType): Promise<string>;
|
|
24
24
|
}
|
|
25
25
|
export declare function moveGetPairValue<TokenType extends BaseCoinInfo, Network, ContextType extends MoveAccountContext<Network, any, any>>(coinList: MoveCoinList<TokenType, Network>, ctx: ContextType, coinx: string, coiny: string, coinXAmount: bigint, coinYAmount: bigint): Promise<BigDecimal>;
|
|
26
26
|
//# sourceMappingURL=move-dex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-dex.d.ts","sourceRoot":"","sources":["../../../src/move/ext/move-dex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,WAAW,eAAe,CAAC,UAAU,EAAE,CAAC;IAC5C,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAA;IAE5B,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAA;IAE5B,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,GAAG,CAAA;IAEzD,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;CAC5B;AAED,qBAAa,OAAO,CAClB,SAAS,SAAS,YAAY,EAC9B,OAAO,EACP,UAAU,EACV,UAAU,EACV,SAAS,EACT,WAAW,SAAS,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,EAC5E,kBAAkB,SAAS,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,EAC1F,CAAC;IAED,QAAQ,EAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC1C,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,EAAE,KAAK,CAAA;IACb,YAAY,EAAE,KAAK,CAAA;IACnB,MAAM,EAAE,KAAK,CAAA;IACb,SAAS,EAAE,KAAK,CAAA;IAChB,SAAS,EAAE,KAAK,CAAA;gBAGd,MAAM,EAAE,KAAK,EACb,YAAY,EAAE,KAAK,EACnB,MAAM,EAAE,KAAK,EACb,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC;IAUvC,mBAAmB,CACvB,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"move-dex.d.ts","sourceRoot":"","sources":["../../../src/move/ext/move-dex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,WAAW,eAAe,CAAC,UAAU,EAAE,CAAC;IAC5C,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAA;IAE5B,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAA;IAE5B,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,GAAG,CAAA;IAEzD,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;CAC5B;AAED,qBAAa,OAAO,CAClB,SAAS,SAAS,YAAY,EAC9B,OAAO,EACP,UAAU,EACV,UAAU,EACV,SAAS,EACT,WAAW,SAAS,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,EAC5E,kBAAkB,SAAS,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,EAC1F,CAAC;IAED,QAAQ,EAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC1C,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,EAAE,KAAK,CAAA;IACb,YAAY,EAAE,KAAK,CAAA;IACnB,MAAM,EAAE,KAAK,CAAA;IACb,SAAS,EAAE,KAAK,CAAA;IAChB,SAAS,EAAE,KAAK,CAAA;gBAGd,MAAM,EAAE,KAAK,EACb,YAAY,EAAE,KAAK,EACnB,MAAM,EAAE,KAAK,EACb,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC;IAUvC,mBAAmB,CACvB,GAAG,EAAE,kBAAkB,EACvB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,GAAG,GAChB,OAAO,CAAC,UAAU,CAAC;IAoDhB,SAAS,CACb,SAAS,EAAE,UAAU,EAAE,EACvB,GAAG,EAAE,kBAAkB,EACvB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IA2F1E,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;CAQtF;AAED,wBAAsB,gBAAgB,CACpC,SAAS,SAAS,YAAY,EAC9B,OAAO,EACP,WAAW,SAAS,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,EAC1C,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CA6BrB"}
|
package/lib/move/ext/move-dex.js
CHANGED
|
@@ -22,12 +22,12 @@ export class MoveDex {
|
|
|
22
22
|
if (!whitelistx && !whitelisty) {
|
|
23
23
|
return result;
|
|
24
24
|
}
|
|
25
|
-
const coinXInfo = await this.coinList.getCoinInfo(coinx);
|
|
26
|
-
const coinYInfo = await this.coinList.getCoinInfo(coiny);
|
|
25
|
+
const coinXInfo = await this.coinList.getCoinInfo(coinx, ctx.network);
|
|
26
|
+
const coinYInfo = await this.coinList.getCoinInfo(coiny, ctx.network);
|
|
27
27
|
const timestamp = ctx.getTimestamp();
|
|
28
28
|
let resultX = BigDecimal(0);
|
|
29
29
|
let resultY = BigDecimal(0);
|
|
30
|
-
const pair = await this.getPair(coinx, coiny);
|
|
30
|
+
const pair = await this.getPair(coinx, coiny, ctx);
|
|
31
31
|
const baseLabels = extraLabels ? { ...extraLabels, pair } : { pair };
|
|
32
32
|
if (whitelistx) {
|
|
33
33
|
resultX = await this.coinList.calculateValueInUsd(coinXAmount, coinXInfo, timestamp, ctx.network);
|
|
@@ -80,11 +80,11 @@ export class MoveDex {
|
|
|
80
80
|
if (!whitelistx && !whitelisty) {
|
|
81
81
|
continue;
|
|
82
82
|
}
|
|
83
|
-
const pair = await this.getPair(coinx, coiny);
|
|
83
|
+
const pair = await this.getPair(coinx, coiny, ctx);
|
|
84
84
|
const extraLabels = this.poolAdaptor.getExtraPoolTags(pool);
|
|
85
85
|
const baseLabels = { ...extraLabels, pair };
|
|
86
|
-
const coinXInfo = await this.coinList.getCoinInfo(coinx);
|
|
87
|
-
const coinYInfo = await this.coinList.getCoinInfo(coiny);
|
|
86
|
+
const coinXInfo = await this.coinList.getCoinInfo(coinx, ctx.network);
|
|
87
|
+
const coinYInfo = await this.coinList.getCoinInfo(coiny, ctx.network);
|
|
88
88
|
const coinx_amount = this.poolAdaptor.getXReserve(pool.data_decoded);
|
|
89
89
|
const coiny_amount = this.poolAdaptor.getYReserve(pool.data_decoded);
|
|
90
90
|
let resultX = BigDecimal(0);
|
|
@@ -143,9 +143,9 @@ export class MoveDex {
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
|
-
async getPair(coinx, coiny) {
|
|
147
|
-
const coinXInfo = await this.coinList.getCoinInfo(coinx);
|
|
148
|
-
const coinYInfo = await this.coinList.getCoinInfo(coiny);
|
|
146
|
+
async getPair(coinx, coiny, ctx) {
|
|
147
|
+
const coinXInfo = await this.coinList.getCoinInfo(coinx, ctx.network);
|
|
148
|
+
const coinYInfo = await this.coinList.getCoinInfo(coiny, ctx.network);
|
|
149
149
|
if (coinXInfo.symbol.localeCompare(coinYInfo.symbol) > 0) {
|
|
150
150
|
return `${coinYInfo.symbol}-${coinXInfo.symbol}`;
|
|
151
151
|
}
|
|
@@ -155,8 +155,8 @@ export class MoveDex {
|
|
|
155
155
|
export async function moveGetPairValue(coinList, ctx, coinx, coiny, coinXAmount, coinYAmount) {
|
|
156
156
|
const whitelistx = coinList.whiteListed(coinx);
|
|
157
157
|
const whitelisty = coinList.whiteListed(coiny);
|
|
158
|
-
const coinXInfo = await coinList.getCoinInfo(coinx);
|
|
159
|
-
const coinYInfo = await coinList.getCoinInfo(coiny);
|
|
158
|
+
const coinXInfo = await coinList.getCoinInfo(coinx, ctx.network);
|
|
159
|
+
const coinYInfo = await coinList.getCoinInfo(coiny, ctx.network);
|
|
160
160
|
const timestamp = ctx.getTimestamp();
|
|
161
161
|
let result = BigDecimal(0.0);
|
|
162
162
|
if (!whitelistx || !whitelisty) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-dex.js","sourceRoot":"","sources":["../../../src/move/ext/move-dex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAe/C,MAAM,OAAO,OAAO;IAUlB,QAAQ,CAAkC;IAC1C,WAAW,CAAgC;IAC3C,MAAM,CAAO;IACb,YAAY,CAAO;IACnB,MAAM,CAAO;IACb,SAAS,CAAO;IAChB,SAAS,CAAO;IAEhB,YACE,MAAa,EACb,YAAmB,EACnB,MAAa,EACb,SAAgB,EAChB,SAAgB,EAChB,WAA2C;QAE3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,
|
|
1
|
+
{"version":3,"file":"move-dex.js","sourceRoot":"","sources":["../../../src/move/ext/move-dex.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sentio/sdk",
|
|
3
|
-
"version": "2.57.13-rc.
|
|
3
|
+
"version": "2.57.13-rc.3",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -88,8 +88,8 @@
|
|
|
88
88
|
"typechain": "^8.3.2",
|
|
89
89
|
"utility-types": "^3.11.0",
|
|
90
90
|
"yaml": "^2.3.4",
|
|
91
|
-
"@sentio/
|
|
92
|
-
"@sentio/
|
|
91
|
+
"@sentio/runtime": "^2.57.13-rc.3",
|
|
92
|
+
"@sentio/protos": "2.57.13-rc.3"
|
|
93
93
|
},
|
|
94
94
|
"peerDependencies": {
|
|
95
95
|
"tsup": "npm:@sentio/tsup@^8.3.5-rc.1"
|
|
@@ -16,7 +16,7 @@ export class CoinList implements MoveCoinList<TokenInfo, AptosNetwork> {
|
|
|
16
16
|
return tokenTokenValueInUsd(amount, coinInfo, timestamp, network)
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
async getCoinInfo(type: string) {
|
|
19
|
+
async getCoinInfo(type: string, network: AptosNetwork = AptosNetwork.MAIN_NET) {
|
|
20
20
|
return getTokenInfoWithFallback(type)
|
|
21
21
|
}
|
|
22
22
|
|
package/src/move/ext/coin.ts
CHANGED
|
@@ -12,6 +12,6 @@ export interface BaseCoinInfo {
|
|
|
12
12
|
export interface MoveCoinList<TokenType extends BaseCoinInfo, Network> {
|
|
13
13
|
whiteListed(type: string): boolean
|
|
14
14
|
whitelistCoins(): Map<string, TokenType>
|
|
15
|
-
getCoinInfo(type: string): Promise<TokenType>
|
|
15
|
+
getCoinInfo(type: string, network: Network): Promise<TokenType>
|
|
16
16
|
calculateValueInUsd(amount: bigint, coinInfo: TokenType, timestamp: number, network: Network): Promise<BigDecimal>
|
|
17
17
|
}
|
package/src/move/ext/move-dex.ts
CHANGED
|
@@ -49,7 +49,7 @@ export class MoveDex<
|
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
async recordTradingVolume(
|
|
52
|
-
ctx:
|
|
52
|
+
ctx: AccountContextType,
|
|
53
53
|
coinx: string,
|
|
54
54
|
coiny: string,
|
|
55
55
|
coinXAmount: bigint,
|
|
@@ -63,12 +63,12 @@ export class MoveDex<
|
|
|
63
63
|
if (!whitelistx && !whitelisty) {
|
|
64
64
|
return result
|
|
65
65
|
}
|
|
66
|
-
const coinXInfo = await this.coinList.getCoinInfo(coinx)
|
|
67
|
-
const coinYInfo = await this.coinList.getCoinInfo(coiny)
|
|
66
|
+
const coinXInfo = await this.coinList.getCoinInfo(coinx, ctx.network)
|
|
67
|
+
const coinYInfo = await this.coinList.getCoinInfo(coiny, ctx.network)
|
|
68
68
|
const timestamp = ctx.getTimestamp()
|
|
69
69
|
let resultX = BigDecimal(0)
|
|
70
70
|
let resultY = BigDecimal(0)
|
|
71
|
-
const pair = await this.getPair(coinx, coiny)
|
|
71
|
+
const pair = await this.getPair(coinx, coiny, ctx)
|
|
72
72
|
const baseLabels: Record<string, string> = extraLabels ? { ...extraLabels, pair } : { pair }
|
|
73
73
|
if (whitelistx) {
|
|
74
74
|
resultX = await this.coinList.calculateValueInUsd(coinXAmount, coinXInfo, timestamp, ctx.network)
|
|
@@ -130,12 +130,12 @@ export class MoveDex<
|
|
|
130
130
|
continue
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
-
const pair = await this.getPair(coinx, coiny)
|
|
133
|
+
const pair = await this.getPair(coinx, coiny, ctx)
|
|
134
134
|
const extraLabels = this.poolAdaptor.getExtraPoolTags(pool)
|
|
135
135
|
const baseLabels: Record<string, string> = { ...extraLabels, pair }
|
|
136
136
|
|
|
137
|
-
const coinXInfo = await this.coinList.getCoinInfo(coinx)
|
|
138
|
-
const coinYInfo = await this.coinList.getCoinInfo(coiny)
|
|
137
|
+
const coinXInfo = await this.coinList.getCoinInfo(coinx, ctx.network)
|
|
138
|
+
const coinYInfo = await this.coinList.getCoinInfo(coiny, ctx.network)
|
|
139
139
|
|
|
140
140
|
const coinx_amount = this.poolAdaptor.getXReserve(pool.data_decoded)
|
|
141
141
|
const coiny_amount = this.poolAdaptor.getYReserve(pool.data_decoded)
|
|
@@ -201,9 +201,9 @@ export class MoveDex<
|
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
203
|
|
|
204
|
-
async getPair(coinx: string, coiny: string): Promise<string> {
|
|
205
|
-
const coinXInfo = await this.coinList.getCoinInfo(coinx)
|
|
206
|
-
const coinYInfo = await this.coinList.getCoinInfo(coiny)
|
|
204
|
+
async getPair(coinx: string, coiny: string, ctx: AccountContextType): Promise<string> {
|
|
205
|
+
const coinXInfo = await this.coinList.getCoinInfo(coinx, ctx.network)
|
|
206
|
+
const coinYInfo = await this.coinList.getCoinInfo(coiny, ctx.network)
|
|
207
207
|
if (coinXInfo.symbol.localeCompare(coinYInfo.symbol) > 0) {
|
|
208
208
|
return `${coinYInfo.symbol}-${coinXInfo.symbol}`
|
|
209
209
|
}
|
|
@@ -225,8 +225,8 @@ export async function moveGetPairValue<
|
|
|
225
225
|
): Promise<BigDecimal> {
|
|
226
226
|
const whitelistx = coinList.whiteListed(coinx)
|
|
227
227
|
const whitelisty = coinList.whiteListed(coiny)
|
|
228
|
-
const coinXInfo = await coinList.getCoinInfo(coinx)
|
|
229
|
-
const coinYInfo = await coinList.getCoinInfo(coiny)
|
|
228
|
+
const coinXInfo = await coinList.getCoinInfo(coinx, ctx.network)
|
|
229
|
+
const coinYInfo = await coinList.getCoinInfo(coiny, ctx.network)
|
|
230
230
|
const timestamp = ctx.getTimestamp()
|
|
231
231
|
let result = BigDecimal(0.0)
|
|
232
232
|
|