diff --git a/app/dapp.css b/app/dapp.css new file mode 100644 index 0000000..e69de29 diff --git a/app/dapp.js b/app/dapp.js new file mode 100644 index 0000000..d351c6a --- /dev/null +++ b/app/dapp.js @@ -0,0 +1,26 @@ +import 'bootstrap'; +import 'bootstrap/dist/css/bootstrap.min.css'; +import EmbarkJS from 'Embark/EmbarkJS'; +import IdentityFactory from 'Embark/contracts/IdentityFactory'; + +import './dapp.css'; + + +$(function(){ + + $("#btnCreateIdentity").on('click', async function() { + console.log(IdentityFactory.options.address); + console.log("Test3"); + web3.eth.getAccounts() + .then(accounts => console.log(accounts)) + //.then(accounts => IdentityFactory.methods.createIdentity().send({from: accounts[0], gasLimit: 5000000})) + // .then((tx) => console.log(tx.events)); + + // test + // addToLog("#blockchain", "SimpleStorage.methods.set(value).send({from: web3.eth.defaultAccount})"); + }); + + + + +}); \ No newline at end of file diff --git a/app/index.html b/app/index.html new file mode 100644 index 0000000..b492d71 --- /dev/null +++ b/app/index.html @@ -0,0 +1,61 @@ + + + + Embark - SimpleStorage Demo + + + + + + + +

Identity contracts

+ + +
+
+ +

1. Create an Identity

+
+ +
+ Identity Address: +
+
+ +

2. Set Kernel

+
+ +
+ UpdatedIdentityKernel Address: +
+
+
+ +
+ Identity Addresss: +
+
+ + +

3. Contract Calls

+

Javascript calls being made:

+
+
+
+ +
+ + +
+
+ +
+
+ + + diff --git a/config/communication.json b/config/communication.json index 80ec2f8..ed19750 100644 --- a/config/communication.json +++ b/config/communication.json @@ -1,6 +1,6 @@ { "default": { - "enabled": true, + "enabled": false, "provider": "whisper", "available_providers": ["whisper", "orbit"], "connection": { diff --git a/config/contracts.json b/config/contracts.json index d435d14..203f643 100644 --- a/config/contracts.json +++ b/config/contracts.json @@ -2,7 +2,7 @@ "default": { "versions": { "web3.js": "1.0.0-beta", - "solc": "0.4.17" + "solc": "0.4.21" }, "deployment": { "host": "localhost", @@ -29,7 +29,7 @@ "TestContract": { "deploy": false }, "UpdatedIdentityKernel": { "deploy": false }, "Identity": { "gas": 5000000 }, - "IdentityFactory": { "deploy": false }, + "IdentityFactory": { "args": ["0x00"] }, "IdentityKernel": { "gas": 5000000 } } } diff --git a/embark.json b/embark.json index de1570c..68b3bb6 100644 --- a/embark.json +++ b/embark.json @@ -1,5 +1,10 @@ { "contracts": ["contracts/**"], + "app": { + "js/dapp.js": ["app/dapp.js"], + "index.html": "app/index.html", + "images/": ["app/images/**"] + }, "buildDir": "dist/", "config": "config/", "plugins": { diff --git a/package.json b/package.json index 8317ed6..7cc070b 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,10 @@ }, "homepage": "https://github.com/status-im/contracts#readme", "devDependencies": { - "solidity-coverage": "^0.4.4", - "elliptic": "^6.4.0" + "bootstrap": "^3.3.7", + "elliptic": "^6.4.0", + "jquery": "^3.3.1", + "solidity-coverage": "^0.4.4" }, "dependencies": { "elliptic-curve": "^0.1.0",