Merge pull request #455 from liquity/multicall

Make BatchedProvider mainnet ready
liquity · Mar 30, 2021 · 2e216d7 · 2e216d7
2 parents 395e6af + 171bbdb
commit 2e216d7
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 259 deletions.
diff --git a/package.json b/package.json
@@ -64,7 +64,6 @@
     "save-live-version": "yarn workspace @liquity/lib-ethers save-live-version",
     "start-dev-chain": "run-s start-dev-chain:*",
     "start-dev-chain:openethereum": "node dev-chain/start.js",
-    "start-dev-chain:deploy-multicaller": "yarn workspace @liquity/providers deploy-to-dev-chain",
     "start-dev-chain:prepare-providers": "yarn prepare:providers",
     "start-dev-chain:deploy-contracts": "yarn deploy --network dev",
     "start-dev-chain:prepare-lib-ethers": "yarn prepare:lib-ethers",

diff --git a/packages/lib-ethers/src/ReadableEthersLiquity.ts b/packages/lib-ethers/src/ReadableEthersLiquity.ts
@@ -213,14 +213,7 @@ export class ReadableEthersLiquity implements ReadableLiquity {
   getPrice(overrides?: EthersCallOverrides): Promise<Decimal> {
     const { priceFeed } = _getContracts(this.connection);
 
-    // fetchPrice() fails when called through BatchedProvider, because that uses a helper contract
-    // that dispatches batched calls using STATICCALL, and fetchPrice() tries to modify state, which
-    // "will result in an exception instead of performing the modification" (EIP-214).
-
-    // Passing a pointless gasPrice override ensures that the call is performed directly --
-    // bypassing the helper contract -- because BatchedProvider has no support for overrides other
-    // than blockTag.
-    return priceFeed.callStatic.fetchPrice({ ...overrides, gasPrice: 0 }).then(decimalify);
+    return priceFeed.callStatic.fetchPrice({ ...overrides }).then(decimalify);
   }
 
   /** @internal */

diff --git a/packages/providers/.gitignore b/packages/providers/.gitignore
diff --git a/packages/providers/multicaller/MultiCaller.json b/packages/providers/multicaller/MultiCaller.json
diff --git a/packages/providers/multicaller/MultiCaller.sol b/packages/providers/multicaller/MultiCaller.sol
diff --git a/packages/providers/multicaller/multicall-example.txt b/packages/providers/multicaller/multicall-example.txt
diff --git a/packages/providers/package.json b/packages/providers/package.json
@@ -5,14 +5,10 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "deploy-to-dev-chain": "ts-node scripts/deployToDevChain.ts",
-    "prepare": "run-s prepare:*",
-    "prepare:backfill-dev-deployment": "ts-node scripts/backfillDevDeployment.ts",
-    "prepare:tsc": "tsc --project tsconfig.dist.json"
+    "prepare": "tsc --project tsconfig.dist.json"
   },
   "devDependencies": {
     "ethers": "^5.0.0",
-    "npm-run-all": "^4.1.5",
     "ts-node": "^9.1.1",
     "typescript": "~4.1.0"
   },

diff --git a/packages/providers/scripts/backfillDevDeployment.ts b/packages/providers/scripts/backfillDevDeployment.ts
diff --git a/packages/providers/scripts/deployToDevChain.ts b/packages/providers/scripts/deployToDevChain.ts