diff --git a/packages/apps-config/src/api/spec/encointer-node.ts b/packages/apps-config/src/api/spec/encointer-node-notee.ts similarity index 88% rename from packages/apps-config/src/api/spec/encointer-node.ts rename to packages/apps-config/src/api/spec/encointer-node-notee.ts index 658de6c3a0..f573ab4ce1 100644 --- a/packages/apps-config/src/api/spec/encointer-node.ts +++ b/packages/apps-config/src/api/spec/encointer-node-notee.ts @@ -67,17 +67,6 @@ export default { attendee_public: 'AccountId', attendee_signature: 'Signature' }, - ShardIdentifier: 'Hash', - Request: { - shard: 'ShardIdentifier', - cyphertext: 'Vec' - }, - Enclave: { - pubkey: 'AccountId', - mrenclave: 'Hash', - timestamp: 'u64', - url: 'Text' - }, - // substrate + // weight changed to u64 since 2.0.0-rc1 (commit 2051ecbf79e April 16th 2020 Weight: 'u32' }; diff --git a/packages/apps-config/src/api/spec/encointer-node-teeproxy.ts b/packages/apps-config/src/api/spec/encointer-node-teeproxy.ts new file mode 100644 index 0000000000..f3de7c7672 --- /dev/null +++ b/packages/apps-config/src/api/spec/encointer-node-teeproxy.ts @@ -0,0 +1,46 @@ +// Copyright 2017-2020 @polkadot/apps-config authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +// structs need to be in order +/* eslint-disable sort-keys */ +/* eslint-disable camelcase */ + +export default { + Address: 'AccountId', + LookupSource: 'AccountId', + CeremonyPhaseType: { + _enum: [ + 'Registering', + 'Assigning', + 'Attesting' + ] + }, + CeremonyIndexType: 'u32', + CurrencyIdentifier: 'Hash', + CurrencyCeremony: { + cid: 'CurrencyIdentifier', + cindex: 'CeremonyIndexType' + }, + Location: { + lat: 'i64', + lon: 'i64' + }, + CurrencyPropertiesType: { + name_utf8: 'Text', + demurrage_per_block: 'i128' + }, + ShardIdentifier: 'Hash', + Request: { + shard: 'ShardIdentifier', + cyphertext: 'Vec' + }, + Enclave: { + pubkey: 'AccountId', + mrenclave: 'Hash', + timestamp: 'u64', + url: 'Text' + }, + // weight changed to u64 since 2.0.0-rc1 (commit 2051ecbf79e April 16th 2020 + Weight: 'u32' +}; diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 0c6ed1bc60..ea3d2389cd 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -4,7 +4,8 @@ import centrifugeChain from './centrifuge-chain'; import edgeware from './edgeware'; -import encointerNode from './encointer-node'; +import encointerNodeNotee from './encointer-node-notee'; +import encointerNodeTeeproxy from './encointer-node-teeproxy'; import kulupu from './kulupu'; import nodeTemplate from './node-template'; import stablePoc from './stable-poc'; @@ -12,7 +13,9 @@ import stablePoc from './stable-poc'; export default { 'centrifuge-chain': centrifugeChain, edgeware, - 'encointer-node': encointerNode, + 'encointer-node': encointerNodeNotee, + 'encointer-node-notee': encointerNodeNotee, + 'encointer-node-teeproxy': encointerNodeTeeproxy, kulupu, 'node-template': nodeTemplate, 'stable-poc': stablePoc, diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index 771881626e..2168c7bf98 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -10,7 +10,8 @@ import chainKusama from './chains/kusama-128.gif'; // defaults for the node type, assuming we don't have a specific chain, but rather match on the implementation import nodeCentrifuge from './nodes/centrifuge.png'; import nodeEdgeware from './nodes/edgeware-circle.svg'; -import nodeEncointer from './nodes/encointer.svg'; +import nodeEncointerNotee from './nodes/encointer-notee.svg'; +import nodeEncointerTeeproxy from './nodes/encointer-teeproxy.svg'; import nodeNodle from './nodes/nodle.svg'; import nodePolkadot from './nodes/polkadot-circle.svg'; import nodePolkadotJs from './nodes/polkadot-js.svg'; @@ -38,7 +39,9 @@ const nodeLogos: Record = [ ['centrifuge chain', nodeCentrifuge], ['Centrifuge Chain Node', nodeCentrifuge], ['Edgeware Node', nodeEdgeware], - ['Encointer Node', nodeEncointer], + ['Encointer Node', nodeEncointerNotee], + ['Encointer Node noTEE', nodeEncointerNotee], + ['Encointer Node TEE proxy', nodeEncointerTeeproxy], ['kulupu', nodeSubstrate], ['node-template', nodeSubstrate], ['Nodle Chain Node', nodeNodle], diff --git a/packages/apps-config/src/ui/logos/nodes/encointer.svg b/packages/apps-config/src/ui/logos/nodes/encointer-notee.svg similarity index 66% rename from packages/apps-config/src/ui/logos/nodes/encointer.svg rename to packages/apps-config/src/ui/logos/nodes/encointer-notee.svg index 8bacbf13fd..174e8d60ab 100644 --- a/packages/apps-config/src/ui/logos/nodes/encointer.svg +++ b/packages/apps-config/src/ui/logos/nodes/encointer-notee.svg @@ -15,7 +15,7 @@ version="1.1" id="svg8" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="encointer_logo_facesonly.svg"> + sodipodi:docname="encointer.svg"> @@ -149,95 +149,108 @@ transform="matrix(0.35277777,0,0,-0.35277777,33.313599,111.30868)" /> + transform="translate(0,-3.1750678)" + style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"> + id="g929" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + clip-path="url(#clipPath847)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + clip-path="url(#clipPath851)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(113.3987,132.0237)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(110.9046,131.2434)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(108.4104,130.4631)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(105.9163,129.6838)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(103.4221,128.9035)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(100.928,128.1233)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(98.4339,127.344)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(95.9397,126.5637)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(94.1956,125.7834)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> @@ -245,92 +258,104 @@ + id="g971" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + clip-path="url(#clipPath855)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + clip-path="url(#clipPath859)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(168.8909,132.0237)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(171.385,131.2434)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(173.8792,130.4631)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(176.3733,129.6838)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(178.8675,128.9035)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(181.3616,128.1233)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(183.8557,127.344)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(186.3499,126.5637)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> + transform="translate(188.094,125.7834)" + style="fill:none;stroke:#ffffff;stroke-width:1.41732287;stroke-miterlimit:4;stroke-dasharray:none"> diff --git a/packages/apps-config/src/ui/logos/nodes/encointer-teeproxy.svg b/packages/apps-config/src/ui/logos/nodes/encointer-teeproxy.svg new file mode 100644 index 0000000000..8c0001d06b --- /dev/null +++ b/packages/apps-config/src/ui/logos/nodes/encointer-teeproxy.svg @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +