@dhedge/backend-flatcoin-core 0.2.95 → 0.2.96

package/dist/contracts/abi/pyth-price-feed.d.ts

@@ -0,0 +1,43 @@
+export declare const PythPriceFeed: ({
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    outputs: {
+        components: ({
+            internalType: string;
+            name: string;
+            type: string;
+            components?: undefined;
+        } | {
+            components: {
+                internalType: string;
+                name: string;
+                type: string;
+            }[];
+            internalType: string;
+            name: string;
+            type: string;
+        })[];
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
+} | {
+    anonymous: boolean;
+    inputs: {
+        indexed: boolean;
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    type: string;
+    outputs?: undefined;
+    stateMutability?: undefined;
+})[];

package/dist/contracts/abi/pyth-price-feed.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PythPriceFeed = void 0;
+exports.PythPriceFeed = [
+    {
+        inputs: [
+            {
+                internalType: 'bytes32',
+                name: 'id',
+                type: 'bytes32',
+            },
+        ],
+        name: 'queryPriceFeed',
+        outputs: [
+            {
+                components: [
+                    {
+                        internalType: 'bytes32',
+                        name: 'id',
+                        type: 'bytes32',
+                    },
+                    {
+                        components: [
+                            {
+                                internalType: 'int64',
+                                name: 'price',
+                                type: 'int64',
+                            },
+                            {
+                                internalType: 'uint64',
+                                name: 'conf',
+                                type: 'uint64',
+                            },
+                            {
+                                internalType: 'int32',
+                                name: 'expo',
+                                type: 'int32',
+                            },
+                            {
+                                internalType: 'uint256',
+                                name: 'publishTime',
+                                type: 'uint256',
+                            },
+                        ],
+                        internalType: 'struct PythStructs.Price',
+                        name: 'price',
+                        type: 'tuple',
+                    },
+                    {
+                        components: [
+                            {
+                                internalType: 'int64',
+                                name: 'price',
+                                type: 'int64',
+                            },
+                            {
+                                internalType: 'uint64',
+                                name: 'conf',
+                                type: 'uint64',
+                            },
+                            {
+                                internalType: 'int32',
+                                name: 'expo',
+                                type: 'int32',
+                            },
+                            {
+                                internalType: 'uint256',
+                                name: 'publishTime',
+                                type: 'uint256',
+                            },
+                        ],
+                        internalType: 'struct PythStructs.Price',
+                        name: 'emaPrice',
+                        type: 'tuple',
+                    },
+                ],
+                internalType: 'struct PythStructs.PriceFeed',
+                name: 'priceFeed',
+                type: 'tuple',
+            },
+        ],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: 'address',
+                name: 'owner',
+                type: 'address',
+            },
+            {
+                indexed: true,
+                internalType: 'address',
+                name: 'spender',
+                type: 'address',
+            },
+            {
+                indexed: false,
+                internalType: 'uint256',
+                name: 'value',
+                type: 'uint256',
+            },
+        ],
+        name: 'Approval',
+        type: 'event',
+    },
+];

package/dist/contracts/index.d.ts

@@ -10,5 +10,5 @@ export { LimitOrder } from './abi/limit-order';
 export { DelayedOrder } from './abi/delayed-order';
 export { FlatcoinVault } from './abi/flatcoin-vault';
 export { CanLiquidateWithPriceFeeds } from './abi/liquidation-module';
-export { AssetHandler } from './abi/asset-handler';
+export { PythPriceFeed } from './abi/pyth-price-feed';
 export * from './helpers';

package/dist/contracts/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssetHandler = exports.CanLiquidateWithPriceFeeds = exports.FlatcoinVault = exports.DelayedOrder = exports.LimitOrder = exports.LiquidateWithoutPriceFeeds = exports.Liquidate = exports.LiquidationModule = exports.LeverageModule = exports.FlatcoinErrors = exports.ViewerGetPositionData = exports.Viewer = exports.StableModule = void 0;
+exports.PythPriceFeed = exports.CanLiquidateWithPriceFeeds = exports.FlatcoinVault = exports.DelayedOrder = exports.LimitOrder = exports.LiquidateWithoutPriceFeeds = exports.Liquidate = exports.LiquidationModule = exports.LeverageModule = exports.FlatcoinErrors = exports.ViewerGetPositionData = exports.Viewer = exports.StableModule = void 0;
 var stable_module_1 = require("./abi/stable-module");
 Object.defineProperty(exports, "StableModule", { enumerable: true, get: function () { return stable_module_1.StableModule; } });
 var viewer_1 = require("./abi/viewer");
@@ -39,6 +39,6 @@ var flatcoin_vault_1 = require("./abi/flatcoin-vault");
 Object.defineProperty(exports, "FlatcoinVault", { enumerable: true, get: function () { return flatcoin_vault_1.FlatcoinVault; } });
 var liquidation_module_4 = require("./abi/liquidation-module");
 Object.defineProperty(exports, "CanLiquidateWithPriceFeeds", { enumerable: true, get: function () { return liquidation_module_4.CanLiquidateWithPriceFeeds; } });
-var asset_handler_1 = require("./abi/asset-handler");
-Object.defineProperty(exports, "AssetHandler", { enumerable: true, get: function () { return asset_handler_1.AssetHandler; } });
+var pyth_price_feed_1 = require("./abi/pyth-price-feed");
+Object.defineProperty(exports, "PythPriceFeed", { enumerable: true, get: function () { return pyth_price_feed_1.PythPriceFeed; } });
 __exportStar(require("./helpers"), exports);

package/dist/service/avg-deposit-price.service.js

@@ -19,11 +19,11 @@ let AvgDepositPriceService = class AvgDepositPriceService {
         this.graphQueryService = graphQueryService;
         this.logger = logger;
         this.blockchainPriceService = blockchainPriceService;
-        if (process.env.ASSET_HANDLER_ETH_ADDRESS) {
-            this.ethAddress = process.env.ASSET_HANDLER_ETH_ADDRESS;
+        if (process.env.PYTH_PRICE_FEED_ETH_ADDRESS) {
+            this.ethAddress = process.env.PYTH_PRICE_FEED_ETH_ADDRESS;
         }
         else {
-            throw new Error('env property ASSET_HANDLER_ETH_ADDRESS is not configured');
+            throw new Error('env property PYTH_PRICE_FEED_ETH_ADDRESS is not configured');
         }
     }
     async getAverageDepositPriceInEth(tokenId) {

package/dist/service/blockchain-price.service.d.ts

@@ -9,4 +9,5 @@ export declare class BlockchainPriceService {
     private readonly assetHandlerContract;
     constructor(graphQueryService: GraphQueryService, customProvider: JsonRpcProvider, logger: Logger);
     getUsdPriceAtBlock(assetAddress: string, blockNumber: number): Promise<BigNumber>;
+    private getUsdPriceAtBlockUnformatted;
 }

package/dist/service/blockchain-price.service.js

@@ -16,7 +16,7 @@ exports.BlockchainPriceService = void 0;
 const common_1 = require("@nestjs/common");
 const graph_query_service_1 = require("./graph-query.service");
 const ethers_1 = require("ethers");
-const asset_handler_1 = require("../contracts/abi/asset-handler");
+const pyth_price_feed_1 = require("../contracts/abi/pyth-price-feed");
 const nestjs_ethers_1 = require("nestjs-ethers");
 const providers_1 = require("@ethersproject/providers");
 let BlockchainPriceService = class BlockchainPriceService {
@@ -24,16 +24,25 @@ let BlockchainPriceService = class BlockchainPriceService {
         this.graphQueryService = graphQueryService;
         this.customProvider = customProvider;
         this.logger = logger;
-        if (process.env.ASSET_HANDLER_CONTRACT_ADDRESS) {
-            this.assetHandlerContract = new ethers_1.Contract(process.env.ASSET_HANDLER_CONTRACT_ADDRESS, asset_handler_1.AssetHandler, this.customProvider);
+        if (process.env.PYHT_PRICE_FEED_CONTRACT_ADDRESS) {
+            this.assetHandlerContract = new ethers_1.Contract(process.env.PYHT_PRICE_FEED_CONTRACT_ADDRESS, pyth_price_feed_1.PythPriceFeed, this.customProvider);
         }
         else {
-            throw new Error('env property ASSET_HANDLER_CONTRACT_ADDRESS is not configured');
+            throw new Error('env property PYHT_PRICE_FEED_CONTRACT_ADDRESS is not configured');
         }
     }
     async getUsdPriceAtBlock(assetAddress, blockNumber) {
         try {
-            return await this.assetHandlerContract.callStatic['getUSDPrice'](assetAddress, {
+            return (await this.getUsdPriceAtBlockUnformatted(assetAddress, blockNumber)).mul(ethers_1.BigNumber.from('10000000000'));
+        }
+        catch (err) {
+            this.logger.error(`Error calling getUSDPrice with asset address ${assetAddress}:`, err);
+            throw err;
+        }
+    }
+    async getUsdPriceAtBlockUnformatted(assetAddress, blockNumber) {
+        try {
+            return await this.assetHandlerContract.callStatic['queryPriceFeed'](assetAddress, {
                 blockTag: blockNumber,
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/backend-flatcoin-core",
-  "version": "0.2.95",
+  "version": "0.2.96",
   "description": "Backend Flatcoin Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/contracts/abi/asset-handler.d.ts

@@ -1,15 +0,0 @@
-export declare const AssetHandler: {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-}[];

package/dist/contracts/abi/asset-handler.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssetHandler = void 0;
-exports.AssetHandler = [
-    {
-        inputs: [
-            {
-                internalType: 'address',
-                name: 'asset',
-                type: 'address',
-            },
-        ],
-        name: 'getUSDPrice',
-        outputs: [
-            {
-                internalType: 'uint256',
-                name: 'price',
-                type: 'uint256',
-            },
-        ],
-        stateMutability: 'view',
-        type: 'function',
-    },
-];