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

2666 Commits

Author SHA1 Message Date
Iuri Matias 500e1af1b3 Revert "update package lock" 
This reverts commit 00597c2ade.
 2018-08-20 09:35:26 -04:00
Jonathan Rainville 6da4f7527e 3.1.9 2018-08-15 09:51:10 -04:00
Jonathan Rainville 00597c2ade update package lock 2018-08-15 09:50:59 -04:00
Iuri Matias 25012184d3
Merge pull request #705 from embark-framework/bug_fix/funding 
set async limit funding
 2018-08-14 17:03:06 -04:00
Jonathan Rainville 7abdc9e0e6 set a limit funding 2018-08-14 14:05:21 -04:00
Iuri Matias e3a48fd46a update to 3.1.8 2018-08-14 13:45:09 -04:00
Michael Bradley e7e7b87881
Merge pull request #699 from embark-framework/3_1_0_templates-gitignore-2 
3_1_0 template .gitignore — round 2
 2018-08-13 10:39:27 -05:00
Michael Bradley, Jr a8f8acb7ff when installing template mv dot.gitignore -> .gitignore if it exists 2018-08-12 15:02:03 -05:00
Michael Bradley, Jr 2c852a22c1 moveSync 2018-08-12 14:59:48 -05:00
Michael Bradley, Jr 690260a0fb remove unused negation in top-level .npmignore 2018-08-12 14:58:44 -05:00
Michael Bradley, Jr e718b33d72 templates' .gitignore -> dot.gitignore 2018-08-12 14:58:05 -05:00
Michael Bradley 74d6904d72
Merge pull request #695 from embark-framework/3_1_0_templates-gitignore 
don't ignore templates' .gitignore files
 2018-08-10 14:34:07 -05:00
Michael Bradley, Jr 2ec77772d7 npm should not ignore templates .gitignore files 2018-08-10 14:12:51 -05:00
Michael Bradley 76daae121f
Merge pull request #672 from embark-framework/3_1_0_defaultHost 
docker awareness for 3_1_0
 2018-08-02 16:02:33 -05:00
Michael Bradley, Jr 4d0b536619 revise blockchain test re: docker awareness 
use defaultHost so tests pass in docker container

+1 for wsPort relative to rpcPort

port change related to proxy now doing `server.listen(port, defaultHost)`
vs. `server.listen(port)`
 2018-08-02 15:37:00 -05:00
Michael Bradley, Jr 6d4870f862 whisper -- canonicalHost, defaultHost 2018-08-02 15:36:46 -05:00
Michael Bradley, Jr f91baf73bc proxy -- canonicalHost, defaultHost 2018-08-02 15:36:25 -05:00
Michael Bradley, Jr ca7a46224d storage procs launcher -- canonicalHost 2018-08-02 15:32:46 -05:00
Michael Bradley, Jr 3885128e18 config -- canonicalHost, defaultHost 2018-08-02 15:32:34 -05:00
Michael Bradley, Jr 6d482cfb95 buildUrlFromConfig -- canonicalHost 2018-08-02 15:32:19 -05:00
Michael Bradley, Jr 0191ec9d24 webserver -- canonicalHost, defaultHost, dockerHostSwap 2018-08-02 15:32:08 -05:00
Michael Bradley, Jr d70264adb6 blockchain -- defaultHost, dockerHostSwap 2018-08-02 15:31:55 -05:00
Michael Bradley, Jr 2ad8097dcb simulator -- defaultHost, dockerHostSwap 2018-08-02 15:31:27 -05:00
Michael Bradley, Jr 000a10b375 host utils 2018-08-02 15:30:43 -05:00
Iuri Matias 807950d216
Merge pull request #667 from embark-framework/patch/dev_funds-tests 
Patch:  Basic unit tests complete for dev_funds
 2018-08-02 12:35:09 -04:00
emizzle 89651dde2f Converted `fakeIpcProvider` to 2 spaces 2018-08-02 13:51:36 +10:00
emizzle 9b41fa8ac2 Modified DevFunds to “factory pattern” 
Added a “factory pattern” to DevFunds to allow for async calls to be made during object construction. This allows for `web3.eth.getAccounts` to be called and the `accounts` property assigned on instantiation.

This modification allows each unit test case to be run independently of the others.
 2018-08-01 11:35:42 +10:00
emizzle 7cb9cd5622 Basic unit tests complete for dev funds 
Finished added unit tests for dev_funds. These are weak tests as the FakeIpcProvider does not provide enough support for keeping track of accounts and balances and instead we are injecting the provider responses in the tests, which kind of defeats the purposes of the tests. Instead, the FakeIpcProvider should be a little smarter and do more of what a real node would do.
 2018-07-31 14:59:55 +10:00
emizzle 12304eac16 Adding in unit tests for dev_funds (WIP) 2018-07-31 14:59:55 +10:00
Iuri Matias c577ad6b16 update to 3.1.7 2018-07-30 07:01:36 -04:00
Iuri Matias c44a95e6ea fix linting issue 2018-07-30 06:58:54 -04:00
Iuri Matias 0cb093b280
Merge pull request #660 from embark-framework/lock_ethereumjs_wallet 
lock ethereumjs-wallet version due to breaking change in 0.6.1 patch
 2018-07-30 06:51:48 -04:00
Iuri Matias 0310d53b41 lock ethereumjs-wallet version due to breaking change in 0.6.1 patch 2018-07-30 06:44:27 -04:00
Iuri Matias a01e600857
Merge pull request #627 from embark-framework/bug_fix/warning-contract-path 
trim the contract name to have the warning correctly (patch)
 2018-07-26 13:31:59 -04:00
Iuri Matias 258358558b update to 3.1.6 2018-07-19 11:18:48 +03:00
Iuri Matias f5d82d222c
Merge pull request #633 from embark-framework/fund_accounts 
Changes for 3.1 & --dev mode
 2018-07-19 11:16:20 +03:00
Iuri Matias 71e9eed67b use config password file; tolerate somethign going terribly wrong since it wouldnt' affect the blockchain process generally 2018-07-19 11:15:16 +03:00
Iuri Matias 69f356b3f0 only use personal in --dev mode 2018-07-19 10:58:47 +03:00
Iuri Matias eda616dc73 update tests 2018-07-19 10:34:56 +03:00
Iuri Matias 0099078e94 fix lint 2018-07-18 17:53:37 +03:00
Iuri Matias c1809e3752 Merge branch 'fund_accounts' of github.com:embark-framework/embark into fund_accounts 2018-07-18 17:48:58 +03:00
Iuri Matias 20406ba51a fix lint 2018-07-18 17:47:53 +03:00
emizzle 9382f98933 Housekeeping and removal of none additions 
Clean up debugging statements from fund_accounts.

Removed the addition of the nonce increment for contracts deploy as this was only affecting mneumonic-generated accounts which is not meant for dev environment.
 2018-07-18 14:08:32 +02:00
Iuri Matias 5e3740f088 add regular account unlocks in devMod due to issues with geth 2018-07-18 13:45:18 +03:00
Iuri Matias 28dd6dba60 add interval to send txs to deal with geth --dev bug 2018-07-18 13:29:02 +03:00
Iuri Matias 3d1db2b21e Merge branch 'fund_accounts' of github.com:embark-framework/embark into fund_accounts 2018-07-17 17:49:32 +03:00
Iuri Matias 91f1748d60 don't wait for account funds 2018-07-17 17:30:23 +03:00
Iuri Matias 231199c0dc ad missing emit 2018-07-17 16:13:12 +03:00
Iuri Matias d0162a6c78 move - for now - determining gas price to deployment to avoid race conditions 2018-07-17 15:10:22 +03:00
emizzle 7e12c5a9f7 funding dev account updates 
Now funds accounts only if they have not been funded, and also funds with only the amount needed.

Also fixed bug with unlocking accounts when re-running `unlockAccounts` on already created accounts.
 2018-07-17 10:57:31 +02:00