From f5832feb027ca392644386cec5144f5621af3cd3 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Wed, 19 Aug 2020 15:39:37 +0200
Subject: [PATCH] Add Kulupu council config, logo and fix display of block time
 (#3448)

* Add KULUPU_GENESIS constant

* Add Kulupu-specific thresholds

* Add support for targetBlockTime

* Styling fix

* Init Kulupu logo

* Fix endpoint icon for Kulupu

* Fix linting
---
 packages/apps-config/src/api/constants.ts     |  2 +
 .../apps-config/src/settings/endpoints.ts     |  2 +-
 packages/apps-config/src/ui/logos/index.ts    |  4 +-
 .../apps-config/src/ui/logos/nodes/kulupu.svg | 83 +++++++++++++++++++
 packages/page-council/src/thresholds.ts       |  6 +-
 packages/react-hooks/src/useBlockTime.ts      |  1 +
 6 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 packages/apps-config/src/ui/logos/nodes/kulupu.svg

diff --git a/packages/apps-config/src/api/constants.ts b/packages/apps-config/src/api/constants.ts
index c5820bb970..e3b9419256 100644
--- a/packages/apps-config/src/api/constants.ts
+++ b/packages/apps-config/src/api/constants.ts
@@ -8,3 +8,5 @@ export const KUSAMA_GENESIS = '0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149
 
 export const POLKADOT_GENESIS = '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3';
 export const POLKADOT_DENOM_BLOCK = new BN(1248328);
+
+export const KULUPU_GENESIS = '0xf7a99d3cb92853d00d5275c971c132c074636256583fee53b3bbe60d7b8769ba';
diff --git a/packages/apps-config/src/settings/endpoints.ts b/packages/apps-config/src/settings/endpoints.ts
index f2bb8bf77b..875e4bdc73 100644
--- a/packages/apps-config/src/settings/endpoints.ts
+++ b/packages/apps-config/src/settings/endpoints.ts
@@ -99,7 +99,7 @@ function createLive (t: TFunction): LinkOption[] {
     },
     {
       dnslink: 'kulupu',
-      info: 'substrate',
+      info: 'kulupu',
       text: t<string>('rpc.kulupu', 'Kulupu (Kulupu Mainnet, hosted by Kulupu)', { ns: 'apps-config' }),
       value: 'wss://rpc.kulupu.corepaper.org/ws'
     }
diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts
index 67d9be5f4e..905fdf01ab 100644
--- a/packages/apps-config/src/ui/logos/index.ts
+++ b/packages/apps-config/src/ui/logos/index.ts
@@ -22,6 +22,7 @@ import nodeKilt from './nodes/kilt.svg';
 import nodePolkadot from './nodes/polkadot-circle.svg';
 import nodePolkadotJs from './nodes/polkadot-js.svg';
 import nodeSubstrate from './nodes/substrate-hexagon.svg';
+import nodeKulupu from './nodes/kulupu.svg';
 
 // extensions
 import extensionPolkadotJs from './extensions/polkadot-js.svg';
@@ -53,7 +54,7 @@ const nodeLogos: Record<string, any> = [
   ['Encointer Node noTEE', nodeEncointerNotee],
   ['Encointer Node TEE proxy', nodeEncointerTeeproxy],
   ['KILT Node', nodeKilt],
-  ['kulupu', nodeSubstrate],
+  ['kulupu', nodeKulupu],
   ['node-template', nodeSubstrate],
   ['Nodle Chain Node', nodeNodle],
   ['parity-polkadot', nodePolkadot],
@@ -72,6 +73,7 @@ const namedLogos: Record<string, any> = {
   edgeware: nodeEdgeware,
   empty: emptyLogo,
   kilt: nodeKilt,
+  kulupu: nodeKulupu,
   kusama: chainKusama,
   nodle: nodeNodle,
   polkadot: nodePolkadot,
diff --git a/packages/apps-config/src/ui/logos/nodes/kulupu.svg b/packages/apps-config/src/ui/logos/nodes/kulupu.svg
new file mode 100644
index 0000000000..bbd87899b3
--- /dev/null
+++ b/packages/apps-config/src/ui/logos/nodes/kulupu.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="kulupu.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   id="svg1237"
+   version="1.1"
+   viewBox="0 0 132.29167 132.29168"
+   height="500.00003"
+   width="500.00003">
+  <defs
+     id="defs1231" />
+  <sodipodi:namedview
+     inkscape:window-maximized="0"
+     inkscape:window-y="22"
+     inkscape:window-x="0"
+     inkscape:window-height="1032"
+     inkscape:window-width="1916"
+     inkscape:snap-bbox="true"
+     inkscape:snap-page="true"
+     units="px"
+     showborder="true"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="290.0126"
+     inkscape:cx="-12.29317"
+     inkscape:zoom="0.35"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1234">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(-66.145836,-66.145836)">
+    <path
+       d="M 198.43751,132.29167 A 66.145836,66.145836 0 0 1 132.29167,198.43751 66.145836,66.145836 0 0 1 66.145836,132.29167 66.145836,66.145836 0 0 1 132.29167,66.145836 66.145836,66.145836 0 0 1 198.43751,132.29167 Z"
+       style="fill:#231f20;fill-opacity:1;stroke:none;stroke-width:0.57163;stroke-opacity:1"
+       id="path845"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1834"
+       transform="translate(-1.8720778,40.71716)">
+      <path
+         d="m 168.34531,58.19922 -29.71538,9.723097 a 17.521244,17.521244 0 0 0 -10.17254,8.717257 l -13.63198,26.836146 a 10.907927,10.907927 0 0 1 -4.34571,4.54909 l -12.840327,7.27921 a 6.1044908,6.1044908 0 0 0 -3.093944,5.31049 v 0 a 4.5445989,4.5445989 0 0 0 7.051901,3.79035 l 15.51366,-10.26228 a 11.795232,11.795232 0 0 0 4.03076,-4.53943 L 134.18227,83.6649 a 17.656454,17.656454 0 0 1 10.54462,-8.933045 l 25.61079,-7.943227 a 4.8941792,4.8941792 0 0 0 3.44438,-4.674519 4.1374683,4.1374683 0 0 0 -5.43675,-3.914889 z M 94.545429,76.931052 a 3.9139513,3.9139513 0 0 0 4.430149,3.318398 h 5.794792 a 6.8104403,6.8104403 0 0 1 4.96881,2.152883 l 6.69934,7.147071 4.06602,-7.556307 -5.95502,-7.118557 a 6.6236024,6.6236024 0 0 0 -5.08034,-2.373659 H 98.975578 a 4.4301517,4.4301517 0 0 0 -4.430149,4.430171 z m 38.358101,19.593053 -3.87468,7.748565 10.85658,13.17114 a 12.251458,12.251458 0 0 0 9.45383,4.45894 h 21.07201 a 3.3707675,3.3707675 0 0 0 3.37079,-3.37076 3.874104,3.874104 0 0 0 -3.94862,-3.79814 h -17.38725 a 10.087613,10.087613 0 0 1 -7.84349,-3.74412 z"
+         style="fill:#ffffff;stroke-width:0.99582398"
+         id="path1130-2"
+         inkscape:connector-curvature="0" />
+      <g
+         inkscape:export-ydpi="60.222229"
+         inkscape:export-xdpi="60.222229"
+         transform="matrix(0.23295834,0,0,0.23295834,-514.53181,-86.111817)"
+         id="g2615-3-5-5" />
+    </g>
+  </g>
+</svg>
diff --git a/packages/page-council/src/thresholds.ts b/packages/page-council/src/thresholds.ts
index d947ec7261..77c8963e31 100644
--- a/packages/page-council/src/thresholds.ts
+++ b/packages/page-council/src/thresholds.ts
@@ -3,9 +3,11 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ApiPromise } from '@polkadot/api';
-import { POLKADOT_GENESIS } from '@polkadot/apps-config/api/constants';
+import { POLKADOT_GENESIS, KULUPU_GENESIS } from '@polkadot/apps-config/api/constants';
 
 const PROPOSE_THRESHOLDS: Record<string, number> = {
+  // Kulupu
+  [KULUPU_GENESIS]: 1,
   // Polkadot
   [POLKADOT_GENESIS]: 0.6
 };
@@ -16,6 +18,8 @@ const SLASH_THRESHOLDS: Record<string, number> = {
 };
 
 const TREASURY_THRESHOLDS: Record<string, number> = {
+  // Kulupu
+  [KULUPU_GENESIS]: 0.8,
   // Polkadot
   [POLKADOT_GENESIS]: 0.6
 };
diff --git a/packages/react-hooks/src/useBlockTime.ts b/packages/react-hooks/src/useBlockTime.ts
index 9479807f89..6044d0d6fb 100644
--- a/packages/react-hooks/src/useBlockTime.ts
+++ b/packages/react-hooks/src/useBlockTime.ts
@@ -21,6 +21,7 @@ export default function useBlockTime (blocks = BN_ONE): Result {
     (): Result => {
       const blockTime = (
         api.consts.babe?.expectedBlockTime ||
+        api.consts.difficulty?.targetBlockTime ||
         api.consts.timestamp?.minimumPeriod.muln(2) ||
         DEFAULT_TIME
       );