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

Changed order of write parameters in LibBytes. Now ordered by most generalized to most specific

Browse Source
This commit is contained in:
Greg Hysen
2018-04-10 21:36:19 -07:00
committed by Amir Bandeali
parent 78d81f193f
commit 219d6c294d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20TransferProxy.sol
View File

@@ -63,7 +63,7 @@ contract ERC20TransferProxy is
// Encode fields into a byte array
assetMetadata = new bytes(21);
assetMetadata[0] = byte(assetProxyId);
writeAddress(tokenAddress, assetMetadata, 1);
writeAddress(assetMetadata, 1, tokenAddress);
return assetMetadata;
}

2
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20TransferProxy_v1.sol
View File

@@ -72,7 +72,7 @@ contract ERC20TransferProxy_v1 is
// Encode fields into a byte array
assetMetadata = new bytes(21);
assetMetadata[0] = byte(assetProxyId);
writeAddress(tokenAddress, assetMetadata, 1);
writeAddress(assetMetadata, 1, tokenAddress);
return assetMetadata;
}

4
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721TransferProxy.sol
View File

@@ -73,8 +73,8 @@ contract ERC721TransferProxy is
// Encode fields into a byte array
assetMetadata = new bytes(53);
assetMetadata[0] = byte(assetProxyId);
writeAddress(tokenAddress, assetMetadata, 1);
writeUint256(tokenId, assetMetadata, 21);
writeAddress(assetMetadata, 1, tokenAddress);
writeUint256(assetMetadata, 21, tokenId);
return assetMetadata;
}

12
packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
View File

@@ -48,13 +48,13 @@ contract LibBytes {
}
/// @dev Writes an address into a specific position in a byte array.
/// @param input Address to put into byte array.
/// @param b Byte array to insert address into.
/// @param index Index in byte array of address.
/// @param input Address to put into byte array.
function writeAddress(
address input,
bytes b,
uint256 index)
uint256 index,
address input)
public pure
{
require(b.length >= index + 20); // 20 is length of address
@@ -104,13 +104,13 @@ contract LibBytes {
}
/// @dev Writes a uint256 into a specific position in a byte array.
/// @param input uint256 to put into byte array.
/// @param b Byte array to insert <input> into.
/// @param index Index in byte array of <input>.
/// @param input uint256 to put into byte array.
function writeUint256(
uint256 input,
bytes b,
uint256 index)
uint256 index,
uint256 input)
public pure
{
require(b.length >= index + 32);