Cherry pick dydx validation from #2456

contracts/integrations/test/bridges/dydx_bridge_mainnet_test.ts

@@ -23,14 +23,14 @@ blockchainTests.fork.resets('Mainnet dydx bridge tests', env => {
     const defaultAmount = toBaseUnitAmount(0.01);
     const defaultDepositAction = {
         actionType: DydxBridgeActionType.Deposit as number,
-        accountId: constants.ZERO_AMOUNT,
+        accountIdx: constants.ZERO_AMOUNT,
         marketId: daiMarketId,
         conversionRateNumerator: constants.ZERO_AMOUNT,
         conversionRateDenominator: constants.ZERO_AMOUNT,
     };
     const defaultWithdrawAction = {
         actionType: DydxBridgeActionType.Withdraw as number,
-        accountId: constants.ZERO_AMOUNT,
+        accountIdx: constants.ZERO_AMOUNT,
         marketId: daiMarketId,
         // This ratio must be less than the `1` to account
         // for interest in dydx balances because the test
@@ -71,7 +71,7 @@ blockchainTests.fork.resets('Mainnet dydx bridge tests', env => {
                     case DydxBridgeActionType.Deposit:
                         expectedDepositEvents.push({
                             accountOwner: dydxAccountOwner,
-                            accountNumber: bridgeData.accountNumbers[action.accountId.toNumber()],
+                            accountNumber: bridgeData.accountNumbers[action.accountIdx.toNumber()],
                             market: action.marketId,
                             update: { deltaWei: { sign: true, value: scaledAmount } },
                             from: dydxAccountOwner,
@@ -81,7 +81,7 @@ blockchainTests.fork.resets('Mainnet dydx bridge tests', env => {
                     case DydxBridgeActionType.Withdraw:
                         expectedWithdrawEvents.push({
                             accountOwner: dydxAccountOwner,
-                            accountNumber: bridgeData.accountNumbers[action.accountId.toNumber()],
+                            accountNumber: bridgeData.accountNumbers[action.accountIdx.toNumber()],
                             market: action.marketId,
                             update: { deltaWei: { sign: false, value: scaledAmount } },
                             to: receiver,

contracts/integrations/test/dev-utils/dev_utils_mainnet_test.ts

@@ -34,6 +34,7 @@ blockchainTests.fork.resets('DevUtils mainnet tests', env => {
             devUtilsArtifacts,
             contractAddresses.exchange,
             contractAddresses.chaiBridge,
+            contractAddresses.dydxBridge,
         );
         await dai.approve(chai.address, constants.MAX_UINT256).awaitTransactionSuccessAsync({ from: daiHolder });
         await chai.join(daiHolder, daiDepositAmount).awaitTransactionSuccessAsync({ from: daiHolder });

contracts/integrations/test/dev-utils/get_order_hash.ts

@@ -27,6 +27,7 @@ blockchainTests('DevUtils.getOrderHash', env => {
             artifacts,
             exchange.address,
             constants.NULL_ADDRESS,
+            constants.NULL_ADDRESS,
         );
     });
 

contracts/integrations/test/dev-utils/lib_asset_data.ts

@@ -81,6 +81,7 @@ blockchainTests.resets('LibAssetData', env => {
             artifacts,
             deployment.exchange.address,
             constants.NULL_ADDRESS,
+            constants.NULL_ADDRESS,
         );
 
         staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync(

contracts/integrations/test/dev-utils/lib_transaction_decoder.ts

@@ -43,6 +43,7 @@ blockchainTests('LibTransactionDecoder', env => {
             artifacts,
             exchange.address,
             constants.NULL_ADDRESS,
+            constants.NULL_ADDRESS,
         );
     });
 

contracts/integrations/test/exchange/fill_dydx_order_test.ts

@@ -34,14 +34,14 @@ blockchainTests.resets('Exchange fills dydx orders', env => {
     let testTokenAddress: string;
     const defaultDepositAction = {
         actionType: DydxBridgeActionType.Deposit as number,
-        accountId: constants.ZERO_AMOUNT,
+        accountIdx: constants.ZERO_AMOUNT,
         marketId,
         conversionRateNumerator: dydxConversionRateNumerator,
         conversionRateDenominator: dydxConversionRateDenominator,
     };
     const defaultWithdrawAction = {
         actionType: DydxBridgeActionType.Withdraw as number,
-        accountId: constants.ZERO_AMOUNT,
+        accountIdx: constants.ZERO_AMOUNT,
         marketId,
         conversionRateNumerator: constants.ZERO_AMOUNT,
         conversionRateDenominator: constants.ZERO_AMOUNT,

contracts/integrations/test/framework/deployment_manager.ts

@@ -203,6 +203,7 @@ export class DeploymentManager {
             devUtilsArtifacts,
             exchange.address,
             constants.NULL_ADDRESS,
+            constants.NULL_ADDRESS,
         );
 
         // Construct the new instance and return it.