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

Add support for MAP in fill-scenarios

Browse Source
This commit is contained in:
Amir Bandeali 2018-12-01 23:32:50 -08:00
parent fc71d87d2b
commit 46359c098b
2 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fill-scenarios/CHANGELOG.json
View File

@ -1,9 +1,9 @@
[ [
{ {
"version": "1.0.17", "version": "1.1.0",
"changes": [ "changes": [
{ {
"note": "Add error message if assetProxyId is not ERC20 or ERC721", "note": "Add support for MultiAssetProxy",
"pr": 1363 "pr": 1363
} }
] ]

81
packages/fill-scenarios/src/fill_scenarios.ts
View File

@ -3,10 +3,10 @@ import * as artifacts from '@0x/contract-artifacts';
import { assetDataUtils } from '@0x/order-utils'; import { assetDataUtils } from '@0x/order-utils';
import { orderFactory } from '@0x/order-utils/lib/src/order_factory'; import { orderFactory } from '@0x/order-utils/lib/src/order_factory';
import { import {
AssetData,
AssetProxyId, AssetProxyId,
ERC20AssetData, ERC20AssetData,
ERC721AssetData, ERC721AssetData,
MultiAssetData,
OrderWithoutExchangeAddress, OrderWithoutExchangeAddress,
SignedOrder, SignedOrder,
} from '@0x/types'; } from '@0x/types';
@ -157,43 +157,8 @@ export class FillScenarios {
feeRecipientAddress: string, feeRecipientAddress: string,
expirationTimeSeconds?: BigNumber, expirationTimeSeconds?: BigNumber,
): Promise<SignedOrder> { ): Promise<SignedOrder> {
const decodedMakerAssetData = assetDataUtils.decodeAssetDataOrThrow(makerAssetData); await this._increaseBalanceAndAllowanceWithAssetDataAsync(makerAssetData, makerAddress, makerFillableAmount);
if (decodedMakerAssetData.assetProxyId === AssetProxyId.ERC20) { await this._increaseBalanceAndAllowanceWithAssetDataAsync(takerAssetData, takerAddress, takerFillableAmount);
await this._increaseERC20BalanceAndAllowanceAsync(
(decodedMakerAssetData as ERC20AssetData).tokenAddress,
makerAddress,
makerFillableAmount,
);
} else if (decodedMakerAssetData.assetProxyId === AssetProxyId.ERC721) {
if (!makerFillableAmount.equals(1)) {
throw new Error(`ERC721 makerFillableAmount should be equal 1. Found: ${makerFillableAmount}`);
}
await this._increaseERC721BalanceAndAllowanceAsync(
(decodedMakerAssetData as ERC721AssetData).tokenAddress,
makerAddress,
// tslint:disable-next-line:no-unnecessary-type-assertion
(decodedMakerAssetData as ERC721AssetData).tokenId,
);
} else {
throw new Error(`Proxy with id ${decodedMakerAssetData.assetProxyId} not supported`);
}
const decodedTakerAssetData = assetDataUtils.decodeAssetDataOrThrow(takerAssetData);
if (decodedTakerAssetData.assetProxyId === AssetProxyId.ERC20) {
const takerTokenAddress = (decodedTakerAssetData as ERC20AssetData).tokenAddress;
await this._increaseERC20BalanceAndAllowanceAsync(takerTokenAddress, takerAddress, takerFillableAmount);
} else if (decodedTakerAssetData.assetProxyId === AssetProxyId.ERC721) {
if (!takerFillableAmount.equals(1)) {
throw new Error(`ERC721 takerFillableAmount should be equal 1. Found: ${takerFillableAmount}`);
}
await this._increaseERC721BalanceAndAllowanceAsync(
(decodedTakerAssetData as ERC721AssetData).tokenAddress,
takerAddress,
// tslint:disable-next-line:no-unnecessary-type-assertion
(decodedMakerAssetData as ERC721AssetData).tokenId,
);
} else {
throw new Error(`Proxy with id ${decodedTakerAssetData.assetProxyId} not supported`);
}
// Fees // Fees
await Promise.all([ await Promise.all([
this._increaseERC20BalanceAndAllowanceAsync(this._zrxTokenAddress, makerAddress, makerFee), this._increaseERC20BalanceAndAllowanceAsync(this._zrxTokenAddress, makerAddress, makerFee),
@ -309,4 +274,44 @@ export class FillScenarios {
}); });
await this._web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); await this._web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
} }
private async _increaseBalanceAndAllowanceWithAssetDataAsync(
assetData: string,
userAddress: string,
amount: BigNumber,
): Promise<void> {
const decodedAssetData = assetDataUtils.decodeAssetDataOrThrow(assetData);
switch (decodedAssetData.assetProxyId) {
case AssetProxyId.ERC20:
await this._increaseERC20BalanceAndAllowanceAsync(
(decodedAssetData as ERC20AssetData).tokenAddress,
userAddress,
amount,
);
break;
case AssetProxyId.ERC721:
await this._increaseERC721BalanceAndAllowanceAsync(
(decodedAssetData as ERC721AssetData).tokenAddress,
userAddress,
// tslint:disable-next-line:no-unnecessary-type-assertion
(decodedAssetData as ERC721AssetData).tokenId,
);
break;
case AssetProxyId.MultiAsset:
for (const [
index,
nestedAssetDataElement,
] of (decodedAssetData as MultiAssetData).nestedAssetData.entries()) {
const amountsElement = (decodedAssetData as MultiAssetData).amounts[index];
const totalAmount = amount.times(amountsElement);
await this._increaseBalanceAndAllowanceWithAssetDataAsync(
nestedAssetDataElement,
userAddress,
totalAmount,
);
}
break;
default:
throw new Error(`Proxy with id ${decodedAssetData.assetProxyId} not supported`);
}
}
} }