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

Check if the token doesn't exist before minting in fill scenarios

Browse Source
This commit is contained in:
Leonid Logvinov
2018-07-17 15:56:10 +02:00
parent c59cd36da6
commit 2aa729b212
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,9 +238,16 @@ export class FillScenarios {
this._web3Wrapper.getProvider(), this._web3Wrapper.getProvider(),
this._web3Wrapper.getContractDefaults(), this._web3Wrapper.getContractDefaults(),
); );
try {
const currentOwner = await erc721Token.ownerOf.callAsync(tokenId);
if (currentOwner !== address) {
throw new Error(`Token ${tokenAddress}:${tokenId} is already owner by ${currentOwner}`);
}
} catch (err) {
const txHash = await erc721Token.mint.sendTransactionAsync(address, tokenId, { from: this._coinbase }); const txHash = await erc721Token.mint.sendTransactionAsync(address, tokenId, { from: this._coinbase });
await this._web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); await this._web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
} }
}
private async _increaseERC20BalanceAndAllowanceAsync( private async _increaseERC20BalanceAndAllowanceAsync(
tokenAddress: string, tokenAddress: string,
address: string, address: string,

2
packages/order-watcher/src/order_watcher/order_watcher.ts
View File

@@ -155,7 +155,7 @@ export class OrderWatcher {
const orderAssetDatas = [signedOrder.makerAssetData, signedOrder.takerAssetData]; const orderAssetDatas = [signedOrder.makerAssetData, signedOrder.takerAssetData];
_.each(orderAssetDatas, assetData => { _.each(orderAssetDatas, assetData => {
const decodedAssetData = assetProxyUtils.decodeAssetData(assetData); const decodedAssetData = assetProxyUtils.decodeAssetDataOrThrow(assetData);
if (decodedAssetData.assetProxyId === AssetProxyId.ERC20) { if (decodedAssetData.assetProxyId === AssetProxyId.ERC20) {
this._collisionResistantAbiDecoder.addERC20Token(decodedAssetData.tokenAddress); this._collisionResistantAbiDecoder.addERC20Token(decodedAssetData.tokenAddress);
} else if (decodedAssetData.assetProxyId === AssetProxyId.ERC721) { } else if (decodedAssetData.assetProxyId === AssetProxyId.ERC721) {