@pancakeswap/multicall 0.0.2 → 1.0.0

package/.turbo/turbo-build.log

@@ -2,15 +2,15 @@ warning package.json: No license field
 $ tsup
 CLI Building entry: {"index":"index.ts"}
 CLI Using tsconfig: tsconfig.json
-CLI tsup v5.12.9
+CLI tsup v6.6.3
 CLI Using tsup config: /home/runner/work/pancake-frontend/pancake-frontend/packages/multicall/tsup.config.ts
-CLI Target: node12
+CLI Target: node14
 ESM Build start
 CJS Build start
-ESM ⚡️ Build success in 20ms
-CJS ⚡️ Build success in 20ms
-ESM dist/index.mjs 9.98 KB
-CJS dist/index.js 11.20 KB
+CJS dist/index.js 10.71 KB
+CJS ⚡️ Build success in 389ms
+ESM dist/index.mjs 10.57 KB
+ESM ⚡️ Build success in 391ms
 DTS Build start
-DTS ⚡️ Build success in 2877ms
-DTS dist/index.d.ts 1.74 KB
+DTS ⚡️ Build success in 9625ms
+DTS dist/index.d.ts 2.03 KB

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @pancakeswap/multicall
 
+## 1.0.0
+
+### Minor Changes
+
+- 65fbb250a: Bump version
+
+### Patch Changes
+
+- Updated dependencies [65fbb250a]
+  - @pancakeswap/sdk@3.2.0
+
 ## 0.0.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,7 +1,10 @@
 import { Contract, CallOverrides } from '@ethersproject/contracts';
 import { Provider } from '@ethersproject/providers';
 import { ChainId } from '@pancakeswap/sdk';
+import { Multicallv3Typed, Multicallv2Typed } from '@pancakeswap/utils/abitype';
 
+type TMulticallv3Typed = typeof Multicallv3Typed;
+type TMulticallv2Typed = typeof Multicallv2Typed;
 declare const multicallAddresses: {
     1: string;
     4: string;
@@ -25,7 +28,7 @@ interface MulticallOptions extends CallOverrides {
  * 2. The return includes a boolean whether the call was successful e.g. [wasSuccessful, callResult]
  */
 interface MulticallV2Params {
-    abi: any[];
+    abi: any[] | any;
     calls: Call[];
     chainId?: ChainId;
     options?: MulticallOptions;
@@ -41,14 +44,16 @@ interface MulticallV3Params {
     allowFailure?: boolean;
     overrides?: CallOverrides;
 }
-declare type MultiCallV2 = <T = any>(params: MulticallV2Params) => Promise<T>;
-declare type MultiCall = <T = any>(abi: any[], calls: Call[], chainId?: ChainId) => Promise<T>;
+type MultiCallV2 = <T = any>(params: MulticallV2Params) => Promise<T>;
+type MultiCall = <T = any>(abi: any[], calls: Call[], chainId?: ChainId) => Promise<T>;
 declare function createMulticall<TProvider extends Provider>(provider: ({ chainId }: {
     chainId?: number | undefined;
 }) => TProvider): {
     multicall: MultiCall;
     multicallv2: MultiCallV2;
     multicallv3: ({ calls, chainId, allowFailure, overrides }: MulticallV3Params) => Promise<any>;
+    multicallv3Typed: typeof Multicallv3Typed;
+    multicallv2Typed: typeof Multicallv2Typed;
 };
 
-export { Call, CallV3, MultiCall, MultiCallV2, MulticallOptions, createMulticall, getMulticallContract, multicallAddresses };
+export { Call, CallV3, MultiCall, MultiCallV2, MulticallOptions, TMulticallv2Typed, TMulticallv3Typed, createMulticall, getMulticallContract, multicallAddresses };

package/dist/index.js

@@ -1,33 +1,10 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+'use strict';
+
+var abi = require('@ethersproject/abi');
+var contracts = require('@ethersproject/contracts');
+var sdk = require('@pancakeswap/sdk');
 
 // index.ts
-var multicall_exports = {};
-__export(multicall_exports, {
-  createMulticall: () => createMulticall,
-  getMulticallContract: () => getMulticallContract,
-  multicallAddresses: () => multicallAddresses
-});
-module.exports = __toCommonJS(multicall_exports);
-var import_abi = require("@ethersproject/abi");
-var import_contracts = require("@ethersproject/contracts");
-var import_sdk = require("@pancakeswap/sdk");
 
 // Multicall.json
 var Multicall_default = [
@@ -277,16 +254,16 @@ var multicallAddresses = {
 };
 var getMulticallContract = (chainId, provider) => {
   if (multicallAddresses[chainId]) {
-    return new import_contracts.Contract(multicallAddresses[chainId], Multicall_default, provider);
+    return new contracts.Contract(multicallAddresses[chainId], Multicall_default, provider);
   }
   return null;
 };
 function createMulticall(provider) {
-  const multicall = async (abi, calls, chainId = import_sdk.ChainId.BSC) => {
+  const multicall = async (abi$1, calls, chainId = sdk.ChainId.BSC) => {
     const multi = getMulticallContract(chainId, provider({ chainId }));
     if (!multi)
       throw new Error(`Multicall Provider missing for ${chainId}`);
-    const itf = new import_abi.Interface(abi);
+    const itf = new abi.Interface(abi$1);
     const calldata = calls.map((call) => ({
       target: call.address.toLowerCase(),
       callData: itf.encodeFunctionData(call.name, call.params)
@@ -295,12 +272,12 @@ function createMulticall(provider) {
     const res = returnData.map((call, i) => itf.decodeFunctionResult(calls[i].name, call));
     return res;
   };
-  const multicallv2 = async ({ abi, calls, chainId = import_sdk.ChainId.BSC, options, provider: _provider }) => {
+  const multicallv2 = async ({ abi: abi$1, calls, chainId = sdk.ChainId.BSC, options, provider: _provider }) => {
     const { requireSuccess = true, ...overrides } = options || {};
     const multi = getMulticallContract(chainId, _provider || provider({ chainId }));
     if (!multi)
       throw new Error(`Multicall Provider missing for ${chainId}`);
-    const itf = new import_abi.Interface(abi);
+    const itf = new abi.Interface(abi$1);
     const calldata = calls.map((call) => ({
       target: call.address.toLowerCase(),
       callData: itf.encodeFunctionData(call.name, call.params)
@@ -312,41 +289,65 @@ function createMulticall(provider) {
     });
     return res;
   };
-  const multicallv3 = async ({ calls, chainId = import_sdk.ChainId.BSC, allowFailure, overrides }) => {
+  const multicallv3 = async ({ calls, chainId = sdk.ChainId.BSC, allowFailure, overrides }) => {
     const multi = getMulticallContract(chainId, provider({ chainId }));
     if (!multi)
       throw new Error(`Multicall Provider missing for ${chainId}`);
-    const _calls = calls.map(({ abi, address, name, params, allowFailure: _allowFailure }) => {
-      const contract = new import_contracts.Contract(address, abi);
-      const callData = contract.interface.encodeFunctionData(name, params != null ? params : []);
-      if (!contract[name])
+    const interfaceCache = /* @__PURE__ */ new WeakMap();
+    const _calls = calls.map(({ abi: abi$1, address, name, params, allowFailure: _allowFailure }) => {
+      let itf = interfaceCache.get(abi$1);
+      if (!itf) {
+        itf = new abi.Interface(abi$1);
+        interfaceCache.set(abi$1, itf);
+      }
+      if (!itf.fragments.some((fragment) => fragment.name === name))
         console.error(`${name} missing on ${address}`);
+      const callData = itf.encodeFunctionData(name, params ?? []);
       return {
-        target: address,
+        target: address.toLowerCase(),
         allowFailure: allowFailure || _allowFailure,
         callData
       };
     });
-    const result = await multi.callStatic.aggregate3([...[_calls], ...overrides ? [overrides] : []]);
+    const result = await multi.callStatic.aggregate3(_calls, ...overrides ? [overrides] : []);
     return result.map((call, i) => {
       const { returnData, success } = call;
       if (!success || returnData === "0x")
         return null;
-      const { address, abi, name } = calls[i];
-      const contract = new import_contracts.Contract(address, abi);
-      const decoded = contract.interface.decodeFunctionResult(name, returnData);
+      const { abi, name } = calls[i];
+      const itf = interfaceCache.get(abi);
+      const decoded = itf == null ? void 0 : itf.decodeFunctionResult(name, returnData);
       return decoded;
     });
   };
+  const multicallv3Typed = async ({ calls, allowFailure, chainId, overrides }) => {
+    return multicallv3({
+      // @ts-ignore
+      calls,
+      allowFailure,
+      chainId,
+      overrides
+    });
+  };
+  const multicallv2Typed = async ({ abi, calls, chainId, options }) => {
+    return multicallv2({
+      // @ts-ignore
+      abi,
+      // @ts-ignore
+      calls,
+      chainId,
+      options
+    });
+  };
   return {
     multicall,
     multicallv2,
-    multicallv3
+    multicallv3,
+    multicallv3Typed,
+    multicallv2Typed
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createMulticall,
-  getMulticallContract,
-  multicallAddresses
-});
+
+exports.createMulticall = createMulticall;
+exports.getMulticallContract = getMulticallContract;
+exports.multicallAddresses = multicallAddresses;

package/dist/index.mjs

@@ -1,7 +1,8 @@
+import { Interface } from '@ethersproject/abi';
+import { Contract } from '@ethersproject/contracts';
+import { ChainId } from '@pancakeswap/sdk';
+
 // index.ts
-import { Interface } from "@ethersproject/abi";
-import { Contract } from "@ethersproject/contracts";
-import { ChainId } from "@pancakeswap/sdk";
 
 // Multicall.json
 var Multicall_default = [
@@ -290,36 +291,59 @@ function createMulticall(provider) {
     const multi = getMulticallContract(chainId, provider({ chainId }));
     if (!multi)
       throw new Error(`Multicall Provider missing for ${chainId}`);
+    const interfaceCache = /* @__PURE__ */ new WeakMap();
     const _calls = calls.map(({ abi, address, name, params, allowFailure: _allowFailure }) => {
-      const contract = new Contract(address, abi);
-      const callData = contract.interface.encodeFunctionData(name, params != null ? params : []);
-      if (!contract[name])
+      let itf = interfaceCache.get(abi);
+      if (!itf) {
+        itf = new Interface(abi);
+        interfaceCache.set(abi, itf);
+      }
+      if (!itf.fragments.some((fragment) => fragment.name === name))
         console.error(`${name} missing on ${address}`);
+      const callData = itf.encodeFunctionData(name, params ?? []);
       return {
-        target: address,
+        target: address.toLowerCase(),
         allowFailure: allowFailure || _allowFailure,
         callData
       };
     });
-    const result = await multi.callStatic.aggregate3([...[_calls], ...overrides ? [overrides] : []]);
+    const result = await multi.callStatic.aggregate3(_calls, ...overrides ? [overrides] : []);
     return result.map((call, i) => {
       const { returnData, success } = call;
       if (!success || returnData === "0x")
         return null;
-      const { address, abi, name } = calls[i];
-      const contract = new Contract(address, abi);
-      const decoded = contract.interface.decodeFunctionResult(name, returnData);
+      const { abi, name } = calls[i];
+      const itf = interfaceCache.get(abi);
+      const decoded = itf == null ? void 0 : itf.decodeFunctionResult(name, returnData);
       return decoded;
     });
   };
+  const multicallv3Typed = async ({ calls, allowFailure, chainId, overrides }) => {
+    return multicallv3({
+      // @ts-ignore
+      calls,
+      allowFailure,
+      chainId,
+      overrides
+    });
+  };
+  const multicallv2Typed = async ({ abi, calls, chainId, options }) => {
+    return multicallv2({
+      // @ts-ignore
+      abi,
+      // @ts-ignore
+      calls,
+      chainId,
+      options
+    });
+  };
   return {
     multicall,
     multicallv2,
-    multicallv3
+    multicallv3,
+    multicallv3Typed,
+    multicallv2Typed
   };
 }
-export {
-  createMulticall,
-  getMulticallContract,
-  multicallAddresses
-};
+
+export { createMulticall, getMulticallContract, multicallAddresses };

package/index.ts

@@ -1,10 +1,14 @@
-import { Interface } from '@ethersproject/abi'
+import { Interface, Fragment } from '@ethersproject/abi'
 import { CallOverrides, Contract } from '@ethersproject/contracts'
 import { Provider } from '@ethersproject/providers'
 import { ChainId } from '@pancakeswap/sdk'
+import type { Multicallv2Typed, Multicallv3Typed } from '@pancakeswap/utils/abitype'
 
 import multicallAbi from './Multicall.json'
 
+export type TMulticallv3Typed = typeof Multicallv3Typed
+export type TMulticallv2Typed = typeof Multicallv2Typed
+
 export const multicallAddresses = {
   1: '0xcA11bde05977b3631167028862bE2a173976CA11',
   4: '0xcA11bde05977b3631167028862bE2a173976CA11',
@@ -37,7 +41,7 @@ export interface MulticallOptions extends CallOverrides {
  * 2. The return includes a boolean whether the call was successful e.g. [wasSuccessful, callResult]
  */
 interface MulticallV2Params {
-  abi: any[]
+  abi: any[] | any
   calls: Call[]
   chainId?: ChainId
   options?: MulticallOptions
@@ -101,32 +105,61 @@ export function createMulticall<TProvider extends Provider>(
   const multicallv3 = async ({ calls, chainId = ChainId.BSC, allowFailure, overrides }: MulticallV3Params) => {
     const multi = getMulticallContract(chainId, provider({ chainId }))
     if (!multi) throw new Error(`Multicall Provider missing for ${chainId}`)
+    const interfaceCache = new WeakMap()
     const _calls = calls.map(({ abi, address, name, params, allowFailure: _allowFailure }) => {
-      const contract = new Contract(address, abi)
-      const callData = contract.interface.encodeFunctionData(name, params ?? [])
-      if (!contract[name]) console.error(`${name} missing on ${address}`)
+      let itf = interfaceCache.get(abi)
+      if (!itf) {
+        itf = new Interface(abi)
+        interfaceCache.set(abi, itf)
+      }
+      if (!itf.fragments.some((fragment: Fragment) => fragment.name === name))
+        console.error(`${name} missing on ${address}`)
+      const callData = itf.encodeFunctionData(name, params ?? [])
       return {
-        target: address,
+        target: address.toLowerCase(),
         allowFailure: allowFailure || _allowFailure,
         callData,
       }
     })
 
-    const result = await multi.callStatic.aggregate3([...[_calls], ...(overrides ? [overrides] : [])])
+    const result = await multi.callStatic.aggregate3(_calls, ...(overrides ? [overrides] : []))
 
     return result.map((call: any, i: number) => {
       const { returnData, success } = call
       if (!success || returnData === '0x') return null
-      const { address, abi, name } = calls[i]
-      const contract = new Contract(address, abi)
-      const decoded = contract.interface.decodeFunctionResult(name, returnData)
+      const { abi, name } = calls[i]
+      const itf = interfaceCache.get(abi)
+      const decoded = itf?.decodeFunctionResult(name, returnData)
       return decoded
     })
   }
 
+  const multicallv3Typed: typeof Multicallv3Typed = async ({ calls, allowFailure, chainId, overrides }) => {
+    return multicallv3({
+      // @ts-ignore
+      calls,
+      allowFailure,
+      chainId,
+      overrides,
+    })
+  }
+
+  const multicallv2Typed: typeof Multicallv2Typed = async ({ abi, calls, chainId, options }) => {
+    return multicallv2({
+      // @ts-ignore
+      abi,
+      // @ts-ignore
+      calls,
+      chainId,
+      options,
+    })
+  }
+
   return {
     multicall,
     multicallv2,
     multicallv3,
+    multicallv3Typed,
+    multicallv2Typed,
   }
 }

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@pancakeswap/multicall",
-  "version": "0.0.2",
+  "version": "1.0.0",
   "sideEffects": false,
   "scripts": {
     "build": "tsup",
+    "dev": "tsup --watch",
     "prepublishOnly": "yarn run build",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   },
   "peerDependencies": {
-    "@pancakeswap/sdk": "^3.1.0"
+    "@pancakeswap/sdk": "^3.2.0"
   },
   "dependencies": {
     "@ethersproject/abi": "^5.0.0",
@@ -16,10 +17,10 @@
     "@ethersproject/providers": "^5.0.0"
   },
   "devDependencies": {
-    "@pancakeswap/sdk": "^3.1.0",
+    "@pancakeswap/sdk": "*",
     "tsconfig": "*",
-    "tsup": "^5.10.1",
-    "typescript": "^4.5.3"
+    "tsup": "^6.6.3",
+    "typescript": "^4.9.4"
   },
   "exports": {
     "./package.json": "./package.json",

package/tsconfig.json

@@ -1,6 +1,8 @@
 {
-  "extends": "tsconfig/react-library",
+  "extends": "tsconfig/base",
+  "include": ["./index.ts"],
   "compilerOptions": {
+    "outDir": "./dist",
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "isolatedModules": true,

package/tsup.config.ts

@@ -6,4 +6,6 @@ export default defineConfig({
   },
   format: ['esm', 'cjs'],
   dts: true,
+  treeshake: true,
+  splitting: true,
 })