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

Pass PK in to the constructor 

Instead of passing the PK of the embark-configured accounts in to `EmbarkJS.Plasma.init()`, pass it in to the constructor of `Embark.Plasma` instead. This makes the PK available in other functions of `Embark.Plasma` (ie `.transfer()`.

Bump version
This commit is contained in:
emizzle 2019-06-26 12:44:20 +10:00
parent 06902418a2
commit fbb25d99ff
No known key found for this signature in database
GPG Key ID: 1FD4BAB3C37EE9BA
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "embark-plasma", "name": "embark-plasma",
"version": "1.0.4", "version": "1.0.5",
"description": "OmiseGO Plasma plugin for Embark", "description": "OmiseGO Plasma plugin for Embark",
"main": "dist/index.js", "main": "dist/index.js",
"files": [ "files": [

11
src/index.js
View File

@ -20,14 +20,16 @@ class EmbarkPlasma extends EmbarkJSPlasma {
// gets hydrated blockchain config from embark, use it to init // gets hydrated blockchain config from embark, use it to init
// this.events.once("config:load:contracts", this.addCodeToEmbarkJs.bind(this)); // this.events.once("config:load:contracts", this.addCodeToEmbarkJs.bind(this));
this.addCodeToEmbarkJs();
this.registerServiceCheck(); this.registerServiceCheck();
this.registerConsoleCommands(); this.registerConsoleCommands();
this.events.request("blockchain:get", (web3) => { this.events.request("blockchain:get", (web3) => {
this.events.request("blockchain:ready", () => { this.events.request("blockchain:ready", () => {
this.events.request("blockchain:provider:contract:accounts:getAll", (_err, accounts) => { this.events.request("blockchain:provider:contract:accounts:getAll", (_err, accounts) => {
this.init(web3, true, accounts); this.accounts = accounts;
this.addCodeToEmbarkJs();
this.init(web3, true);
}); });
}); });
}); });
@ -77,13 +79,14 @@ class EmbarkPlasma extends EmbarkJSPlasma {
error: console.error, error: console.error,
trace: console.trace trace: console.trace
}, },
pluginConfig: ${JSON.stringify(this.pluginConfig)} pluginConfig: ${JSON.stringify(this.pluginConfig)},
accounts: ${JSON.stringify(this.accounts)}
};`; };`;
code += "\nEmbarkJS.onReady(() => {"; code += "\nEmbarkJS.onReady(() => {";
code += "\n EmbarkJS.Plasma = new __embarkPlasma(opts);"; code += "\n EmbarkJS.Plasma = new __embarkPlasma(opts);";
code += `\n const embarkJsWeb3Provider = EmbarkJS.Blockchain.Providers["web3"]`; code += `\n const embarkJsWeb3Provider = EmbarkJS.Blockchain.Providers["web3"]`;
code += `\n if (!embarkJsWeb3Provider) { throw new Error("web3 cannot be found. Please ensure you have the 'embarkjs-connector-web3' plugin installed in your DApp."); }`; code += `\n if (!embarkJsWeb3Provider) { throw new Error("web3 cannot be found. Please ensure you have the 'embarkjs-connector-web3' plugin installed in your DApp."); }`;
code += `\n if (global.embarkjsOmg) EmbarkJS.Plasma.init(embarkJsWeb3Provider.web3, true, ${JSON.stringify(this.accounts)}).catch((err) => console.error(err));`; // global.embarkjsOmg ? "${web3SymlinkPath}" : null);`; // pass the symlink path ONLY when we are in the node (VM) context code += `\n if (global.embarkjsOmg) EmbarkJS.Plasma.init(embarkJsWeb3Provider.web3, true).catch((err) => console.error(err));`;
code += "\n});"; code += "\n});";
this.embark.addCodeToEmbarkJS(code); this.embark.addCodeToEmbarkJS(code);