Skip to content

Commit

Permalink
[1] Finished refactoring into separate imparters and wallets.
Browse files Browse the repository at this point in the history 
[2] fixes to playground
[3] fixes to getTallyDollars and getFromDollars
  • Loading branch information
Jakub Ner committed Apr 19, 2021
1 parent fcb2405 commit f3ae133
Show file tree
Hide file tree
Showing 12 changed files with 319 additions and 327 deletions.
172 changes: 2 additions & 170 deletions dist/ledgers.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ledgers.js.map
View file

Large diffs are not rendered by default.

148 changes: 148 additions & 0 deletions docs/ledgers.js-rendered-docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,26 @@ <h3 class='mb0 no-anchor'>ledgers.js :: overhide remuneration library for browse

</li>


<li><a
href='#addtag'
class="">
addTag

</a>

</li>


<li><a
href='#removetag'
class="">
removeTag

</a>

</li>

</ul>
</div>
<div class='mt1 h6 quiet'>
Expand Down Expand Up @@ -2464,6 +2484,134 @@ <h3 class='fl m0' id='fire'>



</section>




<section class='p2 mb2 clearfix bg-white minishadow'>


<div class='clearfix'>

<h3 class='fl m0' id='addtag'>
addTag
</h3>


</div>



<div class='pre p1 fill-light mt0'>addTag(tag: <a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>)</div>











<div class='py1 quiet mt1 prose-big'>Parameters</div>
<div class='prose'>

<div class='space-bottom0'>
<div>
<span class='code bold'>tag</span> <code class='quiet'>(<a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>)</code>
-- to add to
<code>imparterTags</code>
if not in
<code>imparterTags</code>

</div>

</div>

</div>

















</section>




<section class='p2 mb2 clearfix bg-white minishadow'>


<div class='clearfix'>

<h3 class='fl m0' id='removetag'>
removeTag
</h3>


</div>



<div class='pre p1 fill-light mt0'>removeTag(tag: <a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>)</div>











<div class='py1 quiet mt1 prose-big'>Parameters</div>
<div class='prose'>

<div class='space-bottom0'>
<div>
<span class='code bold'>tag</span> <code class='quiet'>(<a href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>)</code>
-- to remove from
<code>imparterTags</code>
if in
<code>imparterTags</code>

</div>

</div>

</div>

















</section>


Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ledgers.js",
"version": "4.0.4",
"version": "4.1.0",
"description": "JavaScript library for ledger-based authorizations :: abstracting different ledgers to be used in an application's authentication and authorization workflows.",
"engines": {
"node": ">=10.13.0"
Expand Down
46 changes: 28 additions & 18 deletions play/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@
<p><input name="signature" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label
class="w3-text-blue">signature</label></p>
<p>
<select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event)">
<option value="eth-web3" selected>eth-web3</option>
<option value="ohledger">ohledger</option>
<option value="ohledger-web3">ohledger-web3</option>
</select><label class="w3-text-blue">imparterTag</label>
<select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label>
</p>
</p>
</form>
Expand All @@ -92,7 +88,7 @@
</ul>
</p></p>
<form id="getters"><p>
<input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label>
<select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="getters()">run getters()</button></p>
</div>
Expand All @@ -104,7 +100,7 @@
Call <em>generateCredentials(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#generatecredentials' target='_blank'>documentation</a>).
</p>
<form id="generateCredentials"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><textarea name="generateCredentialsOptionsJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">options JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#generatecredentials' target='_blank'>see docs</a>)</label></p>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="generateCredentials()">run generateCredentials()</button></p>
Expand All @@ -117,7 +113,7 @@
Call <em>setCredentials(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#setcredentials' target='_blank'>documentation</a>).
</p>
<form id="setCredentials"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><textarea name="credentialsOptionsJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">options JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#setcredentials' target='_blank'>see docs</a>)</label></p>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="setCredentials()">run setCredentials()</button></p>
Expand All @@ -130,7 +126,7 @@
Call <em>setNetwork(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#setnetwork' target='_blank'>documentation</a>).
</p>
<form id="setNetwork"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><textarea name="networkDetailsJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">options JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#setnetwork' target='_blank'>see docs</a>)</label></p>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="setNetwork()">run setNetwork()</button></p>
Expand All @@ -140,10 +136,10 @@
<div class="w3-panel w3-card">
<p class="usecase">getTallyDollars</p>
<p>
Call <em>getTallyDollars(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#getTallyDollars' target='_blank'>documentation</a>).
Call <em>getTallyDollars(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#gettallydollars' target='_blank'>documentation</a>).
</p>
<form id="getTallyDollars"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><textarea name="recipientJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">recipient JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#getTallyDollars' target='_blank'>see docs</a>)</label></p>
<p><input name="since" class="w3-input w3-border" type="datetime-local" onchange="scrubForm(event)"><label class="w3-text-blue">since</label></p>
</p></form>
Expand All @@ -157,7 +153,7 @@
Call <em>getTally(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#gettally' target='_blank'>documentation</a>).
</p>
<form id="getTally"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><textarea name="recipientJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">recipient JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#gettally' target='_blank'>see docs</a>)</label></p>
<p><input name="since" class="w3-input w3-border" type="datetime-local" onchange="scrubForm(event)"><label class="w3-text-blue">since</label></p>
</p></form>
Expand All @@ -168,10 +164,10 @@
<div class="w3-panel w3-card">
<p class="usecase">getFromDollars</p>
<p>
Call <em>getFromDollars(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#getFromDollars' target='_blank'>documentation</a>).
Call <em>getFromDollars(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#getfromdollars' target='_blank'>documentation</a>).
</p>
<form id="getFromDollars"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><input name="dollarAmount" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">dollarAmount</label></p>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="getFromDollars()">run getFromDollars()</button></p>
Expand All @@ -184,7 +180,7 @@
Call <em>getTransactions(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#gettransactions' target='_blank'>documentation</a>).
</p>
<form id="getTransactions"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><textarea name="recipientJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">recipient JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#gettransactions' target='_blank'>see docs</a>)</label></p>
<p><input name="since" class="w3-input w3-border" type="datetime-local" onchange="scrubForm(event)"><label class="w3-text-blue">since</label></p>
</p></form>
Expand All @@ -198,7 +194,7 @@
Call <em>isOnLedger(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#isonledger' target='_blank'>documentation</a>).
</p>
<form id="isOnLedger"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="isOnLedger()">run isOnLedger()</button></p>
</div>
Expand All @@ -210,7 +206,7 @@
Call <em>sign(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#sign' target='_blank'>documentation</a>).
</p>
<form id="sign"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><input name="message" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">message</label></p>
</p></form>
<p><button class="w3-btn w3-blue w3-left-align w3-block" onclick="sign()">run sign()</button></p>
Expand All @@ -223,7 +219,7 @@
Call <em>createTransaction(..)</em> (<a href='../docs/ledgers.js-rendered-docs/index.html#createtransaction' target='_blank'>documentation</a>).
</p>
<form id="createTransaction"><p>
<p><input name="imparterTag" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">imparterTag</label></p>
<p><select name="imparterTag" class="w3-select w3-border" onchange="scrubForm(event); refreshCreds()"></select><label class="w3-text-blue">imparterTag</label></p>
<p><input name="amount" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">amount (cents, wei, satoshis)</label></p>
<p><input name="to" class="w3-input w3-border" type="text" onchange="scrubForm(event)"><label class="w3-text-blue">to (address)</label></p>
<p><textarea name="transactionOptionsJSON" class="w3-input w3-border" rows="2" required onchange="scrubForm(event)"></textarea><label class="w3-text-blue">transaction JSON (<a href='../docs/ledgers.js-rendered-docs/index.html#createtransaction' target='_blank'>see docs</a>)</label></p>
Expand Down Expand Up @@ -262,6 +258,7 @@
getToken();

window.onload = function () {
setImparterTags()
showPostScreenSetupLogs(); // ignore above :: logging setup
}

Expand All @@ -279,6 +276,19 @@
** Supporting Methods / Utilities **
========================================================================= */

function setImparterTags() {
for (var el of $('form select[name=imparterTag]'))
{
el.append(new Option('eth-web3','eth-web3',true,true));
el.append(new Option('ohledger-web3','ohledger-web3'));
el.append(new Option('ohledger','ohledger'));
}
}

function refreshCreds() {
updateData({...data, secret: '', ...oh$.getCredentials(data.imparterTag)});
}

function getToken() {
const tokenUrl = `https://token.overhide.io/token`;
const apiKey = '0x___API_KEY_ONLY_FOR_DEMOS_AND_TESTS___';
Expand Down
8 changes: 3 additions & 5 deletions src/fns/ohledger_fns.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class overhide_fns {
class ohledger_fns {
static setNetwork_check_details(details) {
if (!('currency' in details)) throw new Error("'currency' must be passed in");
if (!('mode' in details)) throw new Error("'mode' must be passed in");
Expand All @@ -19,11 +19,9 @@ class overhide_fns {
}
await showGratisFn(from, signature, message);
} else {
let eventPromise = setupNewPromise();
data.OHLEDGER_IMPARTER_TAG.oh_ledger_transact_fn[data.OHLEDGER_IMPARTER_TAG.mode](amount, from, to);
await eventPromise;
await ohLedgerTransactFn(amount, from, to);
}
}
}

export default overhide_fns;
export default ohledger_fns;
Loading

0 comments on commit f3ae133

Please sign in to comment.