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

Update remaining contract Solidity versions to 0.5.5

Browse Source
This commit is contained in:
Amir Bandeali 2019-03-07 14:56:59 -08:00
parent 87cc1f9415
commit d35a053efd
125 changed files with 453 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/asset-proxy/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [
@ -19,11 +28,6 @@
}
},
"contracts": [
"@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
"@0x/contracts-erc20/contracts/test/DummyMultipleReturnERC20Token.sol",
"@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol",
"@0x/contracts-erc721/contracts/test/DummyERC721Receiver.sol",
"@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
"src/ERC20Proxy.sol",
"src/ERC721Proxy.sol",
"src/MixinAuthorizable.sol",

2
contracts/asset-proxy/package.json
View File

@ -33,7 +33,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
},
"config": {
"abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json",
"abis": "./generated-artifacts/@(ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
},
"repository": {

10
contracts/asset-proxy/src/artifacts.ts
View File

@ -5,11 +5,6 @@
*/
import { ContractArtifact } from 'ethereum-types';
import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json';
import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json';
import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
import * as IAssetData from '../generated-artifacts/IAssetData.json';
@ -18,11 +13,6 @@ import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
export const artifacts = {
DummyERC20Token: DummyERC20Token as ContractArtifact,
DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
DummyERC721Token: DummyERC721Token as ContractArtifact,
ERC20Proxy: ERC20Proxy as ContractArtifact,
ERC721Proxy: ERC721Proxy as ContractArtifact,
MixinAuthorizable: MixinAuthorizable as ContractArtifact,

5
contracts/asset-proxy/src/wrappers.ts
View File

@ -3,11 +3,6 @@
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
export * from '../generated-wrappers/dummy_erc20_token';
export * from '../generated-wrappers/dummy_erc721_receiver';
export * from '../generated-wrappers/dummy_erc721_token';
export * from '../generated-wrappers/dummy_multiple_return_erc20_token';
export * from '../generated-wrappers/dummy_no_return_erc20_token';
export * from '../generated-wrappers/erc20_proxy';
export * from '../generated-wrappers/erc721_proxy';
export * from '../generated-wrappers/i_asset_data';

24
contracts/asset-proxy/test/proxies.ts
View File

@ -1,3 +1,15 @@
import {
artifacts as erc20Artifacts,
DummyERC20TokenContract,
DummyERC20TokenTransferEventArgs,
DummyMultipleReturnERC20TokenContract,
DummyNoReturnERC20TokenContract,
} from '@0x/contracts-erc20';
import {
artifacts as erc721Artifacts,
DummyERC721ReceiverContract,
DummyERC721TokenContract,
} from '@0x/contracts-erc721';
import {
chaiSetup,
constants,
@ -18,12 +30,6 @@ import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC20TokenTransferEventArgs,
DummyERC721ReceiverContract,
DummyERC721TokenContract,
DummyMultipleReturnERC20TokenContract,
DummyNoReturnERC20TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
@ -148,7 +154,7 @@ describe('Asset Transfer Proxies', () => {
constants.DUMMY_TOKEN_DECIMALS,
);
noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync(
artifacts.DummyNoReturnERC20Token,
erc20Artifacts.DummyNoReturnERC20Token,
provider,
txDefaults,
constants.DUMMY_TOKEN_NAME,
@ -157,7 +163,7 @@ describe('Asset Transfer Proxies', () => {
constants.DUMMY_TOKEN_TOTAL_SUPPLY,
);
multipleReturnErc20Token = await DummyMultipleReturnERC20TokenContract.deployFrom0xArtifactAsync(
artifacts.DummyMultipleReturnERC20Token,
erc20Artifacts.DummyMultipleReturnERC20Token,
provider,
txDefaults,
constants.DUMMY_TOKEN_NAME,
@ -198,7 +204,7 @@ describe('Asset Transfer Proxies', () => {
// Deploy and configure ERC721 tokens and receiver
[erc721TokenA, erc721TokenB] = await erc721Wrapper.deployDummyTokensAsync();
erc721Receiver = await DummyERC721ReceiverContract.deployFrom0xArtifactAsync(
artifacts.DummyERC721Receiver,
erc721Artifacts.DummyERC721Receiver,
provider,
txDefaults,
);

5
contracts/asset-proxy/test/utils/erc20_wrapper.ts
View File

@ -1,3 +1,4 @@
import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
import { assetDataUtils } from '@0x/order-utils';
import { BigNumber } from '@0x/utils';
@ -5,7 +6,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import { ZeroExProvider } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, DummyERC20TokenContract, ERC20ProxyContract } from '../../src';
import { artifacts, ERC20ProxyContract } from '../../src';
export class ERC20Wrapper {
private readonly _tokenOwnerAddresses: string[];
@ -36,7 +37,7 @@ export class ERC20Wrapper {
for (let i = 0; i < numberToDeploy; i++) {
this._dummyTokenContracts.push(
await DummyERC20TokenContract.deployFrom0xArtifactAsync(
artifacts.DummyERC20Token,
erc20Artifacts.DummyERC20Token,
this._provider,
txDefaults,
constants.DUMMY_TOKEN_NAME,

5
contracts/asset-proxy/test/utils/erc721_wrapper.ts
View File

@ -1,3 +1,4 @@
import { artifacts as erc721Artifacts, DummyERC721TokenContract } from '@0x/contracts-erc721';
import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
import { generatePseudoRandomSalt } from '@0x/order-utils';
import { BigNumber } from '@0x/utils';
@ -5,7 +6,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import { ZeroExProvider } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, DummyERC721TokenContract, ERC721ProxyContract } from '../../src';
import { artifacts, ERC721ProxyContract } from '../../src';
export class ERC721Wrapper {
private readonly _tokenOwnerAddresses: string[];
@ -28,7 +29,7 @@ export class ERC721Wrapper {
for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) {
this._dummyTokenContracts.push(
await DummyERC721TokenContract.deployFrom0xArtifactAsync(
artifacts.DummyERC721Token,
erc721Artifacts.DummyERC721Token,
this._provider,
txDefaults,
constants.DUMMY_TOKEN_NAME,

3
contracts/coordinator/test/coordinator.ts
View File

@ -1,4 +1,5 @@
import { DummyERC20TokenContract, ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import {
artifacts as exchangeArtifacts,
ExchangeCancelEventArgs,

14
contracts/erc20/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [
@ -28,7 +37,6 @@
"src/interfaces/IEtherToken.sol",
"test/DummyERC20Token.sol",
"test/DummyMultipleReturnERC20Token.sol",
"test/DummyNoReturnERC20Token.sol",
"test/ReentrantERC20Token.sol"
"test/DummyNoReturnERC20Token.sol"
]
}

2
contracts/erc20/contracts/src/ERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "./interfaces/IERC20Token.sol";

2
contracts/erc20/contracts/src/MintableERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "./UnlimitedAllowanceERC20Token.sol";

2
contracts/erc20/contracts/src/UnlimitedAllowanceERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "./ERC20Token.sol";

2
contracts/erc20/contracts/src/interfaces/IERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IERC20Token {

2
contracts/erc20/contracts/src/interfaces/IEtherToken.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "./IERC20Token.sol";

6
contracts/erc20/contracts/test/DummyERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "../src/MintableERC20Token.sol";
@ -32,8 +32,8 @@ contract DummyERC20Token is
uint256 public constant MAX_MINT_AMOUNT = 10000000000000000000000;
constructor (
string _name,
string _symbol,
string memory _name,
string memory _symbol,
uint256 _decimals,
uint256 _totalSupply
)

6
contracts/erc20/contracts/test/DummyMultipleReturnERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "./DummyERC20Token.sol";
@ -26,8 +26,8 @@ contract DummyMultipleReturnERC20Token is
DummyERC20Token
{
constructor (
string _name,
string _symbol,
string memory _name,
string memory _symbol,
uint256 _decimals,
uint256 _totalSupply
)

6
contracts/erc20/contracts/test/DummyNoReturnERC20Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "./DummyERC20Token.sol";
@ -26,8 +26,8 @@ contract DummyNoReturnERC20Token is
DummyERC20Token
{
constructor (
string _name,
string _symbol,
string memory _name,
string memory _symbol,
uint256 _decimals,
uint256 _totalSupply
)

4
contracts/erc20/package.json
View File

@ -68,8 +68,8 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.2",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",
"@0x/contracts-exchange-libs": "^1.1.3",
"@0x/contracts-utils": "^2.0.8",
"@0x/types": "^2.1.1",
"@0x/typescript-typings": "^4.1.0",
"@0x/utils": "^4.2.2",

2
contracts/erc20/src/artifacts.ts
View File

@ -12,7 +12,6 @@ import * as ERC20Token from '../generated-artifacts/ERC20Token.json';
import * as IERC20Token from '../generated-artifacts/IERC20Token.json';
import * as IEtherToken from '../generated-artifacts/IEtherToken.json';
import * as MintableERC20Token from '../generated-artifacts/MintableERC20Token.json';
import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json';
import * as UnlimitedAllowanceERC20Token from '../generated-artifacts/UnlimitedAllowanceERC20Token.json';
import * as WETH9 from '../generated-artifacts/WETH9.json';
import * as ZRXToken from '../generated-artifacts/ZRXToken.json';
@ -27,5 +26,4 @@ export const artifacts = {
DummyERC20Token: DummyERC20Token as ContractArtifact,
DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
};

1
contracts/erc20/src/wrappers.ts
View File

@ -10,7 +10,6 @@ export * from '../generated-wrappers/erc20_token';
export * from '../generated-wrappers/i_erc20_token';
export * from '../generated-wrappers/i_ether_token';
export * from '../generated-wrappers/mintable_erc20_token';
export * from '../generated-wrappers/reentrant_erc20_token';
export * from '../generated-wrappers/unlimited_allowance_erc20_token';
export * from '../generated-wrappers/weth9';
export * from '../generated-wrappers/zrx_token';

11
contracts/erc721/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [

4
contracts/erc721/contracts/src/ERC721Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "./interfaces/IERC721Token.sol";
import "./interfaces/IERC721Receiver.sol";
@ -59,7 +59,7 @@ contract ERC721Token is
address _from,
address _to,
uint256 _tokenId,
bytes _data
bytes calldata _data
)
external
{

2
contracts/erc721/contracts/src/MintableERC721Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "./ERC721Token.sol";

4
contracts/erc721/contracts/src/interfaces/IERC721Receiver.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IERC721Receiver {
@ -37,7 +37,7 @@ contract IERC721Receiver {
address _operator,
address _from,
uint256 _tokenId,
bytes _data
bytes calldata _data
)
external
returns (bytes4);

4
contracts/erc721/contracts/src/interfaces/IERC721Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IERC721Token {
@ -66,7 +66,7 @@ contract IERC721Token {
address _from,
address _to,
uint256 _tokenId,
bytes _data
bytes calldata _data
)
external;

4
contracts/erc721/contracts/test/DummyERC721Receiver.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/interfaces/IERC721Receiver.sol";
@ -51,7 +51,7 @@ contract DummyERC721Receiver is
address _operator,
address _from,
uint256 _tokenId,
bytes _data
bytes calldata _data
)
external
returns (bytes4)

6
contracts/erc721/contracts/test/DummyERC721Token.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/MintableERC721Token.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
@ -31,8 +31,8 @@ contract DummyERC721Token is
string public symbol;
constructor (
string _name,
string _symbol
string memory _name,
string memory _symbol
)
public
{

4
contracts/erc721/contracts/test/InvalidERC721Receiver.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/interfaces/IERC721Receiver.sol";
@ -50,7 +50,7 @@ contract InvalidERC721Receiver is
address _operator,
address _from,
uint256 _tokenId,
bytes _data
bytes calldata _data
)
external
returns (bytes4)

2
contracts/erc721/package.json
View File

@ -68,7 +68,7 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.2",
"@0x/contracts-utils": "2.0.1",
"@0x/contracts-utils": "^2.0.8",
"@0x/types": "^2.1.1",
"@0x/typescript-typings": "^4.1.0",
"@0x/utils": "^4.2.2",

19
contracts/exchange-forwarder/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [
@ -18,11 +27,5 @@
}
}
},
"contracts": [
"@0x/contracts-erc20/contracts/src/WETH9.sol",
"@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
"@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
"@0x/contracts-exchange/contracts/src/Exchange.sol",
"src/Forwarder.sol"
]
"contracts": ["src/Forwarder.sol"]
}

4
contracts/exchange-forwarder/package.json
View File

@ -70,8 +70,8 @@
"dependencies": {
"@0x/base-contract": "^5.0.2",
"@0x/contracts-asset-proxy": "^1.0.9",
"@0x/contracts-erc20": "^1.0.9",
"@0x/contracts-erc721": "^1.0.9",
"@0x/contracts-erc20": "1.0.8",
"@0x/contracts-erc721": "1.0.8",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",

8
contracts/exchange-forwarder/src/artifacts.ts
View File

@ -5,15 +5,7 @@
*/
import { ContractArtifact } from 'ethereum-types';
import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
import * as Exchange from '../generated-artifacts/Exchange.json';
import * as Forwarder from '../generated-artifacts/Forwarder.json';
import * as WETH9 from '../generated-artifacts/WETH9.json';
export const artifacts = {
WETH9: WETH9 as ContractArtifact,
DummyERC20Token: DummyERC20Token as ContractArtifact,
DummyERC721Token: DummyERC721Token as ContractArtifact,
Exchange: Exchange as ContractArtifact,
Forwarder: Forwarder as ContractArtifact,
};

4
contracts/exchange-forwarder/src/wrappers.ts
View File

@ -3,8 +3,4 @@
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
export * from '../generated-wrappers/dummy_erc20_token';
export * from '../generated-wrappers/dummy_erc721_token';
export * from '../generated-wrappers/exchange';
export * from '../generated-wrappers/forwarder';
export * from '../generated-wrappers/weth9';

19
contracts/exchange-forwarder/test/forwarder.ts
View File

@ -1,10 +1,7 @@
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20Wrapper,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import {
chaiSetup,
constants,
@ -26,7 +23,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import { artifacts, ForwarderContract, ForwarderWrapper, WETH9Contract } from '../src';
import { artifacts, ForwarderContract, ForwarderWrapper } from '../src';
chaiSetup.configure();
const expect = chai.expect;
@ -91,14 +88,14 @@ describe(ContractName.Forwarder, () => {
const erc721Balances = await erc721Wrapper.getBalancesAsync();
erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address];
wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults);
wethContract = await WETH9Contract.deployFrom0xArtifactAsync(erc20Artifacts.WETH9, provider, txDefaults);
weth = new DummyERC20TokenContract(wethContract.abi, wethContract.address, provider);
erc20Wrapper.addDummyTokenContract(weth);
wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
artifacts.Exchange,
exchangeArtifacts.Exchange,
provider,
txDefaults,
zrxAssetData,
@ -169,7 +166,7 @@ describe(ContractName.Forwarder, () => {
describe('constructor', () => {
it('should revert if assetProxy is unregistered', async () => {
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
artifacts.Exchange,
exchangeArtifacts.Exchange,
provider,
txDefaults,
zrxAssetData,

10
contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
View File

@ -1,3 +1,6 @@
import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
import { constants, formatters, LogDecoder, MarketSellOrders, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils';
@ -58,7 +61,12 @@ export class ForwarderWrapper {
constructor(contractInstance: ForwarderContract, provider: Web3ProviderEngine) {
this._forwarderContract = contractInstance;
this._web3Wrapper = new Web3Wrapper(provider);
this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
this._logDecoder = new LogDecoder(this._web3Wrapper, {
...artifacts,
...exchangeArtifacts,
...erc20Artifacts,
...erc721Artifacts,
});
}
public async marketSellOrdersWithEthAsync(
orders: SignedOrder[],

11
contracts/exchange-libs/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [

2
contracts/exchange-libs/contracts/src/LibAbiEncoder.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "./LibOrder.sol";

2
contracts/exchange-libs/contracts/src/LibAssetProxyErrors.sol
View File

@ -17,7 +17,7 @@
*/
// solhint-disable
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
/// @dev This contract documents the revert reasons used in the AssetProxy contracts.

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

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
// solhint-disable max-line-length

2
contracts/exchange-libs/contracts/src/LibEIP712.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
contract LibEIP712 {

2
contracts/exchange-libs/contracts/src/LibExchangeErrors.sol
View File

@ -17,7 +17,7 @@
*/
// solhint-disable
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
/// @dev This contract documents the revert reasons used in the Exchange contract.

2
contracts/exchange-libs/contracts/src/LibExchangeSelectors.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
contract LibExchangeSelectors {

2
contracts/exchange-libs/contracts/src/LibFillResults.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/SafeMath.sol";

2
contracts/exchange-libs/contracts/src/LibMath.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/SafeMath.sol";

2
contracts/exchange-libs/contracts/src/LibOrder.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.5.3;
pragma solidity ^0.5.5;
import "./LibEIP712.sol";

2
contracts/exchange-libs/contracts/test/TestLibs.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.5.3;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "../src/LibMath.sol";

22
contracts/exchange/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [
@ -19,14 +28,6 @@
}
},
"contracts": [
"@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol",
"@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol",
"@0x/contracts-asset-proxy/contracts/src/MultiAssetProxy.sol",
"@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
"@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol",
"@0x/contracts-erc20/contracts/test/ReentrantERC20Token.sol",
"@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
"@0x/contracts-exchange-libs/contracts/test/TestLibs.sol",
"examples/ExchangeWrapper.sol",
"examples/Validator.sol",
"examples/Wallet.sol",
@ -44,6 +45,7 @@
"test/TestAssetProxyDispatcher.sol",
"test/TestExchangeInternals.sol",
"test/TestSignatureValidator.sol",
"test/TestStaticCallReceiver.sol"
"test/TestStaticCallReceiver.sol",
"test/ReentrantERC20Token.sol"
]
}

4
contracts/exchange/contracts/examples/ExchangeWrapper.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "../src/interfaces/IExchange.sol";
@ -43,7 +43,7 @@ contract ExchangeWrapper {
function cancelOrdersUpTo(
uint256 targetOrderEpoch,
uint256 salt,
bytes makerSignature
bytes calldata makerSignature
)
external
{

4
contracts/exchange/contracts/examples/Validator.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/interfaces/IValidator.sol";
@ -44,7 +44,7 @@ contract Validator is
function isValidSignature(
bytes32 hash,
address signerAddress,
bytes signature
bytes calldata signature
)
external
view

4
contracts/exchange/contracts/examples/Wallet.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/interfaces/IWallet.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
@ -44,7 +44,7 @@ contract Wallet is
/// @return Validity of signature.
function isValidSignature(
bytes32 hash,
bytes eip712Signature
bytes calldata eip712Signature
)
external
view

4
contracts/exchange/contracts/examples/Whitelist.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "../src/interfaces/IExchange.sol";
@ -69,7 +69,7 @@ contract Whitelist is
function isValidSignature(
bytes32 hash,
address signerAddress,
bytes signature
bytes calldata signature
)
external
view

4
contracts/exchange/contracts/src/Exchange.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity 0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibConstants.sol";
@ -37,7 +37,7 @@ contract Exchange is
MixinAssetProxyDispatcher,
MixinWrapperFunctions
{
string constant public VERSION = "2.0.1-alpha";
string constant public VERSION = "3.0.0";
// Mixins are instantiated in the order they are inherited
constructor (bytes memory _zrxAssetData)

12
contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol
View File

@ -16,11 +16,11 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./mixins/MAssetProxyDispatcher.sol";
import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetProxy.sol";
import "./interfaces/IAssetProxy.sol";
contract MixinAssetProxyDispatcher is
@ -28,7 +28,7 @@ contract MixinAssetProxyDispatcher is
MAssetProxyDispatcher
{
// Mapping from Asset Proxy Id's to their respective Asset Proxy
mapping (bytes4 => IAssetProxy) public assetProxies;
mapping (bytes4 => address) public assetProxies;
/// @dev Registers an asset proxy to its asset proxy id.
/// Once an asset proxy is registered, it cannot be unregistered.
@ -37,10 +37,8 @@ contract MixinAssetProxyDispatcher is
external
onlyOwner
{
IAssetProxy assetProxyContract = IAssetProxy(assetProxy);
// Ensure that no asset proxy exists with current id.
bytes4 assetProxyId = assetProxyContract.getProxyId();
bytes4 assetProxyId = IAssetProxy(assetProxy).getProxyId();
address currentAssetProxy = assetProxies[assetProxyId];
require(
currentAssetProxy == address(0),
@ -48,7 +46,7 @@ contract MixinAssetProxyDispatcher is
);
// Add asset proxy and log registration.
assetProxies[assetProxyId] = assetProxyContract;
assetProxies[assetProxyId] = assetProxy;
emit AssetProxyRegistered(
assetProxyId,
assetProxy

2
contracts/exchange/contracts/src/MixinExchangeCore.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";

2
contracts/exchange/contracts/src/MixinMatchOrders.sol
View File

@ -11,7 +11,7 @@
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";

8
contracts/exchange/contracts/src/MixinSignatureValidator.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
@ -46,7 +46,7 @@ contract MixinSignatureValidator is
function preSign(
bytes32 hash,
address signerAddress,
bytes signature
bytes calldata signature
)
external
{
@ -233,7 +233,7 @@ contract MixinSignatureValidator is
function isValidWalletSignature(
bytes32 hash,
address walletAddress,
bytes signature
bytes memory signature
)
internal
view
@ -282,7 +282,7 @@ contract MixinSignatureValidator is
address validatorAddress,
bytes32 hash,
address signerAddress,
bytes signature
bytes memory signature
)
internal
view

10
contracts/exchange/contracts/src/MixinTransactions.sol
View File

@ -15,7 +15,8 @@
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeErrors.sol";
import "./mixins/MSignatureValidator.sol";
@ -43,8 +44,8 @@ contract MixinTransactions is
function executeTransaction(
uint256 salt,
address signerAddress,
bytes data,
bytes signature
bytes calldata data,
bytes calldata signature
)
external
{
@ -84,8 +85,9 @@ contract MixinTransactions is
// Execute transaction
transactions[transactionHash] = true;
(bool success,) = address(this).delegatecall(data);
require(
address(this).delegatecall(data),
success,
"FAILED_EXECUTION"
);

2
contracts/exchange/contracts/src/MixinWrapperFunctions.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";

43
contracts/exchange/contracts/src/interfaces/IAssetProxy.sol Normal file
View File

@ -0,0 +1,43 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.5.5;
contract IAssetProxy {
/// @dev Transfers assets. Either succeeds or throws.
/// @param assetData Byte array encoded for the respective asset proxy.
/// @param from Address to transfer asset from.
/// @param to Address to transfer asset to.
/// @param amount Amount of asset to transfer.
function transferFrom(
bytes calldata assetData,
address from,
address to,
uint256 amount
)
external;
/// @dev Gets the proxy id associated with the proxy address.
/// @return Proxy id.
function getProxyId()
external
pure
returns (bytes4);
}

2
contracts/exchange/contracts/src/interfaces/IAssetProxyDispatcher.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IAssetProxyDispatcher {

2
contracts/exchange/contracts/src/interfaces/IExchange.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "./IExchangeCore.sol";

2
contracts/exchange/contracts/src/interfaces/IExchangeCore.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

3
contracts/exchange/contracts/src/interfaces/IMatchOrders.sol
View File

@ -15,7 +15,8 @@
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

4
contracts/exchange/contracts/src/interfaces/ISignatureValidator.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract ISignatureValidator {
@ -28,7 +28,7 @@ contract ISignatureValidator {
function preSign(
bytes32 hash,
address signerAddress,
bytes signature
bytes calldata signature
)
external;

7
contracts/exchange/contracts/src/interfaces/ITransactions.sol
View File

@ -15,7 +15,8 @@
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract ITransactions {
@ -28,8 +29,8 @@ contract ITransactions {
function executeTransaction(
uint256 salt,
address signerAddress,
bytes data,
bytes signature
bytes calldata data,
bytes calldata signature
)
external;
}

4
contracts/exchange/contracts/src/interfaces/IValidator.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IValidator {
@ -29,7 +29,7 @@ contract IValidator {
function isValidSignature(
bytes32 hash,
address signerAddress,
bytes signature
bytes calldata signature
)
external
view

4
contracts/exchange/contracts/src/interfaces/IWallet.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IWallet {
@ -27,7 +27,7 @@ contract IWallet {
/// @return Validity of order signature.
function isValidSignature(
bytes32 hash,
bytes signature
bytes calldata signature
)
external
view

2
contracts/exchange/contracts/src/interfaces/IWrapperFunctions.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

2
contracts/exchange/contracts/src/mixins/MAssetProxyDispatcher.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "../interfaces/IAssetProxyDispatcher.sol";

2
contracts/exchange/contracts/src/mixins/MExchangeCore.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

3
contracts/exchange/contracts/src/mixins/MMatchOrders.sol
View File

@ -15,7 +15,8 @@
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

6
contracts/exchange/contracts/src/mixins/MSignatureValidator.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "../interfaces/ISignatureValidator.sol";
@ -51,7 +51,7 @@ contract MSignatureValidator is
function isValidWalletSignature(
bytes32 hash,
address walletAddress,
bytes signature
bytes memory signature
)
internal
view
@ -67,7 +67,7 @@ contract MSignatureValidator is
address validatorAddress,
bytes32 hash,
address signerAddress,
bytes signature
bytes memory signature
)
internal
view

3
contracts/exchange/contracts/src/mixins/MTransactions.sol
View File

@ -15,7 +15,8 @@
limitations under the License.
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "../interfaces/ITransactions.sol";

2
contracts/exchange/contracts/src/mixins/MWrapperFunctions.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

6
contracts/erc20/contracts/test/ReentrantERC20Token.sol → contracts/exchange/contracts/test/ReentrantERC20Token.sol
View File

@ -16,12 +16,12 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "../src/ERC20Token.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-erc20/contracts/src/ERC20Token.sol";
import "../src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

2
contracts/exchange/contracts/test/TestAssetProxyDispatcher.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/MixinAssetProxyDispatcher.sol";

2
contracts/exchange/contracts/test/TestExchangeInternals.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "../src/Exchange.sol";

2
contracts/exchange/contracts/test/TestSignatureValidator.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "../src/MixinSignatureValidator.sol";
import "../src/MixinTransactions.sol";

6
contracts/exchange/contracts/test/TestStaticCallReceiver.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
@ -34,7 +34,7 @@ contract TestStaticCallReceiver {
function isValidSignature(
bytes32 hash,
address signerAddress,
bytes signature
bytes calldata signature
)
external
returns (bool isValid)
@ -49,7 +49,7 @@ contract TestStaticCallReceiver {
/// @return Validity of order signature.
function isValidSignature(
bytes32 hash,
bytes signature
bytes calldata signature
)
external
returns (bool isValid)

4
contracts/exchange/package.json
View File

@ -71,8 +71,8 @@
"@0x/contracts-asset-proxy": "^1.0.9",
"@0x/contracts-erc20": "^1.0.9",
"@0x/contracts-erc721": "^1.0.9",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",
"@0x/contracts-exchange-libs": "^1.1.3",
"@0x/contracts-utils": "^2.0.8",
"@0x/order-utils": "^7.0.2",
"@0x/types": "^2.1.1",
"@0x/typescript-typings": "^4.1.0",

10
contracts/exchange/test/core.ts
View File

@ -1,14 +1,16 @@
import {
DummyERC20TokenContract,
DummyERC20TokenTransferEventArgs,
DummyERC721TokenContract,
DummyNoReturnERC20TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
MultiAssetProxyContract,
} from '@0x/contracts-asset-proxy';
import {
DummyERC20TokenContract,
DummyERC20TokenTransferEventArgs,
DummyNoReturnERC20TokenContract,
} from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import {
chaiSetup,
constants,

9
contracts/exchange/test/dispatcher.ts
View File

@ -1,10 +1,5 @@
import {
DummyERC20TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import {
chaiSetup,
constants,

11
contracts/exchange/test/match_orders.ts
View File

@ -1,11 +1,6 @@
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import {
chaiSetup,
constants,

3
contracts/exchange/test/transactions.ts
View File

@ -1,4 +1,5 @@
import { DummyERC20TokenContract, ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import {
chaiSetup,
constants,

11
contracts/exchange/test/wrapper.ts
View File

@ -1,11 +1,6 @@
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import {
chaiSetup,
constants,

15
contracts/extensions/compiler.json
View File

@ -5,7 +5,16 @@
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"optimizer": {
"enabled": true,
"runs": 1000000,
"details": {
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
},
"outputSelection": {
"*": {
"*": [
@ -19,11 +28,7 @@
}
},
"contracts": [
"@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol",
"@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol",
"@0x/contracts-erc20/contracts/src/WETH9.sol",
"@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
"@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
"@0x/contracts-exchange/contracts/examples/ExchangeWrapper.sol",
"@0x/contracts-exchange/contracts/src/Exchange.sol",
"src/BalanceThresholdFilter/BalanceThresholdFilter.sol",

2
contracts/extensions/contracts/src/BalanceThresholdFilter/BalanceThresholdFilter.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "./interfaces/IThresholdAsset.sol";

9
contracts/extensions/contracts/src/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
@ -57,8 +57,8 @@ contract MixinBalanceThresholdFilterCore is
function executeTransaction(
uint256 salt,
address signerAddress,
bytes signedExchangeTransaction,
bytes signature
bytes calldata signedExchangeTransaction,
bytes calldata signature
)
external
{
@ -92,7 +92,8 @@ contract MixinBalanceThresholdFilterCore is
/// @param signerAddress Address of transaction signer.
/// @return addressesToValidate Array of addresses to validate.
function getAddressesToValidate(address signerAddress)
internal pure
internal
pure
returns (address[] memory addressesToValidate)
{
bytes4 exchangeFunctionSelector = bytes4(exchangeCalldataload(0));

20
contracts/extensions/contracts/src/BalanceThresholdFilter/MixinExchangeCalldata.sol
View File

@ -17,7 +17,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "./mixins/MExchangeCalldata.sol";
import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
@ -34,7 +34,8 @@ contract MixinExchangeCalldata is
/// @param offset Offset into the Exchange calldata.
/// @return value Corresponding 32 byte value stored at `offset`.
function exchangeCalldataload(uint256 offset)
internal pure
internal
pure
returns (bytes32 value)
{
assembly {
@ -58,7 +59,8 @@ contract MixinExchangeCalldata is
/// @param offset Offset into the Exchange calldata (minus the 4 byte selector)
/// @return value Corresponding 32 byte value stored at `offset` + 4.
function loadExchangeData(uint256 offset)
internal pure
internal
pure
returns (bytes32 value)
{
value = exchangeCalldataload(offset + 4);
@ -70,12 +72,13 @@ contract MixinExchangeCalldata is
/// @param orderParamIndex Index of the order in the Exchange function's signature.
/// @return makerAddress The extracted maker address.
function loadMakerAddressFromOrder(uint256 orderParamIndex)
internal pure
internal
pure
returns (address makerAddress)
{
uint256 orderOffsetInBytes = orderParamIndex * 32;
uint256 orderPtr = uint256(loadExchangeData(orderOffsetInBytes));
makerAddress = address(loadExchangeData(orderPtr));
makerAddress = address(uint256(loadExchangeData(orderPtr)));
return makerAddress;
}
@ -84,8 +87,9 @@ contract MixinExchangeCalldata is
/// @param orderArrayParamIndex Index of the order array in the Exchange function's signature
/// @return makerAddresses The extracted maker addresses.
function loadMakerAddressesFromOrderArray(uint256 orderArrayParamIndex)
internal pure
returns (address[] makerAddresses)
internal
pure
returns (address[] memory makerAddresses)
{
uint256 orderArrayOffsetInBytes = orderArrayParamIndex * 32;
uint256 orderArrayPtr = uint256(loadExchangeData(orderArrayOffsetInBytes));
@ -95,7 +99,7 @@ contract MixinExchangeCalldata is
uint256 orderArrayElementEndPtr = orderArrayElementPtr + orderArrayLengthInBytes;
for (uint orderPtrOffset = orderArrayElementPtr; orderPtrOffset < orderArrayElementEndPtr; orderPtrOffset += 32) {
uint256 orderPtr = uint256(loadExchangeData(orderPtrOffset));
address makerAddress = address(loadExchangeData(orderPtr + orderArrayElementPtr));
address makerAddress = address(uint256(loadExchangeData(orderPtr + orderArrayElementPtr)));
makerAddresses = makerAddresses.append(makerAddress);
}
return makerAddresses;

6
contracts/extensions/contracts/src/BalanceThresholdFilter/interfaces/IBalanceThresholdFilterCore.sol
View File

@ -17,7 +17,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IBalanceThresholdFilterCore {
@ -48,8 +48,8 @@ contract IBalanceThresholdFilterCore {
function executeTransaction(
uint256 salt,
address signerAddress,
bytes signedExchangeTransaction,
bytes signature
bytes calldata signedExchangeTransaction,
bytes calldata signature
)
external;
}

2
contracts/extensions/contracts/src/BalanceThresholdFilter/interfaces/IThresholdAsset.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IThresholdAsset {

5
contracts/extensions/contracts/src/BalanceThresholdFilter/mixins/MBalanceThresholdFilterCore.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "../interfaces/IThresholdAsset.sol";
@ -49,6 +49,7 @@ contract MBalanceThresholdFilterCore is
/// @param signerAddress Address of transaction signer.
/// @return addressesToValidate Array of addresses to validate.
function getAddressesToValidate(address signerAddress)
internal pure
internal
pure
returns (address[] memory addressesToValidate);
}

7
contracts/extensions/contracts/src/BalanceThresholdFilter/mixins/MExchangeCalldata.sol
View File

@ -17,7 +17,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract MExchangeCalldata {
@ -51,6 +51,7 @@ contract MExchangeCalldata {
/// @param orderArrayParamIndex Index of the order array in the Exchange function's signature
/// @return makerAddresses The extracted maker addresses.
function loadMakerAddressesFromOrderArray(uint256 orderArrayParamIndex)
internal pure
returns (address[] makerAddresses);
internal
pure
returns (address[] memory makerAddresses);
}

6
contracts/extensions/contracts/src/DutchAuction/DutchAuction.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
@ -139,9 +139,7 @@ contract DutchAuction is
/// @dev Calculates the Auction Details for the given order
/// @param order The sell order
/// @return AuctionDetails
function getAuctionDetails(
LibOrder.Order memory order
)
function getAuctionDetails(LibOrder.Order memory order)
public
returns (AuctionDetails memory auctionDetails)
{

8
contracts/extensions/contracts/src/OrderMatcher/MixinAssets.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
@ -39,7 +39,7 @@ contract MixinAssets is
/// @param assetData Byte array encoded for the respective asset proxy.
/// @param amount Amount of asset to withdraw.
function withdrawAsset(
bytes assetData,
bytes calldata assetData,
uint256 amount
)
external
@ -52,7 +52,7 @@ contract MixinAssets is
/// @param assetData Byte array encoded for the respective asset proxy.
/// @param amount Amount of asset to approve for respective proxy.
function approveAssetProxy(
bytes assetData,
bytes calldata assetData,
uint256 amount
)
external
@ -104,7 +104,7 @@ contract MixinAssets is
// Transfer tokens.
// We do a raw call so we can check the success separate
// from the return data.
bool success = token.call(abi.encodeWithSelector(
(bool success,) = token.call(abi.encodeWithSelector(
ERC20_TRANSFER_SELECTOR,
msg.sender,
amount

2
contracts/extensions/contracts/src/OrderMatcher/MixinMatchOrders.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol";

2
contracts/extensions/contracts/src/OrderMatcher/OrderMatcher.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity 0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/Ownable.sol";

6
contracts/extensions/contracts/src/OrderMatcher/interfaces/IAssets.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
contract IAssets {
@ -27,7 +27,7 @@ contract IAssets {
/// @param assetData Byte array encoded for the respective asset proxy.
/// @param amount Amount of asset to withdraw.
function withdrawAsset(
bytes assetData,
bytes calldata assetData,
uint256 amount
)
external;
@ -36,7 +36,7 @@ contract IAssets {
/// @param assetData Byte array encoded for the respective asset proxy.
/// @param amount Amount of asset to approve for respective proxy.
function approveAssetProxy(
bytes assetData,
bytes calldata assetData,
uint256 amount
)
external;

2
contracts/extensions/contracts/src/OrderMatcher/interfaces/IMatchOrders.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";

2
contracts/extensions/contracts/src/OrderMatcher/interfaces/IOrderMatcher.sol
View File

@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.24;
pragma solidity ^0.5.5;
import "@0x/contract-utils/contracts/src/interfaces/IOwnable.sol";
import "./IMatchOrders.sol";

Some files were not shown because too many files have changed in this diff Show More