Merge pull request #1832 from 0xProject/feat/3.0/transactionExpiratio…

…nsAndLogs Add transaction expirations and execution logs
0xProject · May 30, 2019 · ba70c11 · ba70c11
2 parents fec59df + d4baa3c
commit ba70c11
Show file tree

Hide file tree

Showing 24 changed files with 401 additions and 133 deletions.
diff --git a/contracts/coordinator/test/coordinator.ts b/contracts/coordinator/test/coordinator.ts
@@ -135,7 +135,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should fill the order with a signed approval`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -174,7 +174,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should fill the order if called by approver`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
                     await coordinatorContract.executeTransaction.sendTransactionAsync(
                         transaction,
@@ -206,7 +206,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert with no approval signature`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 await expectTransactionFailedAsync(
                     coordinatorContract.executeTransaction.sendTransactionAsync(
                         transaction,
@@ -225,7 +225,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert with an invalid approval signature`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -249,7 +249,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert with an expired approval`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -272,7 +272,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert if not called by tx signer or approver`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -299,7 +299,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should fill the orders with a signed approval`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -340,7 +340,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should fill the orders if called by approver`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
                     await coordinatorContract.executeTransaction.sendTransactionAsync(
                         transaction,
@@ -374,7 +374,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert with an invalid approval signature`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -398,7 +398,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert with an expired approval`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -421,7 +421,7 @@ describe('Coordinator tests', () => {
             it(`${fnName} should revert if not called by tx signer or approver`, async () => {
                 const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transaction = await takerTransactionFactory.newSignedTransactionAsync({ data });
                 const currentTimestamp = await getLatestBlockTimestampAsync();
                 const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
                 const approval = approvalFactory.newSignedApproval(
@@ -447,7 +447,7 @@ describe('Coordinator tests', () => {
         it('cancelOrder call should be successful without an approval', async () => {
             const orders = [await orderFactory.newSignedOrderAsync()];
             const data = exchangeDataEncoder.encodeOrdersToExchangeData(ExchangeFunctionName.CancelOrder, orders);
-            const transaction = makerTransactionFactory.newSignedTransaction(data);
+            const transaction = await makerTransactionFactory.newSignedTransactionAsync({ data });
             const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
                 await coordinatorContract.executeTransaction.sendTransactionAsync(
                     transaction,
@@ -475,7 +475,7 @@ describe('Coordinator tests', () => {
         it('batchCancelOrders call should be successful without an approval', async () => {
             const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
             const data = exchangeDataEncoder.encodeOrdersToExchangeData(ExchangeFunctionName.BatchCancelOrders, orders);
-            const transaction = makerTransactionFactory.newSignedTransaction(data);
+            const transaction = await makerTransactionFactory.newSignedTransactionAsync({ data });
             const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
                 await coordinatorContract.executeTransaction.sendTransactionAsync(
                     transaction,
@@ -505,7 +505,7 @@ describe('Coordinator tests', () => {
         it('cancelOrdersUpTo call should be successful without an approval', async () => {
             const targetEpoch = constants.ZERO_AMOUNT;
             const data = exchange.cancelOrdersUpTo.getABIEncodedTransactionData(targetEpoch);
-            const transaction = makerTransactionFactory.newSignedTransaction(data);
+            const transaction = await makerTransactionFactory.newSignedTransactionAsync({ data });
             const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
                 await coordinatorContract.executeTransaction.sendTransactionAsync(
                     transaction,

diff --git a/contracts/coordinator/test/libs.ts b/contracts/coordinator/test/libs.ts
@@ -42,6 +42,7 @@ describe('Libs tests', () => {
         it('should return the correct transaction hash', async () => {
             const tx = {
                 salt: new BigNumber(0),
+                expirationTimeSeconds: new BigNumber(0),
                 signerAddress: constants.NULL_ADDRESS,
                 data: '0x1234',
                 domain: {
@@ -59,6 +60,7 @@ describe('Libs tests', () => {
         it('should return the correct approval hash', async () => {
             const signedTx = {
                 salt: new BigNumber(0),
+                expirationTimeSeconds: new BigNumber(0),
                 signerAddress: constants.NULL_ADDRESS,
                 data: '0x1234',
                 signature: '0x5678',