Compare commits

..

108 Commits

Author SHA1 Message Date
Leonid Logvinov
855b6b1dc5 Updated CHANGELOGS 2018-07-23 16:58:40 +02:00
Leonid Logvinov
2c1daf9c9a Add missing timestamps in CHANGELOGs 2018-07-23 16:24:13 +02:00
Leonid Logvinov
ffdaf88fd0 Add missing timestamps in CHANGELOGs 2018-07-23 15:57:16 +02:00
Amir Bandeali
195d11f9d0 Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback
Removed receiverData and `onReceive` callback from ERC721 proxy.
2018-07-22 18:14:09 -05:00
Fabio Berger
06f61949f9 Merge pull request #880 from feuGeneA/patch-5
make PR template checklist more useful
2018-07-22 15:35:15 +02:00
Francesco Agosti
0e72b67865 Merge pull request #895 from 0xProject/feature/website/send-eth-from-portal
Send Ether from Portal
2018-07-22 03:45:21 -07:00
Fabio Berger
b987eebf21 Fix version of ethereumjs-abi to 0.6.5 to fix decoding bug 2018-07-22 07:37:12 +02:00
Fabio Berger
c808d12b74 Merge pull request #904 from lukeautry/luke/leading_zero_encode
0x.js v2: fix decodeAssetData for addresses starting in 0
2018-07-22 07:16:49 +02:00
Luke Autry
b466431ede fix decodeAssetData for addresses starting in 0 2018-07-21 18:05:33 -04:00
Amir Bandeali
bf69ca6e53 Merge pull request #899 from kroitor/patch-1
Deduplicate assert web3-wrapper signMessageAsync
2018-07-20 20:28:29 -07:00
Brandon Millman
e54501522d Merge pull request #903 from 0xProject/bug/website/fix-website
Add AbortController polyfill to fetchAsync in utils
2018-07-20 13:51:12 -07:00
Brandon Millman
f2baeddc30 Merge branch 'v2-prototype' into bug/website/fix-website
* v2-prototype:
  Add missing timestamp to CHANGELOG entries
2018-07-20 12:07:27 -07:00
Brandon Millman
fd349b618a Add changelog entry for @0xproject/utils 2018-07-20 12:05:47 -07:00
Brandon Millman
6ca2a02766 Add AbortController polyfill to fetchAsync in utils 2018-07-20 11:58:38 -07:00
Brandon Millman
d9a282bd92 Increase node heap size for webpack command 2018-07-20 11:56:20 -07:00
Fabio Berger
dc151f7290 Add missing timestamp to CHANGELOG entries 2018-07-20 20:13:53 +02:00
Brandon Millman
cce2127f72 Upgrade some @0xproject packages to 1.0.0 in website 2018-07-20 10:55:47 -07:00
Amir Bandeali
8e7c395f59 Merge pull request #892 from 0xProject/refactor/contracts/LibAbiEncoder
Created LibAbiEncoder with `fillOrderNoThrow`
2018-07-20 07:43:40 -07:00
Amir Bandeali
02d50a513a Hard code fillOrder selector into abiEncodeFillOrder 2018-07-20 07:37:40 -07:00
Greg Hysen
d61759f6dd Returns byte array instead of memory range for encoding fillOrder calldata 2018-07-20 07:37:40 -07:00
Greg Hysen
5790ed7ba9 Created LibAbiEncoder with fillOrderNoThrow 2018-07-20 07:37:40 -07:00
Leonid Logvinov
7fadba59e7 Merge pull request #901 from 0xProject/feature/abi-gen-fix
Fix the abi-gen entry point
2018-07-20 16:34:17 +02:00
Fabio Berger
bcde0731db Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
  Fix linter error
  Remove the postinstall hook
2018-07-20 16:31:49 +02:00
Fabio Berger
052afb67a4 Add missing dep in migrations 2018-07-20 16:31:39 +02:00
Leonid Logvinov
6e15d7bb0f Fix the abi-gen entry point 2018-07-20 16:30:47 +02:00
Igor Kroitor
5bb68974ec Deduplicate assert web3-wrapper signMessageAsync 2018-07-20 08:49:16 +03:00
Leonid Logvinov
0a3ba4d27d Fix linter error 2018-07-20 02:06:11 +02:00
Leonid Logvinov
482a226dc5 Remove the postinstall hook 2018-07-20 02:02:16 +02:00
Fabio Berger
9e69458ba8 Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
  @0xproject/sra-report@1.0.0
  Change all package to depend on the new @0xproject/connect@1.0.0
2018-07-20 01:24:19 +02:00
Fabio Berger
71e386d5fa Update website package.json with original imports 2018-07-20 01:22:48 +02:00
Leonid Logvinov
60b501b137 @0xproject/sra-report@1.0.0 2018-07-20 01:07:44 +02:00
Leonid Logvinov
36f8e9f1d5 Change all package to depend on the new @0xproject/connect@1.0.0 2018-07-20 01:06:14 +02:00
Leonid Logvinov
78707bd3ca @0xproject/connect@1.0.0 2018-07-20 01:03:15 +02:00
Leonid Logvinov
56137d0605 Use old assert version in @0xproject/connect 2018-07-20 01:01:54 +02:00
Leonid Logvinov
681a582630 FIx a typo 2018-07-20 00:54:44 +02:00
Leonid Logvinov
846a447c4d Remove rc versions from unmigrated packages 2018-07-20 00:50:13 +02:00
Leonid Logvinov
f76be4f016 0x.js@1.0.0-rc.2 2018-07-20 00:45:19 +02:00
Fabio Berger
ed19067096 Move methods in ZeroEx.assetData to ZeroEx itself 2018-07-20 00:39:23 +02:00
Leonid Logvinov
eb9f7c2c9d Fix scoping of assets in 0x.js 2018-07-20 00:21:59 +02:00
Leonid Logvinov
52693f7d0a 0x.js@1.0.0-rc.1 2018-07-20 00:11:00 +02:00
Leonid Logvinov
5e015872ef Remove bundles config 2018-07-20 00:07:25 +02:00
Leonid Logvinov
08c291bd3f @0xproject/order-watcher@1.0.0-rc.1 2018-07-20 00:05:44 +02:00
Leonid Logvinov
48c5d69c9d Add monorepo-scripts postpublish.ts 2018-07-20 00:05:25 +02:00
Leonid Logvinov
0f9c262bb0 Change all package to depend on the new @0xproject/contract-wrappers@1.0.0-rc.1 2018-07-20 00:01:24 +02:00
Leonid Logvinov
dff0fc65bf @0xproject/contract-wrappers@1.0.0-rc.1 2018-07-19 23:56:46 +02:00
Leonid Logvinov
161f96c07d Change all package to depend on the new @0xproject/migrations@1.0.0 2018-07-19 23:50:46 +02:00
Leonid Logvinov
67ad21b368 @0xproject/migrations@1.0.0 2018-07-19 23:46:23 +02:00
Leonid Logvinov
d5e633c38f Change all package to depend on the new @0xproject/sol-cov@1.0.0 2018-07-19 23:44:51 +02:00
Leonid Logvinov
617ef5b6ce @0xproject/sol-cov@1.0.0 2018-07-19 23:42:28 +02:00
Leonid Logvinov
8bd4e38d02 Change all package to depend on the new @0xproject/react-docs@1.0.0 2018-07-19 23:39:28 +02:00
Leonid Logvinov
f364b5c5ab @0xproject/react-docs@1.0.0 2018-07-19 23:38:13 +02:00
Leonid Logvinov
6486fced34 Change all package to depend on the new @0xproject/react-shared@1.0.0 2018-07-19 23:37:01 +02:00
Leonid Logvinov
bc9f2a51a2 @0xproject/react-shared@1.0.0 2018-07-19 23:35:14 +02:00
Leonid Logvinov
9c03b54d75 Copy postpublish scripts on build in fill-scenarios 2018-07-19 23:32:46 +02:00
Leonid Logvinov
eae08ea1e4 Change all package to depend on the new @0xproject/fill-scenarios@1.0.0-rc.1 2018-07-19 23:32:31 +02:00
Leonid Logvinov
6f276223c6 @0xproject/fill-scenarios@1.0.0-rc.1 2018-07-19 23:28:05 +02:00
Leonid Logvinov
21effcaa8b Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1 2018-07-19 23:26:32 +02:00
Leonid Logvinov
114b31a813 @0xproject/order-utils@1.0.0-rc.1 2018-07-19 23:23:37 +02:00
Leonid Logvinov
1a1b7a2bc4 Change all package to depend on the new @0xproject/sol-compiler@1.0.0 2018-07-19 23:21:29 +02:00
Leonid Logvinov
c9b213839a @0xproject/sol-compiler@1.0.0 2018-07-19 23:19:38 +02:00
Leonid Logvinov
4043fa76cc Change all package to depend on the new @0xproject/dev-utils@1.0.0 2018-07-19 23:16:47 +02:00
Leonid Logvinov
9c8e3bc4c9 @0xproject/dev-utils@1.0.0 2018-07-19 23:14:30 +02:00
Leonid Logvinov
18b1f01641 Change all package to depend on the new @0xproject/subproviders@1.0.0 2018-07-19 23:12:44 +02:00
Leonid Logvinov
9085c674e4 @0xproject/subproviders@1.0.0 2018-07-19 23:10:57 +02:00
Leonid Logvinov
b5d19d3fb1 Change all package to depend on the new @0xproject/base-contract@1.0.0 2018-07-19 23:05:01 +02:00
Leonid Logvinov
cc0477153b Fix the scripts build 2018-07-19 23:03:55 +02:00
Leonid Logvinov
76008b41c5 @0xproject/base-contract@1.0.0 2018-07-19 23:02:15 +02:00
Leonid Logvinov
8193fdc304 Change all package to depend on the new @0xproject/web3-wrapper@1.0.0 2018-07-19 22:57:27 +02:00
Leonid Logvinov
9d06c81078 FIx a typo 2018-07-19 22:56:17 +02:00
Leonid Logvinov
cdf85e5eee @0xproject/web3-wrapper@1.0.0 2018-07-19 22:54:32 +02:00
Leonid Logvinov
d774dbc432 Change all package to depend on the new @0xproject/abi-gen@1.0.0 2018-07-19 22:47:58 +02:00
Leonid Logvinov
0369f5ebc4 @0xproject/abi-gen@1.0.0 2018-07-19 22:46:33 +02:00
Leonid Logvinov
1e6b11b27e Change all package to depend on the new @0xproject/assert@1.0.0 2018-07-19 22:45:22 +02:00
Leonid Logvinov
7a8231435b Add forgotten file to git 2018-07-19 22:43:56 +02:00
Leonid Logvinov
b1aa7725df @0xproject/assert@1.0.0 2018-07-19 22:41:35 +02:00
Leonid Logvinov
bfe0ba3e9a Change all package to depend on the new @0xproject/sol-resolver@1.0.0 2018-07-19 22:39:42 +02:00
Leonid Logvinov
2d39329ee7 Add monorepo-scripts to sol-resolver 2018-07-19 22:38:19 +02:00
Leonid Logvinov
761b0063a0 @0xproject/sol-resolver@1.0.0 2018-07-19 22:33:24 +02:00
Leonid Logvinov
0f27ce3424 Change all package to depend on the new @0xproject/json-schemas@1.0.0-rc.1 2018-07-19 22:30:09 +02:00
Leonid Logvinov
2b0c0a6ff7 @0xproject/json-schemas@1.0.0-rc.1 2018-07-19 22:26:35 +02:00
Leonid Logvinov
5bd96f6fe9 Change the next @0xproject/json-schemas version to be 1.0.0-rc.1 2018-07-19 22:26:13 +02:00
Leonid Logvinov
37ac6749ba Change all package to depend on the new @0xproject/utils@1.0.0 2018-07-19 22:22:51 +02:00
Leonid Logvinov
bf955bd87f @0xproject/utils@1.0.0 2018-07-19 22:20:35 +02:00
Leonid Logvinov
6bd921d0bc Add a missing CHANGELOG entry 2018-07-19 22:20:08 +02:00
Leonid Logvinov
534decea95 Change all package to depend on the new @0xproject/types@1.0.0-rc.1 2018-07-19 22:17:55 +02:00
Leonid Logvinov
267830d463 FIx a typo 2018-07-19 22:15:31 +02:00
Leonid Logvinov
e82d0c21ec @0xproject/types@1.0.0-rc.1 2018-07-19 22:06:05 +02:00
Leonid Logvinov
ece6417699 Change the next @0xproject/types version to be 1.0.0-rc.1 2018-07-19 22:05:22 +02:00
Leonid Logvinov
74d5449719 Change all package to depend on the new @0xproject/tslint-config@1.0.0 2018-07-19 22:03:23 +02:00
Leonid Logvinov
4af7ff9cc3 @0xproject/tslint-config@1.0.0 2018-07-19 22:01:18 +02:00
Leonid Logvinov
46dedfcb67 Change the next @0xproject/tslint-config version to be 1.0.0 2018-07-19 22:00:58 +02:00
Leonid Logvinov
a9fa1a0df6 Change all package to depend on the new @0xproject/typescript-typings@1.0.0 2018-07-19 21:54:44 +02:00
Leonid Logvinov
a8572b4944 @0xproject/typescript-typings@1.0.0 2018-07-19 21:51:38 +02:00
Leonid Logvinov
91c0d47ad4 Change the next @0xproject/typescript-typings version to be 1.0.0 2018-07-19 21:51:12 +02:00
Leonid Logvinov
fd2611794a Change all package to depend on the new @0xproject/monorepo-scripts@1.0.0 2018-07-19 21:49:03 +02:00
Leonid Logvinov
1fe1c5321b @0xproject/monorepo-scripts@1.0.0 2018-07-19 21:45:38 +02:00
Leonid Logvinov
f063a5db0f Change all package to depend on the new ethereum-types@1.0.0 2018-07-19 21:44:09 +02:00
Leonid Logvinov
3883315447 Make PR numbers links on Github releases 2018-07-19 21:40:50 +02:00
fragosti
ff12aafc0f Remove TODO 2018-07-19 07:04:48 -07:00
fragosti
c08b4aa6a1 Remove unused Token import 2018-07-19 06:59:35 -07:00
fragosti
52a6e6357b Add lifecycle messages 2018-07-19 06:57:00 -07:00
fragosti
dead04dce8 WIP for sending ether from portal (works) 2018-07-19 04:11:44 -07:00
Greg Hysen
9aa49e59d0 Fixed merge errors 2018-07-18 16:44:24 +02:00
Greg Hysen
86328af6b7 Fixed merge error 2018-07-18 16:27:26 +02:00
Greg Hysen
36c27bdbf8 Ran prettier 2018-07-18 16:18:54 +02:00
Greg Hysen
e1a9f3435f Removed receiverData from ERC721 Proxy Id generation 2018-07-18 15:52:14 +02:00
Greg Hysen
9f74feb347 Removed receiverData and onReceive callback from ERC721 proxy. 2018-07-18 15:50:58 +02:00
F. Eugene Aumson
bffffffc95 make PR template checklist more useful
Goal is to make it so that every PR should check off every checklist
item before it is considered complete.

Removed mention of labels.  Since contributors outside the org don't
have permission to add labels, it's not possible for any such
contributor to ever check those items off.  Opted instead to prescribe
bracketed PR title prefixes, which are accessible to all.

Re-ordered checklist items to better represent chronological progress.
2018-07-16 17:50:24 -04:00
117 changed files with 1895 additions and 917 deletions

View File

@@ -18,12 +18,10 @@
## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- The following points should be used to indicate the progress of your PR. Put an `x` in all the boxes that apply right now, and come back over time and check them off as you make progress. If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
* [ ] Change requires a change to the documentation.
* [ ] Added tests to cover my changes.
* [ ] Prefixed the title of this PR with `[WIP]` if it is a work in progress.
* [ ] Prefixed the title of this PR with bracketed package name(s) corresponding to the changed package(s). For example: `[sol-cov] Fixed bug`.
* [ ] Added tests to cover my changes, or decided that tests would be too impractical.
* [ ] Updated documentation, or decided that no doc change is needed.
* [ ] Added new entries to the relevant CHANGELOG.jsons.
* [ ] Labeled this PR with the 'WIP' label if it is a work in progress.
* [ ] Labeled this PR with the labels corresponding to the changed package.

View File

@@ -1,14 +1,10 @@
{
"lerna": "3.0.0-beta.14",
"packages": ["packages/*"],
"commands": {
"publish": {
"allowBranch": "development"
}
},
"version": "independent",
"commands": {
"publish": {
"registry": "http://localhost:4873/",
"ignore": ["test/**/*", "*.md", "scripts", "lib", "tslint.json", "tsconfig.json"]
}
},

View File

@@ -30,8 +30,7 @@
"test": "wsrun test $PKG --fast-exit --serial --exclude-missing",
"stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing",
"lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing",
"comment:postinstall": "HACK: For some reason `yarn` is not setting up symlinks properly for order-utils. We temporarily set them manually. Remove this after V2 refactor is complete.",
"postinstall": "rm -rf `pwd`/packages/0x.js/node_modules/@0xproject; mkdir `pwd`/packages/0x.js/node_modules/@0xproject; ln -s `pwd`/packages/contract-wrappers `pwd`/packages/0x.js/node_modules/@0xproject/contract-wrappers; ln -s `pwd`/packages/order-utils `pwd`/packages/0x.js/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/types `pwd`/packages/0x.js/node_modules/@0xproject/types; rm -rf `pwd`/packages/order-utils/node_modules/@0xproject; mkdir `pwd`/packages/order-utils/node_modules/@0xproject; ln -s `pwd`/packages/json-schemas `pwd`/packages/order-utils/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/assert `pwd`/packages/order-utils/node_modules/@0xproject/assert; ln -s `pwd`/packages/types `pwd`/packages/order-utils/node_modules/@0xproject/types; rm -rf `pwd`/packages/fill-scenarios/node_modules/@0xproject; mkdir -p `pwd`/packages/fill-scenarios/node_modules/@0xproject; ln -s `pwd`/packages/types `pwd`/packages/fill-scenarios/node_modules/@0xproject/types; ln -s `pwd`/packages/json-schemas `pwd`/packages/fill-scenarios/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/order-utils `pwd`/packages/fill-scenarios/node_modules/@0xproject/order-utils; rm -rf `pwd`/packages/contract-wrappers/node_modules/@0xproject; mkdir -p `pwd`/packages/contract-wrappers/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/contract-wrappers/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/assert `pwd`/packages/contract-wrappers/node_modules/@0xproject/assert; ln -s `pwd`/packages/json-schemas `pwd`/packages/contract-wrappers/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/types `pwd`/packages/contract-wrappers/node_modules/@0xproject/types; ln -s `pwd`/packages/fill-scenarios `pwd`/packages/contract-wrappers/node_modules/@0xproject/fill-scenarios; rm -rf `pwd`/packages/assert/node_modules/@0xproject; mkdir -p `pwd`/packages/assert/node_modules/@0xproject; ln -s `pwd`/packages/json-schemas `pwd`/packages/assert/node_modules/@0xproject/json-schemas; rm -rf `pwd`/packages/order-watcher/node_modules/@0xproject; mkdir `pwd`/packages/order-watcher/node_modules/@0xproject; ln -s `pwd`/packages/assert `pwd`/packages/order-watcher/node_modules/@0xproject/assert; ln -s `pwd`/packages/json-schemas `pwd`/packages/order-watcher/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/order-utils `pwd`/packages/order-watcher/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/types `pwd`/packages/order-watcher/node_modules/@0xproject/types; ln -s `pwd`/packages/contract-wrappers `pwd`/packages/order-watcher/node_modules/@0xproject/contract-wrappers; rm -rf `pwd`/packages/contracts/node_modules/@0xproject; mkdir `pwd`/packages/contracts/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/contracts/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/types `pwd`/packages/contracts/node_modules/@0xproject/types; rm -rf `pwd`/packages/migrations/node_modules/@0xproject; mkdir `pwd`/packages/migrations/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/migrations/node_modules/@0xproject/order-utils"
"comment:postinstall": "HACK: For some reason `yarn` is not setting up symlinks properly for order-utils. We temporarily set them manually. Remove this after V2 refactor is complete."
},
"config": {
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"

View File

@@ -1,32 +1,51 @@
[
{
"timestamp": 1532357734,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043100,
"version": "1.0.0-rc.2",
"changes": [
{
"note": "Remove `zeroEx.assetData` and instead re-export it's static functions directly off `ZeroEx`"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Remove tokenRegistry wrapper",
"pr": 863
},
{
"note": "Rename zeroEx.token to zeroEx.erc20Token, and add zeroEx.erc721Token",
"note": "Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token`",
"pr": 863
},
{
"note": "Rename zeroEx.proxy to zeroEx.erc20Proxy and add zeroEx.erc721Proxy",
"note": "Rename `zeroEx.proxy` to `zeroEx.erc20Proxy` and add `zeroEx.erc721Proxy`",
"pr": 863
},
{
"note":
"Refactored ZeroEx.isValidSignature to zeroEx.isValidSignatureAsync. It is now async so that it can verify contract-dependent signature types",
"Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types",
"pr": 863
},
{
"note":
"Refactored signOrderHashAsync to ecSignOrderHashAsync. There are now many non-ECSignature ways to sign orders too.",
"Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too.",
"pr": 863
},
{
"note":
"Removed createOrderWatcherAsync method. Will be added back once OrderWatcher is refactored for V2",
"Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2",
"pr": 863
},
{
@@ -34,11 +53,7 @@
"pr": 863
},
{
"note": "Remove stateLayer config from OrderWatcher. It now always operates on the latest block",
"pr": 875
},
{
"note": "Export ZeroEx.assetData with methods to decode/encode assetData fields found in 0x orders",
"note": "Export `ZeroEx.assetData` with methods to decode/encode assetData fields found in 0x orders",
"pr": 884
}
]

View File

@@ -1,10 +1,29 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.0 - _July 23, 2018_
* Dependencies updated
## v1.0.0-rc.2 - _July 20, 2018_
* Remove `zeroEx.assetData` and instead re-export it's static functions directly off `ZeroEx`
## v1.0.0-rc.1 - _July 20, 2018_
* Remove tokenRegistry wrapper (#863)
* Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
* Rename `zeroEx.proxy` to `zeroEx.erc20Proxy` and add `zeroEx.erc721Proxy` (#863)
* Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types (#863)
* Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too. (#863)
* Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2 (#863)
* 0x.js exports renamed contract events and event arg types (#863)
* Export `ZeroEx.assetData` with methods to decode/encode assetData fields found in 0x orders (#884)
## v0.38.6 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "0.38.6",
"version": "1.0.0-rc.2",
"engines": {
"node": ">=6.12"
},
@@ -41,8 +41,8 @@
"contracts": "ZRXToken",
"postpublish": {
"assets": [
"packages/0x.js/_bundles/index.js",
"packages/0x.js/_bundles/index.min.js"
"_bundles/index.js",
"_bundles/index.min.js"
],
"docPublishConfigs": {
"extraFileIncludes": [
@@ -51,13 +51,11 @@
"../contract-wrappers/src/types.ts",
"../contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/exchange_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/token_registry_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/token_wrapper.ts",
"../order-watcher/src/order_watcher/order_watcher.ts",
"./src/generated_contract_wrappers/ether_token.ts",
"./src/generated_contract_wrappers/token.ts",
"./src/generated_contract_wrappers/exchange.ts"
"../contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts",
"../order-watcher/src/order_watcher/order_watcher.ts"
],
"s3BucketPath": "s3://doc-jsons/0x.js/",
"s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/"
@@ -70,11 +68,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/migrations": "^0.0.10",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/migrations": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
@@ -100,17 +98,17 @@
"webpack": "^3.1.0"
},
"dependencies": {
"@0xproject/assert": "^0.2.14",
"@0xproject/base-contract": "^0.3.6",
"@0xproject/contract-wrappers": "^0.1.1",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/types": "^1.0.0",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"ethereum-types": "^0.0.2",
"@0xproject/assert": "^1.0.0",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/contract-wrappers": "^1.0.0-rc.1",
"@0xproject/order-utils": "^1.0.0-rc.1",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"ethereum-types": "^1.0.0",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},

View File

@@ -38,10 +38,6 @@ export class ZeroEx {
* this constant for your convenience.
*/
public static NULL_ADDRESS = constants.NULL_ADDRESS;
/**
* A set of methods to easily decode/encode assetData fields found in 0x orders.
*/
public static assetData = assetDataUtils;
/**
* An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
*/
@@ -125,6 +121,57 @@ export class ZeroEx {
const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amount, decimals);
return baseUnitAmount;
}
/**
* Encodes an ERC20 token address into a hex encoded assetData string, usable in the makerAssetData or
* takerAssetData fields in a 0x order.
* @param tokenAddress The ERC20 token address to encode
* @return The hex encoded assetData string
*/
public static encodeERC20AssetData(tokenAddress: string): string {
return assetDataUtils.encodeERC20AssetData(tokenAddress);
}
/**
* Decodes an ERC20 assetData hex string into it's corresponding ERC20 tokenAddress & assetProxyId
* @param assetData Hex encoded assetData string to decode
* @return An object containing the decoded tokenAddress & assetProxyId
*/
public static decodeERC20AssetData(assetData: string): ERC20AssetData {
return assetDataUtils.decodeERC20AssetData(assetData);
}
/**
* Encodes an ERC721 token address into a hex encoded assetData string, usable in the makerAssetData or
* takerAssetData fields in a 0x order.
* @param tokenAddress The ERC721 token address to encode
* @param tokenId The ERC721 tokenId to encode
* @return The hex encoded assetData string
*/
public static encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber): string {
return assetDataUtils.encodeERC721AssetData(tokenAddress, tokenId);
}
/**
* Decodes an ERC721 assetData hex string into it's corresponding ERC721 tokenAddress, tokenId & assetProxyId
* @param assetData Hex encoded assetData string to decode
* @return An object containing the decoded tokenAddress, tokenId & assetProxyId
*/
public static decodeERC721AssetData(assetData: string): ERC721AssetData {
return assetDataUtils.decodeERC721AssetData(assetData);
}
/**
* Decode and return the assetProxyId from the assetData
* @param assetData Hex encoded assetData string to decode
* @return The assetProxyId
*/
public static decodeAssetProxyId(assetData: string): AssetProxyId {
return assetDataUtils.decodeAssetProxyId(assetData);
}
/**
* Decode any assetData into it's corresponding assetData object
* @param assetData Hex encoded assetData string to decode
* @return Either a ERC20 or ERC721 assetData object
*/
public static decodeAssetDataOrThrow(assetData: string): ERC20AssetData | ERC721AssetData {
return assetDataUtils.decodeAssetDataOrThrow(assetData);
}
/**
* Instantiates a new ZeroEx instance that provides the public interface to the 0x.js library.
* @param provider The Provider instance you would like the 0x.js library to use for interacting with

View File

@@ -1,6 +1,17 @@
[
{
"version": "0.4.0",
"version": "1.0.1",
"changes": [
{
"note": "Fix the abi-gen entry point in package.json",
"pr": 901
}
],
"timestamp": 1532357734
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Convert e_r_c to erc in generated file names",

View File

@@ -1,10 +1,20 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Fix the abi-gen entry point in package.json (#901)
## v1.0.0 - _July 20, 2018_
* Convert e_r_c to erc in generated file names (#822)
* Remove the output directory before writing to it (#822)
* skip generation of wrappers that are already up to date (#788)
## v0.3.4 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,2 +1,2 @@
#!/usr/bin/env node
require('../lib/src/index.js')
require('../lib/src/index.js');

View File

@@ -1,12 +1,12 @@
{
"name": "@0xproject/abi-gen",
"version": "0.3.4",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
"description": "Generate contract wrappers from ABI and handlebars templates",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
"watch_without_deps": "tsc -w",
"lint": "tslint --project .",
@@ -32,10 +32,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"chalk": "^2.3.0",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
"lodash": "^4.17.4",
@@ -46,8 +46,8 @@
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/glob": "5.0.35",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",

View File

@@ -1,6 +1,16 @@
[
{
"version": "0.2.14",
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note":

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values (#821)
## v0.2.14 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/assert",
"version": "0.3.0",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -31,8 +31,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
@@ -48,9 +48,9 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/json-schemas": "^1.0.0",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/json-schemas": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"lodash": "^4.17.4",
"valid-url": "^1.0.9"
},

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1531919263,
"version": "0.3.6",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Dependencies updated
## v0.3.6 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/base-contract",
"version": "0.3.6",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -9,7 +9,7 @@
"types": "lib/src/index.d.ts",
"scripts": {
"watch_without_deps": "tsc -w",
"build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf lib scripts",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
@@ -30,8 +30,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
@@ -43,10 +43,10 @@
"typescript": "2.7.1"
},
"dependencies": {
"ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"ethereum-types": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},

View File

@@ -1,10 +1,20 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note":
"Remove WebSocketOrderbookChannel from the public interface and replace with orderbookChannelFactory"
"Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`"
}
]
},

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`
## v0.6.17 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
"version": "0.6.17",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -52,18 +52,18 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": {
"@0xproject/assert": "^0.2.14",
"@0xproject/json-schemas": "0.8.3",
"@0xproject/json-schemas": "^0.8.3",
"@0xproject/types": "^0.8.2",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"lodash": "^4.17.4",
"query-string": "^5.0.1",
"sinon": "^4.0.0",
"websocket": "^1.0.25"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/fetch-mock": "^5.12.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",

View File

@@ -1,16 +1,26 @@
[
{
"timestamp": 1532357734,
"version": "1.0.0",
"changes": [
{
"note": "Update blockstream to v5.0 and propogate up caught errors to active subscriptions"
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Update blockstream to v5.0 and propogate up caught errors to active subscriptions",
"pr": 815
},
{
"note": "Update to v2 of 0x rpotocol",
"pr": 822
}
],
"timestamp": 1531149657
]
},
{
"timestamp": 1531919263,

View File

@@ -1,17 +1,22 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v0.1.1 - _July 18, 2018_
## v1.0.0 - _July 23, 2018_
* Dependencies updated
## v0.1.0 - _July 9, 2018_
## v1.0.0-rc.1 - _July 20, 2018_
* Update Blockstream dep. to V5.0 and no longer force unsubscribe on blockstream error (which are not recoverable)
* Update blockstream to v5.0 and propogate up caught errors to active subscriptions (#815)
* Update to v2 of 0x rpotocol (#822)
## v0.1.1 - _July 18, 2018_
* Dependencies updated
## v0.0.5 - _June 19, 2018_
@@ -19,11 +24,7 @@ CHANGELOG
## v0.0.4 - _May 29, 2018_
* Dependencies updated
## v0.0.3 - _May 29, 2018_
* Dependencies updated
* Expose 'abi' ContractAbi property on all contract wrappers
## v0.0.2 - _May 22, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/contract-wrappers",
"version": "0.1.1",
"version": "1.0.0-rc.1",
"description": "Smart TS wrappers for 0x smart contracts",
"keywords": [
"0xproject",
@@ -26,14 +26,6 @@
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js"
},
"config": {
"postpublish": {
"assets": [
"packages/contract-wrappers/_bundles/index.js",
"packages/contract-wrappers/_bundles/index.min.js"
]
}
},
"repository": {
"type": "git",
"url": "https://github.com/0xProject/0x-monorepo"
@@ -43,13 +35,13 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/migrations": "^0.0.10",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/migrations": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
@@ -74,16 +66,16 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/assert": "^0.3.0",
"@0xproject/base-contract": "^0.3.6",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/fill-scenarios": "^1.0.0",
"@0xproject/json-schemas": "^1.0.0",
"@0xproject/types": "^1.0.0",
"ethereum-types": "^0.0.2",
"@0xproject/assert": "^1.0.0",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/order-utils": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@0xproject/fill-scenarios": "^1.0.0-rc.1",
"@0xproject/json-schemas": "^1.0.0-rc.1",
"@0xproject/types": "^1.0.0-rc.1",
"ethereum-types": "^1.0.0",
"ethereumjs-blockstream": "5.0.0",
"ethereumjs-util": "^5.1.1",
"ethers": "3.0.22",

View File

@@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/sol-cov": "^0.1.3",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/sol-cov": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/bn.js": "^4.11.0",
"@types/node": "^8.0.53",
@@ -72,18 +72,18 @@
"yargs": "^10.0.3"
},
"dependencies": {
"@0xproject/base-contract": "^0.3.6",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/types": "^1.0.0",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"ethereum-types": "^0.0.2",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/order-utils": "^1.0.0-rc.1",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"ethereum-types": "^1.0.0",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "3.0.22",
"lodash": "^4.17.4"
}
}
}

View File

@@ -40,7 +40,7 @@ contract MixinForwarderCore is
MForwarderCore
{
bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)"));
bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
uint256 constant internal MAX_UINT = 2**256 - 1;
constructor ()

View File

@@ -109,12 +109,10 @@ contract MixinTransfer is
// Decode asset data.
address token = assetData.readAddress(16);
uint256 tokenId = assetData.readUint256(36);
bytes memory receiverData = assetData.readBytesWithLength(100);
IERC721Token(token).safeTransferFrom(
IERC721Token(token).transferFrom(
address(this),
to,
tokenId,
receiverData
tokenId
);
}
}

View File

@@ -26,7 +26,7 @@ contract ERC721Proxy is
MixinAuthorizable
{
// Id of this proxy.
bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)"));
bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
// solhint-disable-next-line payable-fallback
function ()
@@ -83,19 +83,15 @@ contract ERC721Proxy is
// WARNING: The ABIv2 specification allows additional padding between
// the Params and Data section. This will result in a larger
// offset to assetData.
// Asset data itself is encoded as follows:
//
// | Area | Offset | Length | Contents |
// |----------|--------|---------|-------------------------------------|
// | Header | 0 | 4 | function selector |
// | Params | | 3 * 32 | function parameters: |
// | Params | | 2 * 32 | function parameters: |
// | | 4 | 12 + 20 | 1. token address |
// | | 36 | | 2. tokenId |
// | | 68 | | 3. offset to receiverData (*) |
// | Data | | | receiverData: |
// | | 100 | 32 | receiverData Length |
// | | 132 | ** | receiverData Contents |
// We construct calldata for the `token.safeTransferFrom` ABI.
// The layout of this calldata is in the table below.
@@ -103,14 +99,10 @@ contract ERC721Proxy is
// | Area | Offset | Length | Contents |
// |----------|--------|---------|-------------------------------------|
// | Header | 0 | 4 | function selector |
// | Params | | 4 * 32 | function parameters: |
// | Params | | 3 * 32 | function parameters: |
// | | 4 | | 1. from |
// | | 36 | | 2. to |
// | | 68 | | 3. tokenId |
// | | 100 | | 4. offset to receiverData (*) |
// | Data | | | receiverData: |
// | | 132 | 32 | receiverData Length |
// | | 164 | ** | receiverData Contents |
// There exists only 1 of each token.
// require(amount == 1, "INVALID_AMOUNT")
@@ -122,76 +114,32 @@ contract ERC721Proxy is
mstore(96, 0)
revert(0, 100)
}
// Require assetData to be at least 132 bytes
let offset := calldataload(4)
if lt(calldataload(add(offset, 4)), 132) {
// Revert with `Error("LENGTH_GREATER_THAN_131_REQUIRED")`
mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
mstore(64, 0x000000204c454e4754485f475245415445525f5448414e5f3133315f52455155)
mstore(96, 0x4952454400000000000000000000000000000000000000000000000000000000)
revert(0, 100)
}
/////// Setup State ///////
// `cdStart` is the start of the calldata for
// `token.safeTransferFrom` (equal to free memory ptr).
let cdStart := mload(64)
// `dataAreaLength` is the total number of words
// needed to store `receiverData`
// As-per the ABI spec, this value is padded up to
// the nearest multiple of 32,
// and includes 32-bytes for length.
// It's calculated as folows:
// - Unpadded length in bytes = `mload(receiverData) + 32`
// - Add 31 to convert rounding down to rounding up.
// Combined with the previous and this is `63`.
// - Round down to nearest multiple of 32 by clearing
// bits 0x1F. This is done with `and` and a mask.
/////// Setup Header Area ///////
// This area holds the 4-byte `transferFromSelector`.
// Any trailing data in transferFromSelector will be
// overwritten in the next `mstore` call.
mstore(cdStart, 0xb88d4fde00000000000000000000000000000000000000000000000000000000)
mstore(0, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
/////// Setup Params Area ///////
// Each parameter is padded to 32-bytes.
// The entire Params Area is 128 bytes.
// Notes:
// 1. A 20-byte mask is applied to addresses
// to zero-out the unused bytes.
// 2. The offset to `receiverData` is the length
// of the Params Area (128 bytes).
let length := calldataload(add(offset, 136))
let token := calldataload(add(offset, 40))
// Round length up to multiple of 32
length := and(add(length, 31), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0)
// Copy `from` and `to`
calldatacopy(add(cdStart, 4), 36, 64)
// TokenId
mstore(add(cdStart, 68), calldataload(add(offset, 72)))
// Offset to receiverData
mstore(add(cdStart, 100), 128)
// receiverData (including length)
calldatacopy(add(cdStart, 132), add(offset, 136), add(length, 32))
/////// Call `token.safeTransferFrom` using the calldata ///////
// We copy the fields `from` and `to` in bulk
// from our own calldata to the new calldata.
calldatacopy(4, 36, 64)
// Copy `tokenId` field from our own calldata to the new calldata.
let assetDataOffset := calldataload(4)
calldatacopy(68, add(assetDataOffset, 72), 32)
/////// Call `token.transferFrom` using the calldata ///////
let token := calldataload(add(assetDataOffset, 40))
let success := call(
gas, // forward all gas
token, // call address of token contract
0, // don't send any ETH
cdStart, // pointer to start of input
add(length, 164), // length of input
0, // write output to null
0 // output size is 0 bytes
gas, // forward all gas
token, // call address of token contract
0, // don't send any ETH
0, // pointer to start of input
100, // length of input
0, // write output to null
0 // output size is 0 bytes
)
if success {
return(0, 0)

View File

@@ -22,12 +22,14 @@ pragma experimental ABIEncoderV2;
import "./libs/LibMath.sol";
import "./libs/LibOrder.sol";
import "./libs/LibFillResults.sol";
import "./libs/LibAbiEncoder.sol";
import "./mixins/MExchangeCore.sol";
contract MixinWrapperFunctions is
LibMath,
LibFillResults,
LibAbiEncoder,
MExchangeCore
{
/// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
@@ -68,177 +70,21 @@ contract MixinWrapperFunctions is
public
returns (FillResults memory fillResults)
{
// We need to call MExchangeCore.fillOrder using a delegatecall in
// assembly so that we can intercept a call that throws. For this, we
// need the input encoded in memory in the Ethereum ABIv2 format [1].
// | Area | Offset | Length | Contents |
// | -------- |--------|---------|-------------------------------------------- |
// | Header | 0x00 | 4 | function selector |
// | Params | | 3 * 32 | function parameters: |
// | | 0x00 | | 1. offset to order (*) |
// | | 0x20 | | 2. takerAssetFillAmount |
// | | 0x40 | | 3. offset to signature (*) |
// | Data | | 12 * 32 | order: |
// | | 0x000 | | 1. senderAddress |
// | | 0x020 | | 2. makerAddress |
// | | 0x040 | | 3. takerAddress |
// | | 0x060 | | 4. feeRecipientAddress |
// | | 0x080 | | 5. makerAssetAmount |
// | | 0x0A0 | | 6. takerAssetAmount |
// | | 0x0C0 | | 7. makerFeeAmount |
// | | 0x0E0 | | 8. takerFeeAmount |
// | | 0x100 | | 9. expirationTimeSeconds |
// | | 0x120 | | 10. salt |
// | | 0x140 | | 11. Offset to makerAssetData (*) |
// | | 0x160 | | 12. Offset to takerAssetData (*) |
// | | 0x180 | 32 | makerAssetData Length |
// | | 0x1A0 | ** | makerAssetData Contents |
// | | 0x1C0 | 32 | takerAssetData Length |
// | | 0x1E0 | ** | takerAssetData Contents |
// | | 0x200 | 32 | signature Length |
// | | 0x220 | ** | signature Contents |
// * Offsets are calculated from the beginning of the current area: Header, Params, Data:
// An offset stored in the Params area is calculated from the beginning of the Params section.
// An offset stored in the Data area is calculated from the beginning of the Data section.
// ** The length of dynamic array contents are stored in the field immediately preceeding the contents.
// [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html
bytes4 fillOrderSelector = this.fillOrder.selector;
// ABI encode calldata for `fillOrder`
bytes memory fillOrderCalldata = abiEncodeFillOrder(
order,
takerAssetFillAmount,
signature
);
// Delegate to `fillOrder` and handle any exceptions gracefully
assembly {
// Areas below may use the following variables:
// 1. <area>Start -- Start of this area in memory
// 2. <area>End -- End of this area in memory. This value may
// be precomputed (before writing contents),
// or it may be computed as contents are written.
// 3. <area>Offset -- Current offset into area. If an area's End
// is precomputed, this variable tracks the
// offsets of contents as they are written.
/////// Setup Header Area ///////
// Load free memory pointer
let headerAreaStart := mload(0x40)
mstore(headerAreaStart, fillOrderSelector)
let headerAreaEnd := add(headerAreaStart, 0x4)
/////// Setup Params Area ///////
// This area is preallocated and written to later.
// This is because we need to fill in offsets that have not yet been calculated.
let paramsAreaStart := headerAreaEnd
let paramsAreaEnd := add(paramsAreaStart, 0x60)
let paramsAreaOffset := paramsAreaStart
/////// Setup Data Area ///////
let dataAreaStart := paramsAreaEnd
let dataAreaEnd := dataAreaStart
// Offset from the source data we're reading from
let sourceOffset := order
// arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array.
let arrayLenBytes := 0
let arrayLenWords := 0
/////// Write order Struct ///////
// Write memory location of Order, relative to the start of the
// parameter list, then increment the paramsAreaOffset respectively.
mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
paramsAreaOffset := add(paramsAreaOffset, 0x20)
// Write values for each field in the order
// It would be nice to use a loop, but we save on gas by writing
// the stores sequentially.
mstore(dataAreaEnd, mload(sourceOffset)) // makerAddress
mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20))) // takerAddress
mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40))) // feeRecipientAddress
mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60))) // senderAddress
mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80))) // makerAssetAmount
mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0))) // takerAssetAmount
mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0))) // makerFeeAmount
mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0))) // takerFeeAmount
mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100))) // expirationTimeSeconds
mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120))) // salt
mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140))) // Offset to makerAssetData
mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160))) // Offset to takerAssetData
dataAreaEnd := add(dataAreaEnd, 0x180)
sourceOffset := add(sourceOffset, 0x180)
// Write offset to <order.makerAssetData>
mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart))
// Calculate length of <order.makerAssetData>
sourceOffset := mload(add(order, 0x140)) // makerAssetData
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
// Write length of <order.makerAssetData>
mstore(dataAreaEnd, arrayLenBytes)
dataAreaEnd := add(dataAreaEnd, 0x20)
// Write contents of <order.makerAssetData>
for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
mstore(dataAreaEnd, mload(sourceOffset))
dataAreaEnd := add(dataAreaEnd, 0x20)
sourceOffset := add(sourceOffset, 0x20)
}
// Write offset to <order.takerAssetData>
mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart))
// Calculate length of <order.takerAssetData>
sourceOffset := mload(add(order, 0x160)) // takerAssetData
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
// Write length of <order.takerAssetData>
mstore(dataAreaEnd, arrayLenBytes)
dataAreaEnd := add(dataAreaEnd, 0x20)
// Write contents of <order.takerAssetData>
for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
mstore(dataAreaEnd, mload(sourceOffset))
dataAreaEnd := add(dataAreaEnd, 0x20)
sourceOffset := add(sourceOffset, 0x20)
}
/////// Write takerAssetFillAmount ///////
mstore(paramsAreaOffset, takerAssetFillAmount)
paramsAreaOffset := add(paramsAreaOffset, 0x20)
/////// Write signature ///////
// Write offset to paramsArea
mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
// Calculate length of signature
sourceOffset := signature
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
// Write length of signature
mstore(dataAreaEnd, arrayLenBytes)
dataAreaEnd := add(dataAreaEnd, 0x20)
// Write contents of signature
for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
mstore(dataAreaEnd, mload(sourceOffset))
dataAreaEnd := add(dataAreaEnd, 0x20)
sourceOffset := add(sourceOffset, 0x20)
}
// Execute delegatecall
let success := delegatecall(
gas, // forward all gas, TODO: look into gas consumption of assert/throw
address, // call address of this contract
headerAreaStart, // pointer to start of input
sub(dataAreaEnd, headerAreaStart), // length of input
headerAreaStart, // write output over input
add(fillOrderCalldata, 32), // pointer to start of input (skip array length in first 32 bytes)
mload(fillOrderCalldata), // length of input
fillOrderCalldata, // write output over input
128 // output size is 128 bytes
)
switch success
@@ -249,10 +95,10 @@ contract MixinWrapperFunctions is
mstore(add(fillResults, 96), 0)
}
case 1 {
mstore(fillResults, mload(headerAreaStart))
mstore(add(fillResults, 32), mload(add(headerAreaStart, 32)))
mstore(add(fillResults, 64), mload(add(headerAreaStart, 64)))
mstore(add(fillResults, 96), mload(add(headerAreaStart, 96)))
mstore(fillResults, mload(fillOrderCalldata))
mstore(add(fillResults, 32), mload(add(fillOrderCalldata, 32)))
mstore(add(fillResults, 64), mload(add(fillOrderCalldata, 64)))
mstore(add(fillResults, 96), mload(add(fillOrderCalldata, 96)))
}
}
return fillResults;

View File

@@ -0,0 +1,218 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "./LibOrder.sol";
contract LibAbiEncoder {
/// @dev ABI encodes calldata for `fillOrder` in memory and returns the address range.
/// This range can be passed into `call` or `delegatecall` to invoke an external
/// call to `fillOrder`.
/// @param order Order struct containing order specifications.
/// @param takerAssetFillAmount Desired amount of takerAsset to sell.
/// @param signature Proof that order has been created by maker.
/// @return calldataBegin Memory address of ABI encoded calldata.
/// @return calldataLength Lenfgth of ABI encoded calldata.
function abiEncodeFillOrder(
LibOrder.Order memory order,
uint256 takerAssetFillAmount,
bytes memory signature
)
public
pure
returns (bytes memory fillOrderCalldata)
{
// We need to call MExchangeCore.fillOrder using a delegatecall in
// assembly so that we can intercept a call that throws. For this, we
// need the input encoded in memory in the Ethereum ABIv2 format [1].
// | Area | Offset | Length | Contents |
// | -------- |--------|---------|-------------------------------------------- |
// | Header | 0x00 | 4 | function selector |
// | Params | | 3 * 32 | function parameters: |
// | | 0x00 | | 1. offset to order (*) |
// | | 0x20 | | 2. takerAssetFillAmount |
// | | 0x40 | | 3. offset to signature (*) |
// | Data | | 12 * 32 | order: |
// | | 0x000 | | 1. senderAddress |
// | | 0x020 | | 2. makerAddress |
// | | 0x040 | | 3. takerAddress |
// | | 0x060 | | 4. feeRecipientAddress |
// | | 0x080 | | 5. makerAssetAmount |
// | | 0x0A0 | | 6. takerAssetAmount |
// | | 0x0C0 | | 7. makerFeeAmount |
// | | 0x0E0 | | 8. takerFeeAmount |
// | | 0x100 | | 9. expirationTimeSeconds |
// | | 0x120 | | 10. salt |
// | | 0x140 | | 11. Offset to makerAssetData (*) |
// | | 0x160 | | 12. Offset to takerAssetData (*) |
// | | 0x180 | 32 | makerAssetData Length |
// | | 0x1A0 | ** | makerAssetData Contents |
// | | 0x1C0 | 32 | takerAssetData Length |
// | | 0x1E0 | ** | takerAssetData Contents |
// | | 0x200 | 32 | signature Length |
// | | 0x220 | ** | signature Contents |
// * Offsets are calculated from the beginning of the current area: Header, Params, Data:
// An offset stored in the Params area is calculated from the beginning of the Params section.
// An offset stored in the Data area is calculated from the beginning of the Data section.
// ** The length of dynamic array contents are stored in the field immediately preceeding the contents.
// [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html
assembly {
// Areas below may use the following variables:
// 1. <area>Start -- Start of this area in memory
// 2. <area>End -- End of this area in memory. This value may
// be precomputed (before writing contents),
// or it may be computed as contents are written.
// 3. <area>Offset -- Current offset into area. If an area's End
// is precomputed, this variable tracks the
// offsets of contents as they are written.
/////// Setup Header Area ///////
// Load free memory pointer
fillOrderCalldata := mload(0x40)
// bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)"))
// = 0xb4be83d5
// Leave 0x20 bytes to store the length
mstore(add(fillOrderCalldata, 0x20), 0xb4be83d500000000000000000000000000000000000000000000000000000000)
let headerAreaEnd := add(fillOrderCalldata, 0x24)
/////// Setup Params Area ///////
// This area is preallocated and written to later.
// This is because we need to fill in offsets that have not yet been calculated.
let paramsAreaStart := headerAreaEnd
let paramsAreaEnd := add(paramsAreaStart, 0x60)
let paramsAreaOffset := paramsAreaStart
/////// Setup Data Area ///////
let dataAreaStart := paramsAreaEnd
let dataAreaEnd := dataAreaStart
// Offset from the source data we're reading from
let sourceOffset := order
// arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array.
let arrayLenBytes := 0
let arrayLenWords := 0
/////// Write order Struct ///////
// Write memory location of Order, relative to the start of the
// parameter list, then increment the paramsAreaOffset respectively.
mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
paramsAreaOffset := add(paramsAreaOffset, 0x20)
// Write values for each field in the order
// It would be nice to use a loop, but we save on gas by writing
// the stores sequentially.
mstore(dataAreaEnd, mload(sourceOffset)) // makerAddress
mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20))) // takerAddress
mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40))) // feeRecipientAddress
mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60))) // senderAddress
mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80))) // makerAssetAmount
mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0))) // takerAssetAmount
mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0))) // makerFeeAmount
mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0))) // takerFeeAmount
mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100))) // expirationTimeSeconds
mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120))) // salt
mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140))) // Offset to makerAssetData
mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160))) // Offset to takerAssetData
dataAreaEnd := add(dataAreaEnd, 0x180)
sourceOffset := add(sourceOffset, 0x180)
// Write offset to <order.makerAssetData>
mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart))
// Calculate length of <order.makerAssetData>
sourceOffset := mload(add(order, 0x140)) // makerAssetData
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
// Write length of <order.makerAssetData>
mstore(dataAreaEnd, arrayLenBytes)
dataAreaEnd := add(dataAreaEnd, 0x20)
// Write contents of <order.makerAssetData>
for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
mstore(dataAreaEnd, mload(sourceOffset))
dataAreaEnd := add(dataAreaEnd, 0x20)
sourceOffset := add(sourceOffset, 0x20)
}
// Write offset to <order.takerAssetData>
mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart))
// Calculate length of <order.takerAssetData>
sourceOffset := mload(add(order, 0x160)) // takerAssetData
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
// Write length of <order.takerAssetData>
mstore(dataAreaEnd, arrayLenBytes)
dataAreaEnd := add(dataAreaEnd, 0x20)
// Write contents of <order.takerAssetData>
for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
mstore(dataAreaEnd, mload(sourceOffset))
dataAreaEnd := add(dataAreaEnd, 0x20)
sourceOffset := add(sourceOffset, 0x20)
}
/////// Write takerAssetFillAmount ///////
mstore(paramsAreaOffset, takerAssetFillAmount)
paramsAreaOffset := add(paramsAreaOffset, 0x20)
/////// Write signature ///////
// Write offset to paramsArea
mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
// Calculate length of signature
sourceOffset := signature
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
// Write length of signature
mstore(dataAreaEnd, arrayLenBytes)
dataAreaEnd := add(dataAreaEnd, 0x20)
// Write contents of signature
for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
mstore(dataAreaEnd, mload(sourceOffset))
dataAreaEnd := add(dataAreaEnd, 0x20)
sourceOffset := add(sourceOffset, 0x20)
}
// Set length of calldata
mstore(
fillOrderCalldata,
sub(dataAreaEnd, add(fillOrderCalldata, 0x20))
)
}
return fillOrderCalldata;
}
}

View File

@@ -1,17 +1,12 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetDataUtils, generatePseudoRandomSalt } from '@0xproject/order-utils';
import { assetDataUtils } from '@0xproject/order-utils';
import { RevertReason } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import { LogWithDecodedArgs } from 'ethereum-types';
import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash';
import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
import {
DummyERC721ReceiverContract,
DummyERC721ReceiverTokenReceivedEventArgs,
} from '../../generated_contract_wrappers/dummy_erc721_receiver';
import { DummyERC721ReceiverContract } from '../../generated_contract_wrappers/dummy_erc721_receiver';
import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
@@ -23,7 +18,6 @@ import { constants } from '../utils/constants';
import { ERC20Wrapper } from '../utils/erc20_wrapper';
import { ERC721Wrapper } from '../utils/erc721_wrapper';
import { LogDecoder } from '../utils/log_decoder';
import { typeEncodingUtils } from '../utils/type_encoding_utils';
import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
chaiSetup.configure();
@@ -253,7 +247,7 @@ describe('Asset Transfer Proxies', () => {
expect(newOwnerMakerAsset).to.be.bignumber.equal(takerAddress);
});
it('should call onERC721Received when transferring to a smart contract without receiver data', async () => {
it('should not call onERC721Received when transferring to a smart contract', async () => {
// Construct ERC721 asset data
const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, erc721MakerTokenId);
// Verify pre-condition
@@ -277,85 +271,12 @@ describe('Asset Transfer Proxies', () => {
}),
);
// Verify that no log was emitted by erc721 receiver
expect(tx.logs.length).to.be.equal(1);
const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
expect(tokenReceivedLog.args.from).to.be.equal(makerAddress);
expect(tokenReceivedLog.args.tokenId).to.be.bignumber.equal(erc721MakerTokenId);
expect(tokenReceivedLog.args.data).to.be.equal(constants.NULL_BYTES);
expect(tx.logs.length).to.be.equal(0);
// Verify transfer was successful
const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
expect(newOwnerMakerAsset).to.be.bignumber.equal(erc721Receiver.address);
});
it('should call onERC721Received when transferring to a smart contract with receiver data', async () => {
// Construct ERC721 asset data
const receiverData = ethUtil.bufferToHex(typeEncodingUtils.encodeUint256(generatePseudoRandomSalt()));
const encodedAssetData = assetDataUtils.encodeERC721AssetData(
erc721Token.address,
erc721MakerTokenId,
receiverData,
);
// Verify pre-condition
const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
// Perform a transfer from makerAddress to takerAddress
const amount = new BigNumber(1);
const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
encodedAssetData,
makerAddress,
erc721Receiver.address,
amount,
);
const logDecoder = new LogDecoder(web3Wrapper, erc721Receiver.address);
const tx = await logDecoder.getTxWithDecodedLogsAsync(
await web3Wrapper.sendTransactionAsync({
to: erc721Proxy.address,
data,
from: exchangeAddress,
gas: constants.MAX_TRANSFER_FROM_GAS,
}),
);
// Validate log emitted by erc721 receiver
expect(tx.logs.length).to.be.equal(1);
const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
expect(tokenReceivedLog.args.from).to.be.equal(makerAddress);
expect(tokenReceivedLog.args.tokenId).to.be.bignumber.equal(erc721MakerTokenId);
expect(tokenReceivedLog.args.data).to.be.equal(receiverData);
// Verify transfer was successful
const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
expect(newOwnerMakerAsset).to.be.bignumber.equal(erc721Receiver.address);
});
it('should throw if there is receiver data but contract does not have onERC721Received', async () => {
// Construct ERC721 asset data
const receiverData = ethUtil.bufferToHex(typeEncodingUtils.encodeUint256(generatePseudoRandomSalt()));
const encodedAssetData = assetDataUtils.encodeERC721AssetData(
erc721Token.address,
erc721MakerTokenId,
receiverData,
);
// Verify pre-condition
const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
// Perform a transfer from makerAddress to takerAddress
const amount = new BigNumber(1);
const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
encodedAssetData,
makerAddress,
erc20Proxy.address, // the ERC20 proxy does not have an ERC721 receiver
amount,
);
return expectTransactionFailedAsync(
web3Wrapper.sendTransactionAsync({
to: erc721Proxy.address,
data,
from: exchangeAddress,
gas: constants.MAX_TRANSFER_FROM_GAS,
}),
RevertReason.TransferFailed,
);
});
it('should throw if transferring 0 amount of a token', async () => {
// Construct ERC721 asset data
const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, erc721MakerTokenId);
@@ -454,9 +375,9 @@ describe('Asset Transfer Proxies', () => {
});
});
it('should have an id of 0x08e937fa', async () => {
it('should have an id of 0x02571792', async () => {
const proxyId = await erc721Proxy.getProxyId.callAsync();
const expectedProxyId = '0x08e937fa';
const expectedProxyId = '0x02571792';
expect(proxyId).to.equal(expectedProxyId);
});
});

View File

@@ -456,30 +456,6 @@ describe('Exchange core', () => {
RevertReason.RoundingError,
);
});
it('should throw if assetData has a length < 132', async () => {
// Construct Exchange parameters
const makerAssetId = erc721MakerAssetIds[0];
const takerAssetId = erc721TakerAssetIds[0];
const makerAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, makerAssetId).slice(0, -2);
signedOrder = await orderFactory.newSignedOrderAsync({
makerAssetAmount: new BigNumber(1),
takerAssetAmount: new BigNumber(1),
makerAssetData,
takerAssetData: assetDataUtils.encodeERC721AssetData(erc721Token.address, takerAssetId),
});
// Verify pre-conditions
const initialOwnerMakerAsset = await erc721Token.ownerOf.callAsync(makerAssetId);
expect(initialOwnerMakerAsset).to.be.bignumber.equal(makerAddress);
const initialOwnerTakerAsset = await erc721Token.ownerOf.callAsync(takerAssetId);
expect(initialOwnerTakerAsset).to.be.bignumber.equal(takerAddress);
// Call Exchange
const takerAssetFillAmount = signedOrder.takerAssetAmount;
return expectTransactionFailedAsync(
exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, { takerAssetFillAmount }),
RevertReason.LengthGreaterThan131Required,
);
});
});
describe('getOrderInfo', () => {

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1531919263,
"version": "0.4.6",
@@ -37,7 +55,8 @@
"note": "Add SolidityProfiler to EnvVars",
"pr": 675
}
]
],
"timestamp": 1527008544
},
{
"version": "0.4.2",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Dependencies updated
## v0.4.6 - _July 18, 2018_
* Dependencies updated
@@ -17,12 +25,14 @@ CHANGELOG
* Dependencies updated
## v0.4.3 - _June 1, 2018_
## v0.4.3 - _May 22, 2018_
* Incorrect publish that was unpublished
* Add optional parameter shouldUseFakeGasEstimate to Web3Config (#622)
* Add SolidityProfiler to EnvVars (#675)
## v0.4.2 - _May 22, 2018_
* Pass SolCompilerArtifactAdapter to CoverageSubprovider (#589)
* Move callbackErrorReporter over from 0x.js (#579)
## v0.4.1 - _May 5, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/dev-utils",
"version": "0.4.6",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -30,8 +30,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
@@ -45,12 +45,12 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/subproviders": "^0.10.6",
"@0xproject/types": "^0.8.2",
"@0xproject/utils": "^0.7.3",
"ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/utils": "^1.0.0",
"ethereum-types": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"lodash": "^4.17.4"
},
"publishConfig": {

View File

@@ -1,5 +1,15 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{

View File

@@ -0,0 +1,19 @@
<!--
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Add `TraceParams` interface for `debug_traceTransaction` parameters (#675)
* Add `TransactionReceiptStatus` type (#812)
## v0.0.2 - _June 1, 2018_
* Initial publish (#642)

View File

@@ -35,8 +35,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",

View File

@@ -1,6 +1,16 @@
[
{
"timestamp": 1532357734,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Make fill-scenarios compatible with V2 of 0x protocol",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.0 - _July 23, 2018_
* Dependencies updated
## v1.0.0-rc.1 - _July 20, 2018_
* Make fill-scenarios compatible with V2 of 0x protocol (#656)
## v0.0.6 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,12 +1,12 @@
{
"name": "@0xproject/fill-scenarios",
"version": "1.0.0",
"version": "1.0.0-rc.1",
"description": "0x order fill scenario generator",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
"watch_without_deps": "yarn pre_build && tsc -w",
"build": "yarn pre_build && tsc",
"build": "yarn pre_build && tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
"pre_build": "run-s update_artifacts generate_contract_wrappers",
"update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json lib/artifacts; done;",
"generate_contract_wrappers": "abi-gen --abis 'lib/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
@@ -28,10 +28,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
@@ -41,13 +41,13 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/base-contract": "^0.3.6",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/types": "1.0.0",
"ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/order-utils": "^1.0.0-rc.1",
"@0xproject/types": "^1.0.0-rc.1",
"ethereum-types": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},

View File

@@ -1,9 +1,19 @@
[
{
"timestamp": 1532357734,
"version": "1.0.0",
"changes": [
{
"note": "Update schemas for V2",
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Update schemas for V2 or 0x Protocol",
"pr": 615
},
{
@@ -51,7 +61,8 @@
"Update Order & SignedOrder schemas, remove ECSignature schema and add Hex schema as part of V2 upgrades",
"pr": 615
}
]
],
"timestamp": 1527008794
},
{
"timestamp": 1527008794,

View File

@@ -1,10 +1,20 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.0 - _July 23, 2018_
* Dependencies updated
## v1.0.0-rc.1 - _July 20, 2018_
* Update schemas for V2 or 0x Protocol (#615)
* Added CallData schema (#821)
* Update CallData schema id to CallData (#894)
## v0.8.3 - _July 18, 2018_
* Dependencies updated
@@ -17,9 +27,9 @@ CHANGELOG
* Dependencies updated
## v0.8.0 - _June 1, 2018_
## v0.8.0 - _May 22, 2018_
* Incorrect publish that was unpublished
* Update Order & SignedOrder schemas, remove ECSignature schema and add Hex schema as part of V2 upgrades (#615)
## v0.7.24 - _May 22, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/json-schemas",
"version": "1.0.0",
"version": "1.0.0-rc.1",
"engines": {
"node": ">=6.12"
},
@@ -47,15 +47,15 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
"dependencies": {
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/typescript-typings": "^1.0.0",
"@types/node": "^8.0.53",
"jsonschema": "^1.2.0",
"lodash.values": "^4.3.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/utils": "^0.7.3",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",

View File

@@ -29,25 +29,25 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/base-contract": "^0.3.6",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/sol-cov": "^0.1.3",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/types": "^0.8.2",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/sol-cov": "^1.0.0",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@types/mocha": "^5.2.2",
"copyfiles": "^2.0.0",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"ethers": "3.0.22",
"lodash": "^4.17.4",
"run-s": "^0.0.0"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/dev-utils": "^1.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Added migrations for 0x Protocol v2"
}
]
},
{
"timestamp": 1531919263,
"version": "0.0.10",
@@ -27,6 +45,7 @@
]
},
{
"timestamp": 1527008794,
"version": "0.0.7",
"changes": [
{

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Added migrations for 0x Protocol v2
## v0.0.10 - _July 18, 2018_
* Dependencies updated
@@ -17,9 +25,9 @@ CHANGELOG
* Dependencies updated
## v0.0.7 - _June 1, 2018_
## v0.0.7 - _May 22, 2018_
* Incorrect publish that was unpublished
* Use AssetProxyOwner instead of MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress (#675)
## v0.0.6 - _May 22, 2018_

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/migrations",
"version": "0.0.10",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -9,7 +9,8 @@
"types": "lib/index.d.ts",
"scripts": {
"watch_without_deps": "yarn pre_build && tsc -w",
"build": "yarn pre_build && tsc",
"build": "yarn pre_build && tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js",
"pre_build": "run-s copy_artifacts generate_contract_wrappers",
"copy_artifacts": "copyfiles 'artifacts/**/*' ./lib",
"clean": "shx rm -rf lib src/contract_wrappers",
@@ -37,11 +38,13 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/types": "^0.8.2",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@types/yargs": "^10.0.0",
"copyfiles": "^1.2.0",
"yargs": "^10.0.3",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
@@ -50,15 +53,15 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/base-contract": "^0.3.6",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/order-utils": "^1.0.0-rc.1",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@ledgerhq/hw-app-eth": "^4.3.0",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},

View File

@@ -0,0 +1,8 @@
import { postpublishUtils } from '@0xproject/monorepo-scripts';
import * as packageJSON from '../package.json';
import * as tsConfigJSON from '../tsconfig.json';
const cwd = `${__dirname}/..`;
// tslint:disable-next-line:no-floating-promises
postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

View File

@@ -9,7 +9,7 @@ export const constants = {
ASSET_PROXY_OWNER_TIMELOCK: new BigNumber(0),
ASSET_PROXY_OWNER_CONFIRMATIONS: new BigNumber(1),
ERC20_PROXY_ID: '0xf47261b0',
ERC721_PROXY_ID: '0x08e937fa',
ERC721_PROXY_ID: '0x02571792',
NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
RPC_URL: 'http://localhost:8545',
KOVAN_NETWORK_ID: 42,

View File

@@ -1,10 +1,23 @@
[
{
"version": "0.2.3",
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Fix git remote tag removal step & add an additional sanity assertion",
"pr": 803
},
{
"note": "Make PR numbers links on Github releases"
}
]
},

View File

@@ -1,10 +1,19 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Fix git remote tag removal step & add an additional sanity assertion (#803)
* Make PR numbers links on Github releases
## v0.2.2 - _July 9, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/monorepo-scripts",
"version": "0.2.2",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},

View File

@@ -128,7 +128,7 @@ export const postpublishUtils = {
_.each(latestLog.changes, change => {
notes += `* ${change.note}`;
if (change.pr) {
notes += ` (${change.pr})`;
notes += ` (#${change.pr})`;
}
notes += `\n`;
});

View File

@@ -1,6 +1,17 @@
[
{
"version": "1.0.0",
"version": "1.0.0-rc.2",
"changes": [
{
"note":
"Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`"
}
],
"timestamp": 1532357734
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Refactor to work with V2 of 0x protocol",

View File

@@ -1,10 +1,20 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.0-rc.2 - _July 23, 2018_
* Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`
## v1.0.0-rc.1 - _July 20, 2018_
* Refactor to work with V2 of 0x protocol (#636)
* Export parseECSignature method (#684)
* Handle Typed Arrays when hashing data (#894)
## v0.0.9 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-utils",
"version": "1.0.0",
"version": "1.0.0-rc.1",
"engines": {
"node": ">=6.12"
},
@@ -51,9 +51,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
@@ -71,18 +71,18 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/assert": "^0.3.0",
"@0xproject/base-contract": "^0.3.6",
"@0xproject/json-schemas": "1.0.0",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/types": "^1.0.0",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/assert": "^1.0.0",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/json-schemas": "^1.0.0-rc.1",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@types/node": "^8.0.53",
"bn.js": "^4.11.8",
"ethereum-types": "^0.0.2",
"ethereumjs-abi": "^0.6.4",
"ethereum-types": "^1.0.0",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "3.0.22",
"lodash": "^4.17.4"

View File

@@ -50,14 +50,13 @@ export const assetDataUtils = {
* @param tokenId The ERC721 tokenId to encode
* @return The hex encoded assetData string
*/
encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber, receiverData?: string): string {
encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber): string {
// TODO: Pass `tokendId` as a BigNumber.
return ethUtil.bufferToHex(
ethAbi.simpleEncode(
'ERC721Token(address,uint256,bytes)',
'ERC721Token(address,uint256)',
tokenAddress,
`0x${tokenId.toString(constants.BASE_16)}`,
ethUtil.toBuffer(receiverData || '0x'),
),
);
},
@@ -83,15 +82,11 @@ export const assetDataUtils = {
}), but got ${assetProxyId}`,
);
}
const [tokenAddress, tokenId, receiverData] = ethAbi.rawDecode(
['address', 'uint256', 'bytes'],
data.slice(constants.SELECTOR_LENGTH),
);
const [tokenAddress, tokenId] = ethAbi.rawDecode(['address', 'uint256'], data.slice(constants.SELECTOR_LENGTH));
return {
assetProxyId,
tokenAddress: ethUtil.addHexPrefix(tokenAddress),
tokenId: new BigNumber(tokenId.toString()),
receiverData: ethUtil.bufferToHex(receiverData),
};
},
/**

View File

@@ -1,4 +1,23 @@
[
{
"timestamp": 1532357734,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Add support for ERC721 event watching and Exchange V2 events",
"pr": 887
}
]
},
{
"timestamp": 1531919263,
"version": "0.0.8",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.0 - _July 23, 2018_
* Dependencies updated
## v1.0.0-rc.1 - _July 20, 2018_
* Add support for ERC721 event watching and Exchange V2 events (#887)
## v0.0.8 - _July 18, 2018_
* Dependencies updated
@@ -13,6 +21,8 @@ CHANGELOG
* Switch out simple getLogs polling with ethereumjs-blockstream (#825)
* Do not stop subscription if error is encountered (#825)
* Fixed a bug that caused the incorrect block to be fetched via JSON-RPC within Blockstream (#875)
* Remove stateLayer config from OrderWatcher. It now always operates on the latest block (#875)
## v0.0.6 - _June 19, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-watcher",
"version": "0.0.8",
"version": "1.0.0-rc.1",
"description": "An order watcher daemon that watches for order validity",
"keywords": [
"0x",
@@ -30,13 +30,7 @@
},
"config": {
"compact_artifacts": "Exchange DummyToken ZRXToken Token EtherToken TokenTransferProxy TokenRegistry",
"contracts": "Exchange DummyToken ZRXToken Token WETH9 TokenTransferProxy_v1 MultiSigWallet MultiSigWalletWithTimeLock MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress MaliciousToken TokenRegistry Arbitrage EtherDelta AccountLevels",
"postpublish": {
"assets": [
"packages/order-watcher/_bundles/index.js",
"packages/order-watcher/_bundles/index.min.js"
]
}
"contracts": "Exchange DummyToken ZRXToken Token WETH9 TokenTransferProxy_v1 MultiSigWallet MultiSigWalletWithTimeLock MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress MaliciousToken TokenRegistry Arbitrage EtherDelta AccountLevels"
},
"repository": {
"type": "git",
@@ -47,12 +41,12 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.3.4",
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/migrations": "^0.0.10",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/abi-gen": "^1.0.0",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/migrations": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -77,18 +71,18 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/assert": "0.3.0",
"@0xproject/base-contract": "0.3.6",
"@0xproject/contract-wrappers": "0.1.1",
"@0xproject/fill-scenarios": "1.0.0",
"@0xproject/json-schemas": "1.0.0",
"@0xproject/order-utils": "1.0.0",
"@0xproject/types": "1.0.0",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/assert": "^1.0.0",
"@0xproject/base-contract": "^1.0.0",
"@0xproject/contract-wrappers": "^1.0.0-rc.1",
"@0xproject/fill-scenarios": "^1.0.0-rc.1",
"@0xproject/json-schemas": "^1.0.0-rc.1",
"@0xproject/order-utils": "^1.0.0-rc.1",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"ethereumjs-blockstream": "5.0.0",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"bintrees": "^1.0.2",
"ethers": "3.0.22",
"lodash": "^4.17.4"

View File

@@ -26,7 +26,7 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
@@ -50,7 +50,7 @@
"webpack-dev-server": "^2.11.1"
},
"dependencies": {
"@0xproject/react-docs": "^0.0.16",
"@0xproject/react-docs": "^1.0.0",
"basscss": "^8.0.3",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",

View File

@@ -1,5 +1,24 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1531919263,
"version": "0.0.17",
"changes": [
{

View File

@@ -1,10 +1,22 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Dependencies updated
## v0.0.17 - _July 18, 2018_
* Nest MD files under versions so that you can update them for future versions (#844)
## v0.0.16 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-docs",
"version": "0.0.16",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -25,9 +25,9 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/compare-versions": "^3.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
@@ -36,8 +36,8 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/react-shared": "^0.2.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/react-shared": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1531919263,
"version": "0.2.3",
@@ -27,14 +45,7 @@
]
},
{
"version": "0.2.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1525477860,
"version": "0.2.0",
"changes": [
{

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Dependencies updated
## v0.2.3 - _July 18, 2018_
* Dependencies updated
@@ -17,13 +25,9 @@ CHANGELOG
* Dependencies updated
## v0.2.0 - _June 1, 2018_
## v0.2.0 - _May 5, 2018_
* Incorrect publish that was unpublished
## v0.1.7 - _May 22, 2018_
* Dependencies updated
* Removed portal specific colors
## v0.1.6 - _May 5, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-shared",
"version": "0.2.3",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -25,9 +25,9 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1531919263,
"version": "0.5.4",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Dependencies updated
## v0.5.4 - _July 18, 2018_
* Dependencies updated
@@ -17,13 +25,15 @@ CHANGELOG
* Dependencies updated
## v0.5.1 - _June 1, 2018_
## v0.5.1 - _May 22, 2018_
* Incorrect publish that was unpublished
* Make `opts` constructor parameter optional (#621)
* Add schema validation for compiler configuration (#621)
## v0.5.0 - _May 22, 2018_
* Properly export the executable binary (#588)
* Add the ability to define a specific solidity version (#589)
## v0.4.3 - _May 5, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-compiler",
"version": "0.5.4",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -53,9 +53,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.4.6",
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/dev-utils": "^1.0.0",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/mkdirp": "^0.5.2",
"@types/require-from-string": "^1.2.0",
"@types/semver": "^5.5.0",
@@ -76,15 +76,15 @@
"zeppelin-solidity": "1.8.0"
},
"dependencies": {
"@0xproject/assert": "0.2.13",
"@0xproject/json-schemas": "0.8.3",
"@0xproject/sol-resolver": "^0.0.8",
"@0xproject/types": "^0.8.2",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/assert": "^1.0.0",
"@0xproject/json-schemas": "^1.0.0-rc.1",
"@0xproject/sol-resolver": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@types/yargs": "^11.0.0",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"chalk": "^2.3.0",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.4",

View File

@@ -1,13 +1,24 @@
[
{
"version": "0.2.0",
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Add artifact adapter as a parameter for CoverageSubprovider. Export AbstractArtifactAdapter",
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note":
"Add artifact adapter as a parameter for `CoverageSubprovider`. Export `AbstractArtifactAdapter`",
"pr": 589
},
{
"note": "Implement SolCompilerArtifactAdapter and TruffleArtifactAdapter",
"note": "Implement `SolCompilerArtifactAdapter` and `TruffleArtifactAdapter`",
"pr": 589
},
{
@@ -19,7 +30,7 @@
"pr": 589
},
{
"note": "Fixed a bug causing RegExp to crash if contract code is longer that 32767 characters",
"note": "Fixed a bug causing `RegExp` to crash if contract code is longer that 32767 characters",
"pr": 675
},
{
@@ -55,11 +66,12 @@
"pr": 675
},
{
"note": "Fix solcVersion regex in parameter validation",
"note": "Fix `solcVersion` regex in parameter validation",
"pr": 690
},
{
"note": "Fix a bug when in TruffleArtifactsAdapter causing it to throw if compiler.json is not there",
"note":
"Fix a bug when in `TruffleArtifactsAdapter` causing it to throw if `compiler.json` is not there",
"pr": 690
},
{
@@ -67,7 +79,7 @@
"pr": 690
},
{
"note": "Create `RevertTraceSubprovider` which prints a stack trace when a REVERT is detected",
"note": "Create `RevertTraceSubprovider` which prints a stack trace when a `REVERT` is detected",
"pr": 705
},
{

View File

@@ -1,10 +1,35 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Add artifact adapter as a parameter for `CoverageSubprovider`. Export `AbstractArtifactAdapter` (#589)
* Implement `SolCompilerArtifactAdapter` and `TruffleArtifactAdapter` (#589)
* Properly parse multi-level traces (#589)
* Add support for solidity libraries (#589)
* Fixed a bug causing `RegExp` to crash if contract code is longer that 32767 characters (#675)
* Fixed a bug caused by Geth debug trace depth being 1indexed (#675)
* Fixed a bug when the tool crashed on empty traces (#675)
* Use `BlockchainLifecycle` to support reverts on Geth (#675)
* Add `ProfilerSubprovider` as a hacky way to profile code using coverage tools (#675)
* Collect traces from `estimate_gas` calls (#675)
* Fix a race condition caused by not awaiting the transaction before getting a trace (#675)
* Add `start`/`stop` functionality to `CoverageSubprovider` and `ProfilerSubprovider` (#675)
* Skip interface artifacts with a warning instead of failing (#675)
* Fix `solcVersion` regex in parameter validation (#690)
* Fix a bug when in `TruffleArtifactsAdapter` causing it to throw if `compiler.json` is not there (#690)
* HUGE perf improvements (#690)
* Create `RevertTraceSubprovider` which prints a stack trace when a `REVERT` is detected (#705)
* Add source code snippets to stack traces printed by `RevertTraceSubprovider` (#725)
## v0.1.3 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-cov",
"version": "0.1.3",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -50,13 +50,13 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
"dependencies": {
"@0xproject/sol-compiler": "^0.5.4",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/dev-utils": "^0.4.6",
"ethereum-types": "^0.0.2",
"@0xproject/sol-compiler": "^1.0.0",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@0xproject/dev-utils": "^1.0.0",
"ethereum-types": "^1.0.0",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
"istanbul": "^0.4.5",
@@ -68,8 +68,8 @@
"solidity-parser-antlr": "^0.2.12"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/istanbul": "^0.4.30",
"@types/loglevel": "^1.5.3",
"@types/mkdirp": "^0.5.1",

View File

@@ -1,6 +1,16 @@
[
{
"version": "0.0.9",
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Fix a bug in FsResolver where it tries to read directories as files",

View File

@@ -1,10 +1,19 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Fix a bug in FsResolver where it tries to read directories as files (#589)
* Fix a bug in NameResolver where it is not ignoring .sol files (#589)
## v0.0.8 - _July 9, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-resolver",
"version": "0.0.8",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -9,7 +9,7 @@
"types": "lib/index.d.ts",
"scripts": {
"watch_without_deps": "tsc -w",
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf lib scripts",
"lint": "tslint --project .",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js"
@@ -24,8 +24,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -33,8 +33,8 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.8.2",
"@0xproject/typescript-typings": "^0.0.3",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/typescript-typings": "^1.0.0",
"lodash": "^4.17.4"
},
"publishConfig": {

View File

@@ -0,0 +1,7 @@
// tslint:disable:completed-docs
declare module '*.json' {
const json: any;
/* tslint:disable */
export default json;
/* tslint:enable */
}

View File

@@ -0,0 +1,8 @@
import { postpublishUtils } from '@0xproject/monorepo-scripts';
import * as packageJSON from '../package.json';
import * as tsConfigJSON from '../tsconfig.json';
const cwd = `${__dirname}/..`;
// tslint:disable-next-line:no-floating-promises
postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1531919263,
"version": "0.1.6",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Dependencies updated
## v0.1.6 - _July 18, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/sra-report",
"version": "0.1.6",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -35,21 +35,21 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
"dependencies": {
"@0xproject/assert": "^0.3.0",
"@0xproject/assert": "^1.0.0",
"@0xproject/types": "^0.8.2",
"@0xproject/order-utils": "^0.0.9",
"@0xproject/connect": "0.6.17",
"@0xproject/json-schemas": "0.8.3",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/connect": "^1.0.0",
"@0xproject/json-schemas": "^0.8.3",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"chalk": "^2.3.0",
"lodash": "^4.17.4",
"newman": "^3.9.3",
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.48",
"@types/nock": "^9.1.2",

View File

@@ -1,9 +1,24 @@
[
{
"version": "0.11.0",
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Add `EthLightwalletSubprovider`"
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Add `RpcSubprovider` with timeout",
"pr": 874
},
{
"note": "Add `EthLightwalletSubprovider`",
"pr": 775
}
]
},
@@ -26,6 +41,7 @@
]
},
{
"timestamp": 1527009133,
"version": "0.10.3",
"changes": [
{

View File

@@ -1,25 +1,30 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v0.10.6 - _July 18, 2018_
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v0.10.5 - _July 9, 2018_
## v1.0.0 - _July 20, 2018_
* Update web3-provider-engine to v14.0.6 including the leaked global.XMLHttpRequest bug fix
* Add `RpcSubprovider` with timeout (#874)
* Add `EthLightwalletSubprovider` (#775)
## v0.10.6 - _July 18, 2018_
* Dependencies updated
## v0.10.4 - _June 19, 2018_
* Dependencies updated
## v0.10.3 - _June 1, 2018_
## v0.10.3 - _May 22, 2018_
* Incorrect publish that was unpublished
* Define engine type as Provider in setEngine (#675)
## v0.10.2 - _May 22, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/subproviders",
"version": "0.10.6",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -40,14 +40,14 @@
}
},
"dependencies": {
"@0xproject/assert": "^0.3.0",
"@0xproject/types": "^1.0.0",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/assert": "^1.0.0",
"@0xproject/types": "^1.0.0-rc.1",
"@0xproject/web3-wrapper": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"bip39": "^2.5.0",
"bn.js": "^4.11.8",
"eth-lightwallet": "^3.0.1",
@@ -61,9 +61,9 @@
"web3-provider-engine": "14.0.6"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/utils": "^0.7.3",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"@types/bip39": "^2.4.0",
"@types/bn.js": "^4.11.0",
"@types/hdkey": "^0.7.0",

View File

@@ -19,10 +19,10 @@
"license": "Apache-2.0",
"dependencies": {
"0x.js": "0.38.5",
"@0xproject/subproviders": "^0.10.6",
"@0xproject/web3-wrapper": "^0.7.3",
"@0xproject/typescript-typings": "^0.4.3",
"@0xproject/utils": "^0.7.3",
"@0xproject/subproviders": "^1.0.0",
"@0xproject/web3-wrapper": "^1.0.0",
"@0xproject/typescript-typings": "^1.0.0",
"@0xproject/utils": "^1.0.0",
"body-parser": "^1.17.1",
"ethereumjs-tx": "^1.3.5",
"ethereumjs-util": "^5.1.1",
@@ -31,11 +31,11 @@
"rollbar": "^0.6.5"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/tslint-config": "^1.0.0",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "4.14.104",
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"awesome-typescript-loader": "^3.1.3",
"gulp": "^3.9.1",
"make-promises-safe": "^1.1.0",

View File

@@ -1,4 +1,23 @@
[
{
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Added a bunch of rules",
"pr": 883
}
]
},
{
"timestamp": 1531149657,
"version": "0.4.21",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Added a bunch of rules (#883)
## v0.4.21 - _July 9, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/tslint-config",
"version": "0.4.21",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -34,7 +34,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/monorepo-scripts": "^1.0.0",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",

View File

@@ -1,9 +1,19 @@
[
{
"timestamp": 1532357734,
"version": "1.0.0",
"changes": [
{
"notes": "Updated types for V2 of 0x protocol"
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Updated types for V2 of 0x protocol"
},
{
"note": "Add `ECSignatureBuffer`"
@@ -32,6 +42,7 @@
]
},
{
"timestamp": 1527009133,
"version": "0.8.0",
"changes": [
{

View File

@@ -1,10 +1,20 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.0 - _July 23, 2018_
* Dependencies updated
## v1.0.0-rc.1 - _July 20, 2018_
* Updated types for V2 of 0x protocol
* Add `ECSignatureBuffer`
* Add Forwarder contract revert reasons
## v0.8.2 - _July 9, 2018_
* Dependencies updated
@@ -13,12 +23,13 @@ CHANGELOG
* Dependencies updated
## v0.8.0 - _June 1, 2018_
## v0.8.0 - _May 22, 2018_
* Incorrect publish that was unpublished
* Change the order type to v2 format (#618)
## v0.7.0 - _May 22, 2018_
* Make OpCode type an enum (#589)
* Moved ExchangeContractErrs, DoneCallback, Token, OrderRelevantState, OrderStateValid, OrderStateInvalid, OrderState, OrderAddresses and OrderValues types from 0x.js (#579)
## v0.6.3 - _May 5, 2018_

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/types",
"version": "1.0.0",
"version": "1.0.0-rc.1",
"engines": {
"node": ">=6.12"
},
@@ -24,8 +24,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/tslint-config": "^0.4.21",
"@0xproject/monorepo-scripts": "^1.0.0",
"@0xproject/tslint-config": "^1.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -35,7 +35,7 @@
"dependencies": {
"@types/node": "^8.0.53",
"bignumber.js": "~4.1.0",
"ethereum-types": "^0.0.2"
"ethereum-types": "^1.0.0"
},
"publishConfig": {
"access": "public"

View File

@@ -159,7 +159,7 @@ export interface ECSignature {
export enum AssetProxyId {
ERC20 = '0xf47261b0',
ERC721 = '0x08e937fa',
ERC721 = '0x02571792',
}
export interface ERC20AssetData {
@@ -171,7 +171,6 @@ export interface ERC721AssetData {
assetProxyId: string;
tokenAddress: string;
tokenId: BigNumber;
receiverData: string;
}
export enum RevertReason {

View File

@@ -1,6 +1,16 @@
[
{
"version": "0.4.4",
"timestamp": 1532357734,
"version": "1.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Add types for `eth-lightwallet`",

View File

@@ -1,18 +1,28 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Dependencies updated
## v1.0.0 - _July 20, 2018_
* Add types for `eth-lightwallet` (#775)
* Improve 'web3-provider-engine' typings (#768)
* Additional error type for `ethers.js` (#763)
* Add @ledgerhq typings (#770)
## v0.4.3 - _July 18, 2018_
* Add back ethers-contracts types for Aquaduct which relies on it (#885)
## v0.4.2 - _July 9, 2018_
## v0.4.1 - _June 19, 2018_
* Improve 'web3-provider-engine' typings (#768)
* Additional error type for `ethers.js` (#763)
* Dependencies updated
## v0.4.0 - _June 19, 2018_
@@ -20,10 +30,6 @@ CHANGELOG
* Add types for `react-popper`, remove types for `react-joyride`
* Remove types for blockies, bn.js, compare-versions, ethereumjs-abi, ethereumjs-tx, find-versions, hdkey, is-mobile, solidity-parser-antlr, xml-js as they were moved to DefinitelyTyped (#641)
## v0.4.0 - _June 1, 2018_
* Incorrect publish that was unpublished
## v0.3.2 - _May 22, 2018_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/typescript-typings",
"version": "0.4.3",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
@@ -25,11 +25,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/typescript-typings#readme",
"dependencies": {
"ethereum-types": "^0.0.2",
"ethereum-types": "^1.0.0",
"bignumber.js": "~4.1.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.2.2",
"@0xproject/monorepo-scripts": "^1.0.0",
"copyfiles": "^1.2.0",
"shx": "^0.2.2"
},

View File

@@ -1,4 +1,24 @@
[
{
"version": "1.0.1",
"changes": [
{
"note": "Add `AbortController` polyfill to `fetchAsync`",
"pr": 903
}
],
"timestamp": 1532357734
},
{
"timestamp": 1532043000,
"version": "1.0.0",
"changes": [
{
"note": "Add `fetchAsync` which adds a default timeout to all requests",
"pr": 874
}
]
},
{
"timestamp": 1531919263,
"version": "0.7.3",

View File

@@ -1,10 +1,18 @@
<!--
This file is auto-generated using the monorepo-scripts package. Don't edit directly.
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.1 - _July 23, 2018_
* Add `AbortController` polyfill to `fetchAsync` (#903)
## v1.0.0 - _July 20, 2018_
* Add `fetchAsync` which adds a default timeout to all requests (#874)
## v0.7.3 - _July 18, 2018_
* Dependencies updated

Some files were not shown because too many files have changed in this diff Show More