aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-06-05 13:34:04 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-06-08 06:39:40 +0800
commit774d831fae5809408f9ddfcf9393d579416b1bfb (patch)
tree6ea66da84f218b54263aaec1d5c6f8a5b064abc6 /packages/contracts/src
parenta1b49d8389844c9b2d62ded91b76a23deb060ab6 (diff)
downloaddexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.tar
dexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.tar.gz
dexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.tar.bz2
dexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.tar.lz
dexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.tar.xz
dexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.tar.zst
dexon-sol-tools-774d831fae5809408f9ddfcf9393d579416b1bfb.zip
Style updates to ERC721 onReceiver
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol1
-rw-r--r--packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol4
-rw-r--r--packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol9
3 files changed, 6 insertions, 8 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
index c8e8f4587..50632400e 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
@@ -20,7 +20,6 @@ pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
-import "../../tokens/ERC20Token/IERC20Token.sol";
import "./MixinAssetProxy.sol";
import "./MixinAuthorizable.sol";
import "../../tokens/ERC20Token/IERC20Token.sol";
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
index 7de7968cc..21e5518c6 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
@@ -33,8 +33,6 @@ contract ERC721Proxy is
// Id of this proxy.
uint8 constant PROXY_ID = 2;
- string constant PROXY_ID_MISMATCH = "Proxy id in metadata does not match this proxy id.";
-
/// @dev Internal version of `transferFrom`.
/// @param assetData Encoded byte array.
/// @param from Address to transfer asset from.
@@ -60,7 +58,7 @@ contract ERC721Proxy is
// Data must be intended for this proxy.
require(
proxyId == PROXY_ID,
- PROXY_ID_MISMATCH
+ ASSET_PROXY_ID_MISMATCH
);
// There exists only 1 of each token.
diff --git a/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol b/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
index 5610c47b3..8f6647d20 100644
--- a/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
+++ b/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
@@ -332,7 +332,8 @@ contract LibBytes is
internal
pure
{
- // Read length of nested bytes
+ // Assert length of <b> is valid, given
+ // length of input
require(
b.length >= index + 32 /* 32 bytes to store length */ + input.length,
GTE_32_LENGTH_REQUIRED
@@ -340,9 +341,9 @@ contract LibBytes is
// Copy <input> into <b>
memcpy(
- getMemAddress(b) + index + 32, // +32 to skip length of <b>
- getMemAddress(input), // include length of byte array
- input.length + 32 // +32 bytes to store length
+ getMemAddress(b) + 32 + index, // +32 to skip length of <b>
+ getMemAddress(input), // includes length of <input>
+ input.length + 32 // +32 bytes to store <input> length
);
}
}