diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-22 16:39:07 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-22 16:39:07 +0800 |
| commit | 3ce295a2af17feef6cd4e3140196501805493719 (patch) | |
| tree | 964df912ce86d98a211f81f3d6159d797a37c3b3 /packages/contracts/src/utils/exchange_wrapper.ts | |
| parent | a30107ab867964d371b2d5fc6791c7b1963f1c7b (diff) | |
| parent | 0515c6acded983bba05320895ea2c2891f37055c (diff) | |
| download | dexon-0x-contracts-3ce295a2af17feef6cd4e3140196501805493719.tar.gz dexon-0x-contracts-3ce295a2af17feef6cd4e3140196501805493719.tar.zst dexon-0x-contracts-3ce295a2af17feef6cd4e3140196501805493719.zip | |
Merge branch 'v2-prototype' into refactor/check-revert-reasons
* v2-prototype: (40 commits)
Use make-promises-safe as a preloader instead of manually importing
Updated compiler runs to be 1,000,000
Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts
Add senderAddress to Fill and Cancel logs, add comments to events and types
Fix Island component
Add missing image assets for Chris and Mel
Fix some bugs in sol-cov
Remove unreachable PreSigned check
Fix linting
Buttons look hella disabled now
Remove border radius, fix width issue for unlock step
Add Chris and Mel to about page
fix linter issues
only call getLocationByOffset if source if defined
Set settleOrder and settleMatchedOrders to private
Prevent prettier issue
Support mobile friendly onboarding flows
Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders`
Migrations after rebasing
Linter
...
Diffstat (limited to 'packages/contracts/src/utils/exchange_wrapper.ts')
| -rw-r--r-- | packages/contracts/src/utils/exchange_wrapper.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/src/utils/exchange_wrapper.ts b/packages/contracts/src/utils/exchange_wrapper.ts index 4cc8f0b89..06eb70644 100644 --- a/packages/contracts/src/utils/exchange_wrapper.ts +++ b/packages/contracts/src/utils/exchange_wrapper.ts @@ -215,7 +215,7 @@ export class ExchangeWrapper { ): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await this._exchange.executeTransaction.sendTransactionAsync( signedTx.salt, - signedTx.signer, + signedTx.signerAddress, signedTx.data, signedTx.signature, { from }, |