upgrades: cli should not check bytescode in creation for proxy

Author: abarmat

contracts/upgrades/GraphProxy.sol

@@ -49,6 +49,13 @@ contract GraphProxy is GraphProxyStorage {
         return _implementation();
     }
 
+    /**
+     * @return The address of the pending implementation.
+     */
+    function pendingImplementation() external view returns (address) {
+        return _pendingimplementation();
+    }
+
     /**
      * @dev Upgrades to a new implementation contract.
      * @param _newImplementation Address of implementation contract

scripts/cli/commands/upgrade.ts

@@ -34,6 +34,7 @@ export const upgrade = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
     savedAddress,
     cli.addressBook,
     cli.wallet.provider,
+    false,
   )
   if (!isDeployed) {
     logger.error(
@@ -55,10 +56,10 @@ export const upgrade = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
   }
 
   // Upgrade to new implementation
-  const pendingImplementation = (await proxy.functions['pendingImplementation']())[0]
-  if (pendingImplementation != implAddress) {
-    await sendTransaction(cli.wallet, proxy, 'upgradeTo', ...[implAddress])
-  }
+  // const pendingImplementation = (await proxy.functions['pendingImplementation']())[0]
+  // if (pendingImplementation != implAddress) {
+  await sendTransaction(cli.wallet, proxy, 'upgradeTo', ...[implAddress])
+  // }
 
   // Accept upgrade from the implementation
   const contractArgs = initArgs ? initArgs.split(',') : []

scripts/cli/network.ts

@@ -17,6 +17,7 @@ export const isContractDeployed = async (
   address: string | undefined,
   addressBook: AddressBook,
   provider: providers.Provider,
+  checkCreationCode = true,
 ): Promise<boolean> => {
   logger.log(`Checking for valid ${name} contract...`)
   if (!address || address === '') {
@@ -29,12 +30,15 @@ export const isContractDeployed = async (
   // If the contract is behind a proxy we check the Proxy artifact instead
   const artifact = addressEntry.proxy === true ? loadArtifact('GraphProxy') : loadArtifact(name)
 
-  const savedCreationCodeHash = addressEntry.creationCodeHash
-  const creationCodeHash = hash(artifact.bytecode)
-  if (!savedCreationCodeHash || savedCreationCodeHash !== creationCodeHash) {
-    logger.warn(`creationCodeHash in our address book doesn't match ${name} artifacts`)
-    logger.log(`${savedCreationCodeHash} !== ${creationCodeHash}`)
-    return false
+  if (checkCreationCode) {
+    const savedCreationCodeHash = addressEntry.creationCodeHash
+    console.log(artifact.bytecode)
+    const creationCodeHash = hash(artifact.bytecode)
+    if (!savedCreationCodeHash || savedCreationCodeHash !== creationCodeHash) {
+      logger.warn(`creationCodeHash in our address book doesn't match ${name} artifacts`)
+      logger.log(`${savedCreationCodeHash} !== ${creationCodeHash}`)
+      return false
+    }
   }
 
   const savedRuntimeCodeHash = addressEntry.runtimeCodeHash