Adds dappId check for provided proxy address on deploy scripts

Author: acenolaza

deploy/001_deploy_InverseApi3ReaderProxyV1.ts

@@ -3,6 +3,7 @@ import type { DeploymentsExtension } from 'hardhat-deploy/types';
 
 import { getDeploymentName } from '../src';
 import * as testUtils from '../test/test-utils';
+import { IApi3ReaderProxyWithDappId__factory } from '../typechain-types';
 
 export const CONTRACT_NAME = 'InverseApi3ReaderProxyV1';
 
@@ -42,7 +43,15 @@ module.exports = async (hre: HardhatRuntimeEnvironment) => {
   }
   log(`Proxy address: ${proxyAddress}`);
 
-  // TODO: check that proxyAddress returns a dappId
+  if (!isLocalNetwork) {
+    try {
+      const proxy = IApi3ReaderProxyWithDappId__factory.connect(proxyAddress, ethers.provider);
+      const dappId = await proxy.dappId();
+      log(`Proxy dappId: ${dappId}`);
+    } catch {
+      throw new Error(`Failed to read dappId from proxy at ${proxyAddress}`);
+    }
+  }
 
   const confirmations = isLocalNetwork ? 1 : 5;
   log(`Deployment confirmations: ${confirmations}`);

deploy/003_deploy_ProductApi3ReaderProxyV1.ts

@@ -3,6 +3,7 @@ import type { DeploymentsExtension } from 'hardhat-deploy/types';
 
 import { getDeploymentName } from '../src';
 import * as testUtils from '../test/test-utils';
+import { IApi3ReaderProxyWithDappId__factory } from '../typechain-types';
 
 export const CONTRACT_NAME = 'ProductApi3ReaderProxyV1';
 
@@ -47,6 +48,17 @@ module.exports = async (hre: HardhatRuntimeEnvironment) => {
   }
   log(`Proxy 1 address: ${proxy1Address}`);
 
+  let dappId1;
+  if (!isLocalNetwork) {
+    try {
+      const proxy1 = IApi3ReaderProxyWithDappId__factory.connect(proxy1Address, ethers.provider);
+      dappId1 = await proxy1.dappId();
+      log(`Proxy 1 dappId: ${dappId1}`);
+    } catch {
+      throw new Error(`Failed to read dappId from proxy at ${proxy1Address}`);
+    }
+  }
+
   // Sleep for 1 sec when deploying to local network in order to generate a different proxy address
   if (isLocalNetwork) {
     await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -63,6 +75,21 @@ module.exports = async (hre: HardhatRuntimeEnvironment) => {
   }
   log(`Proxy 2 address: ${proxy2Address}`);
 
+  let dappId2;
+  if (!isLocalNetwork) {
+    try {
+      const proxy2 = IApi3ReaderProxyWithDappId__factory.connect(proxy2Address, ethers.provider);
+      dappId2 = await proxy2.dappId();
+      log(`Proxy 2 dappId: ${dappId2}`);
+    } catch {
+      throw new Error(`Failed to read dappId from proxy at ${proxy2Address}`);
+    }
+  }
+
+  if (!isLocalNetwork && dappId1 && dappId2 && dappId1 !== dappId2) {
+    throw new Error(`dApp IDs of PROXY1 (${dappId1}) and PROXY2 (${dappId2}) do not match.`);
+  }
+
   const confirmations = isLocalNetwork ? 1 : 5;
   log(`Deployment confirmations: ${confirmations}`);
 

deploy/004_deploy_ScaledApi3FeedProxyV1.ts

@@ -3,6 +3,7 @@ import type { DeploymentsExtension } from 'hardhat-deploy/types';
 
 import { getDeploymentName } from '../src';
 import * as testUtils from '../test/test-utils';
+import { IApi3ReaderProxyWithDappId__factory } from '../typechain-types';
 
 export const CONTRACT_NAME = 'ScaledApi3FeedProxyV1';
 
@@ -48,6 +49,16 @@ module.exports = async (hre: HardhatRuntimeEnvironment) => {
   }
   log(`Proxy address: ${proxyAddress}`);
 
+  if (!isLocalNetwork) {
+    try {
+      const proxy = IApi3ReaderProxyWithDappId__factory.connect(proxyAddress, ethers.provider);
+      const dappId = await proxy.dappId();
+      log(`Proxy dappId: ${dappId}`);
+    } catch {
+      throw new Error(`Failed to read dappId from proxy at ${proxyAddress}`);
+    }
+  }
+
   const confirmations = isLocalNetwork ? 1 : 5;
   log(`Deployment confirmations: ${confirmations}`);
 

deploy/005_deploy_PriceCappedApi3ReaderProxyV1.ts

@@ -3,6 +3,7 @@ import type { DeploymentsExtension } from 'hardhat-deploy/types';
 
 import { getDeploymentName } from '../src';
 import * as testUtils from '../test/test-utils';
+import { IApi3ReaderProxyWithDappId__factory } from '../typechain-types';
 
 export const CONTRACT_NAME = 'PriceCappedApi3ReaderProxyV1';
 
@@ -42,6 +43,16 @@ module.exports = async (hre: HardhatRuntimeEnvironment) => {
   }
   log(`Proxy address: ${proxyAddress}`);
 
+  if (!isLocalNetwork) {
+    try {
+      const proxy = IApi3ReaderProxyWithDappId__factory.connect(proxyAddress, ethers.provider);
+      const dappId = await proxy.dappId();
+      log(`Proxy dappId: ${dappId}`);
+    } catch {
+      throw new Error(`Failed to read dappId from proxy at ${proxyAddress}`);
+    }
+  }
+
   const lowerBound = process.env.LOWER_BOUND ? BigInt(process.env.LOWER_BOUND) : 0n; // Defaults to 0
   log(`Using lower bound: ${lowerBound.toString()}`);