embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into features/test-revamp-multi

This commit is contained in:
Iuri Matias 2018-06-01 18:14:32 -04:00 committed by GitHub
parent 91b8033ab5 061ff51f83
commit 17f5bb3905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 77 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/contracts/code_generator.js
View File

@ -35,14 +35,14 @@ class CodeGenerator {
listenToCommands() {
let self = this;
this.events.setCommandHandlerOnce('provider-code', function(cb) {
this.events.setCommandHandler('provider-code', function(cb) {
let providerCode = self.generateProvider(false);
cb(providerCode);
});
// new events
this.events.setCommandHandlerOnce('code-vanila', function(cb) {
this.events.setCommandHandler('code-vanila', function(cb) {
self.events.request("contracts:list", (contractsList) => {
let vanillaABI = self.generateABI(contractsList, {useEmbarkJS: false});
let contractsJSON = self.generateContractsJSON(contractsList);
@ -50,7 +50,7 @@ class CodeGenerator {
});
});
this.events.setCommandHandlerOnce('code', function(cb) {
this.events.setCommandHandler('code', function(cb) {
self.events.request("contracts:list", (contractsList) => {
let embarkJSABI = self.generateABI(contractsList, {useEmbarkJS: true});
let contractsJSON = self.generateContractsJSON(contractsList);
@ -58,7 +58,7 @@ class CodeGenerator {
});
});
this.events.setCommandHandlerOnce('code-contracts-vanila', function(cb) {
this.events.setCommandHandler('code-contracts-vanila', function(cb) {
self.events.request("contracts:list", (contractsList) => {
let vanillaContractsABI = self.generateContracts(contractsList, false, true, false);
let contractsJSON = self.generateContractsJSON(contractsList);
@ -66,7 +66,7 @@ class CodeGenerator {
});
});
this.events.setCommandHandlerOnce('code-vanila-deployment', function(cb) {
this.events.setCommandHandler('code-vanila-deployment', function(cb) {
self.events.request("contracts:list", (contractsList) => {
let vanillaABI = self.generateABI(contractsList, {useEmbarkJS: false, deployment: true});
let contractsJSON = self.generateContractsJSON(contractsList);
@ -74,7 +74,7 @@ class CodeGenerator {
});
});
this.events.setCommandHandlerOnce('code-generator:web3js', function(cb) {
this.events.setCommandHandler('code-generator:web3js', function(cb) {
self.buildWeb3JS(cb);
});

49
package-lock.json generated
View File

@ -3867,7 +3867,7 @@
"readable-stream": "2.3.5",
"request": "2.85.0",
"semaphore": "1.1.0",
"solc": "0.4.23",
"solc": "0.4.24",
"tape": "4.9.0",
"xhr": "2.4.1",
"xtend": "4.0.1"
@ -10852,9 +10852,9 @@
}
},
"solc": {
"version": "0.4.23",
"resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz",
"integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==",
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/solc/-/solc-0.4.24.tgz",
"integrity": "sha512-2xd7Cf1HeVwrIb6Bu1cwY2/TaLRodrppCq3l7rhLimFQgmxptXhTC3+/wesVLpB09F1A2kZgvbMOgH7wvhFnBQ==",
"requires": {
"fs-extra": "0.30.0",
"memorystream": "0.3.1",
@ -13072,7 +13072,46 @@
"p-finally": "1.0.0"
}
},
"prepend-http": {
"underscore": {
"version": "1.8.3",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
}
}
},
"webcrypto-shim": {
"version": "github:dignifiedquire/webcrypto-shim#190bc9ec341375df6025b17ae12ddb2428ea49c8"
},
"webpack": {
"version": "3.11.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.11.0.tgz",
"integrity": "sha512-3kOFejWqj5ISpJk4Qj/V7w98h9Vl52wak3CLiw/cDOfbVTq7FeoZ0SdoHHY9PYlHr50ZS42OfvzE2vB4nncKQg==",
"requires": {
"acorn": "5.5.3",
"acorn-dynamic-import": "2.0.2",
"ajv": "6.2.1",
"ajv-keywords": "3.1.0",
"async": "2.6.0",
"enhanced-resolve": "3.4.1",
"escope": "3.6.0",
"interpret": "1.1.0",
"json-loader": "0.5.7",
"json5": "0.5.1",
"loader-runner": "2.3.0",
"loader-utils": "1.1.0",
"memory-fs": "0.4.1",
"mkdirp": "0.5.1",
"node-libs-browser": "2.1.0",
"source-map": "0.5.7",
"supports-color": "4.5.0",
"tapable": "0.2.8",
"uglifyjs-webpack-plugin": "0.4.6",
"watchpack": "1.6.0",
"webpack-sources": "1.1.0",
"yargs": "8.0.2"
},
"dependencies": {
"has-flag": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="

2
package.json
View File

@ -62,7 +62,7 @@
"request": "^2.85.0",
"serve-static": "^1.11.1",
"shelljs": "^0.5.0",
"solc": "0.4.23",
"solc": "0.4.24",
"string-replace-async": "^1.2.1",
"style-loader": "^0.19.0",
"tar": "^3.1.5",

2
templates/boilerplate/embark.json
View File

@ -10,7 +10,7 @@
"config": "config/",
"versions": {
"web3": "1.0.0-beta",
"solc": "0.4.23",
"solc": "0.4.24",
"ipfs-api": "17.2.4",
"p-iteration": "1.1.7"
},

2
templates/demo/embark.json
View File

@ -9,7 +9,7 @@
"config": "config/",
"versions": {
"web3": "1.0.0-beta",
"solc": "0.4.23",
"solc": "0.4.24",
"ipfs-api": "17.2.4",
"p-iteration": "1.1.7"
},

2
templates/simple/embark.json
View File

@ -10,7 +10,7 @@
"webserver": false
},
"versions": {
"solc": "0.4.23"
"solc": "0.4.24"
},
"plugins": {}
}

24
test/compiler.js
View File

File diff suppressed because one or more lines are too long

2
test_apps/contracts_app/embark.json
View File

@ -10,6 +10,6 @@
},
"versions": {
"web3": "1.0.0-beta",
"solc": "0.4.17"
"solc": "0.4.24"
}
}

2
test_apps/test_app/embark.json
View File

@ -15,7 +15,7 @@
"buildDir": "dist/",
"config": "config/",
"versions": {
"solc": "0.4.18",
"solc": "0.4.24",
"web3": "1.0.0-beta.34",
"ipfs-api": "17.2.7",
"p-iteration": "1.1.7"