@steerprotocol/data-connector-loader 3.0.1 → 3.1.0

package/lib/bundle/bundleBase.d.ts

@@ -1,5 +1,5 @@
 import { WasmModule } from '@steerprotocol/app-loader';
-import { providers } from 'ethers';
+import { ethers } from 'ethers';
 import { EtherRpcConfig, ExecutionContext } from '../types';
 export declare class BundleBase {
     module?: WasmModule;
@@ -9,12 +9,12 @@ export declare class BundleBase {
         [key: string]: any;
     };
     protected etherRpcConfig?: EtherRpcConfig;
-    protected providerIdentity?: providers.Provider;
+    protected providerIdentity?: ethers.Provider;
     executionContext?: ExecutionContext & {
         epochTimestamp: number;
     };
     protected scheduleEpochTimestamp: number | undefined;
-    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: providers.Provider, etherRpcConfig?: EtherRpcConfig);
+    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     load(): Promise<WasmModule>;
     loadSync(): WasmModule;
     execute(response: string): Promise<string>;
@@ -22,7 +22,7 @@ export declare class BundleBase {
     setExecutionContextStrategyExecution(executionContext: ExecutionContext): void;
     setExecutionContextDataConnector(executionContext: ExecutionContext): void;
     protected executeModule(response: string): Promise<string>;
-    getProvider(config: any): providers.Provider | undefined;
+    getProvider(config: any): ethers.Provider | undefined;
     getResults(): string;
     version(): number;
     private subtractDate;

package/lib/bundle/bundleBase.js

@@ -124,7 +124,7 @@ class BundleBase {
             chainId = config.chainId;
         }
         if (chainId && this.etherRpcConfig && this.etherRpcConfig[chainId]) {
-            const provider = new ethers_1.providers.JsonRpcProvider(this.etherRpcConfig[chainId].url);
+            const provider = new ethers_1.ethers.JsonRpcProvider(this.etherRpcConfig[chainId].url);
             return provider;
         }
         else {

package/lib/bundle/bundleDataConnector.d.ts

@@ -1,8 +1,8 @@
-import { providers } from 'ethers';
+import { ethers } from 'ethers';
 import { EtherRpcConfig, ViewConfig } from '../types';
 import { BundleBase } from './bundleBase';
 export declare class DataConnector extends BundleBase {
-    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: providers.Provider, etherRpcConfig?: EtherRpcConfig);
+    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     getRpcUrl(config: any): string | undefined;
     view(config: ViewConfig): Promise<string>;
 }

package/lib/esm/bundle/bundleBase.d.ts

@@ -1,5 +1,5 @@
 import { WasmModule } from '@steerprotocol/app-loader';
-import { providers } from 'ethers';
+import { ethers } from 'ethers';
 import { EtherRpcConfig, ExecutionContext } from '../types';
 export declare class BundleBase {
     module?: WasmModule;
@@ -9,12 +9,12 @@ export declare class BundleBase {
         [key: string]: any;
     };
     protected etherRpcConfig?: EtherRpcConfig;
-    protected providerIdentity?: providers.Provider;
+    protected providerIdentity?: ethers.Provider;
     executionContext?: ExecutionContext & {
         epochTimestamp: number;
     };
     protected scheduleEpochTimestamp: number | undefined;
-    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: providers.Provider, etherRpcConfig?: EtherRpcConfig);
+    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     load(): Promise<WasmModule>;
     loadSync(): WasmModule;
     execute(response: string): Promise<string>;
@@ -22,7 +22,7 @@ export declare class BundleBase {
     setExecutionContextStrategyExecution(executionContext: ExecutionContext): void;
     setExecutionContextDataConnector(executionContext: ExecutionContext): void;
     protected executeModule(response: string): Promise<string>;
-    getProvider(config: any): providers.Provider | undefined;
+    getProvider(config: any): ethers.Provider | undefined;
     getResults(): string;
     version(): number;
     private subtractDate;

package/lib/esm/bundle/bundleBase.js

@@ -1,5 +1,5 @@
 import { loadWasm, loadWasmSync } from '@steerprotocol/app-loader';
-import { providers } from 'ethers';
+import { ethers } from 'ethers';
 export class BundleBase {
     constructor(wasmFile, _config, identity, etherRpcConfig) {
         this.wasmFile = wasmFile;
@@ -102,7 +102,7 @@ export class BundleBase {
             chainId = config.chainId;
         }
         if (chainId && this.etherRpcConfig && this.etherRpcConfig[chainId]) {
-            const provider = new providers.JsonRpcProvider(this.etherRpcConfig[chainId].url);
+            const provider = new ethers.JsonRpcProvider(this.etherRpcConfig[chainId].url);
             return provider;
         }
         else {

package/lib/esm/bundle/bundleDataConnector.d.ts

@@ -1,8 +1,8 @@
-import { providers } from 'ethers';
+import { ethers } from 'ethers';
 import { EtherRpcConfig, ViewConfig } from '../types';
 import { BundleBase } from './bundleBase';
 export declare class DataConnector extends BundleBase {
-    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: providers.Provider, etherRpcConfig?: EtherRpcConfig);
+    constructor(wasmFile: string | ArrayBuffer, _config: string, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     getRpcUrl(config: any): string | undefined;
     view(config: ViewConfig): Promise<string>;
 }

package/lib/esm/execution/executionApp.d.ts

@@ -8,7 +8,7 @@ export declare class ExecutionApp extends ExecutionBase {
     isDirectionalPool: boolean;
     chainId: number;
     constructor(vault: string, steerSubgraph: string, isAlgebraPool: boolean, isDirectionalPool: boolean, chainId: number, maxRetries?: number);
-    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.providers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
+    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
     private getSmartPoolExecutionContext;
     private getPoolCurrentTick;
     private getVaultPoolAddress;

package/lib/esm/execution/executionBase.d.ts

@@ -7,8 +7,8 @@ export declare class ExecutionBase {
     protected delay(ms: number): Promise<void>;
     protected log(...args: any[]): void;
     protected getExecutionContext(dataConnector: DataConnector, vaultConfig: VaultConfigPayload): Promise<ExecutionContext>;
-    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.providers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
+    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
     protected getDataConnectorVersion(dataConnector: DataConnector): Promise<number>;
-    getAverageBlockTime(provider: ethers.providers.Provider, blockCount?: number): Promise<number>;
-    getBlockNumberFromAvgBlockTime(provider: ethers.providers.Provider, targetTimestamp: number, avgBlockTime: number): Promise<number>;
+    getAverageBlockTime(provider: ethers.Provider, blockCount?: number): Promise<number>;
+    getBlockNumberFromAvgBlockTime(provider: ethers.Provider, targetTimestamp: number, avgBlockTime: number): Promise<number>;
 }

package/lib/esm/types.d.ts

@@ -1,4 +1,4 @@
-import { ContractInterface } from 'ethers';
+import { InterfaceAbi } from 'ethers';
 export type VaultInput = {
     _id?: string;
     tokenId: string;
@@ -76,7 +76,7 @@ export type EtherRpcConfig = {
 };
 export interface ViewConfig {
     address: string;
-    abi: ContractInterface;
+    abi: InterfaceAbi;
     method: string;
     arguments: unknown[];
 }

package/lib/esm/utils/blockFinder.d.ts

@@ -5,4 +5,4 @@ import { ethers } from 'ethers';
  * @param timestamp
  * @param Idenity
  */
-export declare function getBlockFromTimestamp(timestamp: number, provider: ethers.providers.Provider): Promise<number>;
+export declare function getBlockFromTimestamp(timestamp: number, provider: ethers.Provider): Promise<number>;

package/lib/esm/utils/blockFinder.js

@@ -1,4 +1,3 @@
-// import { providers,  } from "ethers";
 /**
  * Iterates down from current block to find the block previous or equal to the given timestamp
  * Not the most efficient for far past timestamps, a binary search could be used for better performance

package/lib/esm/utils/utils.d.ts

@@ -1,7 +1,7 @@
 import { Candle } from '@steerprotocol/app-loader';
 import { AxiosRequestConfig } from 'axios';
 import { ExecutionContext, ViewContractConfig } from '../types';
-import { providers } from 'ethers';
+import { Provider } from 'ethers';
 export declare const extendOHLCV: (rawData: Candle[], period: number, endTimestamp: number) => Candle[];
 export declare function fetchData(request: AxiosRequestConfig, attempts: number): Promise<any>;
 export declare function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId, }: {
@@ -9,7 +9,7 @@ export declare function readSlot0Contract({ address, abi, currentExecutionContex
     abi: any;
     currentExecutionContext: ExecutionContext;
     functionName: string;
-    provider: providers.Provider;
+    provider: Provider;
     rpc: string;
     chainId: number;
 }): Promise<any>;

package/lib/execution/executionApp.d.ts

@@ -8,7 +8,7 @@ export declare class ExecutionApp extends ExecutionBase {
     isDirectionalPool: boolean;
     chainId: number;
     constructor(vault: string, steerSubgraph: string, isAlgebraPool: boolean, isDirectionalPool: boolean, chainId: number, maxRetries?: number);
-    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.providers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
+    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
     private getSmartPoolExecutionContext;
     private getPoolCurrentTick;
     private getVaultPoolAddress;

package/lib/execution/executionBase.d.ts

@@ -7,8 +7,8 @@ export declare class ExecutionBase {
     protected delay(ms: number): Promise<void>;
     protected log(...args: any[]): void;
     protected getExecutionContext(dataConnector: DataConnector, vaultConfig: VaultConfigPayload): Promise<ExecutionContext>;
-    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.providers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
+    execute<T>(_wasmFile: string | ArrayBuffer, _vaultConfig: string, _data: Array<any>, _identity?: ethers.Provider, _etherRpcConfig?: EtherRpcConfig): Promise<Array<T>>;
     protected getDataConnectorVersion(dataConnector: DataConnector): Promise<number>;
-    getAverageBlockTime(provider: ethers.providers.Provider, blockCount?: number): Promise<number>;
-    getBlockNumberFromAvgBlockTime(provider: ethers.providers.Provider, targetTimestamp: number, avgBlockTime: number): Promise<number>;
+    getAverageBlockTime(provider: ethers.Provider, blockCount?: number): Promise<number>;
+    getBlockNumberFromAvgBlockTime(provider: ethers.Provider, targetTimestamp: number, avgBlockTime: number): Promise<number>;
 }

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { ContractInterface } from 'ethers';
+import { InterfaceAbi } from 'ethers';
 export type VaultInput = {
     _id?: string;
     tokenId: string;
@@ -76,7 +76,7 @@ export type EtherRpcConfig = {
 };
 export interface ViewConfig {
     address: string;
-    abi: ContractInterface;
+    abi: InterfaceAbi;
     method: string;
     arguments: unknown[];
 }

package/lib/utils/blockFinder.d.ts

@@ -5,4 +5,4 @@ import { ethers } from 'ethers';
  * @param timestamp
  * @param Idenity
  */
-export declare function getBlockFromTimestamp(timestamp: number, provider: ethers.providers.Provider): Promise<number>;
+export declare function getBlockFromTimestamp(timestamp: number, provider: ethers.Provider): Promise<number>;

package/lib/utils/blockFinder.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBlockFromTimestamp = void 0;
-// import { providers,  } from "ethers";
 /**
  * Iterates down from current block to find the block previous or equal to the given timestamp
  * Not the most efficient for far past timestamps, a binary search could be used for better performance

package/lib/utils/utils.d.ts

@@ -1,7 +1,7 @@
 import { Candle } from '@steerprotocol/app-loader';
 import { AxiosRequestConfig } from 'axios';
 import { ExecutionContext, ViewContractConfig } from '../types';
-import { providers } from 'ethers';
+import { Provider } from 'ethers';
 export declare const extendOHLCV: (rawData: Candle[], period: number, endTimestamp: number) => Candle[];
 export declare function fetchData(request: AxiosRequestConfig, attempts: number): Promise<any>;
 export declare function readSlot0Contract({ address, abi, currentExecutionContext, functionName, provider, rpc, chainId, }: {
@@ -9,7 +9,7 @@ export declare function readSlot0Contract({ address, abi, currentExecutionContex
     abi: any;
     currentExecutionContext: ExecutionContext;
     functionName: string;
-    provider: providers.Provider;
+    provider: Provider;
     rpc: string;
     chainId: number;
 }): Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "App Loader for Steer Protocol",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -76,10 +76,10 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "@steerprotocol/app-loader": "^2.0.0",
+    "@steerprotocol/app-loader": "^2.1.0",
     "@steerprotocol/strategy-utils": "^3.1.2",
     "axios": "^1.3.4",
-    "ethers": "^5.1.0",
+    "ethers": "^6.16.0",
     "timestring": "^7.0.0"
   }
 }