* add LibERC721Order.sol * Add ERC721 interface to vendor/ * Add ERC721OrdersFeature interface * Storage lib for ERC721 orders feature * Implement basic functionality for ERC721 orders (buy, sell, cancel, etc) * Add isValidERC721OrderSignature to interface * implement onERC721Received * Implement batchBuyERC721s * left/right orders -> sell/buy orders * Add missing @return comments * Implement matching functions * Use SafeMath where necessary * add rich errors for ERC721OrdersFeature * Add comments * Add presign support for ERC721 orders * Cancel using just the order nonce * Add IERC721OrdersFeature to IZeroEx * Add taker callback * Assembly optimizations in LibERC721Order * Add ERC721Orders TS class * create zero-ex/contracts/test/integration/ and tokens/ directories * TestMintableERC721Token * tmp * address feedback from original PR (#391) * address feedback from original PR * Update contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol Co-authored-by: Kim Persson <kimpers@users.noreply.github.com> * address review feedback and improve order parameter naming * Add batchCancel function * Emit order fields in preSign * Fix tests Co-authored-by: Lawrence Forman <me@merklejerk.com> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com> Co-authored-by: Michael Zhu <mchl.zhu.96@gmail.com> * Remove revertIfIncomplete from batchMatch * Sanity check maker address in preSign * ERC1155OrdersFeature contracts * Commence refactor, abstract base contract * ERC721OrdersFeature inherits from NFTOrders * Refactor ERC1155OrdersFeature to inherit from NFTOrders * Fix order hashing * Fix ERC721OrdersFeature tests * Typos * Remove maker address from preSigned mapping * disable dex sampler tests * Refactor TS tooling * Address PR feedback * Rearrange event fields to better align with struct fields * Update comments * update AbiEncoder.create params * Add ERC1155Order to protocol-utils * Add ERC1155OrdersFeeature tests * Bump package versions and regenerate contract wrappers * Add ERC165Feature * NFT orders: address audit findings (#417) * CVF-1: use pragma solidity ^0.6 instead of ^0.6.5 * CVF-11: fix inaccurate comment * CVF-16: Enable taker callbacks for batchBuyERC1155s * CVF-17: use internal call if revertIfIncomplete is true * CVF-21: avoid duplicate SLOAD * CVF-23: merge if statements * CVF-24: Reorder status checks to be consistent with ERC721OrdersFeature * CVF-25: Update unclear comment (canonical hash -> EIP-712 hash) * CVF-31: Document keys of orderState mapping * CVF-45: DRY up fees/properties hashing * CVF-47, CVF-50, CVF-57: calculate properties.length once; hash propertyStructHashArray in-place using assembly * CVF-56: More descriptive names for assembly variables * CVF-71: Update confusing comment about rounding in _payFees * CVF-72: Move ETH assertions outside of loop in _payFees * CVF-74: Move property validation loop to else branch * CVF-82: Update inaccurate comment * CVF-86: Enable taker callbacks for batchBuyERC721s * CVF-87: use internal call if revertIfIncomplete is true * CVF-89: Perform token mismatch checks before stateful operations * CVF-90, CVF-91: Defer ERC20 token mismatch check * CVF-93: Add inline comments for _payFees parameters in matchERC721Orders * CVF-94: Fix comment (Step 7 -> Step 5) * CVF-98: Use binary & operator instead of mod * CVF-99: Update unclear comment (canonical hash -> EIP-712 hash) * CVF-65, CVF-66, CVF-67: Copy params.ethAvailable into local variable; check that ethSpent does not exceed ethAvailable; remove ethAvailable < erc20FillAmount check * CVF-52, CVF-55, CVF-59: calculate fees.length once; hash feeStructHashArray in-place using assembly * CVF-14, CVF-32: OrderState struct; separate storage mapping for 1155 cancellations so orders can be cancelled by nonce * Update changelogs, IZeroEx artifact/wrapper Co-authored-by: Lawrence Forman <lawrence@0xproject.com> Co-authored-by: Lawrence Forman <me@merklejerk.com> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com>
81 lines
5.7 KiB
JSON
81 lines
5.7 KiB
JSON
{
|
|
"private": true,
|
|
"name": "@0x/protocol-repo",
|
|
"engines": {
|
|
"node": ">=6.12"
|
|
},
|
|
"workspaces": [
|
|
"packages/*",
|
|
"contracts/*"
|
|
],
|
|
"scripts": {
|
|
"deps_versions:ci": "node ./node_modules/@0x/monorepo-scripts/lib/deps_versions.js",
|
|
"fix": "wsrun --fast-exit --parallel --exclude-missing -p $PKG -c fix",
|
|
"ganache": "ganache-cli -p 8545 --gasLimit 10000000 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
|
|
"prettier": "prettier --write '**/*.{ts,tsx,json}' --config .prettierrc",
|
|
"prettier:ci": "prettier --list-different '**/*.{ts,tsx,json}' --config .prettierrc",
|
|
"report_coverage": "lcov-result-merger './packages/*/coverage/lcov.info' | coveralls",
|
|
"test:installation": "node ./node_modules/@0x/monorepo-scripts/lib/test_installation.js",
|
|
"test:installation:local": "IS_LOCAL_PUBLISH=true node ./node_modules/@0x/monorepo-scripts/lib/test_installation.js",
|
|
"test:publish:circleci": "yarn npm-cli-login -u test -p test -e test@example.com -r http://localhost:4873 && IS_LOCAL_PUBLISH=true run-s script:publish test:installation:local",
|
|
"run:publish": "run-s install:all script:prepublish_checks rebuild script:publish",
|
|
"run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish",
|
|
"run:publish:gha": "run-s build script:publish:gha",
|
|
"script:prepublish_checks": "node ./node_modules/@0x/monorepo-scripts/lib/prepublish_checks.js",
|
|
"script:publish": "node ./node_modules/@0x/monorepo-scripts/lib/publish.js --repo protocol --doc-gen-config ./doc-gen-config.json",
|
|
"script:publish:gha": "node ./node_modules/@0x/monorepo-scripts/lib/publish.js --repo protocol --auto-commit --no-upload-docs --yes --doc-gen-config ./doc-gen-config.json --prerelease \"${PUBLISH_PRERELEASE}\"",
|
|
"install:all": "yarn install",
|
|
"wsrun": "wsrun",
|
|
"lerna": "lerna",
|
|
"build": "lerna link && wsrun -r --stages --fast-exit --exclude-missing -p $PKG -c build",
|
|
"build:ci": "lerna link && wsrun --fast-exit -r --stages --exclude-missing -p $PKG -c build:ci",
|
|
"build:contracts": "lerna link && wsrun -p ${npm_package_config_contractsPackages} --fast-exit -r --stages --exclude-missing -c build",
|
|
"build:ts": "tsc -b",
|
|
"watch:ts": "tsc -b -w",
|
|
"clean": "wsrun --fast-exit -r --parallel --exclude-missing -p $PKG -c clean",
|
|
"contracts:watch": "wsrun --parallel --exclude-missing -p $PKG -c watch",
|
|
"remove_node_modules": "lerna clean --yes; rm -rf node_modules",
|
|
"rebuild": "run-s clean build",
|
|
"test": "wsrun --fast-exit --serial --exclude-missing -p $(echo $(echo ${npm_package_config_contractsPackages} ${npm_package_config_nonContractPackages} | tr ' ' '\n' | sort | uniq) ${npm_package_config_ignoreTestsForPackages} | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ') -c test",
|
|
"test:all": "wsrun --fast-exit --serial --exclude-missing -p $PKG -c test",
|
|
"test:contracts": "wsrun --serial -p $(echo ${npm_package_config_contractsPackages} ${npm_package_config_ignoreTestsForPackages} | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ') --fast-exit --exclude-missing -c test",
|
|
"test:contracts:all": "wsrun --serial -p ${npm_package_config_contractsPackages} --fast-exit --exclude-missing -c test",
|
|
"generate_doc": "node ./node_modules/@0x/monorepo-scripts/lib/doc_generate.js --config ./doc-gen-config.json",
|
|
"upload_md_docs": "aws s3 rm --recursive s3://docs-markdown; wsrun --exclude-missing -c s3:sync_md_docs",
|
|
"diff_md_docs:ci": "wsrun --exclude-missing -c diff_docs",
|
|
"test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i || break -1; done;",
|
|
"bundlewatch": "bundlewatch",
|
|
"lint": "wsrun --fast-exit --parallel --exclude-missing -p $PKG -c lint",
|
|
"upgrade_tools": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js -p '@0x/abi-gen|@0x/assert|@0x/base-contract|@0x/contracts-gen|@0x/dev-utils|@0x/json-schemas|@0x/monorepo-scripts|@0x/sol-compiler|@0x/sol-coverage|@0x/sol-doc|@0x/sol-profiler|@0x/sol-resolver|@0x/sol-trace|@0x/sol-tracing-utils|@0x/subproviders|@0x/tslint-config|@0x/types|@0x/typescript-typings|@0x/utils|@0x/verdaccio|@0x/web3-wrapper|ethereum-types'",
|
|
"upgrade_deps": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js",
|
|
"verdaccio": "docker run --rm -i -p 4873:4873 0xorg/verdaccio"
|
|
},
|
|
"config": {
|
|
"contractsPackages": "@0x/contracts-erc20 @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-zero-ex @0x/contracts-treasury",
|
|
"nonContractPackages": "@0x/migrations @0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test @0x/asset-swapper",
|
|
"ignoreTestsForPackages": "",
|
|
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
|
|
"packagesWithDocPages": "@0x/contract-wrappers @0x/migrations",
|
|
"ignoreDependencyVersions": "@types/styled-components @types/node",
|
|
"ignoreDependencyVersionsForPackage": "contract-wrappers"
|
|
},
|
|
"devDependencies": {
|
|
"@0x/monorepo-scripts": "^3.2.1",
|
|
"@0x-lerna-fork/lerna": "3.16.10",
|
|
"@0xproject/npm-cli-login": "^0.0.11",
|
|
"async-child-process": "^1.1.1",
|
|
"coveralls": "^3.0.0",
|
|
"ganache-cli": "6.8.0-istanbul.0",
|
|
"lcov-result-merger": "^3.0.0",
|
|
"lerna": "^3.0.0-beta.25",
|
|
"npm-run-all": "^4.1.2",
|
|
"prettier": "1.19.1",
|
|
"source-map-support": "^0.5.6",
|
|
"typescript": "4.2.2",
|
|
"wsrun": "^5.2.4"
|
|
},
|
|
"resolutions": {
|
|
"merkle-patricia-tree": "^2.3.2"
|
|
}
|
|
}
|