Commit Graph

2576 Commits

Author SHA1 Message Date
Iuri Matias a6195d2517 Merge branch 'develop' 2018-06-20 15:55:16 -04:00
Iuri Matias 6a5020402f update to 3.1 2018-06-19 17:54:10 -04:00
Iuri Matias de33dc9de2
Merge pull request #563 from embark-framework/disable_ipc_client
disable ipc client in tests
2018-06-19 17:39:54 -04:00
Iuri Matias 650eb5e359 disable ipc client 2018-06-19 17:33:24 -04:00
Iuri Matias aa5063e5ef
Merge pull request #562 from embark-framework/remove_extra_messages
remove extra logs
2018-06-19 15:49:37 -04:00
Iuri Matias 9f16740ead
Merge pull request #559 from embark-framework/warn_wrong_upload_cmd
warn if old upload cmd is used
2018-06-19 15:47:39 -04:00
Iuri Matias 9beaaa2a29 remove extra logs 2018-06-19 15:46:55 -04:00
Iuri Matias 6a031e1dab warn if old cmd is used 2018-06-19 14:07:14 -04:00
Iuri Matias 9574562602
Merge pull request #558 from embark-framework/bug_fix/console-dir-test
Fix testing a directory without ending slash
2018-06-19 11:40:44 -04:00
Iuri Matias d2489f0da8
Merge pull request #557 from embark-framework/bug_fix/hanging-graph
Fix hanging embark graph by starting web3 service
2018-06-19 11:38:21 -04:00
Jonathan Rainville c1f29fdea4 fix test directory without ending slash 2018-06-19 10:58:09 -04:00
Jonathan Rainville 01277f6014 start web3 service so getGasPrice is available 2018-06-19 10:03:46 -04:00
Iuri Matias b363873da2
Merge pull request #556 from embark-framework/bug_fix/hanging-test-node
Fix hanging tests when using a wrong node
2018-06-19 09:33:41 -04:00
Jonathan Rainville 287998d127
Merge pull request #554 from embark-framework/bug_fix/https-rpc-network
Add support for https ethereum network hosts and infura hosts with API key
2018-06-19 09:26:46 -04:00
Jonathan Rainville 1a91f3c688 ping endpoint before connecting to see if available 2018-06-19 09:24:36 -04:00
Jonathan Rainville aa02aeb74c move pingEndpoint to utils 2018-06-19 09:02:19 -04:00
emizzle ba66d763fe Add support for infura network hosts with api key.
Fix bug with non-development code generation.
2018-06-19 15:14:37 +10:00
emizzle b56def7c57 Updated web3 endpoint for use with infura api key and https
Allows `protocol` to be specified in config/contract.js[on] for `<env>/deployment/protocol`.
2018-06-19 14:43:55 +10:00
Iuri Matias c5799839bb
Merge pull request #553 from embark-framework/chores/update-templates
Update templates with tests and comments
2018-06-18 16:35:16 -04:00
Jonathan Rainville f9d6e196c8 add configs for local swarm 2018-06-18 16:10:31 -04:00
Jonathan Rainville 002f5992d4 add semicolons 2018-06-18 16:04:35 -04:00
Jonathan Rainville a6dc2f5a91 fix linting 2018-06-18 16:04:05 -04:00
Jonathan Rainville bf0cd2866c add comments to contracts templates 2018-06-18 15:59:48 -04:00
Jonathan Rainville 78f8dfdd60 add comments in communication templates 2018-06-18 15:44:24 -04:00
Jonathan Rainville c1540dc2ea add comments in blockchain configs 2018-06-18 15:40:06 -04:00
Jonathan Rainville 3d9a006ecc update tests in templates 2018-06-18 15:15:24 -04:00
Iuri Matias c25bf086f9
Merge pull request #552 from embark-framework/bug_fix/default-account
Register web3 object after init
2018-06-18 14:42:41 -04:00
Jonathan Rainville ed1ac3af2e register web3 after init 2018-06-18 14:33:25 -04:00
Iuri Matias 49d58b5d1e
Merge pull request #551 from embark-framework/fix_from
put defaultAccount as the default contract from
2018-06-18 14:23:52 -04:00
Iuri Matias 59b2d809f1 put defaultAccount as the default contract from 2018-06-18 14:02:02 -04:00
Iuri Matias 8ad79b63b0
Merge pull request #549 from embark-framework/readd_mocha
re-add mocha to dependencies
2018-06-18 13:24:22 -04:00
Iuri Matias 1f49c71850 re-add mocha to dependencies 2018-06-18 13:18:54 -04:00
Iuri Matias ce8e333685
Merge pull request #548 from embark-framework/warn_about_embark_spec
warn about EmbarkSpec deprecation
2018-06-18 12:54:41 -04:00
Iuri Matias 329af9f348 warn about EmbarkSpec deprecation 2018-06-18 12:46:39 -04:00
Iuri Matias b7d6bc1c45
Merge pull request #547 from embark-framework/contracts_api_fix
Contracts api fix
2018-06-18 11:38:27 -04:00
Iuri Matias a0a2d16cb3
Merge pull request #546 from embark-framework/fix_contract_tracking_issue
fix contract tracking issue
2018-06-18 11:38:16 -04:00
Iuri Matias 7bf1f2420f
Merge pull request #545 from embark-framework/debug_options
add debug option correctly
2018-06-18 11:37:48 -04:00
Iuri Matias 231e48cecb add todo 2018-06-18 11:37:23 -04:00
Iuri Matias e615354fac
Merge pull request #544 from embark-framework/provider-package
use new npm package instead of fork
2018-06-18 11:36:24 -04:00
Iuri Matias b34ddf32cf refactor pluginPath 2018-06-18 11:27:29 -04:00
Iuri Matias e0e3887aaf add command event to add a contract file; fix internal plugin Path 2018-06-18 11:25:43 -04:00
Iuri Matias 5c6e6e50f9 use contractAddress instead of address 2018-06-18 10:22:04 -04:00
Iuri Matias 76ab330546 add debug option 2018-06-18 09:44:16 -04:00
Jonathan Rainville a988962aed change package name 2018-06-18 09:26:17 -04:00
Jonathan Rainville f517cc104f use new npm package instead of fork 2018-06-18 09:13:09 -04:00
Iuri Matias f9e62b9f49
Merge pull request #543 from embark-framework/feature/run-ipfs-init
Run `ipfs init` for the case when user has installed ipfs, but not initialised it.
2018-06-18 08:57:15 -04:00
emizzle bb4fdbe369 Run `ipfs init` for the case when user has installed ipfs, but not initialised it.
Runs `ipfs daemon` first, reads stdout for message regarding ipfs not initialised, then runs `ipfs init`, then re-runs `ipfs daemon`.
2018-06-18 22:34:42 +10:00
Iuri Matias 7706e276bf
Merge pull request #533 from embark-framework/bug_fix/ipfs-service-check-error
Storage provider initialisation fixes and improvements.
2018-06-15 18:09:30 -04:00
Iuri Matias 37ab60d6de
Merge pull request #538 from embark-framework/features/ws-node
Enable connection to websocket node
2018-06-15 18:01:12 -04:00
Iuri Matias b62c9dcd38
Merge pull request #532 from embark-framework/bug_fix/contract-breaks-pipeline
Fix for starting embark with a contract that has an error, then fixing, seems to still break the pipeline
2018-06-15 17:50:02 -04:00