diff --git a/package.json b/package.json index 2b893c26..0271dd35 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "author": "Jaco Greeff ", + "author": "GHOST Chain ", "bugs": "https://github.com/polkadot-js/extension/issues", "engines": { "node": ">=18.14" @@ -14,10 +14,10 @@ }, "sideEffects": false, "type": "module", - "version": "0.64.1", + "version": "0.0.1", "versions": { - "git": "0.64.1", - "npm": "0.64.1" + "git": "0.0.1", + "npm": "0.0.1" }, "workspaces": [ "packages/*" diff --git a/packages/extension-base/src/stores/Accounts.ts b/packages/extension-base/src/stores/Accounts.ts index 386e05ab..5cfa25f0 100644 --- a/packages/extension-base/src/stores/Accounts.ts +++ b/packages/extension-base/src/stores/Accounts.ts @@ -9,7 +9,7 @@ import BaseStore from './Base.js'; export default class AccountsStore extends BaseStore implements KeyringStore { constructor () { super( - EXTENSION_PREFIX && EXTENSION_PREFIX !== 'polkadot{.js}' + EXTENSION_PREFIX && EXTENSION_PREFIX !== 'GHOST Keychain' ? `${EXTENSION_PREFIX}accounts` : null ); diff --git a/packages/extension-base/src/stores/Metadata.ts b/packages/extension-base/src/stores/Metadata.ts index 78963d9a..55bfff1c 100644 --- a/packages/extension-base/src/stores/Metadata.ts +++ b/packages/extension-base/src/stores/Metadata.ts @@ -9,7 +9,7 @@ import BaseStore from './Base.js'; export default class MetadataStore extends BaseStore { constructor () { super( - EXTENSION_PREFIX && EXTENSION_PREFIX !== 'polkadot{.js}' + EXTENSION_PREFIX && EXTENSION_PREFIX !== 'GHOST Keychain' ? `${EXTENSION_PREFIX}metadata` : 'metadata' ); diff --git a/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx b/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx index 8855e9e9..6ca149e5 100644 --- a/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx +++ b/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx @@ -61,7 +61,7 @@ export default styled(WebsiteEntry)` .connectedAccounts{ margin-left: .5rem; background-color: var(--primaryColor); - color: white; + color: var(--primaryColorLabel); cursor: pointer; padding: 0 0.5rem; border-radius: 4px; diff --git a/packages/extension-ui/src/Popup/CreateAccount/index.tsx b/packages/extension-ui/src/Popup/CreateAccount/index.tsx index c9b8bb1f..f1a075fb 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/index.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/index.tsx @@ -31,6 +31,14 @@ function CreateAccount ({ className }: Props): React.ReactElement { const [genesisHash, setGenesis] = useState(null); const chain = useMetadata(genesisHash, true); + useEffect((): void => { + // Default to CASPER if the user hasn't picked anything yet + const casper = options.find((o) => o.text === 'CASPER Staging Testnet'); + if (casper && genesisHash === null) { + setGenesis(casper.value as HexString); + } + }, [options, genesisHash]); + useEffect((): void => { createSeed(undefined) .then(({ address, seed }): void => { diff --git a/packages/extension-ui/src/Popup/PhishingDetected.tsx b/packages/extension-ui/src/Popup/PhishingDetected.tsx index c66d2c85..fade9dee 100644 --- a/packages/extension-ui/src/Popup/PhishingDetected.tsx +++ b/packages/extension-ui/src/Popup/PhishingDetected.tsx @@ -27,7 +27,7 @@ function PhishingDetected ({ className }: Props): React.ReactElement {

- {t('You have been redirected because the Polkadot{.js} extension believes that this website could compromise the security of your accounts and your tokens.')} + {t('You have been redirected because the GHOST Keychain extension believes that this website could compromise the security of your accounts and your tokens.')}

{decodedWebsite} diff --git a/packages/extension-ui/src/assets/GHOST-Keychain.svg b/packages/extension-ui/src/assets/GHOST-Keychain.svg new file mode 100644 index 00000000..a202fcd7 --- /dev/null +++ b/packages/extension-ui/src/assets/GHOST-Keychain.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/extension-ui/src/assets/arrow-down.svg b/packages/extension-ui/src/assets/arrow-down.svg index 494dd408..e5043b86 100644 --- a/packages/extension-ui/src/assets/arrow-down.svg +++ b/packages/extension-ui/src/assets/arrow-down.svg @@ -1 +1 @@ - + diff --git a/packages/extension-ui/src/assets/checkmark.svg b/packages/extension-ui/src/assets/checkmark.svg index 3996dc0b..d0767d92 100644 --- a/packages/extension-ui/src/assets/checkmark.svg +++ b/packages/extension-ui/src/assets/checkmark.svg @@ -1 +1 @@ - + diff --git a/packages/extension-ui/src/assets/ghost-spinner.svg b/packages/extension-ui/src/assets/ghost-spinner.svg new file mode 100644 index 00000000..cb6bfd7b --- /dev/null +++ b/packages/extension-ui/src/assets/ghost-spinner.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/extension-ui/src/components/Address.tsx b/packages/extension-ui/src/components/Address.tsx index d3949e4c..ecf813b6 100644 --- a/packages/extension-ui/src/components/Address.tsx +++ b/packages/extension-ui/src/components/Address.tsx @@ -321,7 +321,7 @@ export default styled(Address)` &.chain { background: var(--primaryColor); border-radius: 0 0 0 10px; - color: white; + color: var(--primaryColorLabel); padding: 0.1rem 0.5rem 0.1rem 0.75rem; right: 0; z-index: 1; diff --git a/packages/extension-ui/src/components/Spinner.tsx b/packages/extension-ui/src/components/Spinner.tsx index 3eb2bdc8..02895c28 100644 --- a/packages/extension-ui/src/components/Spinner.tsx +++ b/packages/extension-ui/src/components/Spinner.tsx @@ -3,7 +3,7 @@ import React from 'react'; -import spinnerSrc from '../assets/spinner.png'; +import spinnerSrc from '../assets/ghost-spinner.svg'; import { styled } from '../styled.js'; interface Props { diff --git a/packages/extension-ui/src/partials/Header.tsx b/packages/extension-ui/src/partials/Header.tsx index 41b622dd..e2bf7ec1 100644 --- a/packages/extension-ui/src/partials/Header.tsx +++ b/packages/extension-ui/src/partials/Header.tsx @@ -5,7 +5,7 @@ import { faArrowLeft, faCog, faPlusCircle, faSearch } from '@fortawesome/free-so import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'; -import logo from '../assets/pjs.svg'; +import logo from '../assets/GHOST-Keychain.svg'; import { ActionContext } from '../components/index.js'; import InputFilter from '../components/InputFilter.js'; import Link from '../components/Link.js'; @@ -113,7 +113,7 @@ function Header ({ children, className = '', onFilter, showAdd, showBackArrow, s /> ) } - {text || 'polkadot{.js}'} + {text || 'GHOST Keychain'}

{showSearch && (
@@ -245,7 +245,7 @@ export default React.memo(styled(Header)` .greenDot { margin-right: 0.3rem; - font-size: 1.5rem; + font-size: 2rem; color: var(--connectedDotColor); padding-bottom: 0.2rem; } diff --git a/packages/extension-ui/src/partials/MenuSettings.tsx b/packages/extension-ui/src/partials/MenuSettings.tsx index f7379442..a1a5a6de 100644 --- a/packages/extension-ui/src/partials/MenuSettings.tsx +++ b/packages/extension-ui/src/partials/MenuSettings.tsx @@ -6,7 +6,7 @@ import React, { useCallback, useContext, useEffect, useMemo, useState } from 're import { settings } from '@polkadot/ui-settings'; -import { ActionContext, ActionText, Checkbox, chooseTheme, Dropdown, Menu, MenuDivider, MenuItem, Switch, ThemeSwitchContext } from '../components/index.js'; +import { ActionContext, ActionText, Checkbox, Dropdown, Menu, MenuDivider, MenuItem } from '../components/index.js'; import { useIsPopup, useTranslation } from '../hooks/index.js'; import { setNotification, windowOpen } from '../messaging.js'; import { styled } from '../styled.js'; @@ -34,8 +34,6 @@ function MenuSettings ({ className, reference }: Props): React.ReactElement getLanguageOptions(), []); const onAction = useContext(ActionContext); @@ -61,16 +59,6 @@ function MenuSettings ({ className, reference }: Props): React.ReactElement { - const theme = checked ? 'dark' : 'light'; - - setThemeContext(theme); - setTheme(theme); - }, - [setThemeContext] - ); - const _onWindowOpen = useCallback( (): void => { windowOpen('/').catch(console.error); @@ -100,17 +88,6 @@ function MenuSettings ({ className, reference }: Props): React.ReactElement - - - ` width: 100%; } } -`); +`); \ No newline at end of file diff --git a/packages/extension-ui/src/util/chains.ts b/packages/extension-ui/src/util/chains.ts index fd1556e1..a13305a1 100644 --- a/packages/extension-ui/src/util/chains.ts +++ b/packages/extension-ui/src/util/chains.ts @@ -14,4 +14,12 @@ const hashes: MetadataDefBase[] = selectableNetworks ss58Format: network.prefix })); -export default hashes; +// Inject CASPER (not in the upstream SS58 registry yet) +hashes.push({ + chain: 'CASPER Staging Testnet', + genesisHash: '0xcaf9c5ddccc7ba6f96149a6b8a81c26a3641742795cd5e7e0aee79bf3f4e77b7' as `0x${string}`, + icon: 'substrate', + ss58Format: 1996 +}); + +export default hashes; \ No newline at end of file diff --git a/packages/extension/manifest_chrome.json b/packages/extension/manifest_chrome.json index 891acc81..caffbba5 100644 --- a/packages/extension/manifest_chrome.json +++ b/packages/extension/manifest_chrome.json @@ -1,9 +1,9 @@ { - "author": "polkadot.{js}", - "description": "Manage your Polkadot accounts outside of dapps. Injects the accounts and allows signing transactions for a specific account.", - "homepage_url": "https://github.com/polkadot-js/extension", - "name": "polkadot{.js} extension", - "short_name": "polkadot{.js}", + "author": "GHOST", + "description": "Manage your GHOST Chain accounts outside of dapps. Injects the accounts and allows signing transactions for a specific account.", + "homepage_url": "https://git.ghostchain.io/ghostchain/ghost-keychain", + "name": "GHOST Keychain", + "short_name": "GHOST Keychain", "manifest_version": 3, "permissions": ["storage", "tabs"], "background": { @@ -11,7 +11,7 @@ "type": "module" }, "action": { - "default_title": "polkadot{.js}", + "default_title": "GHOST Keychain", "default_popup": "index.html" }, "content_scripts": [{ diff --git a/packages/extension/manifest_firefox.json b/packages/extension/manifest_firefox.json index fce98b78..bfd7f505 100644 --- a/packages/extension/manifest_firefox.json +++ b/packages/extension/manifest_firefox.json @@ -1,9 +1,10 @@ { - "author": "polkadot.{js}", - "description": "Manage your Polkadot accounts outside of dapps. Injects the accounts and allows signing transactions for a specific account.", - "homepage_url": "https://github.com/polkadot-js/extension", - "name": "polkadot{.js} extension", - "short_name": "polkadot{.js}", + "author": "GHOST", + "description": "Manage your GHOST Chain accounts outside of dapps. Injects the accounts and allows signing transactions for a specific account.", + "homepage_url": "https://git.ghostchain.io/ghostchain/ghost-keychain", + "name": "GHOST Keychain", + "version": "0.0.1", + "short_name": "GHOST Keychain", "manifest_version": 3, "permissions": ["storage", "tabs"], "background": { @@ -11,13 +12,16 @@ "type": "module" }, "action": { - "default_title": "polkadot{.js}", + "default_title": "GHOST Keychain", "default_popup": "index.html" }, "browser_specific_settings": { "gecko": { - "id": "{7e3ce1f0-15fb-4fb1-99c6-25774749ec6d}", - "strict_min_version": "108.0.2" + "id": "dev@ghostchain.io", + "strict_min_version": "140.0", + "data_collection_permissions": { + "required": ["none"] + } } }, "content_scripts": [{ diff --git a/packages/extension/package.json b/packages/extension/package.json index e2c1afe5..115aa738 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -1,7 +1,7 @@ { - "author": "Jaco Greeff ", + "author": "GHOST Chain ", "bugs": "https://github.com/polkadot-js/extension/issues", - "description": "A sample signer extension for the @polkadot/api", + "description": "Manage your GHOST Chain accounts outside of dapps. Injects the accounts and allows signing transactions for a specific account.", "engines": { "node": ">=18" }, @@ -15,12 +15,12 @@ }, "sideEffects": false, "type": "module", - "version": "0.64.1", + "version": "0.0.1", "dependencies": { "@polkadot/api": "^17.0.1", - "@polkadot/extension-base": "0.64.1", - "@polkadot/extension-inject": "0.64.1", - "@polkadot/extension-ui": "0.64.1", + "@polkadot/extension-base": "0.0.1", + "@polkadot/extension-inject": "0.0.1", + "@polkadot/extension-ui": "0.0.1", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/packages/extension/public/favicon.ico b/packages/extension/public/favicon.ico index ec3c167a..06952fad 100644 Binary files a/packages/extension/public/favicon.ico and b/packages/extension/public/favicon.ico differ diff --git a/packages/extension/public/fonts/Ubuntu-Regular.eot b/packages/extension/public/fonts/Ubuntu-Regular.eot new file mode 100644 index 00000000..d7cd47a1 Binary files /dev/null and b/packages/extension/public/fonts/Ubuntu-Regular.eot differ diff --git a/packages/extension/public/fonts/Ubuntu-Regular.ttf b/packages/extension/public/fonts/Ubuntu-Regular.ttf new file mode 100644 index 00000000..f98a2dab Binary files /dev/null and b/packages/extension/public/fonts/Ubuntu-Regular.ttf differ diff --git a/packages/extension/public/fonts/Ubuntu-Regular.woff b/packages/extension/public/fonts/Ubuntu-Regular.woff new file mode 100644 index 00000000..aec0eeaf Binary files /dev/null and b/packages/extension/public/fonts/Ubuntu-Regular.woff differ diff --git a/packages/extension/public/fonts/Ubuntu-Regular.woff2 b/packages/extension/public/fonts/Ubuntu-Regular.woff2 new file mode 100644 index 00000000..c700cb16 Binary files /dev/null and b/packages/extension/public/fonts/Ubuntu-Regular.woff2 differ diff --git a/packages/extension/public/fonts/fonts.css b/packages/extension/public/fonts/fonts.css index 1e70af46..723facad 100644 --- a/packages/extension/public/fonts/fonts.css +++ b/packages/extension/public/fonts/fonts.css @@ -1,12 +1,11 @@ @font-face { - font-family: 'Nunito'; - src: url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot'); /* IE9 Compat Modes */ - src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), - url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ - url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.svg#NunitoSans') format('svg'); /* Legacy iOS */ - font-weight: 400; - font-style: normal; -} + font-family: 'Ubuntu'; + src: url('./Ubuntu-Regular.eot'); /* IE9 Compat Modes */ + src: local('Ubuntu Regular'), local('Ubuntu-Regular'), + url('./Ubuntu-Regular.eot?#iefix') format('embedded-opentype'), + url('./Ubuntu-Regular.woff2') format('woff2'), + url('./Ubuntu-Regular.woff') format('woff'), + url('./Ubuntu-Regular.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} \ No newline at end of file diff --git a/packages/extension/public/images/icon-128.png b/packages/extension/public/images/icon-128.png index e65f627c..8203f68b 100644 Binary files a/packages/extension/public/images/icon-128.png and b/packages/extension/public/images/icon-128.png differ diff --git a/packages/extension/public/images/icon-16.png b/packages/extension/public/images/icon-16.png index 28ae22ff..def9d25d 100644 Binary files a/packages/extension/public/images/icon-16.png and b/packages/extension/public/images/icon-16.png differ diff --git a/packages/extension/public/images/icon-32.png b/packages/extension/public/images/icon-32.png index a37852bb..9d046c6a 100644 Binary files a/packages/extension/public/images/icon-32.png and b/packages/extension/public/images/icon-32.png differ diff --git a/packages/extension/public/images/icon-48.png b/packages/extension/public/images/icon-48.png index 9e6e39a3..19797c49 100644 Binary files a/packages/extension/public/images/icon-48.png and b/packages/extension/public/images/icon-48.png differ diff --git a/packages/extension/public/images/icon-64.png b/packages/extension/public/images/icon-64.png index 746db520..643f8514 100644 Binary files a/packages/extension/public/images/icon-64.png and b/packages/extension/public/images/icon-64.png differ diff --git a/packages/extension/public/images/pjs.svg b/packages/extension/public/images/pjs.svg index 595779f2..a202fcd7 100644 --- a/packages/extension/public/images/pjs.svg +++ b/packages/extension/public/images/pjs.svg @@ -1,4 +1,106 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/extension/public/index.html b/packages/extension/public/index.html index 9862076b..a3fafc56 100644 --- a/packages/extension/public/index.html +++ b/packages/extension/public/index.html @@ -2,7 +2,7 @@ - polkadot{.js} + GHOST Keychain