diff --git a/README.md b/README.md index 47ad79fadc..42885f2739 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr | [`@0x/contracts-multisig`](/contracts/multisig) | [![npm](https://img.shields.io/npm/v/@0x/contracts-multisig.svg)](https://www.npmjs.com/package/@0x/contracts-multisig) | Various implementations of multisignature wallets, including the [`AssetProxyOwner`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxyowner) contract that has permissions to upgrade the protocol | | [`@0x/contracts-test-utils`](/contracts/test-utils) | [![npm](https://img.shields.io/npm/v/@0x/contracts-test-utils.svg)](https://www.npmjs.com/package/@0x/contracts-test-utils) | Typescript/Javascript shared utilities used for testing contracts | | [`@0x/contracts-utils`](/contracts/utils) | [![npm](https://img.shields.io/npm/v/@0x/contracts-utils.svg)](https://www.npmjs.com/package/@0x/contracts-utils) | Generic libraries and utilities used throughout all of the contracts | -| [`@0x/contracts-coordinator`](/contracts/coordinator) | [![npm](https://img.shields.io/npm/v/@0x/contracts-coordinator.svg)](https://www.npmjs.com/package/@0x/contracts-coordinator) | A contract that allows users to execute 0x transactions with permission from a Coordinator | +| [`@0x/contracts-coordinator`](/contracts/coordinator) | [![npm](https://img.shields.io/npm/v/@0x/contracts-coordinator.svg)](https://www.npmjs.com/package/@0x/contracts-coordinator) | A contract that allows users to execute 0x transactions with permission from a Coordinator | ### Typescript/Javascript Packages diff --git a/contracts/coordinator/test/coordinator.ts b/contracts/coordinator/test/coordinator.ts index 386bef791f..51ef135f57 100644 --- a/contracts/coordinator/test/coordinator.ts +++ b/contracts/coordinator/test/coordinator.ts @@ -190,10 +190,16 @@ describe('Coordinator tests', () => { const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders); const transaction = takerTransactionFactory.newSignedTransaction(data); await expectTransactionFailedAsync( - coordinatorContract.executeTransaction.sendTransactionAsync(transaction, transaction.signature, [], [], { - from: takerAddress, - gas: devConstants.MAX_EXECUTE_TRANSACTION_GAS, - }), + coordinatorContract.executeTransaction.sendTransactionAsync( + transaction, + transaction.signature, + [], + [], + { + from: takerAddress, + gas: devConstants.MAX_EXECUTE_TRANSACTION_GAS, + }, + ), RevertReason.InvalidApprovalSignature, ); }); @@ -388,9 +394,15 @@ describe('Coordinator tests', () => { const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.CANCEL_ORDERS, orders); const transaction = makerTransactionFactory.newSignedTransaction(data); const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync( - await coordinatorContract.executeTransaction.sendTransactionAsync(transaction, transaction.signature, [], [], { - from: makerAddress, - }), + await coordinatorContract.executeTransaction.sendTransactionAsync( + transaction, + transaction.signature, + [], + [], + { + from: makerAddress, + }, + ), ); const cancelLogs = transactionReceipt.logs.filter( log => (log as LogWithDecodedArgs).event === 'Cancel', @@ -409,9 +421,15 @@ describe('Coordinator tests', () => { const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.BATCH_CANCEL_ORDERS, orders); const transaction = makerTransactionFactory.newSignedTransaction(data); const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync( - await coordinatorContract.executeTransaction.sendTransactionAsync(transaction, transaction.signature, [], [], { - from: makerAddress, - }), + await coordinatorContract.executeTransaction.sendTransactionAsync( + transaction, + transaction.signature, + [], + [], + { + from: makerAddress, + }, + ), ); const cancelLogs = transactionReceipt.logs.filter( log => (log as LogWithDecodedArgs).event === 'Cancel', @@ -432,9 +450,15 @@ describe('Coordinator tests', () => { const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.CANCEL_ORDERS_UP_TO, orders); const transaction = makerTransactionFactory.newSignedTransaction(data); const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync( - await coordinatorContract.executeTransaction.sendTransactionAsync(transaction, transaction.signature, [], [], { - from: makerAddress, - }), + await coordinatorContract.executeTransaction.sendTransactionAsync( + transaction, + transaction.signature, + [], + [], + { + from: makerAddress, + }, + ), ); const cancelLogs = transactionReceipt.logs.filter( log => (log as LogWithDecodedArgs).event === 'CancelUpTo', diff --git a/contracts/coordinator/test/mixins.ts b/contracts/coordinator/test/mixins.ts index 42592cc739..dedab35d58 100644 --- a/contracts/coordinator/test/mixins.ts +++ b/contracts/coordinator/test/mixins.ts @@ -81,14 +81,20 @@ describe('Mixins tests', () => { describe('getSignerAddress', () => { it('should return the correct address using the EthSign signature type', async () => { const data = devConstants.NULL_BYTES; - const transaction = transactionFactory.newSignedCoordinatorTransaction(data, CoordinatorSignatureType.EthSign); + const transaction = transactionFactory.newSignedCoordinatorTransaction( + data, + CoordinatorSignatureType.EthSign, + ); const transactionHash = hashUtils.getTransactionHashHex(transaction); const signerAddress = await mixins.getSignerAddress.callAsync(transactionHash, transaction.signature); expect(transaction.signerAddress).to.eq(signerAddress); }); it('should return the correct address using the EIP712 signature type', async () => { const data = devConstants.NULL_BYTES; - const transaction = transactionFactory.newSignedCoordinatorTransaction(data, CoordinatorSignatureType.EIP712); + const transaction = transactionFactory.newSignedCoordinatorTransaction( + data, + CoordinatorSignatureType.EIP712, + ); const transactionHash = hashUtils.getTransactionHashHex(transaction); const signerAddress = await mixins.getSignerAddress.callAsync(transactionHash, transaction.signature); expect(transaction.signerAddress).to.eq(signerAddress); diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 7597990692..229dcd5a25 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,6 +1,5 @@ [ { - "version": "2.0.9", "changes": [ {