Fix build
This commit is contained in:
parent
c7c8a4891f
commit
30a2015a68
@ -27,7 +27,7 @@ contract LibConstants {
|
|||||||
|
|
||||||
uint256 constant internal MAX_UINT = uint256(-1);
|
uint256 constant internal MAX_UINT = uint256(-1);
|
||||||
|
|
||||||
// The v2 order id is the first 4 bytes of the ExchangeV2 order shema hash.
|
// The v2 order id is the first 4 bytes of the ExchangeV2 order schema hash.
|
||||||
// bytes4(keccak256(abi.encodePacked(
|
// bytes4(keccak256(abi.encodePacked(
|
||||||
// "Order(",
|
// "Order(",
|
||||||
// "address makerAddress,",
|
// "address makerAddress,",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
|
import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
|
||||||
import { artifacts, ForwarderContract } from '@0x/contracts-exchange-forwarder';
|
import { artifacts, ForwarderContract } from '@0x/contracts-exchange-forwarder';
|
||||||
import { BlockchainTestsEnvironment } from '@0x/contracts-test-utils';
|
import { BlockchainTestsEnvironment, constants } from '@0x/contracts-test-utils';
|
||||||
|
|
||||||
import { DeploymentManager } from '../framework/deployment_manager';
|
import { DeploymentManager } from '../framework/deployment_manager';
|
||||||
|
|
||||||
@ -17,6 +17,7 @@ export async function deployForwarderAsync(
|
|||||||
deployment.txDefaults,
|
deployment.txDefaults,
|
||||||
{ ...exchangeArtifacts, ...artifacts },
|
{ ...exchangeArtifacts, ...artifacts },
|
||||||
deployment.exchange.address,
|
deployment.exchange.address,
|
||||||
|
constants.NULL_ADDRESS, // ExchangeV2 not tested on Ganache
|
||||||
deployment.tokens.weth.address,
|
deployment.tokens.weth.address,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -125,6 +125,7 @@ blockchainTests('Forwarder integration tests', env => {
|
|||||||
env.txDefaults,
|
env.txDefaults,
|
||||||
{},
|
{},
|
||||||
exchange.address,
|
exchange.address,
|
||||||
|
constants.NULL_ADDRESS,
|
||||||
deployment.tokens.weth.address,
|
deployment.tokens.weth.address,
|
||||||
);
|
);
|
||||||
await expect(deployForwarder).to.revertWith(
|
await expect(deployForwarder).to.revertWith(
|
||||||
|
@ -243,6 +243,7 @@ export async function runMigrationsAsync(
|
|||||||
txDefaults,
|
txDefaults,
|
||||||
artifacts,
|
artifacts,
|
||||||
exchange.address,
|
exchange.address,
|
||||||
|
constants.NULL_ADDRESS,
|
||||||
etherToken.address,
|
etherToken.address,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -238,15 +238,15 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
|
|||||||
chainId,
|
chainId,
|
||||||
);
|
);
|
||||||
|
|
||||||
const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
|
await ForwarderContract.deployFrom0xArtifactAsync(
|
||||||
forwarderArtifacts.Forwarder,
|
forwarderArtifacts.Forwarder,
|
||||||
provider,
|
provider,
|
||||||
txDefaults,
|
txDefaults,
|
||||||
forwarderArtifacts,
|
forwarderArtifacts,
|
||||||
exchange.address,
|
exchange.address,
|
||||||
|
deployedAddresses.exchangeV2,
|
||||||
deployedAddresses.etherToken,
|
deployedAddresses.etherToken,
|
||||||
);
|
);
|
||||||
await forwarder.approveMakerAssetProxy(deployedAddresses.etherToken).awaitTransactionSuccessAsync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
(async () => {
|
(async () => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user