Skip to content

Commit

Permalink
readme udpated.
Browse files Browse the repository at this point in the history
  • Loading branch information
@avatar-lavventura
avatar-lavventura committed May 3, 2018
1 parent 171eca8 commit bed619c
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 21 deletions.
10 changes: 4 additions & 6 deletions docs/connect.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ Downloading
Initialises a new genesis block and definition for the network
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

:warning: Do ``bash initialize.sh`` only once. You do not need to do it
again :warning:
Do ``bash initialize.sh`` only once. You do not need to do it again.

.. code:: bash
Expand Down Expand Up @@ -214,11 +213,10 @@ To Run
- Please open ``stats.sh`` file under ``eblocGeth``\ directory. Write
your unique name instead of ``mynameis``.

- :warning: Change ``DATADIR`` variable with path for
``eth-net-intelligence-api`` directory :warning:
- Change ``DATADIR`` variable with path for
``eth-net-intelligence-api`` directory.

- :warning: ``geth-server`` should be running on the background
:warning:
- ``geth-server`` should be running on the background.

Finally you should run following command
''''''''''''''''''''''''''''''''''''''''
Expand Down
6 changes: 3 additions & 3 deletions docs/convert/source/geth.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ npm install
```

#### Initialises a new genesis block and definition for the network
:warning: Do `bash initialize.sh` only once. You do not need to do it again :warning:
Do `bash initialize.sh` only once. You do not need to do it again.

```bash
bash initialize.sh
Expand Down Expand Up @@ -177,9 +177,9 @@ sudo chown -R $(whoami) private/keystore/UTC--...

- Please open `stats.sh` file under `eblocGeth`directory. Write your unique name instead of `mynameis`.

- :warning: Change `DATADIR` variable with path for `eth-net-intelligence-api` directory :warning:
- Change `DATADIR` variable with path for `eth-net-intelligence-api` directory.

- :warning: `geth-server` should be running on the background :warning:
- `geth-server` should be running on the background.

##### Finally you should run following command

Expand Down
10 changes: 4 additions & 6 deletions docs/convert/source/geth.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ Downloading
Initialises a new genesis block and definition for the network
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

:warning: Do ``bash initialize.sh`` only once. You do not need to do it
again :warning:
Do ``bash initialize.sh`` only once. You do not need to do it again.

.. code:: bash
Expand Down Expand Up @@ -214,11 +213,10 @@ To Run
- Please open ``stats.sh`` file under ``eblocGeth``\ directory. Write
your unique name instead of ``mynameis``.

- :warning: Change ``DATADIR`` variable with path for
``eth-net-intelligence-api`` directory :warning:
- Change ``DATADIR`` variable with path for
``eth-net-intelligence-api`` directory.

- :warning: ``geth-server`` should be running on the background
:warning:
- ``geth-server`` should be running on the background.

Finally you should run following command
''''''''''''''''''''''''''''''''''''''''
Expand Down
12 changes: 10 additions & 2 deletions docs/convert/source/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ $ bash initialize.sh # Do it only once.
$ bash runDaemon.sh
```

## Connect to eBlocBroker Contract

```bash
var address="0x8c22de03d3ce0b9dcb39617e7c31483ec484c720"
var abi=[{"constant":true,"inputs":[{"name":"userAddress","type":"address"}],"name":"isUserExist","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"},{"name":"index","type":"uint256"}],"name":"getJobInfo","outputs":[{"name":"","type":"uint8"},{"name":"","type":"uint32"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"getClusterReceivedAmount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"jobKey","type":"string"},{"name":"index","type":"uint32"},{"name":"jobRunTimeMinute","type":"uint32"},{"name":"resultIpfsHash","type":"string"},{"name":"storageID","type":"uint8"},{"name":"endTime","type":"uint256"}],"name":"receiptCheck","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"getClusterReceiptSize","outputs":[{"name":"","type":"uint32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"userAddress","type":"address"}],"name":"getUserInfo","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getClusterAddresses","outputs":[{"name":"","type":"address[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"userEmail","type":"string"},{"name":"fID","type":"string"},{"name":"miniLockID","type":"string"},{"name":"ipfsAddress","type":"string"}],"name":"registerUser","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getDeployedBlockNumber","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"getClusterInfo","outputs":[{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"deregisterCluster","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"},{"name":"core","type":"uint32"},{"name":"jobDesc","type":"string"},{"name":"coreMinuteGas","type":"uint32"},{"name":"storageID","type":"uint8"}],"name":"submitJob","outputs":[{"name":"success","type":"bool"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"index","type":"uint32"}],"name":"getClusterReceiptNode","outputs":[{"name":"","type":"uint256"},{"name":"","type":"int32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"coreNumber","type":"uint32"},{"name":"clusterEmail","type":"string"},{"name":"fID","type":"string"},{"name":"miniLockID","type":"string"},{"name":"coreMinutePrice","type":"uint256"},{"name":"ipfsAddress","type":"string"}],"name":"updateCluster","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"isClusterExist","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"}],"name":"getJobSize","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"coreNumber","type":"uint32"},{"name":"clusterEmail","type":"string"},{"name":"fID","type":"string"},{"name":"miniLockID","type":"string"},{"name":"coreMinutePrice","type":"uint256"},{"name":"ipfsAddress","type":"string"}],"name":"registerCluster","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"jobKey","type":"string"},{"name":"index","type":"uint32"},{"name":"stateID","type":"uint8"},{"name":"startTime","type":"uint256"}],"name":"setJobStatus","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"},{"name":"index","type":"uint32"}],"name":"refund","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint256"},{"indexed":false,"name":"storageID","type":"uint8"},{"indexed":false,"name":"desc","type":"string"}],"name":"LogJob","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"received","type":"uint256"},{"indexed":false,"name":"returned","type":"uint256"},{"indexed":false,"name":"endTime","type":"uint256"},{"indexed":false,"name":"resultIpfsHash","type":"string"},{"indexed":false,"name":"storageID","type":"uint8"}],"name":"LogReceipt","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"coreNumber","type":"uint32"},{"indexed":false,"name":"clusterEmail","type":"string"},{"indexed":false,"name":"fID","type":"string"},{"indexed":false,"name":"miniLockID","type":"string"},{"indexed":false,"name":"coreMinutePrice","type":"uint256"},{"indexed":false,"name":"ipfsAddress","type":"string"}],"name":"LogCluster","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"userEmail","type":"string"},{"indexed":false,"name":"fID","type":"string"},{"indexed":false,"name":"miniLockID","type":"string"},{"indexed":false,"name":"ipfsAddress","type":"string"}],"name":"LogUser","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"clusterAddress","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint32"}],"name":"LogRefund","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"clusterAddress","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint32"},{"indexed":false,"name":"startTime","type":"uint256"}],"name":"LogSetJob","type":"event"}]
var eBlocBroker = web3.eth.contract(abi).at(address);
```

## Start Running Cluster using eBlocBroker

### SLURM Setup:
Expand Down Expand Up @@ -128,7 +136,7 @@ coreGasDay = 0;
coreGasHour = 0;
coreGasMin = 10;
jobDescription = "Science"
storageType = 0; // Please note that '0' stands for IPFS repository share. Fixed.
storageType = 0; # Please note that '0' stands for IPFS repository share. Fixed.
```
#### **2. How to submit a job using EUDAT**

Expand Down Expand Up @@ -179,7 +187,7 @@ coreGasDay = 0;
coreGasHour = 0;
coreGasMin = 10;
jobDescription = "Science"
storageType = 2; // Please note 2 stands for IPFS with miniLock repository share. Fixed.
storageType = 2; # Please note 2 stands for IPFS with miniLock repository share. Fixed.
```

#### **4. How to submit a job using GitHub**
Expand Down
13 changes: 11 additions & 2 deletions docs/convert/source/readme.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ Please do following inside your Amazon instance.
$ bash initialize.sh # Do it only once.
$ bash runDaemon.sh
Connect to eBlocBroker Contract
-------------------------------

.. code:: bash
var address="0x8c22de03d3ce0b9dcb39617e7c31483ec484c720"
var abi=[{"constant":true,"inputs":[{"name":"userAddress","type":"address"}],"name":"isUserExist","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"},{"name":"index","type":"uint256"}],"name":"getJobInfo","outputs":[{"name":"","type":"uint8"},{"name":"","type":"uint32"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"getClusterReceivedAmount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"jobKey","type":"string"},{"name":"index","type":"uint32"},{"name":"jobRunTimeMinute","type":"uint32"},{"name":"resultIpfsHash","type":"string"},{"name":"storageID","type":"uint8"},{"name":"endTime","type":"uint256"}],"name":"receiptCheck","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"getClusterReceiptSize","outputs":[{"name":"","type":"uint32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"userAddress","type":"address"}],"name":"getUserInfo","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getClusterAddresses","outputs":[{"name":"","type":"address[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"userEmail","type":"string"},{"name":"fID","type":"string"},{"name":"miniLockID","type":"string"},{"name":"ipfsAddress","type":"string"}],"name":"registerUser","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getDeployedBlockNumber","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"getClusterInfo","outputs":[{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"deregisterCluster","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"},{"name":"core","type":"uint32"},{"name":"jobDesc","type":"string"},{"name":"coreMinuteGas","type":"uint32"},{"name":"storageID","type":"uint8"}],"name":"submitJob","outputs":[{"name":"success","type":"bool"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"index","type":"uint32"}],"name":"getClusterReceiptNode","outputs":[{"name":"","type":"uint256"},{"name":"","type":"int32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"coreNumber","type":"uint32"},{"name":"clusterEmail","type":"string"},{"name":"fID","type":"string"},{"name":"miniLockID","type":"string"},{"name":"coreMinutePrice","type":"uint256"},{"name":"ipfsAddress","type":"string"}],"name":"updateCluster","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"}],"name":"isClusterExist","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"}],"name":"getJobSize","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"coreNumber","type":"uint32"},{"name":"clusterEmail","type":"string"},{"name":"fID","type":"string"},{"name":"miniLockID","type":"string"},{"name":"coreMinutePrice","type":"uint256"},{"name":"ipfsAddress","type":"string"}],"name":"registerCluster","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"jobKey","type":"string"},{"name":"index","type":"uint32"},{"name":"stateID","type":"uint8"},{"name":"startTime","type":"uint256"}],"name":"setJobStatus","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"clusterAddress","type":"address"},{"name":"jobKey","type":"string"},{"name":"index","type":"uint32"}],"name":"refund","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint256"},{"indexed":false,"name":"storageID","type":"uint8"},{"indexed":false,"name":"desc","type":"string"}],"name":"LogJob","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"received","type":"uint256"},{"indexed":false,"name":"returned","type":"uint256"},{"indexed":false,"name":"endTime","type":"uint256"},{"indexed":false,"name":"resultIpfsHash","type":"string"},{"indexed":false,"name":"storageID","type":"uint8"}],"name":"LogReceipt","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"coreNumber","type":"uint32"},{"indexed":false,"name":"clusterEmail","type":"string"},{"indexed":false,"name":"fID","type":"string"},{"indexed":false,"name":"miniLockID","type":"string"},{"indexed":false,"name":"coreMinutePrice","type":"uint256"},{"indexed":false,"name":"ipfsAddress","type":"string"}],"name":"LogCluster","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"cluster","type":"address"},{"indexed":false,"name":"userEmail","type":"string"},{"indexed":false,"name":"fID","type":"string"},{"indexed":false,"name":"miniLockID","type":"string"},{"indexed":false,"name":"ipfsAddress","type":"string"}],"name":"LogUser","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"clusterAddress","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint32"}],"name":"LogRefund","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"clusterAddress","type":"address"},{"indexed":false,"name":"jobKey","type":"string"},{"indexed":false,"name":"index","type":"uint32"},{"indexed":false,"name":"startTime","type":"uint256"}],"name":"LogSetJob","type":"event"}]
var eBlocBroker = web3.eth.contract(abi).at(address);
Start Running Cluster using eBlocBroker
---------------------------------------

Expand Down Expand Up @@ -165,7 +174,7 @@ Please update following arguments inside ``submitJob.py`` file.
coreGasHour = 0;
coreGasMin = 10;
jobDescription = "Science"
storageType = 0; // Please note that '0' stands for IPFS repository share. Fixed.
storageType = 0; # Please note that '0' stands for IPFS repository share. Fixed.
**2. How to submit a job using EUDAT**
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -228,7 +237,7 @@ Please update following arguments inside ``submitJob.py`` file.
coreGasHour = 0;
coreGasMin = 10;
jobDescription = "Science"
storageType = 2; // Please note 2 stands for IPFS with miniLock repository share. Fixed.
storageType = 2; # Please note 2 stands for IPFS with miniLock repository share. Fixed.
**4. How to submit a job using GitHub**
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Loading

0 comments on commit bed619c

Please sign in to comment.