Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
obany committed Apr 25, 2018
2 parents db80e71 + 88851ef commit b57949b
Show file tree
Hide file tree
Showing 51 changed files with 7,425 additions and 11,610 deletions.
4 changes: 2 additions & 2 deletions .nsprc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"org": "iotaeco",
"integration": "1fcb4e52-e85f-4bc9-9a9a-7523694cd3d5"
"org": "https://github.com/iota-pico",
"integration": "e87b3745-994f-45db-9949-eeadd9097437"
}
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
sudo: required
language: node_js
node_js:
- "node"
- 9
install:
- cd ../../
- git clone --branch=$TRAVIS_BRANCH https://github.com/iotaeco/iota-pico-core.git iotaeco/iota-pico-core
- cd iotaeco/iota-pico-core
- git clone --branch=$TRAVIS_BRANCH https://github.com/iota-pico/core.git iota-pico/core
- cd iota-pico/core
- npm link
- cd ../../
- git clone --branch=$TRAVIS_BRANCH https://github.com/iotaeco/iota-pico-data.git iotaeco/iota-pico-data
- cd iotaeco/iota-pico-data
- git clone --branch=$TRAVIS_BRANCH https://github.com/iota-pico/data.git iota-pico/data
- cd iota-pico/data
- npm link @iota-pico/core
- npm link
- cd ../../
- git clone --branch=$TRAVIS_BRANCH https://github.com/iotaeco/iota-pico-crypto.git iotaeco/iota-pico-crypto
- cd iotaeco/iota-pico-crypto
- git clone --branch=$TRAVIS_BRANCH https://github.com/iota-pico/crypto.git iota-pico/crypto
- cd iota-pico/crypto
- npm link @iota-pico/core @iota-pico/data
- npm link
- cd ../iota-pico-pow-webgl
- cd ../pow-webgl
- npm link @iota-pico/core @iota-pico/data @iota-pico/crypto
- npm install
script:
- npm run build || travis_terminate 1
- npm run docs || travis_terminate 1
- npm run security || travis_terminate 1
# - npm run security || travis_terminate 1
- npm run test-publish || travis_terminate 1
cache:
directories:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v0.9.3

* Repo rename
* Updated webpack major ver

## v0.9.2

* Can now perform multi-pass pow as well as single pass
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/iotaeco/iota-pico-pow-webgl/master/LICENSE) [![Build Status](https://travis-ci.org/iotaeco/iota-pico-pow-webgl.svg?branch=master)](https://travis-ci.org/iotaeco/iota-pico-pow-webgl) [![NSP Status](https://nodesecurity.io/orgs/iotaeco/projects/1fcb4e52-e85f-4bc9-9a9a-7523694cd3d5/badge)](https://nodesecurity.io/orgs/iotaeco/projects/1fcb4e52-e85f-4bc9-9a9a-7523694cd3d5)
[![Coveralls](https://img.shields.io/coveralls/iotaeco/iota-pico-pow-webgl.svg)](https://coveralls.io/github/iotaeco/iota-pico-pow-webgl)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/https://github.com/iota-pico/pow-webgl/master/LICENSE) [![Build Status](https://travis-ci.org/https://github.com/iota-pico/pow-webgl.svg?branch=master)](https://travis-ci.org/https://github.com/iota-pico/pow-webgl) [![NSP Status](https://nodesecurity.io/orgs/https://github.com/iota-pico/projects/e87b3745-994f-45db-9949-eeadd9097437/badge)](https://nodesecurity.io/orgs/https://github.com/iota-pico/projects/e87b3745-994f-45db-9949-eeadd9097437)
[![Coveralls](https://img.shields.io/coveralls/https://github.com/iota-pico/pow-webgl.svg)](https://coveralls.io/github/https://github.com/iota-pico/pow-webgl)

# IOTA Pico Framework Proof Of Work WebGL

Expand All @@ -20,16 +20,16 @@ Documentation for the code can be found in [docs](./docs/README.md) folder.
The IOTA Pico Framework is a multi-layered set of object oriented JavaScript libraries for use with the IOTA tangle.

If you don't want to use the layered versions of the libraries consider using the ready bundled versions:
* [@iota-pico/lib-browser](https://github.com/iotaeco/iota-pico-lib-browser)
* [@iota-pico/lib-nodejs](https://github.com/iotaeco/iota-pico-lib-nodejs)
* [@iota-pico/lib-browser](https://github.com/iota-pico/lib-browser)
* [@iota-pico/lib-nodejs](https://github.com/iota-pico/lib-nodejs)

Each layer is fully abstracted allowing you to replace components with your own implementations very easily.

The layered libraries are written in TypeScript so are all strongly typed. The modules are generated as ES6 so you may need to transpile them when including them for use in older JavaScript eco-systems. The code will run without transpilation in all modern browsers and when used by NodeJs.

## Tutorials

Some tutorials can be found in the following repo [@iota-pico/tutorials](https://github.com/iotaeco/iota-pico-tutorials)
Some tutorials can be found in the following repo [@iota-pico/tutorials](https://github.com/iota-pico/tutorials)


# Contributing
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/pearlDiver/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
30 changes: 15 additions & 15 deletions coverage/lcov-report/src/pearlDiver/pearlDiver.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -450,16 +450,16 @@ <h1>
<span class="cline-any cline-yes"></span>
<span class="cline-any cline-yes">5103×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">2772×</span>
<span class="cline-any cline-yes">2772×</span>
<span class="cline-any cline-yes">2772×</span>
<span class="cline-any cline-yes">2422×</span>
<span class="cline-any cline-yes">2422×</span>
<span class="cline-any cline-yes">2422×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1204×</span>
<span class="cline-any cline-yes">1204×</span>
<span class="cline-any cline-yes">1204×</span>
<span class="cline-any cline-yes">1334×</span>
<span class="cline-any cline-yes">1334×</span>
<span class="cline-any cline-yes">1334×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1127×</span>
<span class="cline-any cline-yes">1127×</span>
<span class="cline-any cline-yes">1347×</span>
<span class="cline-any cline-yes">1347×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes"></span>
Expand Down Expand Up @@ -509,13 +509,13 @@ <h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">7×</span>
<span class="cline-any cline-yes">7×</span>
<span class="cline-any cline-yes">7×</span>
<span class="cline-any cline-yes">7×</span>
<span class="cline-any cline-yes">6×</span>
<span class="cline-any cline-yes">6×</span>
<span class="cline-any cline-yes">6×</span>
<span class="cline-any cline-yes">6×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">7×</span>
<span class="cline-any cline-yes">2×</span>
<span class="cline-any cline-yes">6×</span>
<span class="cline-any cline-yes">1×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes"></span>
<span class="cline-any cline-yes"></span>
Expand Down Expand Up @@ -784,7 +784,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/proofOfWorkWebGl.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/add.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/checkCol.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/checkDo.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/checkK.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/finalize.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/headers.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/increment.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/init.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/shaders/transform.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/webGL/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/webGL/stdlib.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/src/webGL/vertexShaderCode.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
10 changes: 5 additions & 5 deletions coverage/lcov-report/src/webGL/webGLHelper.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,14 @@ <h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">599×</span>
<span class="cline-any cline-yes">515×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">599×</span>
<span class="cline-any cline-yes">515×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">599×</span>
<span class="cline-any cline-yes">515×</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">599×</span>
<span class="cline-any cline-yes">515×</span>
<span class="cline-any cline-yes"></span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -343,7 +343,7 @@ <h1>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 20 2018 17:22:54 GMT+0300 (Turkey Standard Time)
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Apr 24 2018 16:33:48 GMT+0300 (E. Africa Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down

0 comments on commit b57949b

Please sign in to comment.