From c811b710eb59060ad2a544e704027aae71b7bcc2 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Thu, 12 Apr 2018 14:45:11 -0700 Subject: Explicity declare `memory` for complex types, where possible --- .../current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol | 4 ++-- .../current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol | 4 ++-- .../current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/contracts/src') diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol index 66d9d9b4b..bcf6e0a80 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol @@ -55,7 +55,7 @@ contract ERC20Proxy is uint8 assetProxyId, address tokenAddress) public pure - returns (bytes assetMetadata) + returns (bytes memory assetMetadata) { // 0 is reserved as invalid proxy id require(assetProxyId != 0); @@ -70,7 +70,7 @@ contract ERC20Proxy is /// @dev Decodes ERC20-encoded byte array. /// @param assetMetadata ERC20-encoded byte array. /// @return tokenAddress Address of ERC20 token. - function decodeMetadata(bytes assetMetadata) + function decodeMetadata(bytes memory assetMetadata) public pure returns (address tokenAddress) { diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol index ba84a439c..ec04df8bd 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol @@ -64,7 +64,7 @@ contract ERC20Proxy_v1 is uint8 assetProxyId, address tokenAddress) public pure - returns (bytes assetMetadata) + returns (bytes memory assetMetadata) { // 0 is reserved as invalid proxy id require(assetProxyId != 0); @@ -79,7 +79,7 @@ contract ERC20Proxy_v1 is /// @dev Decodes ERC20-encoded byte array. /// @param assetMetadata ERC20-encoded byte array. /// @return tokenAddress Address of ERC20 token. - function decodeMetadata(bytes assetMetadata) + function decodeMetadata(bytes memory assetMetadata) public pure returns (address tokenAddress) { diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol index 8d6cf3202..6e0f46147 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol @@ -67,7 +67,7 @@ contract ERC721Proxy is address tokenAddress, uint256 tokenId) public pure - returns (bytes assetMetadata) + returns (bytes memory assetMetadata) { // 0 is reserved as invalid proxy id require(assetProxyId != 0); -- cgit