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

@0x/contracts-dev-utils: Add marketBuy/SellOrdersNoThrow and marketBuy/SellOrdersFillOrKill to LibTransactionDecoder.

Browse Source
This commit is contained in:
Lawrence Forman
2019-08-16 17:39:15 -04:00
parent 740913fa20
commit 89f1d54ebc
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/dev-utils/CHANGELOG.json
View File

@@ -9,6 +9,10 @@
{ {
"note": "Compile and export all contracts, artifacts, and wrappers by default", "note": "Compile and export all contracts, artifacts, and wrappers by default",
"pr": 2055 "pr": 2055
},
{
"note": "Add `marketBuy/SellOrdersNoThrow` and `marketBuy/SellOrdersFillOrKill` to `LibTransactionDecoder`.",
"pr": "TODO"
} }
] ]
}, },

18
contracts/dev-utils/contracts/src/LibTransactionDecoder.sol
View File

@@ -62,10 +62,14 @@ contract LibTransactionDecoder {
functionName = "fillOrderNoThrow"; functionName = "fillOrderNoThrow";
} else if (functionSelector == IExchange(address(0)).fillOrKillOrder.selector) { } else if (functionSelector == IExchange(address(0)).fillOrKillOrder.selector) {
functionName = "fillOrKillOrder"; functionName = "fillOrKillOrder";
} else if (functionSelector == IExchange(address(0)).marketBuyOrders.selector) { } else if (functionSelector == IExchange(address(0)).marketBuyOrdersNoThrow.selector) {
functionName = "marketBuyOrders"; functionName = "marketBuyOrdersNoThrow";
} else if (functionSelector == IExchange(address(0)).marketSellOrders.selector) { } else if (functionSelector == IExchange(address(0)).marketSellOrdersNoThrow.selector) {
functionName = "marketSellOrders"; functionName = "marketSellOrdersNoThrow";
} else if (functionSelector == IExchange(address(0)).marketBuyOrdersFillOrKill.selector) {
functionName = "marketBuyOrdersFillOrKill";
} else if (functionSelector == IExchange(address(0)).marketSellOrdersFillOrKill.selector) {
functionName = "marketSellOrdersFillOrKill";
} else if (functionSelector == IExchange(address(0)).matchOrders.selector) { } else if (functionSelector == IExchange(address(0)).matchOrders.selector) {
functionName = "matchOrders"; functionName = "matchOrders";
} else if ( } else if (
@@ -100,8 +104,10 @@ contract LibTransactionDecoder {
) { ) {
(orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForSingleOrderFill(transactionData); (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForSingleOrderFill(transactionData);
} else if ( } else if (
functionSelector == IExchange(address(0)).marketBuyOrders.selector || functionSelector == IExchange(address(0)).marketBuyOrdersNoThrow.selector ||
functionSelector == IExchange(address(0)).marketSellOrders.selector functionSelector == IExchange(address(0)).marketSellOrdersNoThrow.selector ||
functionSelector == IExchange(address(0)).marketBuyOrdersFillOrKill.selector ||
functionSelector == IExchange(address(0)).marketSellOrdersFillOrKill.selector
) { ) {
(orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForMarketFill(transactionData); (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForMarketFill(transactionData);
} else if (functionSelector == IExchange(address(0)).matchOrders.selector) { } else if (functionSelector == IExchange(address(0)).matchOrders.selector) {

7
contracts/dev-utils/test/lib_transaction_decoder.ts
View File

@@ -98,7 +98,12 @@ describe('LibTransactionDecoder', () => {
}); });
} }
for (const func of ['marketBuyOrders', 'marketSellOrders']) { for (const func of [
'marketBuyOrdersNoThrow',
'marketSellOrdersNoThrow',
'marketBuyOrdersFillOrKill',
'marketSellOrdersFillOrKill',
]) {
const input = (exchangeInterface as any)[func].getABIEncodedTransactionData( const input = (exchangeInterface as any)[func].getABIEncodedTransactionData(
[order, order], [order, order],
takerAssetFillAmount, takerAssetFillAmount,