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

Merge pull request #1701 from 0xProject/feature/contracts/erc1155ProxySolidity055

Browse Source 
Upgrade asset-proxy package to solidity 0.5.5
This commit is contained in:
Greg Hysen 2019-03-15 21:32:57 -07:00 committed by GitHub
commit 842ea4645b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -34,6 +34,8 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
### Solidity Packages ### Solidity Packages
These packages are all under development. See [/contracts/README.md](/contracts/README.md) for a list of deployed packages.
| Package | Version | Description | | Package | Version | Description |
| ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [`@0x/contracts-asset-proxy`](/contracts/asset-proxy) | [![npm](https://img.shields.io/npm/v/@0x/contracts-asset-proxy.svg)](https://www.npmjs.com/package/@0x/contracts-asset-proxy) | [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts used within the protocol | | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy) | [![npm](https://img.shields.io/npm/v/@0x/contracts-asset-proxy.svg)](https://www.npmjs.com/package/@0x/contracts-asset-proxy) | [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts used within the protocol |

12
contracts/README.md Normal file
View File

@ -0,0 +1,12 @@
#### Deployed Contract Packages
| Contract | Package | Version | Git Tag |
| --------------- | ------------------------------------------------------------------- | -------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
| AssetProxyOwner | [`@0x/contracts-multisig`](/contracts/multisig) | [v1.0.2](https://www.npmjs.com/package/@0x/contracts-multisig/v/1.0.2) | [@0x/contracts-multisig@1.0.2](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-multisig@1.0.2) |
| ERC20Proxy | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-asset-proxy/v/1.0.1) | [@0x/contracts-asset-proxy@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-asset-proxy@1.0.1) |
| ERC721Proxy | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-asset-proxy/v/1.0.1) | [@0x/contracts-asset-proxy@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-asset-proxy@1.0.1) |
| Exchange | [`@0x/contracts-exchange`](/contracts/exchange) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-exchange/v/1.0.1) | [@0x/contracts-exchange@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-exchange@1.0.1) |
| DutchAuction | [`@0x/contracts-extensions`](/contracts/extensions) | [v1.0.2](https://www.npmjs.com/package/@0x/contracts-extensions/v/1.0.2) | [@0x/contracts-extensions@1.0.2](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-extensions@1.0.2) |
| Forwarder | [`@0x/contracts-exchange-forwarder`](/contracts/exchange-forwarder) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-exchange-forwarder/v/1.0.1) | [@0x/contracts-exchange-forwarder@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-exchange-forwarder@1.0.1) |
| MultiAssetProxy | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-asset-proxy/v/1.0.1) | [@0x/contracts-asset-proxy@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-asset-proxy@1.0.1) |
| ZRXToken | [`@0x/contracts-erc20`](/contracts/erc20) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-erc20/v/1.0.1) | [@0x/contracts-erc20@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-erc20@1.0.1) |

4
contracts/asset-proxy/CHANGELOG.json
View File

@ -13,6 +13,10 @@
{ {
"note": "Add ERC1155Proxy", "note": "Add ERC1155Proxy",
"pr": 1661 "pr": 1661
},
{
"note": "Bumped solidity version to ^0.5.5",
"pr": 1701
} }
] ]
}, },

2
contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
View File

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

2
contracts/asset-proxy/contracts/src/ERC20Proxy.sol
View File

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

2
contracts/asset-proxy/contracts/src/ERC721Proxy.sol
View File

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

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

2
contracts/asset-proxy/contracts/src/MixinAuthorizable.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 "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./mixins/MAuthorizable.sol"; import "./mixins/MAuthorizable.sol";

2
contracts/asset-proxy/contracts/src/MultiAssetProxy.sol
View File

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

6
contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol
View File

@ -17,7 +17,7 @@
*/ */
// solhint-disable // solhint-disable
pragma solidity ^0.4.24; pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
@ -36,8 +36,8 @@ interface IAssetData {
external; external;
function MultiAsset( function MultiAsset(
uint256[] amounts, uint256[] calldata amounts,
bytes[] nestedAssetData bytes[] calldata nestedAssetData
) )
external; external;

4
contracts/asset-proxy/contracts/src/interfaces/IAssetProxy.sol
View File

@ -16,7 +16,7 @@
*/ */
pragma solidity ^0.4.24; pragma solidity ^0.5.5;
import "./IAuthorizable.sol"; import "./IAuthorizable.sol";
@ -30,7 +30,7 @@ contract IAssetProxy is
/// @param to Address to transfer asset to. /// @param to Address to transfer asset to.
/// @param amount Amount of asset to transfer. /// @param amount Amount of asset to transfer.
function transferFrom( function transferFrom(
bytes assetData, bytes calldata assetData,
address from, address from,
address to, address to,
uint256 amount uint256 amount

2
contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol
View File

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

2
contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol
View File

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

2
contracts/asset-proxy/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"; import "../interfaces/IAssetProxyDispatcher.sol";

2
contracts/asset-proxy/contracts/src/mixins/MAuthorizable.sol
View File

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

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

@ -71,7 +71,7 @@
"@0x/contracts-erc20": "^1.0.9", "@0x/contracts-erc20": "^1.0.9",
"@0x/contracts-erc721": "^1.0.9", "@0x/contracts-erc721": "^1.0.9",
"@0x/contracts-erc1155": "^1.0.0", "@0x/contracts-erc1155": "^1.0.0",
"@0x/contracts-utils": "2.0.1", "@0x/contracts-utils": "^2.0.8",
"@0x/order-utils": "^7.0.2", "@0x/order-utils": "^7.0.2",
"@0x/types": "^2.1.1", "@0x/types": "^2.1.1",
"@0x/typescript-typings": "^4.1.0", "@0x/typescript-typings": "^4.1.0",