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

Add length check to MultiAsset encoding

Browse Source
This commit is contained in:
Amir Bandeali 2018-11-30 15:57:30 -08:00
parent 1553b366da
commit 0cb5209266
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/order-utils/src/asset_data_utils.ts
View File

@ -73,6 +73,13 @@ export const assetDataUtils = {
* @return The hex encoded assetData string * @return The hex encoded assetData string
*/ */
encodeMultiAssetData(amounts: BigNumber[], nestedAssetData: string[]): string { encodeMultiAssetData(amounts: BigNumber[], nestedAssetData: string[]): string {
if (amounts.length !== nestedAssetData.length) {
throw new Error(
`Invalid MultiAsset arguments. Expected length of 'amounts' (${
amounts.length
}) to equal length of 'nestedAssetData' (${nestedAssetData.length})`,
);
}
_.forEach(nestedAssetData, assetDataElement => assetDataUtils.validateAssetDataOrThrow(assetDataElement)); _.forEach(nestedAssetData, assetDataElement => assetDataUtils.validateAssetDataOrThrow(assetDataElement));
const abiEncoder = new AbiEncoder.Method(constants.MULTI_ASSET_METHOD_ABI as MethodAbi); const abiEncoder = new AbiEncoder.Method(constants.MULTI_ASSET_METHOD_ABI as MethodAbi);
const args = [amounts, nestedAssetData]; const args = [amounts, nestedAssetData];

2
packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
View File

@ -122,7 +122,7 @@ export class BalanceAndProxyAllowanceLazyStore implements AbstractBalanceAndProx
const decodedAssetData = assetDataUtils.decodeERC721AssetData(assetData); const decodedAssetData = assetDataUtils.decodeERC721AssetData(assetData);
if ( if (
decodedAssetData.assetProxyId === AssetProxyId.ERC721 && decodedAssetData.assetProxyId === AssetProxyId.ERC721 &&
!_.isUndefined(decodedAssetData.tokenAddress) && decodedAssetData.tokenAddress === tokenAddress &&
!_.isUndefined(this._proxyAllowance[assetData][userAddress]) !_.isUndefined(this._proxyAllowance[assetData][userAddress])
) { ) {
delete this._proxyAllowance[assetData][userAddress]; delete this._proxyAllowance[assetData][userAddress];