embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,580 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

1531 Commits

Author SHA1 Message Date
Jonathan Rainville eecd719515 put message if swarm or ipfs is not installed 2018-06-08 10:40:01 -04:00
Iuri Matias 46e085b011 lint is king 2018-06-08 09:40:23 -04:00
Iuri Matias c8b52a1746 fix errors handling so it doesn't attempt to continue building when there are fatal errors compiling contracts 2018-06-08 07:07:27 -04:00
Iuri Matias 2efea55d2b lint is king 2018-06-08 06:17:51 -04:00
Iuri Matias ede4926069 don't continue testing file if there was deploy errors; avoids unrelated errors for each 'it' 2018-06-08 06:14:46 -04:00
Iuri Matias edbbaa160b make config params optional 2018-06-07 20:21:01 -04:00
Iuri Matias 402ee19722 default contracts fields 2018-06-07 20:20:24 -04:00
Iuri Matias 1c6df9db8d remove data parameter 2018-06-07 20:20:24 -04:00
Iuri Matias c1590d0b48 change deploy to beforeAll, so it takes priority over the test before 2018-06-07 20:20:24 -04:00
Iuri Matias 8fa7357d07 fix default from and data; add single test spec 2018-06-07 20:20:24 -04:00
Iuri Matias dd4088fd08
Merge pull request #480 from embark-framework/bug_fix/solc-loading-issue 
Updates console to inform user of an ongoing package download.
 2018-06-07 19:00:39 -04:00
Iuri Matias 9f0ab86c2d
Merge pull request #497 from embark-framework/features/test-connect-node 
Connect to a node in tests
 2018-06-07 18:59:27 -04:00
Jonathan Rainville e902c86ed2 conflicts in tests 2018-06-07 16:14:42 -04:00
Jonathan Rainville cbe456bf1e remove useless config 2018-06-07 16:09:54 -04:00
Jonathan Rainville a6a5bac053 use new provider when using account with a node specified 2018-06-07 16:07:58 -04:00
Jonathan Rainville 1b89199f50 fund accounts in wallet using contracts config 2018-06-07 13:06:09 -04:00
Jonathan Rainville 9c9bb761a4 add error when using deployAll 2018-06-07 13:01:13 -04:00
Jonathan Rainville a5ecd9f1f4 add tests for getBalance 2018-06-07 13:01:13 -04:00
Jonathan Rainville bb3e87d85e move getBalance in accountParser 2018-06-07 13:01:12 -04:00
Jonathan Rainville 3d70028cc5 fixing small stuff 2018-06-07 13:01:12 -04:00
Jonathan Rainville 2a61b2251c use web3 utils function instead 2018-06-07 13:01:12 -04:00
Jonathan Rainville 4ffb5c401f enable setting balance in mutliple formats 2018-06-07 13:01:12 -04:00
Jonathan Rainville 30a8263569 enable using accounts and balances 2018-06-07 13:01:12 -04:00
Jonathan Rainville ac631f90dc fix missing error callback 2018-06-07 13:01:12 -04:00
Jonathan Rainville bfc8663a61 change account funding order to enable starting a node before 2018-06-07 12:55:07 -04:00
Iuri Matias b5ac5626cb
Merge pull request #494 from embark-framework/missing_contract_name 
add missing variable
 2018-06-06 15:58:21 -04:00
Iuri Matias c4880535a4 add missing variable 2018-06-06 15:45:16 -04:00
Jonathan Rainville 435e5eba03 fix calling back with accounts 2018-06-06 13:54:20 -04:00
RJ Catalano 60e4f9f07d
Merge pull request #491 from embark-framework/alias_address 
alias address
 2018-06-06 12:16:21 -05:00
Iuri Matias a4196be958 alias address 2018-06-06 12:47:16 -04:00
Iuri Matias 1e4838d25a
Merge pull request #490 from embark-framework/fix_assert 
make assert global like before
 2018-06-06 11:24:27 -04:00
Iuri Matias e2f2c84aa2
Merge pull request #489 from embark-framework/avoid_zombies 
avoid sending messages to disconnected processes
 2018-06-06 11:24:16 -04:00
Iuri Matias ab20b10d5d use existing process send to avoid the extra if 2018-06-06 11:09:06 -04:00
Iuri Matias 6a10ef7187
Merge pull request #488 from embark-framework/default_account_fix 
fix setting default account
 2018-06-06 11:01:55 -04:00
Iuri Matias da6572bb11 make assert global like before 2018-06-06 11:00:30 -04:00
Iuri Matias 805091aa66
Merge pull request #482 from embark-framework/fuzzer 
Fuzzer
 2018-06-06 10:54:28 -04:00
Iuri Matias 2c2540417c avoid sending messages to disconnected processes 2018-06-06 10:42:06 -04:00
Iuri Matias cd6dcb7548 fix setting default account 2018-06-06 10:39:02 -04:00
emizzle 7e2f5624ba Increased time before reporting of library download duration goes red to 4 seconds. 
Incrased travis build version to node 8, as embark only supports 8.10, and also perf_hooks requires 8.5
 2018-06-06 12:04:30 +10:00
emizzle bbaf1676fb Updates console to inform user of an ongoing package download. 
Console message turns red after 1 second.
 2018-06-06 11:39:13 +10:00
Iuri Matias f44ed981b5
Merge pull request #481 from embark-framework/ipc 
add socket support
 2018-06-05 16:42:44 -04:00
Iuri Matias a41cf99be0 reverse condition 2018-06-05 16:13:17 -04:00
VoR0220 e42cbb4ade one last change 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 15:07:41 -05:00
VoR0220 95a06e0bf9 formatting fixes 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>

one more

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 14:44:05 -05:00
VoR0220 773f5a7921 convert console logs to embark logger and this baby is ready to rock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 14:16:38 -05:00
VoR0220 a7629d2ac0 fix linting 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:54:43 -05:00
Jonathan Rainville df3c5c2fd0 fix blockchain already booted 2018-06-05 14:39:18 -04:00
VoR0220 ffe26d052a some changes to the way randomness is calculated and getting rid of unnecessary garbage and added logging 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 28d1d585fe checkpoint 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 4858f8a19f convert to BN instead of number 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 2056a7e9ad finish engine addition 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 a0d0d9692b flesh it out further and add a console command and fix annoying bugs 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 7812951164 wip 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 f4bca2710f gas estimator and fuzzer 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
Jonathan Rainville d3c4f6275c hotfix for zombie killer 2018-06-05 13:24:16 -04:00
Jonathan Rainville 6b941d09d2 fix typo 2018-06-05 12:15:47 -04:00
Jonathan Rainville 820fd45c46 remove killer code 2018-06-05 12:14:46 -04:00
Jonathan Rainville e49a474380 Ping parent and die when 3 errors 2018-06-05 12:09:57 -04:00
Iuri Matias 0e6d526ab4 comply with linter 2018-06-05 08:37:27 -04:00
Iuri Matias 85443959e0 remove unneded option 2018-06-05 08:04:27 -04:00
Eric Mastro c45fdb12df Improve storage logging (during --loglevel trace) 
Includes IPFS command run 
Includes response from IPFS/Swarm service checks
Includes url being checked during IPFS/Swarm service checks.
 2018-06-05 11:39:28 +10:00
Iuri Matias c0e559a7d9 assign roles so ipc connections don't conflict; fallback if can't connect to ipc 2018-06-04 18:15:37 -04:00
Iuri Matias a57bce2a40 refactor to use callbacks on ipc requests 2018-06-04 18:15:37 -04:00
Iuri Matias 37ade68804 debug console logs 2018-06-04 18:15:37 -04:00
Iuri Matias 1821e89346 refactor ipc to a module 2018-06-04 18:15:37 -04:00
Iuri Matias 6e37c2d91b only reply to compile action 2018-06-04 18:15:37 -04:00
Iuri Matias e96842f9da use .embark instead of /tmp 2018-06-04 18:15:37 -04:00
Iuri Matias b16c06025b use ipc for compiler 2018-06-04 18:15:37 -04:00
Jonathan Rainville b32c90b56e compile tests only once 2018-06-04 10:45:50 -04:00
Iuri Matias 6e424f36b0 use const instead of let 2018-06-02 10:06:58 -04:00
Iuri Matias 72e24f5e1b improve loading time by only doing require when needed 2018-06-02 09:54:32 -04:00
Iuri Matias 74df72fc0d lint is king 2018-06-01 19:35:41 -04:00
Iuri Matias 083961fc21 remove unneeded assignments 2018-06-01 19:32:14 -04:00
Iuri Matias 07e58bcd04 check window size in dashboard instead of index 2018-06-01 19:32:14 -04:00
Iuri Matias 60c687aa41 refactor storage module 2018-06-01 19:32:14 -04:00
Iuri Matias eadbeb0498 use monitor as a service 2018-06-01 19:32:14 -04:00
Iuri Matias 37d54e22db refactor services monitor to use events instead of passing addCheck around 2018-06-01 19:32:14 -04:00
Iuri Matias 0804779a20 don't sync i18n files anymore 2018-06-01 19:31:26 -04:00
Iuri Matias 0dbefad48b move requires to methods that actually need them 2018-06-01 19:30:51 -04:00
Iuri Matias a3de13e011 refactor to addPluginType 2018-06-01 19:30:51 -04:00
Iuri Matias 0282e7d71c
Merge pull request #476 from embark-framework/fix_events_limit_issue 
fix events limit issue
 2018-06-01 19:30:23 -04:00
Iuri Matias 2ade8cfd09 lint is king 2018-06-01 19:12:54 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 152dfe2815 initialize web3 in the whisper module itself; use defined configuration 2018-06-01 18:11:23 -04:00
Jonathan Rainville 876a9a3103 fix pipeline not building by removing the `once`s 2018-06-01 15:48:10 -04:00
Jonathan Rainville 91b8033ab5 fix using deployedAddress instead of address 2018-06-01 14:12:10 -04:00
Jonathan Rainville aa04279a6f Merge branch 'features/test-revamp-multi' of https://github.com/embark-framework/embark into features/test-revamp-multi 
# Conflicts:
#	lib/contracts/contract_deployer.js
#	lib/i18n/locales/en.json
#	lib/tests/test.js
#	package-lock.json
 2018-06-01 13:57:39 -04:00
Jonathan Rainville b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville 57a194d20d remove timer 2018-06-01 13:44:54 -04:00
Jonathan Rainville 61a518f569 remove initCOnfig in tests because useless 2018-06-01 13:44:54 -04:00
Jonathan Rainville f3d55f6742 patch weird event max listeners bug 2018-06-01 13:44:54 -04:00
Jonathan Rainville 73fca42ce1 fix error messages for non deployed contracts 2018-06-01 13:44:54 -04:00
Jonathan Rainville d76ab75c4a remove initTest 2018-06-01 13:44:54 -04:00
Jonathan Rainville 88889a1a9d update test_app tests 2018-06-01 13:44:53 -04:00
Jonathan Rainville 2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville 33bd52e9ec add id to solc process to avoid multiple callback calls 2018-06-01 13:44:35 -04:00
Jonathan Rainville dbb2352928 fix contracts that are instances of 2018-06-01 13:44:14 -04:00
Jonathan Rainville 6712fc294c change another storage test 2018-06-01 13:44:14 -04:00
Jonathan Rainville beb0df8985 make running config() without callback work 2018-06-01 13:44:14 -04:00
Jonathan Rainville ab92457319 fix missing default from 2018-06-01 13:43:48 -04:00
Jonathan Rainville 4040c1eec9 use object assign to assign new values to contract 2018-06-01 13:43:48 -04:00
Jonathan Rainville 8664570d7c conflict in test 2018-06-01 13:43:43 -04:00
Jonathan Rainville d0a289a450 conflict in deployManager 2018-06-01 13:42:05 -04:00
Jonathan Rainville b97c85d5f4 conflict in tests 2018-06-01 13:41:12 -04:00
Jonathan Rainville 3555575ff9 change another storage test 2018-06-01 13:35:58 -04:00
Jonathan Rainville 049af73294 make running config() without callback work 2018-06-01 13:35:58 -04:00
Jonathan Rainville 491ff47cf8 conflict in en.json 2018-06-01 13:35:52 -04:00
Jonathan Rainville d647ea791e fix missing default from 2018-06-01 13:35:18 -04:00
Jonathan Rainville 72da3b4a35 use object assign to assign new values to contract 2018-06-01 13:35:18 -04:00
Jonathan Rainville a1d32e72e7 conflict in deployManager 2018-06-01 13:35:15 -04:00
Jonathan Rainville 9dcb64bde3 conflict in deployManager 2018-06-01 13:34:23 -04:00
Jonathan Rainville c234655acd resolve conflict in test.js 2018-06-01 13:33:11 -04:00
Jonathan Rainville 723a4ae805 reformat run_test 2018-06-01 13:32:23 -04:00
Jonathan Rainville ed1a2c4ddb remove timer 2018-06-01 13:31:22 -04:00
Jonathan Rainville 10f55910d2 remove initCOnfig in tests because useless 2018-06-01 13:30:08 -04:00
Jonathan Rainville 7cab30f4df patch weird event max listeners bug 2018-06-01 13:29:51 -04:00
Iuri Matias 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Jonathan Rainville e5ec461f78 fix error messages for non deployed contracts 2018-06-01 11:30:02 -04:00
Jonathan Rainville eeb88010d5 remove initTest 2018-06-01 11:06:07 -04:00
Jonathan Rainville 55df42979f update test_app tests 2018-06-01 10:48:29 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
Jonathan Rainville a112f18d93 always deploy contracts when in tests and make all test work 2018-06-01 10:05:43 -04:00
Eric Mastro 421f9a4096 Merge in remote 2018-06-01 14:10:54 +10:00
emizzle 74d5ee3984 small fixes 2018-06-01 14:06:02 +10:00
emizzle 446f28ed6f de-dupe en.json 2018-06-01 13:39:00 +10:00
emizzle a11047c681 Further fixes for starting dappConnection processes automatically 
moved storage process launching to storage module

refactored all cases of storage url building to util methods

updated cors so that a processes will not include itself in cors list

changed child process command console output to trace, so it's visible when --logLevel == trace
 2018-06-01 13:36:46 +10:00
emizzle 927f562a41 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes. 
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
 2018-06-01 13:35:25 +10:00
emizzle 7aa44c7fe3 Added improvements to storage config 2018-06-01 13:35:11 +10:00
emizzle 85117cf55c Dynamic selection of storage provider now working based on improved storage config. 
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
 2018-06-01 13:35:11 +10:00
emizzle 6ac8672a31 Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-06-01 13:34:49 +10:00
emizzle 942a57aa3a Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase. 
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
 2018-06-01 13:33:44 +10:00
emizzle 0cb79d84a0 Dynamic selection of storage provider now working based on improved storage config. 
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
 2018-06-01 13:30:01 +10:00
emizzle ec15823dbc Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-06-01 13:28:28 +10:00
emizzle f6667b6948 Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase. 
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
 2018-06-01 13:28:05 +10:00
Jonathan Rainville 0ab151500d add id to solc process to avoid multiple callback calls 2018-05-31 13:32:02 -04:00
Jonathan Rainville ac69f2f9fd Merge branch 'develop' of https://github.com/embark-framework/embark into develop 2018-05-31 10:38:09 -04:00
Iuri Matias 75c91992e3
Merge pull request #469 from embark-framework/refactor_contracts_part2 
Refactor contracts part2
 2018-05-31 10:37:43 -04:00
Jonathan Rainville 30c6555649 hotfix tag for github urls 2018-05-31 10:37:40 -04:00
Iuri Matias 9929415da8 remove unneded passing of contracts manager 2018-05-31 10:09:26 -04:00
Iuri Matias 20d7496980 take into account errors when determining arguments 2018-05-31 10:02:57 -04:00
Jonathan Rainville a0cfe525a9 fix contracts that are instances of 2018-05-31 09:52:37 -04:00
Jonathan Rainville 4b4ae66c93 change another storage test 2018-05-31 08:38:25 -04:00
Jonathan Rainville 827a3b309f make running config() without callback work 2018-05-31 08:38:25 -04:00
Jonathan Rainville 756d77a9b1 conflict en.json 2018-05-31 08:38:20 -04:00
Jonathan Rainville 622f54bda9 fix missing default from 2018-05-31 08:37:21 -04:00
Jonathan Rainville 641a77c2dc use object assign to assign new values to contract 2018-05-31 08:37:21 -04:00
Jonathan Rainville 1176a2e8be make require and test work 2018-05-31 08:37:21 -04:00
Jonathan Rainville 093bd13c6a build only once 2018-05-31 08:37:21 -04:00
Jonathan Rainville 41aaa5c20d conflict package json 2018-05-31 08:37:17 -04:00
Jonathan Rainville 68fb70f788 reformat run_test 2018-05-31 08:37:00 -04:00
emizzle 0aa96aa504 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes. 
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
 2018-05-31 20:18:25 +10:00
emizzle 6d77aae6de Added improvements to storage config 2018-05-31 15:19:09 +10:00
emizzle 30f0f4dc72 Dynamic selection of storage provider now working based on improved storage config. 
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
 2018-05-31 15:18:58 +10:00
emizzle 0a331e9352 Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-05-31 15:18:10 +10:00
emizzle d0d73320aa Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase. 
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
 2018-05-31 15:18:10 +10:00
Iuri Matias 7ee62adb24 remove unused assignment 2018-05-30 17:30:51 -04:00
Iuri Matias b3173c1ff3 register ipfs cmd correctly 2018-05-30 17:22:12 -04:00
Iuri Matias b43a766de7 cleanup module call 2018-05-30 13:38:08 -04:00
Iuri Matias 7d795fa180 remove unused var 2018-05-30 13:38:08 -04:00
Iuri Matias 4f20d31b4c add emitAndRunActionsForEvent 2018-05-30 13:38:08 -04:00
Iuri Matias 45f7767313 remove contracts manager dependency from deploy manager 2018-05-30 13:38:08 -04:00
Iuri Matias 1d782c0e53 emit contractsDeployed event only 2018-05-30 13:38:08 -04:00
Iuri Matias 68e6782f49 remove unneded assignment 2018-05-30 13:38:08 -04:00
Iuri Matias 9b368bc1b3 remove unneeded assignment 2018-05-30 13:38:08 -04:00
Iuri Matias 1912981d7d move contract deploy code to contract deployer; move it to events 2018-05-30 13:38:08 -04:00
Iuri Matias 70f38d863e fix code generator event 2018-05-30 13:35:36 -04:00
Iuri Matias f1cb7d1187 lint is king 2018-05-30 13:35:36 -04:00
Iuri Matias 69e5af2308 replace beforeAction plugin api with event action api 2018-05-30 13:35:36 -04:00
Iuri Matias 8458acd207 filter for plugins that have defined properties 2018-05-30 13:35:36 -04:00
Iuri Matias 3f20f400dd certify pluginTypes are uniques, to avoid issue with a plugin call being called twice or more 2018-05-30 13:35:36 -04:00
Iuri Matias 71cd523f30 remove old methods 2018-05-30 13:35:36 -04:00
Iuri Matias 16653d491b move onDeploy to new api 2018-05-30 13:35:36 -04:00
Iuri Matias 93e5003c64 cleanup 2018-05-30 13:35:36 -04:00
Iuri Matias 4f45b4fa13 add new plugin method for generalized event actions 2018-05-30 13:35:36 -04:00
Iuri Matias f08bb56337 simplify determine args method 2018-05-30 13:35:36 -04:00
Iuri Matias cf13f098ac refactor deploy method 2018-05-30 13:35:36 -04:00
Iuri Matias f4010bd66e remove unnecessary determin params call 2018-05-30 13:35:36 -04:00
Iuri Matias 8cc86e0b0f remove legacy events 2018-05-30 13:35:36 -04:00
Iuri Matias 742632eccf remove contractsManager dependency 2018-05-30 13:35:36 -04:00
Iuri Matias 3f9c55131b use requests instead of contractsManager directly 2018-05-30 13:35:36 -04:00
Iuri Matias 5f64376c84 refactor generateContractsJson 2018-05-30 13:35:36 -04:00
Iuri Matias cf999ce997 refactor runcode to use events instead; remove dependencies 2018-05-30 13:35:36 -04:00
Iuri Matias fc92b69211 use self 2018-05-30 13:35:03 -04:00
Jonathan Rainville e35474f726 early return 2018-05-30 13:23:18 -04:00
Jonathan Rainville 4db2d40ef5 fix swarm 2018-05-30 12:58:32 -04:00
Jonathan Rainville b5e96beb81 little oopsie 2018-05-30 12:07:48 -04:00
Jonathan Rainville ff0d24aa1f Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process 
# Conflicts:
#	lib/contracts/blockchain.js
 2018-05-30 12:02:30 -04:00
Jonathan Rainville b5d9a86680 start blockchain process at false and deploy on ready 2018-05-30 12:00:44 -04:00
Jonathan Rainville 138aaf39ff fix processes on ubuntu 2018-05-30 11:03:33 -04:00
Jonathan Rainville 2f3a94f3a1 little fixes 2018-05-30 11:03:33 -04:00
Jonathan Rainville 2023689eb2 fix tests 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4df669ab52 add more error management to ipfs 2018-05-30 11:03:33 -04:00
Jonathan Rainville d06a7f43ac fix swarm spawn 2018-05-30 11:03:33 -04:00
Jonathan Rainville c86c50fb4e boot swarm with spawn 2018-05-30 11:03:33 -04:00
Jonathan Rainville 8655b49a39 change ipfs to spawn too 2018-05-30 11:03:33 -04:00
Jonathan Rainville 73db1a6133 something en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville 3f671c2fb0 conflict in en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville d36af9f5e1 fix blockchain start 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4e20e82edf conflict in blockchain 2018-05-30 11:03:33 -04:00
Jonathan Rainville a88ab82261 conflict in blockchain.js 2018-05-30 11:02:01 -04:00