fix: v3 rollup deployment tool

scripts/local-deployment/deployCreatorAndCreateRollup.ts

@@ -46,10 +46,12 @@ async function main() {
   let stakeToken = process.env.STAKE_TOKEN_ADDRESS as string
   if (!stakeToken) {
     console.log('Deploying WETH')
-    const wethFactory = await ethers.getContractFactory('TestWETH9')
+    const wethFactory = (await ethers.getContractFactory('TestWETH9')).connect(deployerWallet)
     const weth = await wethFactory.deploy('Wrapped Ether', 'WETH')
     await weth.deployTransaction.wait()
+    await weth.deployed()
     stakeToken = weth.address
+    console.log('WETH deployed at', stakeToken)
   }
 
   /// deploy templates and rollup creator

scripts/rollupCreation.ts

@@ -8,6 +8,7 @@ import { ERC20, ERC20__factory, IERC20__factory } from '../build/types'
 import { sleep } from './testSetup'
 import { promises as fs } from 'fs'
 import { _isRunningOnArbitrum, verifyContract } from './deploymentUtils'
+import { AssertionStateStruct, ConfigStruct, RollupCreator } from '../build/types/src/rollup/RollupCreator'
 
 // 1 gwei
 const MAX_FER_PER_GAS = BigNumber.from('1000000000')
@@ -39,6 +40,7 @@ interface RollupCreationResult {
   'native-token': string
   'upgrade-executor': string
   'validator-wallet-creator': string
+  'stake-token': string
 }
 
 interface ChainInfo {
@@ -186,6 +188,7 @@ export async function createRollup(
         'native-token': nativeToken,
         'upgrade-executor': upgradeExecutor,
         'validator-wallet-creator': validatorWalletCreator,
+        'stake-token': stakeToken,
       }
 
       const chainInfo: ChainInfo = {
@@ -220,7 +223,7 @@ async function _getDevRollupConfig(
   feeToken: string,
   validatorWalletCreator: string,
   stakeToken: string
-) {
+): Promise<RollupCreator.RollupDeploymentParamsStruct> {
   // set up owner address
   const ownerAddress =
     process.env.OWNER_ADDRESS !== undefined ? process.env.OWNER_ADDRESS : ''
@@ -238,6 +241,7 @@ async function _getDevRollupConfig(
   for (let i = 1; i <= authorizeValidators; i++) {
     validators.push(_createValidatorAddress(validatorWalletCreator, i))
   }
+  validators.push('0x6A568afe0f82d34759347bb36F14A6bB171d2CBe') // testnode validator signer
 
   // get chain config
   const childChainConfigPath =
@@ -292,39 +296,50 @@ async function _getDevRollupConfig(
     }
   }
 
-  return {
-    config: {
-      confirmPeriodBlocks: ethers.BigNumber.from('20'),
-      extraChallengeTimeBlocks: ethers.BigNumber.from('200'),
-      stakeToken: stakeToken,
-      baseStake: ethers.utils.parseEther('1'),
-      wasmModuleRoot: wasmModuleRoot,
-      owner: ownerAddress,
-      loserStakeEscrow: ethers.constants.AddressZero,
-      chainId: JSON.parse(chainConfig)['chainId'],
-      chainConfig: chainConfig,
-      minimumAssertionPeriod: 75,
-      validatorAfkBlocks: 201600,
-      genesisAssertionState: {}, // AssertionState
-      genesisInboxCount: 0,
-      miniStakeValues: [
-        ethers.utils.parseEther('1'),
-        ethers.utils.parseEther('1'),
-        ethers.utils.parseEther('1'),
-      ],
-      layerZeroBlockEdgeHeight: 2 ** 5,
-      layerZeroBigStepEdgeHeight: 2 ** 5,
-      layerZeroSmallStepEdgeHeight: 2 ** 5,
-      numBigStepLevel: 1,
-      challengeGracePeriodBlocks: 10,
-      bufferConfig: { threshold: 600, max: 14400, replenishRateInBasis: 500 },
-      sequencerInboxMaxTimeVariation: {
-        delayBlocks: ethers.BigNumber.from('5760'),
-        futureBlocks: ethers.BigNumber.from('12'),
-        delaySeconds: ethers.BigNumber.from('86400'),
-        futureSeconds: ethers.BigNumber.from('3600'),
-      },
+  const genesisAssertionState: AssertionStateStruct = {
+    globalState: {
+      bytes32Vals: [ethers.constants.HashZero, ethers.constants.HashZero],
+      u64Vals: [ethers.BigNumber.from('0'), ethers.BigNumber.from('0')],
+    },
+    machineStatus: 1, // FINISHED
+    endHistoryRoot: ethers.constants.HashZero,
+  }
+
+  const config: ConfigStruct = {
+    confirmPeriodBlocks: ethers.BigNumber.from('20'),
+    stakeToken: stakeToken,
+    baseStake: 8,
+    wasmModuleRoot: wasmModuleRoot,
+    owner: ownerAddress,
+    loserStakeEscrow: ownerAddress,
+    chainId: JSON.parse(chainConfig)['chainId'],
+    chainConfig: chainConfig,
+    minimumAssertionPeriod: 5,
+    validatorAfkBlocks: 201600,
+    genesisAssertionState: genesisAssertionState,
+    genesisInboxCount: 0,
+    miniStakeValues: [
+      4,
+      2,
+      1,
+    ],
+    layerZeroBlockEdgeHeight: 2 ** 26,
+    layerZeroBigStepEdgeHeight: 2 ** 19,
+    layerZeroSmallStepEdgeHeight: 2 ** 23,
+    numBigStepLevel: 1,
+    challengeGracePeriodBlocks: 10,
+    bufferConfig: { threshold: 600, max: 14400, replenishRateInBasis: 500 },
+    sequencerInboxMaxTimeVariation: {
+      delayBlocks: ethers.BigNumber.from('5760'),
+      futureBlocks: ethers.BigNumber.from('12'),
+      delaySeconds: ethers.BigNumber.from('86400'),
+      futureSeconds: ethers.BigNumber.from('3600'),
     },
+    anyTrustFastConfirmer: ethers.constants.AddressZero
+  }
+
+  return {
+    config: config,
     validators: validators,
     maxDataSize: _maxDataSize,
     nativeToken: feeToken,

test/e2e/orbitChain.ts

@@ -817,7 +817,7 @@ describe('Orbit Chain', () => {
         bytes32Vals: [ethers.constants.HashZero, ethers.constants.HashZero],
         u64Vals: [ethers.BigNumber.from('0'), ethers.BigNumber.from('0')],
       },
-      machineStatus: 0,
+      machineStatus: 1, // FINISHED
       endHistoryRoot: ethers.constants.HashZero,
     }