Add option to specify MultiCall contract address #23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hzhu
reviewed
Jun 12, 2023
| @@ -51,6 +51,7 @@ | |||
| "@openzeppelin/contracts": "^4.8.0", | |||
| "@vitest/coverage-c8": "^0.31.2", | |||
| "esbuild": "^0.17.5", | |||
| "ethers": "^6.5.1", | |||
There was a problem hiding this comment.
The ethers package should remain a peerDependency.
| @@ -415,7 +415,7 @@ describe("utilities", () => { | |||
| "throws when using a network that does not support ENS", | |||
| async () => { | |||
| const mockProvider = { | |||
| getNetwork: async () => ({ chainId: 137n, name: "matic" }), | |||
| getNetwork: async () => ({ chainId: BigInt(137), name: "matic" }), | |||
There was a problem hiding this comment.
Is this change necessary? I'd prefer to keep the changeset minimal, focusing solely on the capability to specify a MultiCall address. Note that BigInt(137) evaluates to 137n.
Comment on lines
+10
to
+29
| import {abi as erc20Abi} from "@openzeppelin/contracts/build/contracts/ERC20.json"; | ||
| import multicallAbi from "./abi/multicall.json"; | ||
| import type { BytesLike, Provider } from "ethers"; | ||
| import type {BytesLike, Provider} from "ethers"; | ||
|
|
||
| const coder = AbiCoder.defaultAbiCoder(); | ||
| const erc20Interface = new Interface(erc20Abi); | ||
|
|
||
| const MULTICALL3_CONTRACT = "0xcA11bde05977b3631167028862bE2a173976CA11"; | ||
|
|
||
| const fragmentTypes = erc20Abi.reduce<Record<string, string>>( | ||
| (typesByName, abiItem) => { | ||
| const { name, outputs } = abiItem; | ||
| if (outputs) { | ||
| return { | ||
| ...typesByName, | ||
| [name]: outputs[0].type, | ||
| }; | ||
| } | ||
| return typesByName; | ||
| }, | ||
| {} | ||
| (typesByName, abiItem) => { | ||
| const {name, outputs} = abiItem; | ||
| if (outputs) { | ||
| return { | ||
| ...typesByName, | ||
| [name]: outputs[0].type, | ||
| }; | ||
| } | ||
| return typesByName; | ||
| }, | ||
| {} |
There was a problem hiding this comment.
Looks like there is extra formatting in this file. Can this be removed. As a separate task, I should probably add a prettier config. Sorry about that!
Comment on lines
+185
to
+214
| metaResults: CallResult[], | ||
| context: CallContext[] | ||
| ): MetaByContract { | ||
| return metaResults.reduce((meta: BalancesByContract, result, index) => { | ||
| let methodValue; | ||
| const { 1: data } = result; | ||
| const { contractAddress, methodName } = context[index]; | ||
|
|
||
| try { | ||
| const type = fragmentTypes[methodName]; | ||
| [methodValue] = coder.decode([type], data); | ||
| } catch (error) { | ||
| console.info( | ||
| `Problem decoding ${methodName} for ${contractAddress}. The contract is likely not ERC-20 compliant.` | ||
| ); | ||
| methodValue = decodeBytes32String(data); | ||
| } | ||
|
|
||
| if (methodName === "decimals") { | ||
| methodValue = Number(methodValue); | ||
| } | ||
|
|
||
| return { | ||
| ...meta, | ||
| [contractAddress]: { | ||
| ...meta[contractAddress], | ||
| [methodName]: methodValue, | ||
| }, | ||
| }; | ||
| }, {}); | ||
| return metaResults.reduce((meta: BalancesByContract, result, index) => { | ||
| let methodValue; | ||
| const {1: data} = result; | ||
| const {contractAddress, methodName} = context[index]; | ||
|
|
||
| try { | ||
| const type = fragmentTypes[methodName]; | ||
| [methodValue] = coder.decode([type], data); | ||
| } catch (error) { | ||
| console.info( | ||
| `Problem decoding ${methodName} for ${contractAddress}. The contract is likely not ERC-20 compliant.` | ||
| ); | ||
| methodValue = decodeBytes32String(data); | ||
| } | ||
|
|
||
| if (methodName === "decimals") { | ||
| methodValue = Number(methodValue); | ||
| } | ||
|
|
||
| return { | ||
| ...meta, | ||
| [contractAddress]: { | ||
| ...meta[contractAddress], | ||
| [methodName]: methodValue, | ||
| }, | ||
| }; | ||
| }, {}); |
There was a problem hiding this comment.
It appears that some additional formatting has been inadvertently added. Could these be removed? I think adding a Prettier config should be handled as a separate future task. Thanks!
|
Thanks for the PR! I left a few comments. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds the ability to select multicall contracts and return unformatted
balanceOf.Defaults to current behavior.
Detail
Checklist
npm linkexamples/webandexamples/nodedemo works