@d8x/perpetuals-sdk 2.6.8 → 2.6.10

package/src/contracts/factories/MockUSD__factory.ts

@@ -0,0 +1,430 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Interface, type ContractRunner } from "ethers";
+import type { MockUSD, MockUSDInterface } from "../MockUSD";
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: "uint8",
+        name: "_dec",
+        type: "uint8",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "constructor",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "spender",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "allowance",
+        type: "uint256",
+      },
+      {
+        internalType: "uint256",
+        name: "needed",
+        type: "uint256",
+      },
+    ],
+    name: "ERC20InsufficientAllowance",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "sender",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "balance",
+        type: "uint256",
+      },
+      {
+        internalType: "uint256",
+        name: "needed",
+        type: "uint256",
+      },
+    ],
+    name: "ERC20InsufficientBalance",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "approver",
+        type: "address",
+      },
+    ],
+    name: "ERC20InvalidApprover",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "receiver",
+        type: "address",
+      },
+    ],
+    name: "ERC20InvalidReceiver",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "sender",
+        type: "address",
+      },
+    ],
+    name: "ERC20InvalidSender",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "spender",
+        type: "address",
+      },
+    ],
+    name: "ERC20InvalidSpender",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "owner",
+        type: "address",
+      },
+    ],
+    name: "OwnableInvalidOwner",
+    type: "error",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "account",
+        type: "address",
+      },
+    ],
+    name: "OwnableUnauthorizedAccount",
+    type: "error",
+  },
+  {
+    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",
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "previousOwner",
+        type: "address",
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "newOwner",
+        type: "address",
+      },
+    ],
+    name: "OwnershipTransferred",
+    type: "event",
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "from",
+        type: "address",
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "to",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "value",
+        type: "uint256",
+      },
+    ],
+    name: "Transfer",
+    type: "event",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "owner",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "spender",
+        type: "address",
+      },
+    ],
+    name: "allowance",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "spender",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "value",
+        type: "uint256",
+      },
+    ],
+    name: "approve",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "account",
+        type: "address",
+      },
+    ],
+    name: "balanceOf",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "decimals",
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "_account",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "_amount",
+        type: "uint256",
+      },
+    ],
+    name: "mint",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "name",
+    outputs: [
+      {
+        internalType: "string",
+        name: "",
+        type: "string",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "owner",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "renounceOwnership",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "symbol",
+    outputs: [
+      {
+        internalType: "string",
+        name: "",
+        type: "string",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "totalSupply",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "to",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "value",
+        type: "uint256",
+      },
+    ],
+    name: "transfer",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "from",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "to",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "value",
+        type: "uint256",
+      },
+    ],
+    name: "transferFrom",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "newOwner",
+        type: "address",
+      },
+    ],
+    name: "transferOwnership",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+] as const;
+
+export class MockUSD__factory {
+  static readonly abi = _abi;
+  static createInterface(): MockUSDInterface {
+    return new Interface(_abi) as MockUSDInterface;
+  }
+  static connect(address: string, runner?: ContractRunner | null): MockUSD {
+    return new Contract(address, _abi, runner) as unknown as MockUSD;
+  }
+}

package/src/marketData.ts

@@ -437,12 +437,18 @@ export default class MarketData extends PerpetualDataHandler {
   ): Promise<MarginAccount[]> {
     const MAX_SYMBOLS_PER_CALL = 10;
     const pxInfo = new Array<IdxPriceInfo>();
+    const symbolsToFetch: string[] = [];
     for (let i = 0; i < symbols.length; i++) {
-      let obj = await this.priceFeedGetter.fetchPricesForPerpetual(symbols[i]);
-      pxInfo.push(obj);
+      try {
+        let obj = await this.priceFeedGetter.fetchPricesForPerpetual(symbols[i]);
+        pxInfo.push(obj);
+        symbolsToFetch.push(symbols[i]);
+      } catch (e) {
+        console.log(`skipping symbol ${symbols[i]})`);
+      }
     }
     let mgnAcct: MarginAccount[] = [];
-    let callSymbols = symbols.slice(0, MAX_SYMBOLS_PER_CALL);
+    let callSymbols = symbolsToFetch.slice(0, MAX_SYMBOLS_PER_CALL);
     let _px = pxInfo.slice(0, MAX_SYMBOLS_PER_CALL);
     while (callSymbols.length > 0) {
       const isPred = callSymbols.map((_sym) => this.isPredictionMarket(_sym));
@@ -457,7 +463,7 @@ export default class MarketData extends PerpetualDataHandler {
         overrides
       );
       mgnAcct = mgnAcct.concat(acc);
-      callSymbols = symbols.slice(mgnAcct.length, mgnAcct.length + MAX_SYMBOLS_PER_CALL);
+      callSymbols = symbolsToFetch.slice(mgnAcct.length, mgnAcct.length + MAX_SYMBOLS_PER_CALL);
       _px = pxInfo.slice(mgnAcct.length, mgnAcct.length + MAX_SYMBOLS_PER_CALL);
     }
     return mgnAcct;

package/src/perpetualDataHandler.ts

@@ -149,7 +149,6 @@ export default class PerpetualDataHandler {
   protected nestedPerpetualIDs: number[][];
 
   private refreshLocked:boolean=false;
-
   /**
    * Constructor
    * @param {NodeSDKConfig} config Configuration object, see
@@ -176,25 +175,38 @@ export default class PerpetualDataHandler {
   }
 
   protected async initContractsAndData(signerOrProvider: Signer | Provider, overrides?: Overrides) {
-    this.signerOrProvider = signerOrProvider;
-    // check network
-    let network: Network;
-    try {
-      if (signerOrProvider.provider) {
-        network = await signerOrProvider.provider.getNetwork();
-      } else {
-        throw new Error("Signer has no provider"); // TODO: check
+    let count=0;
+    while(this.refreshLocked) {
+      await sleepForSec(1)
+      if (count==25) {
+        throw new Error("could not obtain lock for init");
       }
-    } catch (error: any) {
-      console.error(error);
-      throw new Error(`Unable to connect to network.`);
+      count += 1;
     }
-    if (network.chainId !== this.chainId) {
-      throw new Error(`Provider: chain id ${network.chainId} does not match config (${this.chainId})`);
+    this.refreshLocked=true;
+    try {
+      this.signerOrProvider = signerOrProvider;
+      // check network
+      let network: Network;
+      try {
+        if (signerOrProvider.provider) {
+          network = await signerOrProvider.provider.getNetwork();
+        } else {
+          throw new Error("Signer has no provider"); // TODO: check
+        }
+      } catch (error: any) {
+        console.error(error);
+        throw new Error(`Unable to connect to network.`);
+      }
+      if (network.chainId !== this.chainId) {
+        throw new Error(`Provider: chain id ${network.chainId} does not match config (${this.chainId})`);
+      }
+      this.proxyContract = IPerpetualManager__factory.connect(this.proxyAddr, signerOrProvider);
+      this.multicall = Multicall3__factory.connect(this.config.multicall ?? MULTICALL_ADDRESS, this.signerOrProvider);
+      await this._fillSymbolMaps({ ...overrides, chainId: this.chainId });
+    } finally {
+      this.refreshLocked=false;
     }
-    this.proxyContract = IPerpetualManager__factory.connect(this.proxyAddr, signerOrProvider);
-    this.multicall = Multicall3__factory.connect(this.config.multicall ?? MULTICALL_ADDRESS, this.signerOrProvider);
-    await this._fillSymbolMaps({ ...overrides, chainId: this.chainId });
   }
 
   /**

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "2.6.8";
+export const D8X_SDK_VERSION = "2.6.10";