5ac7ff7084
* abi-gen/Py: fix return type for multi-val returns Methods that return multiple values were broken in two ways. One: a spurious newline was being injected between the return type and the colon ending the Python method prototype. Two: the return type was being generated as just `[TypeA, TypeB]`, whereas it should be `Tuple[TypeA, TypeB]`. * abi-gen/Py: fix support for arrays of structs * abi-gen/Py: FAILING test case nested unrefd struct When a struct contains another struct, and the inner struct is not directly referenced by any method interface, wrapper generation is failing to render a class to represent the inner struct. This won't fail in CI because at this time CI doesn't run any native Python tooling to analyze the generated code. Running mypy locally on the files in this commit produces the following output: test-cli/output/python/abi_gen_dummy/__init__.py:76: error: Name 'Tuple0x246f9407' is not defined This problem affects the generation of wrappers for the DutchAuction contract. * abi-gen/Py: fix nested unref'd struct failure * abi-gen/Py: introduce newlines to quiet linter When generating contracts with long names (eg CoordinatorRegistryValidator), the `black` reformatter was introducing these newlines for us, and it was moving the `# type: ignore` comment in there such that it no longer was on the line it needed to be on. Introducing these newlines manually (instead of letting black inject them) allows the linter directive to stay where it needs to be. * abi-gen/Py: declare tuples in dependency order * abi-gen/Py: fix support for overloaded methods * contract_wrappers.py: pylint: permit 2-char args By default pylint says that 2 characters is too short for an argument name, but we have some contract methods with 2-character argument names (eg `to` in `AssetProxyOwner.getTransactionIds()`), so we want to permit them. * contract_wrappers.py: include all contracts * Update CHANGELOGs * abi-gen: rename variable * abi-gen: refine comments * abi-gen/Py: reword tuple class docstring
108 lines
5.2 KiB
JSON
108 lines
5.2 KiB
JSON
{
|
|
"name": "@0x/abi-gen",
|
|
"version": "3.1.2",
|
|
"engines": {
|
|
"node": ">=6.12"
|
|
},
|
|
"description": "Generate contract wrappers from ABI and handlebars templates",
|
|
"main": "lib/src/index.js",
|
|
"types": "lib/src/index.d.ts",
|
|
"scripts": {
|
|
"lint": "tslint --format stylish --project . && yarn lint-contracts",
|
|
"lint-contracts": "solhint -c ../../contracts/.solhint.json test-cli/contracts/*.sol",
|
|
"fix": "tslint --fix --format stylish --project . && yarn lint-contracts",
|
|
"clean": "shx rm -rf lib && yarn test_cli:clean",
|
|
"build": "tsc -b && yarn generate_contract_wrappers && yarn prettier_contract_wrappers && yarn test_cli:build",
|
|
"build:ci": "yarn build",
|
|
"test": "yarn run_mocha && yarn test_cli",
|
|
"test:circleci": "yarn test:coverage && yarn test_cli",
|
|
"run_mocha": "(uname -s | grep -q Darwin && echo 'HACK! skipping mocha run due to https://github.com/0xProject/0x-monorepo/issues/2000') || mocha --require source-map-support/register --require make-promises-safe lib/test/*_test.js --timeout 100000 --bail --exit",
|
|
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
|
|
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
|
|
"test_cli": "yarn test_cli:run_mocha && yarn diff_contract_wrappers",
|
|
"test_cli:clean": "rm -rf test-cli/output && rm -rf test-cli/test_typescript/lib",
|
|
"test_cli:build": "tsc --project test-cli/tsconfig.json",
|
|
"test_cli:run_mocha": "mocha --require source-map-support/register --require make-promises-safe test-cli/test_typescript/lib/**/*_test.js --timeout 100000 --bail --exit",
|
|
"test_cli:test_python": "black --check test-cli/output/python/**/__init__.py; test $? -le 1 # just make sure black can parse the output",
|
|
"rebuild_and_test": "run-s build test",
|
|
"test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
|
|
"test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
|
|
"clean:sol": "rm -rf test-cli/artifacts",
|
|
"compile:sol": "sol-compiler",
|
|
"watch:sol": "sol-compiler -w",
|
|
"prettier_contract_wrappers": "prettier --write ./test-cli/output/typescript/* --config ../../.prettierrc",
|
|
"generate_contract_wrappers": "run-p gen_typescript gen_python",
|
|
"gen_typescript": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output ./test-cli/output/typescript --backend ethers",
|
|
"gen_python": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/Python/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/Python/partials/**/*.handlebars' --output ./test-cli/output/python --language Python",
|
|
"diff_contract_wrappers": "test-cli/diff.sh ./test-cli/expected-output ./test-cli/output",
|
|
"coverage:report:text": "istanbul report text",
|
|
"coverage:report:html": "istanbul report html && open coverage/index.html",
|
|
"profiler:report:html": "istanbul report html && open coverage/index.html",
|
|
"contracts:gen": "contracts-gen"
|
|
},
|
|
"config": {
|
|
"abis": "./test-cli/fixtures/artifacts/@(AbiGenDummy|LibDummy|TestLibDummy).json",
|
|
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
|
|
},
|
|
"bin": {
|
|
"abi-gen": "bin/abi-gen.js"
|
|
},
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/0xProject/0x-monorepo.git"
|
|
},
|
|
"license": "Apache-2.0",
|
|
"bugs": {
|
|
"url": "https://github.com/0xProject/0x-monorepo/issues"
|
|
},
|
|
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
|
|
"dependencies": {
|
|
"@0x/types": "^2.4.1",
|
|
"@0x/typescript-typings": "^4.2.4",
|
|
"@0x/utils": "^4.4.2",
|
|
"@types/toposort": "^2.0.1",
|
|
"chalk": "^2.3.0",
|
|
"change-case": "^3.0.2",
|
|
"cli-format": "^3.0.9",
|
|
"ethereum-types": "^2.1.4",
|
|
"glob": "^7.1.2",
|
|
"handlebars": "^4.1.2",
|
|
"lodash": "^4.17.11",
|
|
"mkdirp": "^0.5.1",
|
|
"tmp": "^0.0.33",
|
|
"to-snake-case": "^1.0.0",
|
|
"toposort": "^2.0.2",
|
|
"yargs": "^10.0.3"
|
|
},
|
|
"devDependencies": {
|
|
"@0x/base-contract": "^5.3.0",
|
|
"@0x/contracts-gen": "^1.0.12",
|
|
"@0x/dev-utils": "^2.2.6",
|
|
"@0x/sol-compiler": "^3.1.11",
|
|
"@0x/subproviders": "^5.0.0",
|
|
"@0x/tslint-config": "^3.0.1",
|
|
"@0x/web3-wrapper": "^6.0.9",
|
|
"@types/glob": "5.0.35",
|
|
"@types/mkdirp": "^0.5.2",
|
|
"@types/mocha": "^5.2.7",
|
|
"@types/node": "*",
|
|
"@types/tmp": "^0.0.33",
|
|
"@types/yargs": "^11.0.0",
|
|
"chai": "^4.0.1",
|
|
"chai-as-promised": "^7.1.0",
|
|
"chai-bignumber": "^3.0.0",
|
|
"dirty-chai": "^2.0.1",
|
|
"make-promises-safe": "^1.1.0",
|
|
"mocha": "^6.2.0",
|
|
"npm-run-all": "^4.1.2",
|
|
"shx": "^0.2.2",
|
|
"sinon": "^4.0.0",
|
|
"solhint": "^1.4.1",
|
|
"tslint": "5.11.0",
|
|
"typescript": "3.0.1"
|
|
},
|
|
"publishConfig": {
|
|
"access": "public"
|
|
}
|
|
}
|