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

2761 Commits

Author SHA1 Message Date
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
Eric Mastro d29b033a8a merge in changes from remote 2018-06-01 08:33:01 +10:00
Jonathan Rainville 0ab151500d add id to solc process to avoid multiple callback calls 2018-05-31 13:32:02 -04:00
Iuri Matias 15d9710b00 update to 3.0.9gst 2018-05-31 11:50:43 -04:00
Jonathan Rainville a8507998d9 update other tests 2018-05-31 11:27:38 -04:00
Iuri Matias 11248b15f1 update to 3.0.8 2018-05-31 11:26:35 -04:00
Jonathan Rainville 123346d471 3.0.7 2018-05-31 10:42:36 -04:00
Jonathan Rainville c5b9d194e2 package json update 2018-05-31 10:42:27 -04:00
Jonathan Rainville 59f98c6f0c hotfix tag for github urls 2018-05-31 10:38:48 -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
Iuri Matias 7d28cdfd01
Merge pull request #470 from embark-framework/ipfs_cmd_fix 
register ipfs cmd correctly
 2018-05-31 09:46:36 -04:00
Jonathan Rainville 2ec94feaec Merge branch 'features/test-revamp' of https://github.com/embark-framework/embark into features/test-revamp 
# Conflicts:
#	lib/i18n/locales/en.json
#	package-lock.json
 2018-05-31 08:39:45 -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
Jonathan Rainville 32e676384d change another storage test 2018-05-30 17:35:54 -04: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
Jonathan Rainville 521165f710 make running config() without callback work 2018-05-30 16:17:17 -04:00
Iuri Matias 01fc78059e
Merge pull request #466 from embark-framework/abiFixes 
alias to the abi property in an object
 2018-05-30 15:37:42 -04:00
VoR0220 2d98938f18 eliminate space 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-30 14:35:07 -05:00
VoR0220 21b530fad2 fix for the fix 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-30 14:34:36 -05:00
VoR0220 4d65ccec7a fixed this up 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-30 14:33:29 -05: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