fix: additional post merge fixes

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

Author: tmigone

cli/commands/contracts/disputeManager.ts

@@ -5,7 +5,7 @@ import { createAttestation, Attestation, Receipt } from '@graphprotocol/common-t
 import { logger } from '../../logging'
 import { sendTransaction, getProvider, toGRT, randomHexBytes } from '../../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
-import { getChainID } from '../../../test/lib/testHelpers'
+import { getChainID } from '../../network'
 
 const { HashZero } = constants
 const { defaultAbiCoder: abi, arrayify, concat, hexlify } = utils
@@ -19,7 +19,7 @@ interface ChannelKey {
 async function buildAttestation(receipt: Receipt, signer: string, disputeManagerAddress: string) {
   const attestation = await createAttestation(
     signer,
-    await getChainID(),
+    getChainID(),
     disputeManagerAddress,
     receipt,
     '0',

cli/network.ts

@@ -29,6 +29,10 @@ export const toGRT = (value: string | number): BigNumber => {
 export const getProvider = (providerUrl: string, network?: number): providers.JsonRpcProvider =>
   new providers.JsonRpcProvider(providerUrl, network)
 
+export const getChainID = (): number => {
+  return 4 // Only works for rinkeby right now
+}
+
 export const hashHexString = (input: string): string => keccak256(`0x${input.replace(/^0x/, '')}`)
 
 type ContractParam = string | BigNumber | number

e2e/deployment/init/l1/bridgeEscrow.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import hre from 'hardhat'
-import GraphChain from '../../../../gre/helpers/network'
+import GraphChain from '../../../../gre/helpers/chain'
 
 describe('BridgeEscrow initialization', () => {
   const graph = hre.graph()

scripts/e2e

@@ -174,9 +174,15 @@ if [[ ! -f "$ADDRESS_BOOK" ]]; then
   echo '{}' > "$ADDRESS_BOOK"
 fi
 
-# Create arbitrum address book if needed
-if [[ ! -f "$ARBITRUM_ADDRESS_BOOK" ]]; then
-    echo '{}' > "$ARBITRUM_ADDRESS_BOOK"
+# Reset arbitrum address book (just in case the deployment changed)
+if [[ -f "$ARBITRUM_ADDRESS_BOOK" ]]; then
+  rm "$ARBITRUM_ADDRESS_BOOK"
+fi
+echo '{}' > "$ARBITRUM_ADDRESS_BOOK"
+
+# Reset arbitrum address book (just in case the deployment changed)
+if [[ -f "$ARBITRUM_DEPLOYMENT_FILE" ]]; then
+  rm "$ARBITRUM_DEPLOYMENT_FILE"
 fi
 
 ## DEPLOY

tasks/deployment/unpause.ts

@@ -19,6 +19,7 @@ task('migrate:unpause:protocol', 'Unpause protocol (except bridge)')
   })
 
 task('migrate:unpause:bridge', 'Unpause bridge')
+  .addFlag('disableSecureAccounts', 'Disable secure accounts on GRE')
   .addOptionalParam('addressBook', cliOpts.addressBook.description)
   .addOptionalParam('graphConfig', cliOpts.graphConfig.description)
   .setAction(async (taskArgs, hre) => {