Merge branch 'master' into fix-sub-account-generator

Author: algys

.gitignore

@@ -0,0 +1 @@
+.vscode

codec/codec.js

@@ -1,3 +1,5 @@
+const { TypeRegistry, createType } = polkadotTypes;
+
 let rawBytes = document.getElementById('rawBytes');
 let customTypes = document.getElementById('customTypes');
 let output = document.getElementById('output');
@@ -17,7 +19,7 @@ editor.set(initialJson);
 
 /* CUSTOM TYPES EDITOR END */
 
-const registry = new types.TypeRegistry();
+const registry = new TypeRegistry();
 
 function parseCustomType() {
   try {
@@ -38,7 +40,7 @@ function parseCustomType() {
     }
 
     output.innerText = JSON.stringify(
-      types.createType(registry, lastTypeKey, rawBytes.value.trim())
+      createType(registry, lastTypeKey, rawBytes.value.trim())
     );
   } catch (e) {
     output.innerText = e;

codec/index.html

@@ -73,7 +73,9 @@ <h4>SCALE Decoder</h4>
 		</div>
 	</footer>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/7.0.4/jsoneditor.min.js"></script>
-	<script src="//unpkg.com/polkadot-js-bundle/polkadot.js"></script>
+	<script src="//unpkg.com/@polkadot/util/bundle-polkadot-util.js"></script>
+	<script src="//unpkg.com/@polkadot/util-crypto/bundle-polkadot-util-crypto.js"></script>
+	<script src="//unpkg.com/@polkadot/types/bundle-polkadot-types.js"></script>
 	<script src="codec.js"></script>
 </body>
 

index.html

@@ -27,6 +27,7 @@ <h4>More Utilities</h4>
 						<li><a href="./codec/">SCALE Decoder</a></li>
 						<li><a href="./indices/">Query Indices</a></li>
 						<li><a href="./versions/">Network Versions</a></li>
+						<li><a href="./nominations/">Query Nominations</a></li>
 						<li><a href="https://www.shawntabrizi.com/substrate-balance-graph/">Graph Balances</a></li>
 						<li><a href="https://www.shawntabrizi.com/substrate-weight-graph/">Graph Weights</a></li>
 						<li><a href="https://www.shawntabrizi.com/substrate-balance-calculator/">Calculate Reserved
@@ -159,7 +160,10 @@ <h4>Sub-Account Generator</h4>
 			</span>
 		</div>
 	</footer>
-	<script src="//unpkg.com/polkadot-js-bundle/polkadot.js"></script>
+	<script src="//unpkg.com/@polkadot/util/bundle-polkadot-util.js"></script>
+	<script src="//unpkg.com/@polkadot/util-crypto/bundle-polkadot-util-crypto.js"></script>
+	<script src="//unpkg.com/@polkadot/keyring/bundle-polkadot-keyring.js"></script>
+
 	<script src="utilities.js"></script>
 </body>
 

indices/index.html

@@ -69,8 +69,10 @@ <h4>Query Indices on a Substrate Chain</h4>
 			</span>
 		</div>
 	</footer>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/7.0.4/jsoneditor.min.js"></script>
-	<script src="//unpkg.com/polkadot-js-bundle/polkadot.js"></script>
+	<script src="//unpkg.com/@polkadot/util/bundle-polkadot-util.js"></script>
+	<script src="//unpkg.com/@polkadot/util-crypto/bundle-polkadot-util-crypto.js"></script>
+	<script src="//unpkg.com/@polkadot/types/bundle-polkadot-types.js"></script>
+	<script src="//unpkg.com/@polkadot/api/bundle-polkadot-api.js"></script>
 	<script src="indices.js"></script>
 </body>
 

indices/indices.js

@@ -1,3 +1,5 @@
+const { WsProvider, ApiPromise } = polkadotApi;
+
 // Some global variables used by this code.
 let global = {
 	indices: {},
@@ -8,9 +10,9 @@ let global = {
 async function connect() {
 	let endpoint = document.getElementById('endpoint').value;
 	if (!window.substrate || global.endpoint != endpoint) {
-		const provider = new api.WsProvider(endpoint);
+		const provider = new WsProvider(endpoint);
 		document.getElementById('output').innerHTML = 'Connecting to Endpoint...';
-		window.substrate = await api.ApiPromise.create({ provider });
+		window.substrate = await ApiPromise.create({ provider });
 		global.endpoint = endpoint;
 		document.getElementById('output').innerHTML = 'Connected';
 		clearIndices();
@@ -33,8 +35,8 @@ async function findIndices(a, b) {
 
 	for (let i = 0; i < results.length; i += 2) {
 		let index = results[i];
-		let account = results[i+1];
-		let info =[];
+		let account = results[i + 1];
+		let info = [];
 		info.push(index);
 		let ss58 = substrate.createType('AccountIndex', index).toString();
 		info.push(ss58);
@@ -68,11 +70,8 @@ function createTable() {
 
 	for (index of Object.keys(global.indices)) {
 		let tr2 = document.createElement('tr');
-		console.log(index);
-		console.log(global.indices[index])
 
 		for (key in keys) {
-			console.log(key)
 			let td = document.createElement('td');
 			td.innerText = global.indices[index][key];
 			tr2.appendChild(td);

nominations/index.html

@@ -0,0 +1,76 @@
+<!doctype html>
+<html lang="en" class="h-100">
+
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="description" content="Simple Utilities for Substrate">
+	<meta name="author" content="Shawn Tabrizi">
+	<title>Substrate JS Utilities: Nominations</title>
+
+	<!-- Bootstrap core CSS -->
+	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+		integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+	<!-- Custom styles for this template -->
+	<link href="../custom.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/7.0.4/jsoneditor.min.css" rel="stylesheet">
+</head>
+
+<body class="d-flex flex-column h-100">
+	<main role="main" class="flex-shrink-0">
+		<div class="container">
+			<h1 class="mt-5"> <a href="../">&#8592; Substrate Utilities</a></h1>
+			<p class="lead">Hopefully this page helps you do something.</p>
+			<h4>Query Nominations on a Substrate Chain</h4>
+			<div class="input-group">
+				<div class="input-group-prepend">
+					<span class="input-group-text">Address:</span>
+				</div>
+				<input type="text" class="form-control" id="address"
+					value="12hAtDZJGt4of3m2GqZcUCVAjZPALfvPwvtUTFZPQUbdX1Ud" placeholder="Address" />
+				<div class="input-group-append">
+					<a class="btn btn-lg btn-primary" onclick="queryNominations();" role="button">Query Nominations
+						&raquo;</a>
+				</div>
+			</div>
+			<div class="input-group">
+				<div class="input-group-prepend">
+					<span class="input-group-text">Endpoint:</span>
+				</div>
+				<input type="text" class="form-control" id="endpoint" value="wss://kusama-rpc.polkadot.io/"
+					placeholder="wss://..." />
+
+				<div class="input-group-prepend">
+					<span class="input-group-text">Inflation (%):</span>
+				</div>
+				<input type="number" class="form-control" id="inflation" value="12" placeholder="12" />
+			</div>
+			<div id="output"></div>
+			<br />
+			<div class="alert alert-success" role="alert" id="estimate" style="display: none"></div>
+			<br />
+			<div class="table-responsive">
+				<table id="validators-table" class="table table-striped table-sm">
+				</table>
+			</div>
+		</div>
+	</main>
+
+	<footer class="footer mt-auto py-3">
+		<div class="container">
+			<span class="text-muted">
+				<a href="../">Substrate JS Utilities</a>
+				- Created by <a href="https://shawntabrizi.com">Shawn Tabrizi</a>
+				- Source on <a href="https://github.com/shawntabrizi/substrate-js-utilities">GitHub</a>
+				- Using <a href="https://polkadot.js.org/common/">polkadot-js/common</a>
+			</span>
+		</div>
+	</footer>
+	<script src="//unpkg.com/@polkadot/util/bundle-polkadot-util.js"></script>
+	<script src="//unpkg.com/@polkadot/util-crypto/bundle-polkadot-util-crypto.js"></script>
+	<script src="//unpkg.com/@polkadot/types/bundle-polkadot-types.js"></script>
+	<script src="//unpkg.com/@polkadot/api/bundle-polkadot-api.js"></script>
+	<script src="nominations.js"></script>
+</body>
+
+</html>

nominations/nominations.js

@@ -0,0 +1,137 @@
+const { WsProvider, ApiPromise } = polkadotApi;
+const { BN, BN_HUNDRED } = polkadotUtil;
+
+// Some global variables used by this code.
+let global = {
+	endpoint: "",
+	account: {},
+	validators: [],
+};
+
+function output(text) {
+	document.getElementById('output').innerHTML = text;
+}
+
+// Connect to Substrate endpoint
+async function connect() {
+	let endpoint = document.getElementById('endpoint').value;
+	if (!window.substrate || global.endpoint != endpoint) {
+		const provider = new WsProvider(endpoint);
+		output('Connecting to Endpoint...');
+		window.substrate = await ApiPromise.create({ provider });
+		global.endpoint = endpoint;
+		output('Connected');
+	}
+}
+
+async function getNominations(address) {
+	output("Querying...");
+	if (!substrate.derive.staking) {
+		output("Could not find derive.staking API.");
+		return;
+	}
+
+	global.account = await substrate.derive.staking.account(address);
+	if (global.account.nominators.length == 0) {
+		output(`No nominations found for ${address}.`);
+		return;
+	}
+	global.validators = await substrate.derive.staking.accounts(global.account.nominators);
+	// pull out commission and get identity
+	for ([index, validator] of global.validators.entries()) {
+		validator["identity"] = await substrate.derive.accounts.identity(validator.accountId);
+		validator["commission"] = validator.validatorPrefs.commission.toHuman();
+		validator["display"] = validator.identity.displayParent ? validator.identity.displayParent + "/" : "";
+		validator["display"] += validator.identity.display;
+		validator["#"] = index;
+		validator["lastClaimed"] = validator.stakingLedger.claimedRewards.slice(-1)[0];
+		validator["selfStake"] = substrate.createType("Balance", validator.stakingLedger.active).toHuman();
+	}
+	return global.validators;
+}
+
+// Create a table with the information
+function createTable(validators) {
+	if (!validators || validator.length == 0) {
+		output("No nominations found.");
+		return;
+	}
+	output("Creating Table...");
+
+	let keys = ["#", "display", "accountId", "commission", "lastClaimed", "selfStake"];
+	let table = document.getElementById('validators-table');
+
+	// Clear table
+	while (table.firstChild) {
+		table.removeChild(table.firstChild);
+	}
+
+	let thead = document.createElement('thead');
+	let tbody = document.createElement('tbody');
+
+	let tr = document.createElement('tr');
+	for (key of keys) {
+		let th = document.createElement('th');
+		th.innerText = key;
+		tr.appendChild(th);
+	}
+
+	for (account of validators) {
+		let tr2 = document.createElement('tr');
+
+		for (key of keys) {
+			let td = document.createElement('td');
+			td.innerText = account[key];
+			tr2.appendChild(td);
+		}
+		tbody.appendChild(tr2);
+	}
+
+	thead.appendChild(tr);
+	table.appendChild(thead);
+	table.appendChild(tbody);
+
+	output("Done.");
+}
+
+function estimateReward() {
+	if (global.account && global.account.stakingLedger) {
+		let active = global.account.stakingLedger.active.toBn();
+		let inflation = document.getElementById('inflation').value;
+		let yearlyInflation = new BN(inflation, 10);
+		let yearlyReward = active.mul(yearlyInflation).div(BN_HUNDRED);
+		let daysInYear = new BN("365", 10);
+
+		let dailyReward = yearlyReward.div(daysInYear);
+		global.account["selfStake"] = substrate.createType("Balance", dailyReward).toHuman();
+
+		document.getElementById('estimate').innerText = `Active Stake: ${substrate.createType("Balance", active).toHuman()}
+			Assuming Yearly Inflation: ${yearlyInflation}%
+			Estimated Yearly Rewards: ${substrate.createType("Balance", yearlyReward).toHuman()}
+			Estimated Daily Rewards: ${substrate.createType("Balance", dailyReward).toHuman()}
+		`;
+
+		document.getElementById('estimate').style.display = "block";
+	}
+}
+
+// Main function
+async function queryNominations() {
+	try {
+		await connect();
+
+		let address = document.getElementById("address").value;
+
+		let validators = await getNominations(address);
+		estimateReward();
+		createTable(validators);
+
+	} catch (error) {
+		console.error(error);
+		output(error);
+	}
+}
+
+document.getElementById('inflation').addEventListener("change", estimateReward);
+
+connect();