crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Amir Bandeali 2019-12-15 14:19:16 -08:00 committed by Amir
parent c7c8a4891f
commit 30a2015a68
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/exchange-forwarder/contracts/src/libs/LibConstants.sol
View File

@ -27,7 +27,7 @@ contract LibConstants {
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(
// "Order(",
// "address makerAddress,",

3
contracts/integrations/test/forwarder/deploy_forwarder.ts
View File

@ -1,6 +1,6 @@
import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
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';
@ -17,6 +17,7 @@ export async function deployForwarderAsync(
deployment.txDefaults,
{ ...exchangeArtifacts, ...artifacts },
deployment.exchange.address,
constants.NULL_ADDRESS, // ExchangeV2 not tested on Ganache
deployment.tokens.weth.address,
);
}

1
contracts/integrations/test/forwarder/forwarder_test.ts
View File

@ -125,6 +125,7 @@ blockchainTests('Forwarder integration tests', env => {
env.txDefaults,
{},
exchange.address,
constants.NULL_ADDRESS,
deployment.tokens.weth.address,
);
await expect(deployForwarder).to.revertWith(

1
packages/migrations/src/migration.ts
View File

@ -243,6 +243,7 @@ export async function runMigrationsAsync(
txDefaults,
artifacts,
exchange.address,
constants.NULL_ADDRESS,
etherToken.address,
);

4
packages/migrations/src/testnet_migrations.ts
View File

@ -238,15 +238,15 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
chainId,
);
const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
await ForwarderContract.deployFrom0xArtifactAsync(
forwarderArtifacts.Forwarder,
provider,
txDefaults,
forwarderArtifacts,
exchange.address,
deployedAddresses.exchangeV2,
deployedAddresses.etherToken,
);
await forwarder.approveMakerAssetProxy(deployedAddresses.etherToken).awaitTransactionSuccessAsync();
}
(async () => {