Add support for Multipart2 contract

Author: amateima

packages/core/contracts/common/interfaces/Multicall2.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity >=0.5.0;
+
+contract Multicall2 {
+    struct Call {
+        address target;
+        bytes callData;
+    }
+    struct Result {
+        bool success;
+        bytes returnData;
+    }
+
+    function aggregate(Call[] memory calls) public virtual returns (uint256 blockNumber, bytes[] memory returnData) {}
+
+    function tryBlockAndAggregate(bool requireSuccess, Call[] memory calls) public returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData) {}
+}

packages/sdk/src/clients/multicall/client.e2e.ts

@@ -5,19 +5,24 @@ import { ethers } from "ethers";
 import { emp } from "..";
 
 // multicall contract deployed to mainnet
-const address = "0xeefba1e63905ef1d7acba5a8513c70307c1ce441";
+const multicallV1Address = "0xeefba1e63905ef1d7acba5a8513c70307c1ce441";
+const multicallV2Address = "0x5ba1e12693dc8f9c48aad8770482f4739beed696";
 const empAddress = "0xd81028a6fbAAaf604316F330b20D24bFbFd14478";
 // these require integration testing, skip for ci
 describe("multicall", function () {
-  let client: Client.Instance;
+  let clientV1: Client.Instance;
+  let clientV2: Client.Instance;
   let empClient: emp.Instance;
   test("inits", function () {
     const provider = ethers.providers.getDefaultProvider(process.env.CUSTOM_NODE_URL);
-    client = Client.connect(address, provider);
+    clientV1 = Client.connect(multicallV1Address, provider);
+    clientV2 = Client.connect(multicallV2Address, provider);
     empClient = emp.connect(empAddress, provider);
-    assert.ok(client);
+    assert.ok(clientV1);
+    assert.ok(clientV2);
     assert.ok(empClient);
   });
+
   test("multicall on emp", async function () {
     const calls = ["priceIdentifier", "tokenCurrency", "collateralCurrency"];
     const multicalls = calls.map((call: any) => {
@@ -26,11 +31,27 @@ describe("multicall", function () {
         callData: empClient.interface.encodeFunctionData(call),
       };
     });
-    const response = await client.callStatic.aggregate(multicalls);
+    const response = await clientV1.callStatic.aggregate(multicalls);
     const decoded = calls.map((call: any, i: number) => {
       const result = response.returnData[i];
       return empClient.interface.decodeFunctionResult(call, result);
     });
     assert.equal(decoded.length, calls.length);
   });
+
+  test("multicall2 on emp", async function () {
+    const calls = ["priceIdentifier", "tokenCurrency", "collateralCurrency"];
+    const multicalls = calls.map((call: any) => {
+      return {
+        target: empAddress,
+        callData: empClient.interface.encodeFunctionData(call),
+      };
+    });
+    const response = await clientV2.callStatic.tryBlockAndAggregate(false, multicalls);
+    const decoded = calls.map((call: any, i: number) => {
+      const result = response.returnData[i];
+      return empClient.interface.decodeFunctionResult(call, result[1]);
+    });
+    assert.equal(decoded.length, calls.length);
+  });
 });

packages/sdk/src/clients/multicall/client.ts

@@ -1,8 +1,8 @@
 import { EthersContracts } from "@uma/core";
 import type { SignerOrProvider } from "../..";
 
-export type Instance = EthersContracts.Multicall;
-const Factory = EthersContracts.Multicall__factory;
+export type Instance = EthersContracts.Multicall2;
+const Factory = EthersContracts.Multicall2__factory;
 
 export function connect(address: string, provider: SignerOrProvider): Instance {
   return Factory.connect(address, provider);