diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-11 18:32:57 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-11 18:32:57 +0800 |
| commit | d370296e82c11d67bbb16a1dc73432c3625682aa (patch) | |
| tree | c8e5d440bc2b78feae89644c11ba3ed778da6015 /.gitignore | |
| parent | f78b5741c3ba3495c066dc800ce62d8a1f3fb75f (diff) | |
| parent | f42f608f3f97a5244f09f17ae5ee184c0f775de3 (diff) | |
| download | dexon-sol-tools-d370296e82c11d67bbb16a1dc73432c3625682aa.tar.gz dexon-sol-tools-d370296e82c11d67bbb16a1dc73432c3625682aa.tar.zst dexon-sol-tools-d370296e82c11d67bbb16a1dc73432c3625682aa.zip | |
Merge branch 'development' into breakUp0xjs
* development:
Fix ganache subprovider config
Fix a bug in compiler config precedence
Fix linter errors
Fix templates
Remove unused deployer docs configs
Add a legacy endpoint for the deployer
Add a check for compiler output
Add a comment
Put ARTIFACTS_VERSION in a config
Improve a comment
Remove _applyDefaultsToDeployTxDataAsync
Add a HACK comment
Fix linter issues
Rename deployer to sol-compiler
Remove deployer
Remove deployer from 0x.js and migrations
Configure migrations with a compiler.json
Remove deployer from metacoin and contract tests
Update wallet footer and add remove token functionality
# Conflicts:
# .gitignore
# packages/0x.js/package.json
# packages/0x.js/src/0x.ts
# packages/contracts/package.json
# packages/contracts/test/multi_sig_with_time_lock.ts
# packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
# packages/contracts/util/artifacts.ts
# packages/deployer/test/deployer_test.ts
# packages/migrations/package.json
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 56cff1fe1..2c819cacf 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,6 @@ bin/ # generated contract artifacts/ packages/sol-cov/test/fixtures/artifacts/ packages/metacoin/artifacts/ -packages/0x.js/test/artifacts/ packages/order-watcher/test/artifacts/ packages/contract-wrappers/test/artifacts/ @@ -87,9 +86,10 @@ packages/contract-wrappers/src/contract_wrappers/generated/ packages/metacoin/src/contract_wrappers packages/fill-scenarios/src/generated_contract_wrappers/ packages/order-watcher/src/generated_contract_wrappers/ +packages/migrations/src/contract_wrappers -# solc-bin in deployer -packages/deployer/solc_bin/ +# solc-bin in sol-compiler +packages/sol-compiler/solc_bin/ # Monorepo scripts packages/*/scripts/ |