fix: L1/L2 specific contracts not being loaded

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/common-ts/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.4-testnet] - 2022-11-09
+### Changed
+- Fix L1/L2 specific contracts not being loaded
+
 ## [2.0.3-testnet] - 2022-11-09
 ### Changed
 - Don't error out if contract is not deployed

packages/common-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/common-ts",
-  "version": "2.0.3-testnet",
+  "version": "2.0.4-testnet",
   "description": "Common TypeScript library for Graph Protocol components",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
     "test:watch": "jest --watch --passWithNoTests --detectOpenHandles --verbose"
   },
   "dependencies": {
-    "@graphprotocol/contracts": "^2.0.0-testnet",
+    "@graphprotocol/contracts": "l2-testnet",
     "@graphprotocol/pino-sentry-simple": "0.7.1",
     "@urql/core": "2.4.4",
     "@urql/exchange-execute": "1.2.2",

packages/common-ts/src/contracts/index.ts

@@ -73,7 +73,6 @@ export const connectContracts = async (
 ): Promise<NetworkContracts> => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const deployedContracts = (DEPLOYED_CONTRACTS as any)[`${chainId}`]
-
   const GraphTokenFactory = GraphChain.isL1(chainId)
     ? GraphToken__factory
     : L2GraphToken__factory
@@ -132,20 +131,20 @@ export const connectContracts = async (
   }
 
   if (GraphChain.isL1(chainId)) {
-    if (contracts.l1GraphTokenGateway) {
+    if (deployedContracts.L1GraphTokenGateway) {
       contracts.l1GraphTokenGateway = L1GraphTokenGateway__factory.connect(
         deployedContracts.L1GraphTokenGateway.address,
         providerOrSigner,
       )
     }
-    if (contracts.bridgeEscrow) {
+    if (deployedContracts.BridgeEscrow) {
       contracts.bridgeEscrow = BridgeEscrow__factory.connect(
         deployedContracts.BridgeEscrow.address,
         providerOrSigner,
       )
     }
   } else if (GraphChain.isL2(chainId)) {
-    if (contracts.l2GraphTokenGateway) {
+    if (deployedContracts.L2GraphTokenGateway) {
       contracts.l2GraphTokenGateway = L2GraphTokenGateway__factory.connect(
         deployedContracts.L2GraphTokenGateway.address,
         providerOrSigner,

yarn.lock

@@ -647,7 +647,7 @@
   resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@graphprotocol/contracts@^2.0.0-testnet":
+"@graphprotocol/contracts@l2-testnet":
   version "2.0.0-testnet"
   resolved "https://registry.yarnpkg.com/@graphprotocol/contracts/-/contracts-2.0.0-testnet.tgz#95f3156a03bffc754f523240bf47801a4cbc7eca"
   integrity sha512-ZJ/dxGeSnN4cFI7HGUcU2HBe7hZtNat/5UX2B4f27sQyfV9IJBcXy+6wBugn97rmZFPGj3yk7K1PMvJVVOFKpA==